Skip to content

Commit

Permalink
[sanitizer] NFC: add static_assert to confirm that we use reasonable …
Browse files Browse the repository at this point in the history
…ByteMap type

Summary: If bots work we can replace #ifs with template specialization by TwoLevelByteMapSize1.

There is known users of TwoLevelByteMap with TwoLevelByteMapSize1 equal 8,
and users of FlatByteMap with TwoLevelByteMapSize1 equal 2.

Reviewers: eugenis

Subscribers: kubamracek, #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D61200

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359364 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
vitalybuka committed Apr 27, 2019
1 parent dc8b1be commit 308ab63
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions lib/sanitizer_common/sanitizer_allocator_primary32.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,22 @@ struct SizeClassAllocator32FlagMasks { // Bit masks.
};
};

// This template is not necessary but t helps to see values if static_assert
// fails.
// FIXME: Replace check with automatic type detection. D61206
template <bool Expected, u64 MinSize, u64 ActualSize>
struct CheckTwoLevelByteMapSize {
static_assert((ActualSize >= MinSize) == Expected,
"Unexpected ByteMap type for the size");
};

template <class Params>
class SizeClassAllocator32 {
private:
static const u64 TwoLevelByteMapSize1 =
(Params::kSpaceSize >> Params::kRegionSizeLog) >> 12;
static const u64 kMinFirstMapSizeTwoLevelByteMap = 4;

public:
using AddressSpaceView = typename Params::AddressSpaceView;
static const uptr kSpaceBeg = Params::kSpaceBeg;
Expand All @@ -58,12 +72,16 @@ class SizeClassAllocator32 {
typedef typename Params::MapUnmapCallback MapUnmapCallback;

#if SANITIZER_WORDSIZE == 32
CheckTwoLevelByteMapSize<false, kMinFirstMapSizeTwoLevelByteMap,
TwoLevelByteMapSize1>
Check;
using BM = FlatByteMap<(Params::kSpaceSize >> Params::kRegionSizeLog),
AddressSpaceView>;
#elif SANITIZER_WORDSIZE == 64
using BM =
TwoLevelByteMap<((Params::kSpaceSize >> Params::kRegionSizeLog) >> 12),
1 << 12, AddressSpaceView>;
CheckTwoLevelByteMapSize<true, kMinFirstMapSizeTwoLevelByteMap,
TwoLevelByteMapSize1>
Check;
using BM = TwoLevelByteMap<TwoLevelByteMapSize1, 1 << 12, AddressSpaceView>;
#endif
static_assert((Params::kFlags & SizeClassAllocator32FlagMasks::kForTest) ||
is_same<BM, ByteMap>::value,
Expand Down

0 comments on commit 308ab63

Please sign in to comment.