[compiler-rt] a65cbc4 - Revert "[Darwin][ASan][Test] Create a noinlined wrapper function for reliable suppression in test. (#131247)"

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2025-03-18T20:50:17Z
New Revision: a65cbc4213ebf263f9e838969fca34f0c72c3f1c

URL: https://github.com/llvm/llvm-project/commit/a65cbc4213ebf263f9e838969fca34f0c72c3f1c
DIFF: https://github.com/llvm/llvm-project/commit/a65cbc4213ebf263f9e838969fca34f0c72c3f1c.diff

LOG: Revert "[Darwin][ASan][Test] Create a noinlined wrapper function for reliable suppression in test. (#131247)"

This reverts commit 78f74f686bfe21262f8b171e21450186edd081ab.

Breaks the test on x86-64 mac, e.g. https://green.lab.llvm.org/job/llvm.org/job/clang-stage1-RA/3852/.

Added: 
    

Modified: 
    compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp
index be0a2b1aec516..966f21346e4fe 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp
+++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp
@@ -3,7 +3,7 @@
 // RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s
 
 // Check that suppressing a function name works within a no-fork sandbox
-// RUN: echo "interceptor_via_fun:createCFString" > %t.supp
+// RUN: echo "interceptor_via_fun:CFStringCreateWithBytes" > %t.supp
 // RUN: %env_asan_opts=suppressions='"%t.supp"' \
 // RUN:   sandbox-exec -p '(version 1)(allow default)(deny process-fork)' \
 // RUN:   %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
@@ -13,18 +13,12 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-// Disable optimizations to ensure that this function appears on the stack trace so our
-// configured suppressions `interceptor_via_fun:createCFString` can take effect.
-__attribute__((noinline, disable_tail_calls)) CFStringRef
-createCFString(const unsigned char *bytes, CFIndex length) {
-  return CFStringCreateWithBytes(kCFAllocatorDefault, bytes, length,
-                                 kCFStringEncodingUTF8, FALSE);
-}
-
 int main() {
   char *a = (char *)malloc(6);
   strcpy(a, "hello");
-  CFStringRef str = createCFString((unsigned char *)a, 10); // BOOM
+  CFStringRef str =
+      CFStringCreateWithBytes(kCFAllocatorDefault, (unsigned char *)a, 10,
+                              kCFStringEncodingUTF8, FALSE);  // BOOM
   fprintf(stderr, "Ignored.\n");
   free(a);
   CFRelease(str);