[PR] - move to function-name-is

Author: cjappl

compiler-rt/lib/rtsan/rtsan_assertions.h

@@ -28,10 +28,7 @@ void ExpectNotRealtime(Context &context, const DiagnosticsInfo &info,
   if (context.InRealtimeContext() && !context.IsBypassed()) {
     ScopedBypass sb{context};
 
-    if ((info.type == DiagnosticsInfoType::InterceptedCall &&
-         IsInterceptorSuppressed(info.func_name)) ||
-        (info.type == DiagnosticsInfoType::BlockingCall &&
-         IsBlockingFnSuppressed(info.func_name)))
+    if (IsFunctionSuppressed(info.func_name))
       return;
 
     __sanitizer::BufferedStackTrace stack;

compiler-rt/lib/rtsan/rtsan_checks.inc

@@ -17,5 +17,4 @@
 // SummaryKind should be a string literal.
 
 RTSAN_CHECK(CallStackContains, "call-stack-contains")
-RTSAN_CHECK(InterceptedFnName, "intercepted-fn-name")
-RTSAN_CHECK(BlockingFnName, "blocking-fn-name")
+RTSAN_CHECK(FunctionNameIs, "function-name-is")

compiler-rt/lib/rtsan/rtsan_suppressions.cpp

@@ -93,24 +93,15 @@ bool __rtsan::IsStackTraceSuppressed(const StackTrace &stack) {
   return false;
 }
 
-static bool IsFunctionSuppressed(const char *interceptor_name,
-                                 const char *flag_name) {
+bool __rtsan::IsFunctionSuppressed(const char *function_name) {
   if (suppression_ctx == nullptr)
     return false;
 
+  const char *flag_name = ConvertTypeToFlagName(ErrorType::FunctionNameIs);
+
   if (!suppression_ctx->HasSuppressionType(flag_name))
     return false;
 
   Suppression *s;
-  return suppression_ctx->Match(interceptor_name, flag_name, &s);
-}
-
-bool __rtsan::IsInterceptorSuppressed(const char *interceptor_name) {
-  return IsFunctionSuppressed(
-      interceptor_name, ConvertTypeToFlagName(ErrorType::InterceptedFnName));
-}
-
-bool __rtsan::IsBlockingFnSuppressed(const char *blocking_fn_name) {
-  return IsFunctionSuppressed(blocking_fn_name,
-                              ConvertTypeToFlagName(ErrorType::BlockingFnName));
+  return suppression_ctx->Match(function_name, flag_name, &s);
 }

compiler-rt/lib/rtsan/rtsan_suppressions.h

@@ -18,7 +18,6 @@ namespace __rtsan {
 
 void InitializeSuppressions();
 bool IsStackTraceSuppressed(const __sanitizer::StackTrace &stack);
-bool IsInterceptorSuppressed(const char *interceptor_name);
-bool IsBlockingFnSuppressed(const char *blocking_fn_name);
+bool IsFunctionSuppressed(const char *function_name);
 
 } // namespace __rtsan

compiler-rt/test/rtsan/stack_suppressions.cpp

@@ -36,8 +36,8 @@ void BlockFunc() [[clang::blocking]] {
 void *process() [[clang::nonblocking]] {
   void *ptr = MallocViolation(); // Suppressed call-stack-contains
   VectorViolations();            // Suppressed call-stack-contains with regex
-  BlockFunc();                   // Suppressed blocking-fn-name
-  free(ptr);                     // Suppressed intercepted-fn-name
+  BlockFunc();                   // Suppressed function-name-is
+  free(ptr);                     // Suppressed function-name-is
 
   // This is the one that should abort the program
   // Everything else is suppressed

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

@@ -1,6 +1,5 @@
 call-stack-contains:MallocViolation
 call-stack-contains:std::*vector
 
-intercepted-fn-name:free
-
-blocking-fn-name:BlockFunc
+function-name-is:free
+function-name-is:BlockFunc