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 0173254eb521..dcbe46f6f80a 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 = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -70,7 +70,7 @@ struct AP64Dyn { static const uptr kMetadataSize = 16; typedef ::SizeClassMap SizeClassMap; typedef NoOpMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -81,7 +81,7 @@ struct AP64Compact { static const uptr kMetadataSize = 16; typedef CompactSizeClassMap SizeClassMap; typedef NoOpMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -92,7 +92,7 @@ struct AP64VeryCompact { static const uptr kMetadataSize = 16; typedef VeryCompactSizeClassMap SizeClassMap; typedef NoOpMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -103,7 +103,7 @@ struct AP64Dense { static const uptr kMetadataSize = 16; typedef DenseSizeClassMap SizeClassMap; typedef NoOpMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -439,7 +439,7 @@ struct AP64WithCallback { static const uptr kMetadataSize = 16; typedef ::SizeClassMap SizeClassMap; typedef TestMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; @@ -1040,7 +1040,7 @@ struct AP64_SpecialSizeClassMap { static const uptr kMetadataSize = 0; typedef SpecialSizeClassMap SizeClassMap; typedef NoOpMapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = AddressSpaceViewTy; }; diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h index a3568c33974f..033eb11c54d8 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h @@ -79,7 +79,7 @@ struct AP64 { // Allocator64 parameters. Deliberately using a short name. static const uptr kMetadataSize = 0; typedef DefaultSizeClassMap SizeClassMap; typedef __tsan::MapUnmapCallback MapUnmapCallback; - static const uptr kFlags = SizeClassAllocator32FlagMasks::kForTest; + static const uptr kFlags = 0; using AddressSpaceView = LocalAddressSpaceView; }; typedef SizeClassAllocator64 PrimaryAllocator;