Index: compiler-rt/trunk/test/tsan/inlined_memcpy_race.cc =================================================================== --- compiler-rt/trunk/test/tsan/inlined_memcpy_race.cc +++ compiler-rt/trunk/test/tsan/inlined_memcpy_race.cc @@ -32,6 +32,6 @@ // CHECK: #0 memset // CHECK: #1 MemSetThread // CHECK: Previous write -// CHECK: #0 memcpy +// CHECK: #0 {{(memcpy|memmove)}} // CHECK: #1 MemCpyThread Index: compiler-rt/trunk/test/tsan/memcmp_race.cc =================================================================== --- compiler-rt/trunk/test/tsan/memcmp_race.cc +++ compiler-rt/trunk/test/tsan/memcmp_race.cc @@ -35,7 +35,7 @@ // 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|memmove)}} // CHECK: #1 Thread2 // CHECK: Previous read of size 1 at [[ADDR]] by thread T1: // CHECK: #0 memcmp Index: compiler-rt/trunk/test/tsan/memcpy_race.cc =================================================================== --- compiler-rt/trunk/test/tsan/memcpy_race.cc +++ compiler-rt/trunk/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|memmove)}} // CHECK: #1 Thread2 // CHECK: Previous write of size 1 at [[ADDR]] by thread T1: -// CHECK: #0 memcpy +// CHECK: #0 {{(memcpy|memmove)}} // CHECK: #1 Thread1