Index: compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc =================================================================== --- compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc +++ compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc @@ -34,7 +34,6 @@ // Make sure __asan_init is called before any test case is run. struct AsanInitCaller { AsanInitCaller() { - DisableReexec(); __asan_init(); } }; Index: compiler-rt/trunk/lib/asan/tests/asan_test_main.cc =================================================================== --- compiler-rt/trunk/lib/asan/tests/asan_test_main.cc +++ compiler-rt/trunk/lib/asan/tests/asan_test_main.cc @@ -26,6 +26,12 @@ #endif } +namespace __sanitizer { +bool ReexecDisabled() { + return true; +} +} + int main(int argc, char **argv) { testing::GTEST_FLAG(death_test_style) = "threadsafe"; testing::InitGoogleTest(&argc, argv); Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h =================================================================== --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h @@ -789,7 +789,6 @@ void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp); -void DisableReexec(); void MaybeReexec(); template Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc =================================================================== --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc @@ -1317,10 +1317,6 @@ #endif } -void DisableReexec() { - // No need to re-exec on Linux. -} - void MaybeReexec() { // No need to re-exec on Linux. } Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc =================================================================== --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_mac.cc @@ -554,10 +554,9 @@ } } -static bool reexec_disabled = false; - -void DisableReexec() { - reexec_disabled = true; +SANITIZER_WEAK_CXX_DEFAULT_IMPL +bool ReexecDisabled() { + return false; } extern "C" double dyldVersionNumber; @@ -573,7 +572,7 @@ } void MaybeReexec() { - if (reexec_disabled) return; + if (ReexecDisabled()) return; // Make sure the dynamic runtime library is preloaded so that the // wrappers work. If it is not, set DYLD_INSERT_LIBRARIES and re-exec @@ -627,6 +626,24 @@ CHECK("execv failed" && 0); } + // Verify that interceptors really work. We'll use dlsym to locate + // "pthread_create", if interceptors are working, it should really point to + // "wrap_pthread_create" within our own dylib. + Dl_info info_pthread_create; + void *dlopen_addr = dlsym(RTLD_DEFAULT, "pthread_create"); + CHECK(dladdr(dlopen_addr, &info_pthread_create)); + Report("info.dli_fname = %p = %s, info_pthread_create.dli_fname = %p = %s\n", + info.dli_fname, info.dli_fname, info_pthread_create.dli_fname, + info_pthread_create.dli_fname); + if (internal_strcmp(info.dli_fname, info_pthread_create.dli_fname) != 0) { + Report( + "ERROR: Interceptors are not working. This may be because %s is " + "loaded too late (e.g. via dlopen). Please launch the executable " + "with:\n%s=%s\n", + SanitizerToolName, kDyldInsertLibraries, info.dli_fname); + CHECK("interceptors not installed" && 0); + } + if (!lib_is_in_env) return; Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc =================================================================== --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc @@ -842,10 +842,6 @@ // Do nothing. } -void DisableReexec() { - // No need to re-exec on Windows. -} - void MaybeReexec() { // No need to re-exec on Windows. } Index: compiler-rt/trunk/lib/tsan/tests/rtl/tsan_test.cc =================================================================== --- compiler-rt/trunk/lib/tsan/tests/rtl/tsan_test.cc +++ compiler-rt/trunk/lib/tsan/tests/rtl/tsan_test.cc @@ -54,6 +54,12 @@ } #endif +namespace __sanitizer { +bool ReexecDisabled() { + return true; +} +} + int main(int argc, char **argv) { argv0 = argv[0]; return run_tests(argc, argv); Index: compiler-rt/trunk/lib/tsan/tests/unit/tsan_unit_test_main.cc =================================================================== --- compiler-rt/trunk/lib/tsan/tests/unit/tsan_unit_test_main.cc +++ compiler-rt/trunk/lib/tsan/tests/unit/tsan_unit_test_main.cc @@ -12,6 +12,12 @@ //===----------------------------------------------------------------------===// #include "gtest/gtest.h" +namespace __sanitizer { +bool ReexecDisabled() { + return true; +} +} + int main(int argc, char **argv) { testing::GTEST_FLAG(death_test_style) = "threadsafe"; testing::InitGoogleTest(&argc, argv); Index: compiler-rt/trunk/test/lit.common.cfg =================================================================== --- compiler-rt/trunk/test/lit.common.cfg +++ compiler-rt/trunk/test/lit.common.cfg @@ -118,6 +118,14 @@ lit.util.usePlatformSdkOnDarwin(config, lit_config) +if config.host_os == 'Darwin': + ld_cmd = subprocess.Popen(["bash", "-c", "sw_vers -productVersion | awk -F '.' '{print $1 \".\" $2}'"], stdout = subprocess.PIPE) + ld_out = ld_cmd.stdout.read().decode() + ld_cmd.wait() + osx_version = float(ld_out) + if osx_version >= 10.11: + config.available_features.add('osx-autointerception') + sancovcc_path = os.path.join(llvm_tools_dir, "sancov") if os.path.exists(sancovcc_path): config.available_features.add("has_sancovcc") Index: compiler-rt/trunk/test/tsan/Darwin/dlopen.cc =================================================================== --- compiler-rt/trunk/test/tsan/Darwin/dlopen.cc +++ compiler-rt/trunk/test/tsan/Darwin/dlopen.cc @@ -0,0 +1,41 @@ +// Checks that on OS X 10.11+ (where we do not re-exec anymore, because +// interceptors work automatically), dlopen'ing a TSanified library from a +// non-instrumented program exits with a user-friendly message. + +// REQUIRES: osx-autointerception + +// RUN: %clangxx_tsan %s -o %t.so -shared -DSHARED_LIB +// RUN: %clangxx_tsan -fno-sanitize=thread %s -o %t + +// RUN: TSAN_DYLIB_PATH=`%clangxx_tsan %s -### 2>&1 \ +// RUN: | grep "libclang_rt.tsan_osx_dynamic.dylib" \ +// RUN: | sed -e 's/.*"\(.*libclang_rt.tsan_osx_dynamic.dylib\)".*/\1/'` + +// Launching a non-instrumented binary that dlopen's an instrumented library should fail. +// RUN: not %run %t %t.so 2>&1 | FileCheck %s --check-prefix=CHECK-FAIL +// Launching a non-instrumented binary with an explicit DYLD_INSERT_LIBRARIES should work. +// RUN: DYLD_INSERT_LIBRARIES=$TSAN_DYLIB_PATH %run %t %t.so 2>&1 | FileCheck %s + +#include +#include +#include + +#if defined(SHARED_LIB) +extern "C" void foo() { + fprintf(stderr, "Hello world.\n"); +} +#else // defined(SHARED_LIB) +int main(int argc, char *argv[]) { + void *handle = dlopen(argv[1], RTLD_NOW); + fprintf(stderr, "handle = %p\n", handle); + void (*foo)() = (void (*)())dlsym(handle, "foo"); + fprintf(stderr, "foo = %p\n", foo); + foo(); +} +#endif // defined(SHARED_LIB) + +// CHECK: Hello world. +// CHECK-NOT: ERROR: Interceptors are not working. + +// CHECK-FAIL-NOT: Hello world. +// CHECK-FAIL: ERROR: Interceptors are not working.