diff options
| author | Etienne Bergeron <etienneb@google.com> | 2016-09-19 15:59:01 +0000 |
|---|---|---|
| committer | Etienne Bergeron <etienneb@google.com> | 2016-09-19 15:59:01 +0000 |
| commit | 130a190bf08a3d955d9db24dac936159dc049e12 (patch) | |
| tree | 6e3e4548f1694ea453b3b3f528c5da41d586b807 /compiler-rt/lib/asan/asan_mapping.h | |
| parent | 6ba5176862dcd5a3166b275aa061ac6204fec40f (diff) | |
| download | bcm5719-llvm-130a190bf08a3d955d9db24dac936159dc049e12.tar.gz bcm5719-llvm-130a190bf08a3d955d9db24dac936159dc049e12.zip | |
[compiler-rt] Add support for the dynamic shadow allocation
Summary:
This patch is adding the needed code to compiler-rt to support
dynamic shadow.
This is to support this patch:
https://reviews.llvm.org/D23354
It's adding support for using a shadow placed at a dynamic address determined
at runtime.
The dynamic shadow is required to work on windows 64-bits.
Reviewers: rnk, kcc, vitalybuka
Subscribers: kubabrecka, dberris, llvm-commits, chrisha
Differential Revision: https://reviews.llvm.org/D23363
llvm-svn: 281909
Diffstat (limited to 'compiler-rt/lib/asan/asan_mapping.h')
| -rw-r--r-- | compiler-rt/lib/asan/asan_mapping.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_mapping.h b/compiler-rt/lib/asan/asan_mapping.h index 52c4f67a5d0..40ff54fd0d1 100644 --- a/compiler-rt/lib/asan/asan_mapping.h +++ b/compiler-rt/lib/asan/asan_mapping.h @@ -140,7 +140,6 @@ 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 +182,7 @@ static const u64 kWindowsShadowOffset64 = 1ULL << 45; // 32TB # elif defined(__mips64) # define SHADOW_OFFSET kMIPS64_ShadowOffset64 # elif SANITIZER_WINDOWS64 -# define SHADOW_OFFSET kWindowsShadowOffset64 +# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # else # define SHADOW_OFFSET kDefaultShort64bitShadowOffset # endif |
