6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-08 21:32:39 +00:00
Code Issues Projects Releases Wiki Activity

[ASan] Do not use kDefaultShort64bitShadowOffset on Mac, where the binaries may get mapped at 0x100000000+ and thus may interleave with the shadow.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174964 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexander Potapenko 2013-02-12 12:41:12 +00:00
parent 6158ad1bc7
commit c8a196ae8f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -202,6 +202,7 @@ static ShadowMapping getShadowMapping(const Module &M, int LongSize,
bool ZeroBaseShadow) { bool ZeroBaseShadow) {
llvm::Triple TargetTriple(M.getTargetTriple()); llvm::Triple TargetTriple(M.getTargetTriple());
bool IsAndroid = TargetTriple.getEnvironment() == llvm::Triple::Android; bool IsAndroid = TargetTriple.getEnvironment() == llvm::Triple::Android;
bool IsMacOSX = TargetTriple.getOS() == llvm::Triple::MacOSX;
bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64; bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64;
bool IsX86_64 = TargetTriple.getArch() == llvm::Triple::x86_64; 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 : Mapping.Offset = (IsAndroid || ZeroBaseShadow) ? 0 :
(LongSize == 32 ? kDefaultShadowOffset32 : (LongSize == 32 ? kDefaultShadowOffset32 :
IsPPC64 ? kPPC64_ShadowOffset64 : kDefaultShadowOffset64); IsPPC64 ? kPPC64_ShadowOffset64 : kDefaultShadowOffset64);
if (!ZeroBaseShadow && ClShort64BitOffset && IsX86_64) { if (!ZeroBaseShadow && ClShort64BitOffset && IsX86_64 && !IsMacOSX) {
assert(LongSize == 64); assert(LongSize == 64);
Mapping.Offset = kDefaultShort64bitShadowOffset; Mapping.Offset = kDefaultShort64bitShadowOffset;
} if (!ZeroBaseShadow && ClMappingOffsetLog >= 0) { } if (!ZeroBaseShadow && ClMappingOffsetLog >= 0) {