Skip to content

Commit 4540d3b

Browse files
committed
[NFC][Asan] Return uptr as before D87646
1 parent 08507d8 commit 4540d3b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

compiler-rt/lib/asan/asan_allocator.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ class AsanChunk : public ChunkBase {
161161
};
162162

163163
class LargeChunkHeader {
164-
static constexpr uptr kAllocBegMagic = 0xCC6E96B9;
165-
atomic_uint64_t magic;
164+
static constexpr uptr kAllocBegMagic =
165+
FIRST_32_SECOND_64(0xCC6E96B9, 0xCC6E96B9CC6E96B9ULL);
166+
atomic_uintptr_t magic;
166167
AsanChunk *chunk_header;
167168

168169
public:
@@ -179,7 +180,7 @@ class LargeChunkHeader {
179180
return;
180181
}
181182

182-
u64 old = kAllocBegMagic;
183+
uptr old = kAllocBegMagic;
183184
if (!atomic_compare_exchange_strong(&magic, &old, 0,
184185
memory_order_release)) {
185186
CHECK_EQ(old, kAllocBegMagic);

0 commit comments

Comments
 (0)