[compiler-rt] r359352 - Revert "[sanitizer] NFC: add static_assert to confirm that we use optimal ByteMap type"
JF Bastien via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 26 15:29:49 PDT 2019
Author: jfb
Date: Fri Apr 26 15:29:49 2019
New Revision: 359352
URL: http://llvm.org/viewvc/llvm-project?rev=359352&view=rev
Log:
Revert "[sanitizer] NFC: add static_assert to confirm that we use optimal ByteMap type"
Fails on bots with:
/Users/buildslave/jenkins/workspace/clang-stage1-cmake-RA-expensive/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary32.h:69:3: error: static_assert failed due to requirement 'TwoLevelByteMapSize1 > 128' "TwoLevelByteMap should be used"
static_assert(TwoLevelByteMapSize1 > 128, "TwoLevelByteMap should be used");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/buildslave/jenkins/workspace/clang-stage1-cmake-RA-expensive/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_allocator_combined.h:29:34: note: in instantiation of template class '__sanitizer::SizeClassAllocator32<__sanitizer::AP32>' requested here
typename PrimaryAllocator::AddressSpaceView>::value,
^
http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-expensive/13960/console
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=359352&r1=359351&r2=359352&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 15:29:49 2019
@@ -47,10 +47,6 @@ struct SizeClassAllocator32FlagMasks {
template <class Params>
class SizeClassAllocator32 {
- private:
- static const u64 TwoLevelByteMapSize1 =
- (Params::kSpaceSize >> Params::kRegionSizeLog) >> 12;
-
public:
using AddressSpaceView = typename Params::AddressSpaceView;
static const uptr kSpaceBeg = Params::kSpaceBeg;
@@ -62,12 +58,12 @@ class SizeClassAllocator32 {
typedef typename Params::MapUnmapCallback MapUnmapCallback;
#if SANITIZER_WORDSIZE == 32
- static_assert(TwoLevelByteMapSize1 <= 128, "FlatByteMap should be used");
using BM = FlatByteMap<(Params::kSpaceSize >> Params::kRegionSizeLog),
AddressSpaceView>;
#elif SANITIZER_WORDSIZE == 64
- static_assert(TwoLevelByteMapSize1 > 128, "TwoLevelByteMap should be used");
- using BM = TwoLevelByteMap<TwoLevelByteMapSize1, 1 << 12, AddressSpaceView>;
+ using BM =
+ TwoLevelByteMap<((Params::kSpaceSize >> Params::kRegionSizeLog) >> 12),
+ 1 << 12, AddressSpaceView>;
#endif
static_assert((Params::kFlags & SizeClassAllocator32FlagMasks::kForTest) ||
is_same<BM, ByteMap>::value,
More information about the llvm-commits
mailing list