Re-enable ASAN string annotations

stl/CMakeLists.txt

@@ -8,6 +8,7 @@ set(HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_format_ucd_tables.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_int128.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_iter_core.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_sanitizer_annotate_container.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_system_error_abi.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_tzdb.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_xlocinfo_types.hpp

stl/inc/__msvc_sanitizer_annotate_container.hpp

@@ -0,0 +1,136 @@
+// __msvc_sanitizer_annotate_container.hpp internal header
+
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#pragma once
+#ifndef __MSVC_SANITIZER_ANNOTATE_CONTAINER_HPP
+#define __MSVC_SANITIZER_ANNOTATE_CONTAINER_HPP
+#include <yvals_core.h>
+#if _STL_COMPILER_PREPROCESSOR
+
+#pragma pack(push, _CRT_PACKING)
+#pragma warning(push, _STL_WARNING_LEVEL)
+#pragma warning(disable : _STL_DISABLED_WARNINGS)
+_STL_DISABLE_CLANG_WARNINGS
+#pragma push_macro("new")
+#undef new
+
+#if !defined(_M_CEE_PURE) && !(defined(_DISABLE_STRING_ANNOTATION) && defined(_DISABLE_VECTOR_ANNOTATION))
+
+#if defined(__SANITIZE_ADDRESS__)
+
+#define _ACTIVATE_STRING_ANNOTATION
+#define _INSERT_STRING_ANNOTATION
+#define _ACTIVATE_VECTOR_ANNOTATION
+#define _INSERT_VECTOR_ANNOTATION
+
+#elif defined(__clang__) && defined(__has_feature) // ^^^ __SANITIZE_ADDRESS__ / __clang__ vvv
+
+#if __has_feature(address_sanitizer)
+#define _ACTIVATE_STRING_ANNOTATION
+#define _INSERT_STRING_ANNOTATION
+#define _ACTIVATE_VECTOR_ANNOTATION
+#define _INSERT_VECTOR_ANNOTATION
+#pragma comment(linker, "/INFERASANLIBS")
+#endif // __has_feature(address_sanitizer)
+
+#else // ^^^ __clang__ / !__clang__ && !__SANITIZE_ADDRESS__ vvv
+
+#ifdef _ANNOTATE_STRING
+#define _INSERT_STRING_ANNOTATION
+#endif // _ANNOTATE_STRING
+#ifdef _ANNOTATE_VECTOR
+#define _INSERT_VECTOR_ANNOTATION
+#endif // _ANNOTATE_VECTOR
+
+#endif // __SANITIZE_ADDRESS__
+
+#if defined(_DISABLE_STRING_ANNOTATION)
+#undef _ACTIVATE_STRING_ANNOTATION
+#undef _INSERT_STRING_ANNOTATION
+#endif // _DISABLE_STRING_ANNOTATION
+#if defined(_DISABLE_VECTOR_ANNOTATION)
+#undef _ACTIVATE_VECTOR_ANNOTATION
+#undef _INSERT_VECTOR_ANNOTATION
+#endif // _DISABLE_VECTOR_ANNOTATION
+
+#if !defined(_INSERT_STRING_ANNOTATION)
+#pragma detect_mismatch("annotate_string", "0")
+#endif // !_INSERT_STRING_ANNOTATION
+#if !defined(_INSERT_VECTOR_ANNOTATION)
+#pragma detect_mismatch("annotate_vector", "0")
+#endif // !_INSERT_VECTOR_ANNOTATION
+
+#ifdef _ACTIVATE_STRING_ANNOTATION
+#pragma comment(lib, "stl_asan")
+#pragma detect_mismatch("annotate_string", "1")
+#endif // _ACTIVATE_STRING_ANNOTATION
+#ifdef _ACTIVATE_VECTOR_ANNOTATION
+#pragma comment(lib, "stl_asan")
+#pragma detect_mismatch("annotate_vector", "1")
+#endif // _ACTIVATE_VECTOR_ANNOTATION
+
+// only _INSERT_*_ANNOTATION should be used from here on
+#undef _ACTIVATE_STRING_ANNOTATION
+#undef _ACTIVATE_VECTOR_ANNOTATION
+
+extern "C" {
+#ifdef _INSERT_VECTOR_ANNOTATION
+extern const bool _Asan_vector_should_annotate;
+#endif
+
+#ifdef _INSERT_STRING_ANNOTATION
+extern const bool _Asan_string_should_annotate;
+#endif
+}
+
+#if defined(_INSERT_VECTOR_ANNOTATION) || defined(_INSERT_STRING_ANNOTATION)
+extern "C" {
+void __cdecl __sanitizer_annotate_contiguous_container(
+    const void* _First, const void* _End, const void* _Old_last, const void* _New_last);
+}
+
+#if defined(_M_ARM64EC)
+#pragma comment(linker, \
+    "/alternatename:#__sanitizer_annotate_contiguous_container=#__sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, \
+    "/alternatename:__sanitizer_annotate_contiguous_container=__sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, "/alternatename:#_Asan_vector_should_annotate=#_Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:_Asan_vector_should_annotate=_Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:#_Asan_string_should_annotate=#_Asan_string_should_annotate_default")
+#pragma comment(linker, "/alternatename:_Asan_string_should_annotate=_Asan_string_should_annotate_default")
+#elif defined(_M_HYBRID)
+#pragma comment(linker, \
+    "/alternatename:#__sanitizer_annotate_contiguous_container=#__sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, \
+    "/alternatename:___sanitizer_annotate_contiguous_container=___sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, "/alternatename:#_Asan_vector_should_annotate=#_Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:__Asan_vector_should_annotate=__Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:#_Asan_string_should_annotate=#_Asan_string_should_annotate_default")
+#pragma comment(linker, "/alternatename:__Asan_string_should_annotate=__Asan_string_should_annotate_default")
+#elif defined(_M_IX86)
+#pragma comment(linker, \
+    "/alternatename:___sanitizer_annotate_contiguous_container=___sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, "/alternatename:__Asan_vector_should_annotate=__Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:__Asan_string_should_annotate=__Asan_string_should_annotate_default")
+#elif defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)
+#pragma comment(linker, \
+    "/alternatename:__sanitizer_annotate_contiguous_container=__sanitizer_annotate_contiguous_container_default")
+#pragma comment(linker, "/alternatename:_Asan_vector_should_annotate=_Asan_vector_should_annotate_default")
+#pragma comment(linker, "/alternatename:_Asan_string_should_annotate=_Asan_string_should_annotate_default")
+#else // ^^^ known architecture / unknown architecture vvv
+#error Unknown architecture
+#endif // ^^^ unknown architecture ^^^
+
+#endif // insert asan annotations
+
+#endif // !_M_CEE_PURE && asan not disabled
+
+#pragma pop_macro("new")
+_STL_RESTORE_CLANG_WARNINGS
+#pragma warning(pop)
+#pragma pack(pop)
+
+#endif // _STL_COMPILER_PREPROCESSOR
+#endif // __MSVC_SANITIZER_ANNOTATE_CONTAINER_HPP

stl/inc/header-units.json

@@ -10,6 +10,7 @@
         "__msvc_format_ucd_tables.hpp",
         "__msvc_int128.hpp",
         "__msvc_iter_core.hpp",
+        "__msvc_sanitizer_annotate_container.hpp",
         "__msvc_system_error_abi.hpp",
         "__msvc_tzdb.hpp",
         "__msvc_xlocinfo_types.hpp",

stl/inc/vector

@@ -14,6 +14,8 @@
 #include <xpolymorphic_allocator.h>
 #endif // _HAS_CXX17
 
+#include <__msvc_sanitizer_annotate_container.hpp>
+
 #pragma pack(push, _CRT_PACKING)
 #pragma warning(push, _STL_WARNING_LEVEL)
 #pragma warning(disable : _STL_DISABLED_WARNINGS)
@@ -426,70 +428,6 @@ constexpr _Ty* _Unfancy_maybe_null(_Ty* _Ptr) noexcept { // do nothing for plain
     return _Ptr;
 }
 
-#if !defined(_M_CEE_PURE) && !defined(_DISABLE_VECTOR_ANNOTATION)
-#if defined(__SANITIZE_ADDRESS__)
-#define _ACTIVATE_VECTOR_ANNOTATION
-#define _INSERT_VECTOR_ANNOTATION
-#elif defined(__clang__) && defined(__has_feature) // ^^^ __SANITIZE_ADDRESS__ / __clang__ vvv
-#if __has_feature(address_sanitizer)
-#define _ACTIVATE_VECTOR_ANNOTATION
-#define _INSERT_VECTOR_ANNOTATION
-#pragma comment(linker, "/INFERASANLIBS")
-#endif // __has_feature(address_sanitizer)
-#elif defined(_ANNOTATE_VECTOR) // ^^^ __clang__ / _ANNOTATE_VECTOR vvv
-#define _INSERT_VECTOR_ANNOTATION
-#endif // _ANNOTATE_VECTOR
-#endif // !_M_CEE_PURE && !_DISABLE_VECTOR_ANNOTATION
-
-#ifdef _ACTIVATE_VECTOR_ANNOTATION
-#pragma comment(lib, "stl_asan")
-#pragma detect_mismatch("annotate_vector", "1")
-#endif // _ACTIVATE_VECTOR_ANNOTATION
-
-#ifdef _INSERT_VECTOR_ANNOTATION
-extern "C" {
-void __cdecl __sanitizer_annotate_contiguous_container(
-    const void* _First, const void* _End, const void* _Old_last, const void* _New_last) noexcept;
-extern const bool _Asan_vector_should_annotate;
-}
-
-#if defined(_M_ARM64EC)
-#pragma comment(linker, \
-    "/alternatename:#__sanitizer_annotate_contiguous_container=#__sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, \
-    "/alternatename:__sanitizer_annotate_contiguous_container=__sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, "/alternatename:#_Asan_vector_should_annotate=#_Asan_vector_should_annotate_default")
-#pragma comment(linker, "/alternatename:_Asan_vector_should_annotate=_Asan_vector_should_annotate_default")
-#elif defined(_M_HYBRID)
-#pragma comment(linker, \
-    "/alternatename:#__sanitizer_annotate_contiguous_container=#__sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, \
-    "/alternatename:___sanitizer_annotate_contiguous_container=___sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, "/alternatename:#_Asan_vector_should_annotate=#_Asan_vector_should_annotate_default")
-#pragma comment(linker, "/alternatename:__Asan_vector_should_annotate=__Asan_vector_should_annotate_default")
-#elif defined(_M_IX86)
-#pragma comment(linker, \
-    "/alternatename:___sanitizer_annotate_contiguous_container=___sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, "/alternatename:__Asan_vector_should_annotate=__Asan_vector_should_annotate_default")
-#elif defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)
-#pragma comment(linker, \
-    "/alternatename:__sanitizer_annotate_contiguous_container=__sanitizer_annotate_contiguous_container_default")
-#pragma comment(linker, "/alternatename:_Asan_vector_should_annotate=_Asan_vector_should_annotate_default")
-#else // ^^^ known architecture / unknown architecture vvv
-#error Unknown architecture
-#endif // ^^^ unknown architecture ^^^
-
-template <class _Vec, class = void>
-_INLINE_VAR constexpr bool _Has_minimum_allocation_alignment = alignof(typename _Vec::value_type) >= _Asan_granularity;
-
-template <class _Vec>
-_INLINE_VAR constexpr bool
-    _Has_minimum_allocation_alignment<_Vec, void_t<decltype(_Vec::allocator_type::_Minimum_allocation_alignment)>> =
-        _Vec::allocator_type::_Minimum_allocation_alignment >= _Asan_granularity;
-#else // ^^^ _INSERT_VECTOR_ANNOTATION / !_INSERT_VECTOR_ANNOTATION vvv
-#pragma detect_mismatch("annotate_vector", "0")
-#endif // !_INSERT_VECTOR_ANNOTATION
-
 _EXPORT_STD template <class _Ty, class _Alloc = allocator<_Ty>>
 class vector { // varying size array of values
 private:
@@ -542,7 +480,7 @@ private:
     static _CONSTEXPR20 void _Apply_annotation(
         pointer _First_, pointer _End_, pointer _Old_last_, pointer _New_last_) noexcept {
         _STL_INTERNAL_CHECK(_First_ != nullptr);
-        _STL_INTERNAL_CHECK(_Buffer_last_ != nullptr);
+        _STL_INTERNAL_CHECK(_End_ != nullptr);
         _STL_INTERNAL_CHECK(_Old_last_ != nullptr);
         _STL_INTERNAL_CHECK(_New_last_ != nullptr);
 
@@ -560,20 +498,34 @@ private:
         const void* const _End      = _STD _Unfancy(_End_);
         const void* const _Old_last = _STD _Unfancy(_Old_last_);
         const void* const _New_last = _STD _Unfancy(_New_last_);
-        if constexpr ((_Container_allocation_minimum_alignment<vector>) > _Asan_granularity) {
-            __sanitizer_annotate_contiguous_container(_First, _End, _Old_last, _New_last);
+        if constexpr ((_Container_allocation_minimum_asan_alignment<vector>) >= _Asan_granularity) {
+            // old state:
+            //   [_First, _Old_last) valid
+            //   [_Old_last, _End) poison
+            // new state:
+            //   [_First, _New_last) valid
+            //   [_New_last, asan_aligned_after(_End)) poison
+            _CSTD __sanitizer_annotate_contiguous_container(
+                _First, _STD _Get_asan_aligned_after(_End), _Old_last, _New_last);
         } else {
-            const void* const _Aligned_first = _STD _Get_asan_aligned_first(_First, _Buffer_last);
-            if (!_Aligned_first) {
-                // There is no aligned address within the underlying buffer; nothing to do.
+            const auto _Aligned = _STD _Get_asan_aligned_first_end(_First, _End);
+            if (_Aligned._First == _Aligned._End) {
+                // The buffer does not end at least one shadow memory section; nothing to do.
                 return;
             }
 
-            // last must be >= than first, so fix up when `_Aligned_first > _*_last`
-            const void* const _End_fixed = _End >= _Aligned_first ? _End : _Aligned_first;
-            const void* const _Old_fixed = _Old_last >= _Aligned_first ? _Old_last : _Aligned_first;
-            const void* const _New_fixed = _New_last >= _Aligned_first ? _New_last : _Aligned_first;
-            __sanitizer_annotate_contiguous_container(_Aligned_first, _End_fixed, _Old_fixed, _New_fixed);
+            const void* const _Old_fixed = _Aligned._Clamp_to_end(_Old_last);
+            const void* const _New_fixed = _Aligned._Clamp_to_end(_New_last);
+
+            // old state:
+            //   [_Aligned._First, _Old_fixed) valid
+            //   [_Old_fixed, _Aligned._End) poison
+            //   [_Aligned._End, _End) valid
+            // new state:
+            //   [_Aligned._First, _New_fixed) valid
+            //   [_New_fixed, _Aligned._End) poison
+            //   [_Aligned._End, _End) valid
+            _CSTD __sanitizer_annotate_contiguous_container(_Aligned._First, _Aligned._End, _Old_fixed, _New_fixed);
         }
     }