From f607b87cbe68705684b9dcecab6a26b4cf546b7a Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 31 Oct 2018 12:16:41 +0100 Subject: Revert https://reviews.llvm.org/D40908 which changes asan offset to 1<<44. 2018-10-31 Martin Liska * asan/asan_mapping.h: Revert shadow memory offset to 1 << 41. From-SVN: r265668 --- libsanitizer/ChangeLog | 4 ++++ libsanitizer/asan/asan_mapping.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ba0c30f..4a93302 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,5 +1,9 @@ 2018-10-31 Martin Liska + * asan/asan_mapping.h: Revert shadow memory offset to 1 << 41. + +2018-10-31 Martin Liska + * LOCAL_PATCHES: Update patch list. * asan/asan_globals.cc (CheckODRViolationViaIndicator): Apply patches from GCC's trunk. diff --git a/libsanitizer/asan/asan_mapping.h b/libsanitizer/asan/asan_mapping.h index 3f35a19..c3ad36e 100644 --- a/libsanitizer/asan/asan_mapping.h +++ b/libsanitizer/asan/asan_mapping.h @@ -159,7 +159,7 @@ static const u64 kIosSimShadowOffset64 = kDefaultShadowOffset64; static const u64 kAArch64_ShadowOffset64 = 1ULL << 36; static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000; static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37; -static const u64 kPPC64_ShadowOffset64 = 1ULL << 44; +static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52; static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 -- cgit v1.1