diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flat_map.h b/compiler-rt/lib/sanitizer_common/sanitizer_flat_map.h --- a/compiler-rt/lib/sanitizer_common/sanitizer_flat_map.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_flat_map.h @@ -124,8 +124,7 @@ T *Get(uptr idx) const { DCHECK_LT(idx, kSize1); - return reinterpret_cast( - atomic_load(&map1_[idx], memory_order_acquire)); + return reinterpret_cast(atomic_load_relaxed(&map1_[idx])); } T *GetOrCreate(uptr idx) const { @@ -141,8 +140,7 @@ if (!res) { res = reinterpret_cast(MmapOrDie(MmapSize(), "TwoLevelMap")); MapUnmapCallback().OnMap(reinterpret_cast(res), kSize2); - atomic_store(&map1_[idx], reinterpret_cast(res), - memory_order_release); + atomic_store_relaxed(&map1_[idx], reinterpret_cast(res)); } return res; }