[PR] dtraev/fmayer - call-stack-contains, small refactor of nullptr check

Author: cjappl

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 (IsStackTraceSuppressed(stack))
+    if (HasSuppressions() && IsStackTraceSuppressed(stack))
       return;
 
     OnViolation(stack, info);

compiler-rt/lib/rtsan/rtsan_checks.inc

@@ -16,4 +16,4 @@
 // RTSAN_CHECK(Name, SummaryKind)
 // SummaryKind should be a string literal.
 
-RTSAN_CHECK(InCallStack, "in-call-stack")
+RTSAN_CHECK(CallStackContains, "call-stack-contains")

compiler-rt/lib/rtsan/rtsan_suppressions.cpp

@@ -52,6 +52,8 @@ static const char *ConvertTypeToFlagName(ErrorType Type) {
   UNREACHABLE("unknown ErrorType!");
 }
 
+bool __rtsan::HasSuppressions() { return suppression_ctx != nullptr; }
+
 void __rtsan::InitializeSuppressions() {
   CHECK_EQ(nullptr, suppression_ctx);
 
@@ -65,10 +67,10 @@ void __rtsan::InitializeSuppressions() {
 }
 
 bool __rtsan::IsStackTraceSuppressed(const StackTrace &stack) {
-  if (suppression_ctx == nullptr)
-    return false;
+  CHECK(HasSuppressions());
 
-  const char *call_stack_flag = ConvertTypeToFlagName(ErrorType::InCallStack);
+  const char *call_stack_flag =
+      ConvertTypeToFlagName(ErrorType::CallStackContains);
   if (!suppression_ctx->HasSuppressionType(call_stack_flag))
     return false;
 

compiler-rt/lib/rtsan/rtsan_suppressions.h

@@ -17,6 +17,7 @@
 namespace __rtsan {
 
 void InitializeSuppressions();
+bool HasSuppressions();
 bool IsStackTraceSuppressed(const __sanitizer::StackTrace &stack);
 
 } // namespace __rtsan

compiler-rt/test/rtsan/stack_suppressions.cpp.supp

@@ -1,4 +1,4 @@
-in-call-stack:MallocViolation
-in-call-stack:std::*vector
-in-call-stack:free
-in-call-stack:BlockFunc
+call-stack-contains:MallocViolation
+call-stack-contains:std::*vector
+call-stack-contains:free
+call-stack-contains:BlockFunc