[compiler-rt] r359364 - [sanitizer] NFC: add static_assert to confirm that we use reasonable ByteMap type

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Fri Apr 26 19:13:26 2019
New Revision: 359364

URL: http://llvm.org/viewvc/llvm-project?rev=359364&view=rev
Log:
[sanitizer] NFC: add static_assert to confirm that we use reasonable 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

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_primary32.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_primary32.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_primary32.h?rev=359364&r1=359363&r2=359364&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_primary32.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator_primary32.h Fri Apr 26 19:13:26 2019
@@ -45,8 +45,22 @@ struct SizeClassAllocator32FlagMasks {
   };
 };
 
+// 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;
@@ -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,