[compiler-rt] r263137 - Follow-up fix for r263126. Apparently `printf("%p", NULL)` can output 0x0, (nil) or (null) on different platforms.

[Kuba Brecka via llvm-commits]

Author: kuba.brecka
Date: Thu Mar 10 12:09:57 2016
New Revision: 263137

URL: http://llvm.org/viewvc/llvm-project?rev=263137&view=rev
Log:
Follow-up fix for r263126.  Apparently `printf("%p", NULL)` can output 0x0, (nil) or (null) on different platforms.


Modified:
    compiler-rt/trunk/test/tsan/debugging.cc

Modified: compiler-rt/trunk/test/tsan/debugging.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/debugging.cc?rev=263137&r1=263136&r2=263137&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/debugging.cc (original)
+++ compiler-rt/trunk/test/tsan/debugging.cc Thu Mar 10 12:09:57 2016
@@ -73,7 +73,7 @@ void __tsan_on_report(void *report) {
           tid, addr, size, write, atomic);
   // CHECK: tid = 1, addr = [[GLOBAL]], size = 8, write = 1, atomic = 0
   fprintf(stderr, "trace[0] = %p, trace[1] = %p\n", trace[0], trace[1]);
-  // CHECK: trace[0] = 0x{{[0-9a-f]+}}, trace[1] = 0x0
+  // CHECK: trace[0] = 0x{{[0-9a-f]+}}, trace[1] = {{0x0|\(nil\)|\(null\)}}
 
   __tsan_get_report_mop(report, 1, &tid, &addr, &size, &write, &atomic, trace,
                         16);
@@ -81,7 +81,7 @@ void __tsan_on_report(void *report) {
           tid, addr, size, write, atomic);
   // CHECK: tid = 0, addr = [[GLOBAL]], size = 8, write = 1, atomic = 0
   fprintf(stderr, "trace[0] = %p, trace[1] = %p\n", trace[0], trace[1]);
-  // CHECK: trace[0] = 0x{{[0-9a-f]+}}, trace[1] = 0x0
+  // CHECK: trace[0] = 0x{{[0-9a-f]+}}, trace[1] = {{0x0|\(nil\)|\(null\)}}
 }
 
 // CHECK: Done.