diff options
| author | Alexander Potapenko <glider@google.com> | 2013-02-12 12:41:12 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2013-02-12 12:41:12 +0000 |
| commit | c8a196ae8fad3cba7a777e2e7916fd36ebf70fe6 (patch) | |
| tree | f49168b8c06f55833ceca41b0d094dc05bda1969 /lib/Transforms/Instrumentation | |
| parent | 6158ad1bc73652eaba4c14c4c4e1f14b3fdf1be2 (diff) | |
| download | llvm-c8a196ae8fad3cba7a777e2e7916fd36ebf70fe6.tar.gz llvm-c8a196ae8fad3cba7a777e2e7916fd36ebf70fe6.tar.bz2 llvm-c8a196ae8fad3cba7a777e2e7916fd36ebf70fe6.tar.xz | |
[ASan] Do not use kDefaultShort64bitShadowOffset on Mac, where the binaries may get mapped at 0x100000000+ and thus may interleave with the shadow.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174964 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Instrumentation')
| -rw-r--r-- | lib/Transforms/Instrumentation/AddressSanitizer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 02a8680b6c..4950d838b2 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -202,6 +202,7 @@ static ShadowMapping getShadowMapping(const Module &M, int LongSize, bool ZeroBaseShadow) { llvm::Triple TargetTriple(M.getTargetTriple()); bool IsAndroid = TargetTriple.getEnvironment() == llvm::Triple::Android; + bool IsMacOSX = TargetTriple.getOS() == llvm::Triple::MacOSX; bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64; bool IsX86_64 = TargetTriple.getArch() == llvm::Triple::x86_64; @@ -215,7 +216,7 @@ static ShadowMapping getShadowMapping(const Module &M, int LongSize, Mapping.Offset = (IsAndroid || ZeroBaseShadow) ? 0 : (LongSize == 32 ? kDefaultShadowOffset32 : IsPPC64 ? kPPC64_ShadowOffset64 : kDefaultShadowOffset64); - if (!ZeroBaseShadow && ClShort64BitOffset && IsX86_64) { + if (!ZeroBaseShadow && ClShort64BitOffset && IsX86_64 && !IsMacOSX) { assert(LongSize == 64); Mapping.Offset = kDefaultShort64bitShadowOffset; } if (!ZeroBaseShadow && ClMappingOffsetLog >= 0) { |