Index: test/tsan/fd_location.cc =================================================================== --- test/tsan/fd_location.cc +++ test/tsan/fd_location.cc @@ -28,6 +28,6 @@ // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Location is file descriptor {{[0-9]+}} created by main thread at: -// CHECK: #0 pipe +// CHECK: #0 {{.*pipe}} // CHECK: #1 main Index: test/tsan/fd_pipe_race.cc =================================================================== --- test/tsan/fd_pipe_race.cc +++ test/tsan/fd_pipe_race.cc @@ -28,10 +28,10 @@ // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Write of size 8 -// CHECK: #0 close +// CHECK: #0 {{.*close}} // CHECK: #1 Thread2 // CHECK: Previous read of size 8 -// CHECK: #0 write +// CHECK: #0 {{.*write}} // CHECK: #1 Thread1 Index: test/tsan/free_race.c =================================================================== --- test/tsan/free_race.c +++ test/tsan/free_race.c @@ -40,7 +40,7 @@ // CHECK-NOZUPP: #0 Thread2 // CHECK-NOZUPP: #1 main // CHECK-NOZUPP: Previous write of size 8 at {{.*}} by thread T1{{.*}}: -// CHECK-NOZUPP: #0 free +// CHECK-NOZUPP: #0 {{.*free}} // CHECK-NOZUPP: #{{(1|2)}} Thread1 // CHECK-NOZUPP: SUMMARY: ThreadSanitizer: heap-use-after-free{{.*}}Thread2 // CHECK-SUPP: ThreadSanitizer: Matched 1 suppressions Index: test/tsan/free_race2.c =================================================================== --- test/tsan/free_race2.c +++ test/tsan/free_race2.c @@ -21,6 +21,6 @@ // CHECK: #0 bar // CHECK: #1 main // CHECK: Previous write of size 8 at {{.*}} by main thread: -// CHECK: #0 free +// CHECK: #0 {{.*free}} // CHECK: #{{1|2}} foo // CHECK: #{{2|3}} main Index: test/tsan/inlined_memcpy_race.cc =================================================================== --- test/tsan/inlined_memcpy_race.cc +++ test/tsan/inlined_memcpy_race.cc @@ -29,9 +29,9 @@ } // CHECK: WARNING: ThreadSanitizer: data race -// CHECK: #0 memset +// CHECK: #0 {{.*memset}} // CHECK: #1 MemSetThread // CHECK: Previous write -// CHECK: #0 memcpy +// CHECK: #0 {{.*memcpy}} // CHECK: #1 MemCpyThread Index: test/tsan/inlined_memcpy_race2.cc =================================================================== --- test/tsan/inlined_memcpy_race2.cc +++ test/tsan/inlined_memcpy_race2.cc @@ -30,8 +30,8 @@ } // CHECK: WARNING: ThreadSanitizer: data race -// CHECK: #0 memset +// CHECK: #0 {{.*memset}} // CHECK: #1 MemSetThread // CHECK: Previous write -// CHECK: #0 memmove +// CHECK: #0 {{.*memmove}} // CHECK: #1 MemMoveThread Index: test/tsan/memcmp_race.cc =================================================================== --- test/tsan/memcmp_race.cc +++ test/tsan/memcmp_race.cc @@ -35,8 +35,8 @@ // CHECK: addr=[[ADDR:0x[0-9,a-f]+]] // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Write of size 1 at [[ADDR]] by thread T2: -// CHECK: #0 memcpy +// CHECK: #0 {{.*memcpy}} // CHECK: #1 Thread2 // CHECK: Previous read of size 1 at [[ADDR]] by thread T1: -// CHECK: #0 memcmp +// CHECK: #0 {{.*memcmp}} // CHECK: #1 Thread1 Index: test/tsan/memcpy_race.cc =================================================================== --- test/tsan/memcpy_race.cc +++ test/tsan/memcpy_race.cc @@ -34,8 +34,8 @@ // CHECK: addr=[[ADDR:0x[0-9,a-f]+]] // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Write of size 1 at [[ADDR]] by thread T2: -// CHECK: #0 memcpy +// CHECK: #0 {{.*memcpy}} // CHECK: #1 Thread2 // CHECK: Previous write of size 1 at [[ADDR]] by thread T1: -// CHECK: #0 memcpy +// CHECK: #0 {{.*memcpy}} // CHECK: #1 Thread1 Index: test/tsan/mutex_destroy_locked.cc =================================================================== --- test/tsan/mutex_destroy_locked.cc +++ test/tsan/mutex_destroy_locked.cc @@ -11,12 +11,12 @@ } // CHECK: WARNING: ThreadSanitizer: destroy of a locked mutex -// CHECK: #0 pthread_mutex_destroy +// CHECK: #0 {{.*pthread_mutex_destroy}} // CHECK: #1 main // CHECK: and: -// CHECK: #0 pthread_mutex_lock +// CHECK: #0 {{.*pthread_mutex_lock}} // CHECK: #1 main // CHECK: Mutex {{.*}} created at: -// CHECK: #0 pthread_mutex_init +// CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main // CHECK: SUMMARY: ThreadSanitizer: destroy of a locked mutex{{.*}}main Index: test/tsan/mutexset1.cc =================================================================== --- test/tsan/mutexset1.cc +++ test/tsan/mutexset1.cc @@ -25,7 +25,7 @@ // CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset1.cc:[[@LINE+1]] pthread_mutex_init(&mtx, 0); pthread_t t[2]; Index: test/tsan/mutexset2.cc =================================================================== --- test/tsan/mutexset2.cc +++ test/tsan/mutexset2.cc @@ -25,7 +25,7 @@ // CHECK: Previous write of size 4 at {{.*}} by thread T1 // CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset2.cc:[[@LINE+1]] pthread_mutex_init(&mtx, 0); pthread_t t[2]; Index: test/tsan/mutexset3.cc =================================================================== --- test/tsan/mutexset3.cc +++ test/tsan/mutexset3.cc @@ -28,10 +28,10 @@ // CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]): // CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+4]] // CHECK: Mutex [[M2]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+2]] pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx2, 0); Index: test/tsan/mutexset4.cc =================================================================== --- test/tsan/mutexset4.cc +++ test/tsan/mutexset4.cc @@ -28,10 +28,10 @@ // CHECK: Previous write of size 4 at {{.*}} by thread T1 // CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]): // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+4]] // CHECK: Mutex [[M2]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+2]] pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx2, 0); Index: test/tsan/mutexset8.cc =================================================================== --- test/tsan/mutexset8.cc +++ test/tsan/mutexset8.cc @@ -25,7 +25,7 @@ // CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Mutex [[M1]] (0x{{.*}}) created at: - // CHECK: #0 pthread_mutex_init + // CHECK: #0 {{.*pthread_mutex_init}} // CHECK: #1 main {{.*}}/mutexset8.cc mtx = new pthread_mutex_t; pthread_mutex_init(mtx, 0); Index: test/tsan/race_on_heap.cc =================================================================== --- test/tsan/race_on_heap.cc +++ test/tsan/race_on_heap.cc @@ -38,10 +38,10 @@ // CHECK: WARNING: ThreadSanitizer: data race // ... // CHECK: Location is heap block of size 99 at [[ADDR]] allocated by thread T1: -// CHCEK: #0 malloc +// CHCEK: #0 {{.*malloc}} // CHECK: #{{1|2}} alloc // CHECK: #{{2|3}} AllocThread // ... // CHECK: Thread T1 (tid={{.*}}, finished) created by main thread at: -// CHECK: #0 pthread_create +// CHECK: #0 {{.*pthread_create}} // CHECK: #1 main Index: test/tsan/race_on_mutex.c =================================================================== --- test/tsan/race_on_mutex.c +++ test/tsan/race_on_mutex.c @@ -34,8 +34,8 @@ // CHECK: WARNING: ThreadSanitizer: data race // CHECK-NEXT: Atomic read of size 1 at {{.*}} by thread T2: -// CHECK-NEXT: #0 pthread_mutex_lock +// CHECK-NEXT: #0 {{.*pthread_mutex_lock}} // CHECK-NEXT: #1 Thread2{{.*}} {{.*}}race_on_mutex.c:18{{(:3)?}} ({{.*}}) // CHECK: Previous write of size 1 at {{.*}} by thread T1: -// CHECK-NEXT: #0 pthread_mutex_init {{.*}} ({{.*}}) +// CHECK-NEXT: #0 {{.*pthread_mutex_init}} {{.*}} ({{.*}}) // CHECK-NEXT: #1 Thread1{{.*}} {{.*}}race_on_mutex.c:8{{(:3)?}} ({{.*}}) Index: test/tsan/race_on_read.cc =================================================================== --- test/tsan/race_on_read.cc +++ test/tsan/race_on_read.cc @@ -38,8 +38,8 @@ // CHECK: WARNING: ThreadSanitizer: data race // CHECK: Write of size 1 -// CHECK: #0 read +// CHECK: #0 {{.*read}} // CHECK: Previous write of size 1 -// CHECK: #0 read +// CHECK: #0 {{.*read}} // CHECK: DONE Index: test/tsan/race_with_finished_thread.cc =================================================================== --- test/tsan/race_with_finished_thread.cc +++ test/tsan/race_with_finished_thread.cc @@ -38,5 +38,5 @@ // CHECK: #0 foobar // CHECK: #1 Thread1 // CHECK: Thread T1 (tid={{.*}}, finished) created by main thread at: -// CHECK: #0 pthread_create +// CHECK: #0 {{.*pthread_create}} // CHECK: #1 main Index: test/tsan/simple_stack.c =================================================================== --- test/tsan/simple_stack.c +++ test/tsan/simple_stack.c @@ -57,10 +57,10 @@ // CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack.c:21{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 Thread2{{.*}} {{.*}}simple_stack.c:31{{(:3)?}} ({{.*}}) // CHECK: Thread T1 (tid={{.*}}, running) created by main thread at: -// CHECK-NEXT: #0 pthread_create {{.*}} ({{.*}}) +// CHECK-NEXT: #0 {{.*pthread_create}} {{.*}} ({{.*}}) // CHECK-NEXT: #1 StartThread{{.*}} {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack.c:43{{(:3)?}} ({{.*}}) // CHECK: Thread T2 ({{.*}}) created by main thread at: -// CHECK-NEXT: #0 pthread_create {{.*}} ({{.*}}) +// CHECK-NEXT: #0 {{.*pthread_create}} {{.*}} ({{.*}}) // CHECK-NEXT: #1 StartThread{{.*}} {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}}) // CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack.c:44{{(:3)?}} ({{.*}}) Index: test/tsan/sleep_sync.cc =================================================================== --- test/tsan/sleep_sync.cc +++ test/tsan/sleep_sync.cc @@ -27,6 +27,6 @@ // CHECK: WARNING: ThreadSanitizer: data race // ... // CHECK: As if synchronized via sleep: -// CHECK-NEXT: #0 sleep +// CHECK-NEXT: #0 {{.*sleep}} // CHECK-NEXT: #1 MySleep // CHECK-NEXT: #2 Thread Index: test/tsan/thread_end_with_ignore.cc =================================================================== --- test/tsan/thread_end_with_ignore.cc +++ test/tsan/thread_end_with_ignore.cc @@ -16,7 +16,7 @@ } // CHECK: ThreadSanitizer: thread T1 finished with ignores enabled, created at: -// CHECK: #0 pthread_create +// CHECK: #0 {{.*pthread_create}} // CHECK: #1 main // CHECK: Ignore was enabled at: // CHECK: #0 AnnotateIgnoreReadsBegin