From: Vitaly Buka Date: Wed, 5 Apr 2023 23:12:04 +0000 (-0700) Subject: [hwasan] Use GetBlockBegin instead of GetBlockBeginFastLocked X-Git-Tag: upstream/17.0.6~12515 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d328668691afc32402a7e3c4ce2efb5547be2b2;p=platform%2Fupstream%2Fllvm.git [hwasan] Use GetBlockBegin instead of GetBlockBeginFastLocked Asan and lsan use non-locked version as well. IgnoreObjectLocked name is missleading. --- diff --git a/compiler-rt/lib/hwasan/hwasan_allocator.cpp b/compiler-rt/lib/hwasan/hwasan_allocator.cpp index e6f46ed..b3432f9 100644 --- a/compiler-rt/lib/hwasan/hwasan_allocator.cpp +++ b/compiler-rt/lib/hwasan/hwasan_allocator.cpp @@ -622,7 +622,7 @@ IgnoreObjectResult IgnoreObjectLocked(const void *p) { p = __hwasan::InTaggableRegion(reinterpret_cast(p)) ? UntagPtr(p) : p; uptr addr = reinterpret_cast(p); uptr chunk = - reinterpret_cast(__hwasan::allocator.GetBlockBeginFastLocked(p)); + reinterpret_cast(__hwasan::allocator.GetBlockBegin(p)); if (!chunk) return kIgnoreObjectInvalid; __hwasan::Metadata *metadata = reinterpret_cast<__hwasan::Metadata *>(