From e9daf7774c9f7f5e1d2cb07f28f78cb03d664845 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 3 Mar 2023 08:07:15 -0800 Subject: [PATCH 1/3] vector: Don't undef _ACTIVATE_VECTOR_ANNOTATION. This is used entirely within __msvc_sanitizer_annotate_container.hpp and undef'ed there. --- stl/inc/vector | 1 - 1 file changed, 1 deletion(-) diff --git a/stl/inc/vector b/stl/inc/vector index 85a75e7327c..01574777fdb 100644 --- a/stl/inc/vector +++ b/stl/inc/vector @@ -3726,7 +3726,6 @@ _NODISCARD _CONSTEXPR20 _Iter_diff_t<_VbIt> _Count_vbool(_VbIt _First, const _Vb #undef _ASAN_VECTOR_CREATE_GUARD #undef _ASAN_VECTOR_EXTEND_GUARD #undef _ASAN_VECTOR_RELEASE_GUARD -#undef _ACTIVATE_VECTOR_ANNOTATION #undef _INSERT_VECTOR_ANNOTATION _STD_END From c7ed462eb5684af79adc5d1188d8c940071c765f Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 3 Mar 2023 08:11:54 -0800 Subject: [PATCH 2/3] xstring: Like vector, undef _ASAN_STRING_MEOW and _INSERT_STRING_ANNOTATION. --- stl/inc/xstring | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stl/inc/xstring b/stl/inc/xstring index cfc53742bc7..980c70e256f 100644 --- a/stl/inc/xstring +++ b/stl/inc/xstring @@ -5279,6 +5279,11 @@ namespace pmr { #endif // _HAS_CXX17 _STD_END +#undef _ASAN_STRING_REMOVE +#undef _ASAN_STRING_CREATE +#undef _ASAN_STRING_MODIFY +#undef _INSERT_STRING_ANNOTATION + #pragma pop_macro("new") _STL_RESTORE_CLANG_WARNINGS #pragma warning(pop) From 7f8b55a1cdc68a18a6ddebce51deb019701c80df Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 3 Mar 2023 08:22:58 -0800 Subject: [PATCH 3/3] Macro hygiene: undef _FSTREAM_SUPPORTS_EXPERIMENTAL_FILESYSTEM. --- stl/inc/fstream | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stl/inc/fstream b/stl/inc/fstream index 1fc1001e6d9..ecf2b7509b3 100644 --- a/stl/inc/fstream +++ b/stl/inc/fstream @@ -1361,6 +1361,8 @@ void swap(basic_fstream<_Elem, _Traits>& _Left, basic_fstream<_Elem, _Traits>& _ } _STD_END +#undef _FSTREAM_SUPPORTS_EXPERIMENTAL_FILESYSTEM + #pragma pop_macro("new") _STL_RESTORE_CLANG_WARNINGS #pragma warning(pop)