Author: Fangrui Song Date: 2023-06-12T17:58:40-07:00 New Revision: a8d3ae712290d6f85db2deb9164181058f5c1307
URL: https://github.com/llvm/llvm-project/commit/a8d3ae712290d6f85db2deb9164181058f5c1307 DIFF: https://github.com/llvm/llvm-project/commit/a8d3ae712290d6f85db2deb9164181058f5c1307.diff LOG: [Driver] Default -fsanitize-address-globals-dead-stripping to true for ELF -fsanitize-address-globals-dead-stripping is the default for non-ELF platforms. For ELF, we disabled it to work around an ancient gold 2.26 bug. However, some platforms (Fuchsia and PS) default the option to true. This patch changes -fsanitize-address-globals-dead-stripping to true for all ELF platforms. Without specifying -fdata-sections (non-default for most ELF platforms), `asan_globals` can only be GCed if the monolithic .data/.bss section is GCed, which makes it less effective. However, I think this simplified rule is better than making the -fsanitize-address-globals-dead-stripping default dependent on another option. Related: D120394 Close https://github.com/llvm/llvm-project/issues/63127 Reviewed By: #sanitizers, eugenis, phosek Differential Revision: https://reviews.llvm.org/D152604 Added: Modified: clang/lib/Driver/SanitizerArgs.cpp clang/test/Driver/fsanitize.c Removed: ################################################################################ diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 65c0bbeecc3b6..c3ce13f93464d 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -928,14 +928,9 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, options::OPT_fno_sanitize_address_outline_instrumentation, AsanOutlineInstrumentation); - // As a workaround for a bug in gold 2.26 and earlier, dead stripping of - // globals in ASan is disabled by default on most ELF targets. - // See https://sourceware.org/bugzilla/show_bug.cgi?id=19002 AsanGlobalsDeadStripping = Args.hasFlag( options::OPT_fsanitize_address_globals_dead_stripping, - options::OPT_fno_sanitize_address_globals_dead_stripping, - !TC.getTriple().isOSBinFormatELF() || TC.getTriple().isOSFuchsia() || - TC.getTriple().isPS()); + options::OPT_fno_sanitize_address_globals_dead_stripping, true); // Enable ODR indicators which allow better handling of mixed instrumented // and uninstrumented globals. Disable them for Windows where weak odr diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c index a76293fd3b711..182de9f486444 100644 --- a/clang/test/Driver/fsanitize.c +++ b/clang/test/Driver/fsanitize.c @@ -240,7 +240,7 @@ // CHECK-ASAN-WITHOUT-POISON-CUSTOM-ARRAY-NEW-COOKIE-NOT: -cc1{{.*}}address-poison-custom-array-cookie // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address -fsanitize-address-globals-dead-stripping %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-GLOBALS -// RUN: %clang --target=x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ASAN-GLOBALS +// RUN: %clang --target=x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-GLOBALS // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address -fsanitize-address-globals-dead-stripping -fno-sanitize-address-globals-dead-stripping %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ASAN-GLOBALS // RUN: %clang_cl --target=x86_64-windows-msvc -fsanitize=address -fsanitize-address-globals-dead-stripping -### -- %s 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-GLOBALS // RUN: %clang_cl --target=x86_64-windows-msvc -fsanitize=address -### -- %s 2>&1 | FileCheck %s --check-prefix=CHECK-ASAN-GLOBALS _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
