diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2016-03-10 18:09:57 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2016-03-10 18:09:57 +0000 |
| commit | 28a3b7de06f11f6ef3dfaaca9c52b1c66ed0d902 (patch) | |
| tree | 0b3bcd855d6e279e3b9cfae3c439d9c0f7595a49 /compiler-rt/test/tsan/debugging.cc | |
| parent | e9b2725287159182ba6bafec3e94c49f76b24fb0 (diff) | |
| download | bcm5719-llvm-28a3b7de06f11f6ef3dfaaca9c52b1c66ed0d902.tar.gz bcm5719-llvm-28a3b7de06f11f6ef3dfaaca9c52b1c66ed0d902.zip | |
Follow-up fix for r263126. Apparently `printf("%p", NULL)` can output 0x0, (nil) or (null) on different platforms.
llvm-svn: 263137
Diffstat (limited to 'compiler-rt/test/tsan/debugging.cc')
| -rw-r--r-- | compiler-rt/test/tsan/debugging.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/test/tsan/debugging.cc b/compiler-rt/test/tsan/debugging.cc index 6e878cdedc6..cacdf69f8b5 100644 --- a/compiler-rt/test/tsan/debugging.cc +++ b/compiler-rt/test/tsan/debugging.cc @@ -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. |
