From 580c13be76f35ae7837f6d273300e62c9b891b18 Mon Sep 17 00:00:00 2001 From: Pavel P Date: Wed, 22 Oct 2025 22:53:08 +0200 Subject: [PATCH] Fix asan check in UninitializedMemoryHacks.h libcxx removed all of the macro in favor simple feature test. See: https://github.com/llvm/llvm-project/commit/040e9e02ccbf69bebd293a4c389948d7ecbc7bd9 --- folly/memory/UninitializedMemoryHacks.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/folly/memory/UninitializedMemoryHacks.h b/folly/memory/UninitializedMemoryHacks.h index 6644ca13fb1..5dc5caec6e1 100644 --- a/folly/memory/UninitializedMemoryHacks.h +++ b/folly/memory/UninitializedMemoryHacks.h @@ -336,15 +336,7 @@ void unsafeVectorSetLargerSize(std::vector& v, std::size_t n) { // enabled we need to call the appropriate annotation functions in order to // stop ASAN from reporting false positives. When ASAN is disabled, the // annotation function is a no-op. -#if defined(_LIBCPP_HAS_ASAN) -#define FOLLY_ASAN_ANNOTATE_CONTIGUOUS_CONTAINER _LIBCPP_HAS_ASAN -#elif defined(_LIBCPP_HAS_NO_ASAN) -#define FOLLY_ASAN_ANNOTATE_CONTIGUOUS_CONTAINER 0 -#else -#define FOLLY_ASAN_ANNOTATE_CONTIGUOUS_CONTAINER 1 -#endif - -#if FOLLY_ASAN_ANNOTATE_CONTIGUOUS_CONTAINER +#if __has_feature(address_sanitizer) __sanitizer_annotate_contiguous_container( v.data(), v.data() + v.capacity(), v.data() + s, v.data() + n); #endif