Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tsan] Generalize FrameIsInternal #77143

Merged

Conversation

vitalybuka
Copy link
Collaborator

Prepare to move this into sanitizer_common.

Created using spr 1.3.4
@llvmbot
Copy link
Collaborator

llvmbot commented Jan 5, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

Prepare to move this into sanitizer_common.


Full diff: https://github.com/llvm/llvm-project/pull/77143.diff

1 Files Affected:

  • (modified) compiler-rt/lib/tsan/rtl/tsan_report.cpp (+2-6)
diff --git a/compiler-rt/lib/tsan/rtl/tsan_report.cpp b/compiler-rt/lib/tsan/rtl/tsan_report.cpp
index 35cb6710a54fa4..167e4be4fc0e26 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_report.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_report.cpp
@@ -278,13 +278,9 @@ static bool FrameIsInternal(const SymbolizedStack *frame) {
     return false;
   const char *file = frame->info.file;
   const char *module = frame->info.module;
-  if (file != 0 &&
-      (internal_strstr(file, "tsan_interceptors_posix.cpp") ||
-       internal_strstr(file, "tsan_interceptors_memintrinsics.cpp") ||
-       internal_strstr(file, "sanitizer_common_interceptors.inc") ||
-       internal_strstr(file, "tsan_interface_")))
+  if (file != 0 && (internal_strstr(file, "/compiler-rt/lib/")))
     return true;
-  if (module != 0 && (internal_strstr(module, "libclang_rt.tsan_")))
+  if (module != 0 && (internal_strstr(module, "libclang_rt.")))
     return true;
   return false;
 }

@vitalybuka vitalybuka merged commit 5b54dd4 into main Jan 5, 2024
6 checks passed
@vitalybuka vitalybuka deleted the users/vitalybuka/spr/tsan-generalize-frameisinternal branch January 5, 2024 22:30
justinfargnoli pushed a commit to justinfargnoli/llvm-project that referenced this pull request Jan 28, 2024
Prepare to move this into sanitizer_common.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants