diff --git a/compiler-rt/test/tsan/Linux/double_race.cpp b/compiler-rt/test/tsan/Linux/double_race.cpp
--- a/compiler-rt/test/tsan/Linux/double_race.cpp
+++ b/compiler-rt/test/tsan/Linux/double_race.cpp
@@ -45,7 +45,7 @@
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 8 at {{.*}} by thread T1:
 // CHECK:     #0 memset
-// CHECK:     #1 Thread
+// CHECK:     #2 Thread
 // CHECK-NOT: bad PC passed to __tsan_symbolize_external
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 8 at {{.*}} by thread T1:
diff --git a/compiler-rt/test/tsan/inlined_memcpy_race.cpp b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
--- a/compiler-rt/test/tsan/inlined_memcpy_race.cpp
+++ b/compiler-rt/test/tsan/inlined_memcpy_race.cpp
@@ -30,8 +30,9 @@
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   #0 memset
-// CHECK:   #1 MemSetThread
+// CHECK:   #1 memset
+// CHECK:   #2 MemSetThread
 // CHECK:  Previous write
 // CHECK:   #0 {{(memcpy|memmove)}}
-// CHECK:   #1 MemCpyThread
-
+// CHECK:   #1 {{(memcpy|memmove)}}
+// CHECK:   #2 MemCpyThread
diff --git a/compiler-rt/test/tsan/inlined_memcpy_race2.cpp b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
--- a/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
+++ b/compiler-rt/test/tsan/inlined_memcpy_race2.cpp
@@ -31,7 +31,9 @@
 
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   #0 memset
-// CHECK:   #1 MemSetThread
+// CHECK:   #1 memset
+// CHECK:   #2 MemSetThread
 // CHECK:  Previous write
 // CHECK:   #0 {{(memcpy|memmove)}}
-// CHECK:   #1 MemMoveThread
+// CHECK:   #1 {{(memcpy|memmove)}}
+// CHECK:   #2 MemMoveThread
diff --git a/compiler-rt/test/tsan/memcmp_race.cpp b/compiler-rt/test/tsan/memcmp_race.cpp
--- a/compiler-rt/test/tsan/memcmp_race.cpp
+++ b/compiler-rt/test/tsan/memcmp_race.cpp
@@ -36,7 +36,9 @@
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 1 at [[ADDR]] by thread T2:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread2
+// CHECK:     #1 {{(memcpy|memmove)}}
+// CHECK:     #2 Thread2
 // CHECK:   Previous read of size 1 at [[ADDR]] by thread T1:
 // CHECK:     #0 memcmp
-// CHECK:     #1 Thread1
+// CHECK:     #1 memcmp
+// CHECK:     #2 Thread1
diff --git a/compiler-rt/test/tsan/memcpy_race.cpp b/compiler-rt/test/tsan/memcpy_race.cpp
--- a/compiler-rt/test/tsan/memcpy_race.cpp
+++ b/compiler-rt/test/tsan/memcpy_race.cpp
@@ -35,7 +35,9 @@
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK:   Write of size 1 at [[ADDR]] by thread T2:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread2
+// CHECK:     #1 {{(memcpy|memmove)}}
+// CHECK:     #2 Thread2
 // CHECK:   Previous write of size 1 at [[ADDR]] by thread T1:
 // CHECK:     #0 {{(memcpy|memmove)}}
-// CHECK:     #1 Thread1
+// CHECK:     #1 {{(memcpy|memmove)}}
+// CHECK:     #2 Thread1