Skip to content

Commit

Permalink
[NFC][compiler-rt][asan] Unify asan and lsan allocator settings
Browse files Browse the repository at this point in the history
This updates existing asan allocator settings to use the same allocator settings as what lsan uses for platforms where they already match.

Differential Revision: https://reviews.llvm.org/D126927
  • Loading branch information
PiJoules committed Jun 8, 2022
1 parent 1e29c3a commit dd045dd
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions compiler-rt/lib/asan/asan_allocator.h
Expand Up @@ -17,6 +17,7 @@
#include "asan_flags.h"
#include "asan_interceptors.h"
#include "asan_internal.h"
#include "lsan/lsan_allocator.h"
#include "sanitizer_common/sanitizer_allocator.h"
#include "sanitizer_common/sanitizer_list.h"
#include "sanitizer_common/sanitizer_platform.h"
Expand Down Expand Up @@ -118,12 +119,9 @@ struct AsanMapUnmapCallback {
};

#if SANITIZER_CAN_USE_ALLOCATOR64
# if SANITIZER_FUCHSIA
const uptr kAllocatorSpace = ~(uptr)0;
const uptr kAllocatorSize = 0x40000000000ULL; // 4T.
typedef DefaultSizeClassMap SizeClassMap;
# elif defined(__powerpc64__)
# if defined(__powerpc64__)
const uptr kAllocatorSpace = ~(uptr)0;
// NOTE: This differs slightly from the LSan allocator size which is 4T.
const uptr kAllocatorSize = 0x20000000000ULL; // 2T.
typedef DefaultSizeClassMap SizeClassMap;
# elif defined(__aarch64__) && SANITIZER_ANDROID
Expand All @@ -150,8 +148,9 @@ const uptr kAllocatorSpace = ~(uptr)0;
const uptr kAllocatorSize = 0x8000000000ULL; // 500G
typedef DefaultSizeClassMap SizeClassMap;
# else
const uptr kAllocatorSpace = 0x600000000000ULL;
const uptr kAllocatorSize = 0x40000000000ULL; // 4T.
// Use LSan's allocator configs.
const uptr kAllocatorSpace = __lsan::kAllocatorSpace;
const uptr kAllocatorSize = __lsan::kAllocatorSize;
typedef DefaultSizeClassMap SizeClassMap;
# endif
template <typename AddressSpaceViewTy>
Expand Down

0 comments on commit dd045dd

Please sign in to comment.