Skip to content

Commit 3ae9b9d

Browse files
committed
[ASan] Make insertion of version mismatch guard configurable
By default ASan calls a versioned function `__asan_version_mismatch_check_vXXX` from the ASan module constructor to check that the compiler ABI version and runtime ABI version are compatible. This ensures that we get a predictable linker error instead of hard-to-debug runtime errors. Sometimes, however, we want to skip this safety guard. This new command line option allows us to do just that. rdar://47891956 Reviewed By: kubamracek Differential Revision: https://reviews.llvm.org/D66826 llvm-svn: 370258
1 parent f025968 commit 3ae9b9d

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ static cl::opt<bool> ClRecover(
193193
cl::desc("Enable recovery mode (continue-after-error)."),
194194
cl::Hidden, cl::init(false));
195195

196+
static cl::opt<bool> ClInsertVersionCheck(
197+
"asan-guard-against-version-mismatch",
198+
cl::desc("Guard against compiler/runtime version mismatch."),
199+
cl::Hidden, cl::init(true));
200+
196201
// This flag may need to be replaced with -f[no-]asan-reads.
197202
static cl::opt<bool> ClInstrumentReads("asan-instrument-reads",
198203
cl::desc("instrument read instructions"),
@@ -2426,8 +2431,9 @@ bool ModuleAddressSanitizer::instrumentModule(Module &M) {
24262431

24272432
// Create a module constructor. A destructor is created lazily because not all
24282433
// platforms, and not all modules need it.
2434+
std::string AsanVersion = std::to_string(GetAsanVersion(M));
24292435
std::string VersionCheckName =
2430-
kAsanVersionCheckNamePrefix + std::to_string(GetAsanVersion(M));
2436+
ClInsertVersionCheck ? (kAsanVersionCheckNamePrefix + AsanVersion) : "";
24312437
std::tie(AsanCtorFunction, std::ignore) = createSanitizerCtorAndInitFunctions(
24322438
M, kAsanModuleCtorName, kAsanInitName, /*InitArgTypes=*/{},
24332439
/*InitArgs=*/{}, VersionCheckName);
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
; Check that the ASan module constructor guards against compiler/runtime version
2+
; mismatch.
3+
4+
; RUN: opt < %s -asan-module -S | FileCheck %s
5+
; RUN: opt < %s -asan-module -asan-guard-against-version-mismatch=0 -S | FileCheck %s --check-prefix=NOGUARD
6+
7+
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
8+
target triple = "x86_64-unknown-linux-gnu"
9+
10+
; CHECK-LABEL: define internal void @asan.module_ctor()
11+
; CHECK: call void @__asan_version_mismatch_check_v
12+
; NOGUARD-NOT: call void @__asan_version_mismatch_check_v

0 commit comments

Comments
 (0)