diff options
| author | 2017-05-04 20:59:14 +0000 | |
|---|---|---|
| committer | 2017-05-04 20:59:15 +0000 | |
| commit | 8a18ce7c32d0e31812ff68b1d238f36d3f2b801d (patch) | |
| tree | 4cd9d1631b4ea728fd8e15e0a096e8af14a0a7a8 | |
| parent | 05a252b52b4f94f78759e6099dd420ca5a4e1b2f (diff) | |
| parent | e8857fe3349af3900ef5b6ba65627c82cb13a2c2 (diff) | |
Merge "ART: Change alloc-space begin for x86 ASAN"
| -rw-r--r-- | runtime/gc/heap.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index bd4f99b7f5..298336ae4d 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -150,8 +150,13 @@ static constexpr bool kUsePartialTlabs = true; static uint8_t* const kPreferredAllocSpaceBegin = reinterpret_cast<uint8_t*>(300 * MB - Heap::kDefaultNonMovingSpaceCapacity); #else -// For 32-bit, use 0x20000000 because asan reserves 0x04000000 - 0x20000000. +#ifdef __ANDROID__ +// For 32-bit Android, use 0x20000000 because asan reserves 0x04000000 - 0x20000000. static uint8_t* const kPreferredAllocSpaceBegin = reinterpret_cast<uint8_t*>(0x20000000); +#else +// For 32-bit host, use 0x40000000 because asan uses most of the space below this. +static uint8_t* const kPreferredAllocSpaceBegin = reinterpret_cast<uint8_t*>(0x40000000); +#endif #endif static inline bool CareAboutPauseTimes() { |