Skip to content

Commit a65cbc4

Browse files
committed
Revert "[Darwin][ASan][Test] Create a noinlined wrapper function for reliable suppression in test. (#131247)"
This reverts commit 78f74f6. Breaks the test on x86-64 mac, e.g. https://green.lab.llvm.org/job/llvm.org/job/clang-stage1-RA/3852/.
1 parent 395bdeb commit a65cbc4

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-CRASH %s
44

55
// Check that suppressing a function name works within a no-fork sandbox
6-
// RUN: echo "interceptor_via_fun:createCFString" > %t.supp
6+
// RUN: echo "interceptor_via_fun:CFStringCreateWithBytes" > %t.supp
77
// RUN: %env_asan_opts=suppressions='"%t.supp"' \
88
// RUN: sandbox-exec -p '(version 1)(allow default)(deny process-fork)' \
99
// RUN: %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
@@ -13,18 +13,12 @@
1313

1414
#include <CoreFoundation/CoreFoundation.h>
1515

16-
// Disable optimizations to ensure that this function appears on the stack trace so our
17-
// configured suppressions `interceptor_via_fun:createCFString` can take effect.
18-
__attribute__((noinline, disable_tail_calls)) CFStringRef
19-
createCFString(const unsigned char *bytes, CFIndex length) {
20-
return CFStringCreateWithBytes(kCFAllocatorDefault, bytes, length,
21-
kCFStringEncodingUTF8, FALSE);
22-
}
23-
2416
int main() {
2517
char *a = (char *)malloc(6);
2618
strcpy(a, "hello");
27-
CFStringRef str = createCFString((unsigned char *)a, 10); // BOOM
19+
CFStringRef str =
20+
CFStringCreateWithBytes(kCFAllocatorDefault, (unsigned char *)a, 10,
21+
kCFStringEncodingUTF8, FALSE); // BOOM
2822
fprintf(stderr, "Ignored.\n");
2923
free(a);
3024
CFRelease(str);

0 commit comments

Comments
 (0)