[PATCH] D36231: [asan] Make dump_registers.cc more stable

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL310273: [asan] Make dump_registers.cc more stable (authored by kuba.brecka).

Changed prior to commit:
  https://reviews.llvm.org/D36231?vs=109375&id=110035#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D36231

Files:
  compiler-rt/trunk/test/asan/TestCases/Darwin/dump_registers.cc


Index: compiler-rt/trunk/test/asan/TestCases/Darwin/dump_registers.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/Darwin/dump_registers.cc
+++ compiler-rt/trunk/test/asan/TestCases/Darwin/dump_registers.cc
@@ -5,22 +5,22 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <sys/mman.h>
 
 int main() {
   fprintf(stderr, "Hello\n");
   char *ptr;
 
-  if (sizeof(void *) == 8)
-    ptr = (char *)0x6666666666666666;
-  else if (sizeof(void *) == 4)
-    ptr = (char *)0x55555555;
-  else
-    assert(0 && "Your computer is weird.");
+  ptr = (char *)mmap(NULL, 0x10000, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  assert(ptr && "failed to mmap");
+
+  fprintf(stderr, sizeof(uintptr_t) == 8 ? "p = 0x%016lx\n" : "p = 0x%08lx\n", (uintptr_t)ptr);
+  // CHECK: p = [[ADDR:0x[0-9]+]]
 
   char c = *ptr;  // BOOM
   // CHECK: ERROR: AddressSanitizer: {{SEGV|BUS}}
   // CHECK: Register values:
-  // CHECK: {{0x55555555|0x6666666666666666}}
+  // CHECK: [[ADDR]]
   fprintf(stderr, "World\n");
   return c;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36231.110035.patch
Type: text/x-patch
Size: 1079 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170807/ac68eea3/attachment.bin>