maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC][Asan] Return uptr as before D87646

This commit is contained in:
Vitaly Buka 2020-09-15 00:16:55 -07:00
parent 08507d83be
commit 4540d3baad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/lib/asan/asan_allocator.cpp
View File

@ -161,8 +161,9 @@ class AsanChunk : public ChunkBase {
};
class LargeChunkHeader {
static constexpr uptr kAllocBegMagic = 0xCC6E96B9;
atomic_uint64_t magic;
static constexpr uptr kAllocBegMagic =
FIRST_32_SECOND_64(0xCC6E96B9, 0xCC6E96B9CC6E96B9ULL);
atomic_uintptr_t magic;
AsanChunk *chunk_header;
public:
@ -179,7 +180,7 @@ class LargeChunkHeader {
return;
}
u64 old = kAllocBegMagic;
uptr old = kAllocBegMagic;
if (!atomic_compare_exchange_strong(&magic, &old, 0,
memory_order_release)) {
CHECK_EQ(old, kAllocBegMagic);