diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-05-25 11:32:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 11:32:43 -0700 |
| commit | 0839b625bb68730f208c62cda4380ce6d1152cef (patch) | |
| tree | 6a2b3e57ce8c27e12ade15aaaa15f7686c7cda40 /lib/Transforms | |
| parent | 648f52a667a23ccc7a49d62df738a97a214c5018 (diff) | |
| parent | 563c712a3905bd86b1c895ecddb528a810fd89b9 (diff) | |
| download | external_llvm-0839b625bb68730f208c62cda4380ce6d1152cef.zip external_llvm-0839b625bb68730f208c62cda4380ce6d1152cef.tar.gz external_llvm-0839b625bb68730f208c62cda4380ce6d1152cef.tar.bz2 | |
am 563c712a: Use zero-based shadow by default on Android.
* commit '563c712a3905bd86b1c895ecddb528a810fd89b9':
Use zero-based shadow by default on Android.
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/Instrumentation/AddressSanitizer.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index b43b9e5..7fb33f7 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -22,6 +22,7 @@ #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/Triple.h" #include "llvm/Function.h" #include "llvm/IntrinsicInst.h" #include "llvm/LLVMContext.h" @@ -47,6 +48,7 @@ using namespace llvm; static const uint64_t kDefaultShadowScale = 3; static const uint64_t kDefaultShadowOffset32 = 1ULL << 29; static const uint64_t kDefaultShadowOffset64 = 1ULL << 44; +static const uint64_t kDefaultShadowOffsetAndroid = 0; static const size_t kMaxStackMallocSize = 1 << 16; // 64K static const uintptr_t kCurrentStackFrameMagic = 0x41B58AB3; @@ -556,8 +558,11 @@ bool AddressSanitizer::runOnModule(Module &M) { AsanInitFunction->setLinkage(Function::ExternalLinkage); IRB.CreateCall(AsanInitFunction); - MappingOffset = LongSize == 32 - ? kDefaultShadowOffset32 : kDefaultShadowOffset64; + llvm::Triple targetTriple(M.getTargetTriple()); + bool isAndroid = targetTriple.getEnvironment() == llvm::Triple::ANDROIDEABI; + + MappingOffset = isAndroid ? kDefaultShadowOffsetAndroid : + (LongSize == 32 ? kDefaultShadowOffset32 : kDefaultShadowOffset64); if (ClMappingOffsetLog >= 0) { if (ClMappingOffsetLog == 0) { // special case |