Commit 4446115f authored by Mark Mentovai's avatar Mark Mentovai Committed by Commit Bot

Fix 4ebd0722 for Memory Sanitizer

https://chromium-review.googlesource.com/c/chromium/src/+/2361202/19/base/allocator/partition_allocator/address_space_randomization.h#10
https://ci.chromium.org/p/chromium/builders/ci/Mac%20ASan%2064%20Builder/104645
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8868766400954068720/+/steps/compile/0/stdout

Bug: 1102194
Change-Id: I1192cdf2709be08e87c194d76c5d95a85a714ebd
TBR: zentaro@chromium.org
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419589Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808651}
parent 5d95ae60
......@@ -43,10 +43,12 @@ AslrMask(uintptr_t bits) {
// hard-coded in those tools, bad things happen. This address range is
// copied from TSAN source but works with all tools. See
// https://crbug.com/539863.
constexpr ALWAYS_INLINE uintptr_t ASLRMask() {
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
ASLRMask() {
return AslrAddress(0x007fffffffffULL);
}
constexpr ALWAYS_INLINE uintptr_t ASLROffset() {
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
ASLROffset() {
return AslrAddress(0x7e8000000000ULL);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment