[PR] vitalybuka - revert 'HasSuppressions' function

llvm · Oct 12, 2024 · 87b29f0 · 87b29f0
1 parent 888b53d
commit 87b29f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/compiler-rt/lib/rtsan/rtsan_assertions.h b/compiler-rt/lib/rtsan/rtsan_assertions.h
@@ -35,7 +35,7 @@ void ExpectNotRealtime(Context &context, const DiagnosticsInfo &info,
     stack.Unwind(info.pc, info.bp, nullptr,
                  __sanitizer::common_flags()->fast_unwind_on_fatal);
 
-    if (HasSuppressions() && IsStackTraceSuppressed(stack))
+    if (IsStackTraceSuppressed(stack))
       return;
 
     OnViolation(stack, info);

diff --git a/compiler-rt/lib/rtsan/rtsan_suppressions.cpp b/compiler-rt/lib/rtsan/rtsan_suppressions.cpp
@@ -52,8 +52,6 @@ static const char *ConvertTypeToFlagName(ErrorType Type) {
   UNREACHABLE("unknown ErrorType!");
 }
 
-bool __rtsan::HasSuppressions() { return suppression_ctx != nullptr; }
-
 void __rtsan::InitializeSuppressions() {
   CHECK_EQ(nullptr, suppression_ctx);
 
@@ -67,7 +65,8 @@ void __rtsan::InitializeSuppressions() {
 }
 
 bool __rtsan::IsStackTraceSuppressed(const StackTrace &stack) {
-  CHECK(HasSuppressions());
+  if (suppression_ctx == nullptr)
+    return false;
 
   const char *call_stack_flag =
       ConvertTypeToFlagName(ErrorType::CallStackContains);

diff --git a/compiler-rt/lib/rtsan/rtsan_suppressions.h b/compiler-rt/lib/rtsan/rtsan_suppressions.h
@@ -17,7 +17,6 @@
 namespace __rtsan {
 
 void InitializeSuppressions();
-bool HasSuppressions();
 bool IsStackTraceSuppressed(const __sanitizer::StackTrace &stack);
 
 } // namespace __rtsan