[tsan] improve FrameIsInternal

llvm-svn: 174506

diff --git a/compiler-rt/lib/tsan/lit_tests/atomic_race.cc b/compiler-rt/lib/tsan/lit_tests/atomic_race.cc
index cec5809a2406520d0fa994f3422050427e0bd080..360b81238889db638b8a68c513502a4b87872cbc 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/atomic_race.cc
+++ b/compiler-rt/lib/tsan/lit_tests/atomic_race.cc
@@ -60,12 +60,16 @@ int main() {
 
 // CHECK: Test 0
 // CHECK: ThreadSanitizer: data race
+// CHECK-NOT: SUMMARY{{.*}}tsan_interface_atomic
 // CHECK: Test 1
 // CHECK: ThreadSanitizer: data race
+// CHECK-NOT: SUMMARY{{.*}}tsan_interface_atomic
 // CHECK: Test 2
 // CHECK: ThreadSanitizer: data race
+// CHECK-NOT: SUMMARY{{.*}}tsan_interface_atomic
 // CHECK: Test 3
 // CHECK: ThreadSanitizer: data race
+// CHECK-NOT: SUMMARY{{.*}}tsan_interface_atomic
 // CHECK: Test 0 reverse
 // CHECK: ThreadSanitizer: data race
 // CHECK: Test 1 reverse

diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
index 65fe5448b4d1f92b64acf3c939b879000b040b3a..809aac29705e9ec335b62e19817522af04e594cf 100644 (file)
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
@@ -499,7 +499,8 @@ bool IsFiredSuppression(Context *ctx,
 bool FrameIsInternal(const ReportStack *frame) {
   return frame != 0 && frame->file != 0
       && (internal_strstr(frame->file, "tsan_interceptors.cc") ||
-          internal_strstr(frame->file, "sanitizer_common_interceptors.inc"));
+          internal_strstr(frame->file, "sanitizer_common_interceptors.inc") ||
+          internal_strstr(frame->file, "tsan_interface_"));
 }
 
 // On programs that use Java we see weird reports like: