Skip to content

Conversation

@cjappl
Copy link
Contributor

@cjappl cjappl commented Jun 13, 2025

On my mac, this started having os_unfair_lock_lock as the intercepted function.

I dropped the name so any second intercepted call will pass the test.

@llvmbot
Copy link
Member

llvmbot commented Jun 13, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Chris Apple (cjappl)

Changes

On my mac, this started having os_unfair_lock_lock as the intercepted function.

I dropped the name so any second intercepted call will pass the test.


Full diff: https://github.com/llvm/llvm-project/pull/144018.diff

1 Files Affected:

  • (modified) compiler-rt/test/rtsan/fork_exec.cpp (+6-1)
diff --git a/compiler-rt/test/rtsan/fork_exec.cpp b/compiler-rt/test/rtsan/fork_exec.cpp
index 3b2d2e5ca2f5d..5890a0936a2f7 100644
--- a/compiler-rt/test/rtsan/fork_exec.cpp
+++ b/compiler-rt/test/rtsan/fork_exec.cpp
@@ -45,7 +45,12 @@ int main() MAYBE_NONBLOCKING {
 }
 
 // CHECK-NOHALT: Intercepted call to {{.*}} `fork` {{.*}}
-// CHECK-NOHALT: Intercepted call to {{.*}} `execve` {{.*}}
+
+// We should also get some other intercepted call. On some systems this
+// is `execve`, on others, it's a lock to set up `execve`. In either
+// case, just check that we get a second intercepted call, don't sweat
+// the name.
+// CHECK-NOHALT: Intercepted call to {{.*}}
 
 // usleep checks that rtsan is still enabled in the parent process
 // See note in our interceptors file for why we don't look for `wait`

@cjappl cjappl merged commit b983431 into llvm:main Jun 15, 2025
10 checks passed
akuhlens pushed a commit to akuhlens/llvm-project that referenced this pull request Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants