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 | 18c7b3f26258c76abd9e573dfb478ec7a63bf6d1 (patch) | |
| tree | 21c39080fb7dd177abd999c07baf4f79ae6abfae /test/tsan/debugging.cc | |
| parent | 96a0b31e315f4e64b4a1f69c208c12515392ef1d (diff) | |
Follow-up fix for r263126. Apparently `printf("%p", NULL)` can output 0x0, (nil) or (null) on different platforms.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@263137 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/tsan/debugging.cc')
| -rw-r--r-- | test/tsan/debugging.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tsan/debugging.cc b/test/tsan/debugging.cc index 6e878cded..cacdf69f8 100644 --- a/test/tsan/debugging.cc +++ b/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. |