Skip to content

Commit a9e7fd2

Browse files
vitalybukavitalybuka
committed
NFC: Clang-format msan_allocator.cc
llvm-svn: 359270
1 parent 3db2a7a commit a9e7fd2

File tree

1 file changed

+61
-61
lines changed

1 file changed

+61
-61
lines changed

‎compiler-rt/lib/msan/msan_allocator.cc

+61-61
Original file line numberDiff line numberDiff line change
@@ -45,76 +45,76 @@ struct MsanMapUnmapCallback {
4545
};
4646

4747
#if defined(__mips64)
48-
static const uptr kMaxAllowedMallocSize = 2UL << 30;
49-
static const uptr kRegionSizeLog = 20;
50-
static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
51-
typedef TwoLevelByteMap<(kNumRegions >> 12), 1 << 12> ByteMap;
52-
53-
struct AP32 {
54-
static const uptr kSpaceBeg = 0;
55-
static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
56-
static const uptr kMetadataSize = sizeof(Metadata);
57-
typedef __sanitizer::CompactSizeClassMap SizeClassMap;
58-
static const uptr kRegionSizeLog = __msan::kRegionSizeLog;
59-
using AddressSpaceView = LocalAddressSpaceView;
60-
using ByteMap = __msan::ByteMap;
61-
typedef MsanMapUnmapCallback MapUnmapCallback;
62-
static const uptr kFlags = 0;
63-
};
64-
typedef SizeClassAllocator32<AP32> PrimaryAllocator;
48+
static const uptr kMaxAllowedMallocSize = 2UL << 30;
49+
static const uptr kRegionSizeLog = 20;
50+
static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
51+
typedef TwoLevelByteMap<(kNumRegions >> 12), 1 << 12> ByteMap;
52+
53+
struct AP32 {
54+
static const uptr kSpaceBeg = 0;
55+
static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
56+
static const uptr kMetadataSize = sizeof(Metadata);
57+
typedef __sanitizer::CompactSizeClassMap SizeClassMap;
58+
static const uptr kRegionSizeLog = __msan::kRegionSizeLog;
59+
using AddressSpaceView = LocalAddressSpaceView;
60+
using ByteMap = __msan::ByteMap;
61+
typedef MsanMapUnmapCallback MapUnmapCallback;
62+
static const uptr kFlags = 0;
63+
};
64+
typedef SizeClassAllocator32<AP32> PrimaryAllocator;
6565
#elif defined(__x86_64__)
6666
#if SANITIZER_NETBSD || \
6767
(SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING))
68-
static const uptr kAllocatorSpace = 0x700000000000ULL;
68+
static const uptr kAllocatorSpace = 0x700000000000ULL;
6969
#else
70-
static const uptr kAllocatorSpace = 0x600000000000ULL;
70+
static const uptr kAllocatorSpace = 0x600000000000ULL;
7171
#endif
72-
static const uptr kMaxAllowedMallocSize = 8UL << 30;
73-
74-
struct AP64 { // Allocator64 parameters. Deliberately using a short name.
75-
static const uptr kSpaceBeg = kAllocatorSpace;
76-
static const uptr kSpaceSize = 0x40000000000; // 4T.
77-
static const uptr kMetadataSize = sizeof(Metadata);
78-
typedef DefaultSizeClassMap SizeClassMap;
79-
typedef MsanMapUnmapCallback MapUnmapCallback;
80-
static const uptr kFlags = 0;
81-
using AddressSpaceView = LocalAddressSpaceView;
82-
};
72+
static const uptr kMaxAllowedMallocSize = 8UL << 30;
73+
74+
struct AP64 { // Allocator64 parameters. Deliberately using a short name.
75+
static const uptr kSpaceBeg = kAllocatorSpace;
76+
static const uptr kSpaceSize = 0x40000000000; // 4T.
77+
static const uptr kMetadataSize = sizeof(Metadata);
78+
typedef DefaultSizeClassMap SizeClassMap;
79+
typedef MsanMapUnmapCallback MapUnmapCallback;
80+
static const uptr kFlags = 0;
81+
using AddressSpaceView = LocalAddressSpaceView;
82+
};
8383

84-
typedef SizeClassAllocator64<AP64> PrimaryAllocator;
84+
typedef SizeClassAllocator64<AP64> PrimaryAllocator;
8585

8686
#elif defined(__powerpc64__)
87-
static const uptr kMaxAllowedMallocSize = 2UL << 30; // 2G
88-
89-
struct AP64 { // Allocator64 parameters. Deliberately using a short name.
90-
static const uptr kSpaceBeg = 0x300000000000;
91-
static const uptr kSpaceSize = 0x020000000000; // 2T.
92-
static const uptr kMetadataSize = sizeof(Metadata);
93-
typedef DefaultSizeClassMap SizeClassMap;
94-
typedef MsanMapUnmapCallback MapUnmapCallback;
95-
static const uptr kFlags = 0;
96-
using AddressSpaceView = LocalAddressSpaceView;
97-
};
98-
99-
typedef SizeClassAllocator64<AP64> PrimaryAllocator;
87+
static const uptr kMaxAllowedMallocSize = 2UL << 30; // 2G
88+
89+
struct AP64 { // Allocator64 parameters. Deliberately using a short name.
90+
static const uptr kSpaceBeg = 0x300000000000;
91+
static const uptr kSpaceSize = 0x020000000000; // 2T.
92+
static const uptr kMetadataSize = sizeof(Metadata);
93+
typedef DefaultSizeClassMap SizeClassMap;
94+
typedef MsanMapUnmapCallback MapUnmapCallback;
95+
static const uptr kFlags = 0;
96+
using AddressSpaceView = LocalAddressSpaceView;
97+
};
98+
99+
typedef SizeClassAllocator64<AP64> PrimaryAllocator;
100100
#elif defined(__aarch64__)
101-
static const uptr kMaxAllowedMallocSize = 2UL << 30; // 2G
102-
static const uptr kRegionSizeLog = 20;
103-
static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
104-
typedef TwoLevelByteMap<(kNumRegions >> 12), 1 << 12> ByteMap;
105-
106-
struct AP32 {
107-
static const uptr kSpaceBeg = 0;
108-
static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
109-
static const uptr kMetadataSize = sizeof(Metadata);
110-
typedef __sanitizer::CompactSizeClassMap SizeClassMap;
111-
static const uptr kRegionSizeLog = __msan::kRegionSizeLog;
112-
using AddressSpaceView = LocalAddressSpaceView;
113-
using ByteMap = __msan::ByteMap;
114-
typedef MsanMapUnmapCallback MapUnmapCallback;
115-
static const uptr kFlags = 0;
116-
};
117-
typedef SizeClassAllocator32<AP32> PrimaryAllocator;
101+
static const uptr kMaxAllowedMallocSize = 2UL << 30; // 2G
102+
static const uptr kRegionSizeLog = 20;
103+
static const uptr kNumRegions = SANITIZER_MMAP_RANGE_SIZE >> kRegionSizeLog;
104+
typedef TwoLevelByteMap<(kNumRegions >> 12), 1 << 12> ByteMap;
105+
106+
struct AP32 {
107+
static const uptr kSpaceBeg = 0;
108+
static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
109+
static const uptr kMetadataSize = sizeof(Metadata);
110+
typedef __sanitizer::CompactSizeClassMap SizeClassMap;
111+
static const uptr kRegionSizeLog = __msan::kRegionSizeLog;
112+
using AddressSpaceView = LocalAddressSpaceView;
113+
using ByteMap = __msan::ByteMap;
114+
typedef MsanMapUnmapCallback MapUnmapCallback;
115+
static const uptr kFlags = 0;
116+
};
117+
typedef SizeClassAllocator32<AP32> PrimaryAllocator;
118118
#endif
119119
typedef SizeClassAllocatorLocalCache<PrimaryAllocator> AllocatorCache;
120120
typedef LargeMmapAllocator<MsanMapUnmapCallback> SecondaryAllocator;

0 commit comments

Comments
 (0)