summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2019-04-26 17:04:05 +0000
committerVitaly Buka <vitalybuka@google.com>2019-04-26 17:04:05 +0000
commitefc94feef98a5d88eda8e2aee604fcb446dacfe7 (patch)
treee50b8a651a1e6071341692d95665335972cca7de
parent60f5df948b0dd49349baf4326cebfb0b5e6bacf2 (diff)
downloadbcm5719-llvm-efc94feef98a5d88eda8e2aee604fcb446dacfe7.tar.gz
bcm5719-llvm-efc94feef98a5d88eda8e2aee604fcb446dacfe7.zip
[NFC] Remove ::kForTest from AP64, it does not use it.
llvm-svn: 359323
-rw-r--r--compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc14
-rw-r--r--compiler-rt/lib/tsan/rtl/tsan_rtl.h2
2 files changed, 8 insertions, 8 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 0173254eb52..dcbe46f6f80 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 a3568c33974..033eb11c54d 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<AP64> PrimaryAllocator;
OpenPOWER on IntegriCloud