diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-09-21 18:22:43 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-09-21 18:22:43 +0000 |
| commit | b097c8fa2bae50d8935143a9ec54d1f6db2157d4 (patch) | |
| tree | a5efeddd4191f6c4cf6018f11333f58e60fe76c6 /compiler-rt/lib/asan/asan_mapping.h | |
| parent | 08959d3bddeacece41dae005975f33b02e1b5978 (diff) | |
| download | bcm5719-llvm-b097c8fa2bae50d8935143a9ec54d1f6db2157d4.tar.gz bcm5719-llvm-b097c8fa2bae50d8935143a9ec54d1f6db2157d4.zip | |
revert 282085, 281909, they broke 32-bit dynamic ASan and the sanitizer-windows bot
llvm-svn: 282096
Diffstat (limited to 'compiler-rt/lib/asan/asan_mapping.h')
| -rw-r--r-- | compiler-rt/lib/asan/asan_mapping.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_mapping.h b/compiler-rt/lib/asan/asan_mapping.h index 24584e94f74..52c4f67a5d0 100644 --- a/compiler-rt/lib/asan/asan_mapping.h +++ b/compiler-rt/lib/asan/asan_mapping.h @@ -125,7 +125,6 @@ // || `[0x00000000, 0x2fffffff]` || LowMem || static const u64 kDefaultShadowScale = 3; -static const u64 kDefaultShadowSentinel = ~(uptr)0; static const u64 kDefaultShadowOffset32 = 1ULL << 29; // 0x20000000 static const u64 kDefaultShadowOffset64 = 1ULL << 44; static const u64 kDefaultShort64bitShadowOffset = 0x7FFF8000; // < 2G. @@ -141,6 +140,7 @@ static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52; static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 +static const u64 kWindowsShadowOffset64 = 1ULL << 45; // 32TB #define SHADOW_SCALE kDefaultShadowScale @@ -183,7 +183,7 @@ static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 # elif defined(__mips64) # define SHADOW_OFFSET kMIPS64_ShadowOffset64 # elif SANITIZER_WINDOWS64 -# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address +# define SHADOW_OFFSET kWindowsShadowOffset64 # else # define SHADOW_OFFSET kDefaultShort64bitShadowOffset # endif |
