diff options
| author | Kostya Serebryany <kcc@google.com> | 2011-11-17 23:14:59 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2011-11-17 23:14:59 +0000 |
| commit | 7cf2a04361e8613264498e50babe52d65c070473 (patch) | |
| tree | 9a70d15c2e0d7e4ca7401236bd72112b79ae6ec2 | |
| parent | f24944953986ad1e0a78279e6c3288e15a7e2619 (diff) | |
| download | external_llvm-7cf2a04361e8613264498e50babe52d65c070473.zip external_llvm-7cf2a04361e8613264498e50babe52d65c070473.tar.gz external_llvm-7cf2a04361e8613264498e50babe52d65c070473.tar.bz2 | |
fall back to explicit list of allowed linkages when instrumenting globals in asan; add a test check that asan does not touch linkonce_odr
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144933 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Instrumentation/AddressSanitizer.cpp | 7 | ||||
| -rw-r--r-- | test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index e858bcc..1f3672e 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -448,8 +448,11 @@ bool AddressSanitizer::insertGlobalRedzones(Module &M) { if (!Ty->isSized()) continue; if (!G->hasInitializer()) continue; - if (GlobalVariable::mayBeOverridden(G->getLinkage()) || - G->getLinkage() == GlobalVariable::AppendingLinkage) + // Touch only those globals that will not be defined in other modules. + // Don't handle ODR type linkages since other modules may be built w/o asan. + if (G->getLinkage() != GlobalVariable::GlobalVariable::ExternalLinkage && + G->getLinkage() != GlobalVariable::GlobalVariable::PrivateLinkage && + G->getLinkage() != GlobalVariable::GlobalVariable::InternalLinkage) continue; // For now, just ignore this Alloca if the alignment is large. if (G->getAlignment() > RedzoneSize) continue; diff --git a/test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll b/test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll new file mode 100644 index 0000000..1687877 --- /dev/null +++ b/test/Instrumentation/AddressSanitizer/do-not-touch-odr-global.ll @@ -0,0 +1,6 @@ +; RUN: opt < %s -asan -S | FileCheck %s +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" +target triple = "x86_64-unknown-linux-gnu" +; no action should be taken for these globals +@v1 = linkonce_odr constant i8 1 +; CHECK-NOT: __asan_register_globals |