[lsan] Use SANITIZER_WORDSIZE when selecting ByteMap

Originally this code as added for 64-bit platform and was never changed.
Add static_assert to make sure that we have correct map on all platforms.

llvm-svn: 359269

1 files changed, 11 insertions, 10 deletions

diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
index ec130f3d572..0173254eb52 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
@@ -59,7 +59,7 @@ struct AP64 {  // Allocator Params. Short name for shorter demangled names..
   static const uptr kMetadataSize = 16;
   typedef ::SizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -70,7 +70,7 @@ struct AP64Dyn {
   static const uptr kMetadataSize = 16;
   typedef ::SizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -81,7 +81,7 @@ struct AP64Compact {
   static const uptr kMetadataSize = 16;
   typedef CompactSizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -92,7 +92,7 @@ struct AP64VeryCompact {
   static const uptr kMetadataSize = 16;
   typedef VeryCompactSizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -103,7 +103,7 @@ struct AP64Dense {
   static const uptr kMetadataSize = 16;
   typedef DenseSizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -155,7 +155,7 @@ struct AP32Compact {
   using AddressSpaceView = AddressSpaceViewTy;
   using ByteMap = FlatByteMap<kFlatByteMapSize, AddressSpaceView>;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
 };
 template <typename AddressSpaceView>
 using Allocator32CompactASVT =
@@ -302,7 +302,8 @@ struct AP32SeparateBatches {
   using ByteMap = FlatByteMap<kFlatByteMapSize, AddressSpaceView>;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
   static const uptr kFlags =
-      SizeClassAllocator32FlagMasks::kUseSeparateSizeClassForBatch;
+      SizeClassAllocator32FlagMasks::kUseSeparateSizeClassForBatch |
+      SizeClassAllocator32FlagMasks::kForTest;
 };
 template <typename AddressSpaceView>
 using Allocator32SeparateBatchesASVT =
@@ -438,7 +439,7 @@ struct AP64WithCallback {
   static const uptr kMetadataSize = 16;
   typedef ::SizeClassMap SizeClassMap;
   typedef TestMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };
 
@@ -476,7 +477,7 @@ struct AP32WithCallback {
   using AddressSpaceView = AddressSpaceViewTy;
   using ByteMap = FlatByteMap<kFlatByteMapSize, AddressSpaceView>;
   typedef TestMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
 };
 
 TEST(SanitizerCommon, SizeClassAllocator32MapUnmapCallback) {
@@ -1039,7 +1040,7 @@ struct AP64_SpecialSizeClassMap {
   static const uptr kMetadataSize = 0;
   typedef SpecialSizeClassMap SizeClassMap;
   typedef NoOpMapUnmapCallback MapUnmapCallback;
-  static const uptr kFlags = 0;
+  static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest;
   using AddressSpaceView = AddressSpaceViewTy;
 };