diff --git a/libcxx/include/deque b/libcxx/include/deque --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -968,7 +968,12 @@ }; // The following functions are no-ops outside of AddressSanitizer mode. -// We call annotations only for the default Allocator. +// We call annotations for every allocator, unless explicitly disabled. +// +// To disable annotations for a particular allocator, change value of +// __asan_annotate_container_with_allocator to false. +// For more details, see the "Using libc++" documentation page or +// the documentation for __sanitizer_annotate_contiguous_container. #if !defined(_LIBCPP_HAS_NO_ASAN) && _LIBCPP_CLANG_VER >= 1600 // TODO LLVM18: Remove the special-casing _LIBCPP_HIDE_FROM_ABI void __annotate_double_ended_contiguous_container( diff --git a/libcxx/include/vector b/libcxx/include/vector --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -840,9 +840,12 @@ inline void __emplace_back_slow_path(_Args&&... __args); // The following functions are no-ops outside of AddressSanitizer mode. - // We call annotatations only for the default Allocator because other allocators - // may not meet the AddressSanitizer alignment constraints. - // See the documentation for __sanitizer_annotate_contiguous_container for more details. + // We call annotations for every allocator, unless explicitly disabled. + // + // To disable annotations for a particular allocator, change value of + // __asan_annotate_container_with_allocator to false. + // For more details, see the "Using libc++" documentation page or + // the documentation for __sanitizer_annotate_contiguous_container. #ifndef _LIBCPP_HAS_NO_ASAN _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_contiguous_container(const void *__beg, const void *__end,