<vector>: Add ASan annotations.

stl/inc/vector

@@ -436,6 +436,7 @@ constexpr _Ty* _Unfancy_maybe_null(_Ty* _Ptr) noexcept { // do nothing for plain
 #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__ ^^^ // vvv _ANNOTATE_VECTOR vvv
 #define _INSERT_VECTOR_ANNOTATION
@@ -3429,6 +3430,8 @@ _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
 
 #pragma pop_macro("new")

stl/msbuild/stl_base/libcp.settings.targets

@@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     <PropertyGroup>
         <ClProgramDataBaseFileName>$(OutputLibPdbPath)$(OutputName)$(PdbVerName).pdb</ClProgramDataBaseFileName>
         <ClDefines Condition="'$(DependsOnConcRT)' == 'true'">$(ClDefines);_STL_CONCRT_SUPPORT</ClDefines>
-        <ClDefines>$(ClDefines);_VCRT_ALLOW_INTERNALS</ClDefines>
+        <ClDefines>$(ClDefines);_VCRT_ALLOW_INTERNALS;_ANNOTATE_VECTOR</ClDefines>
     </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\stl.files.settings.targets"/>

tests/std/tests/GH_002030_asan_annotate_vector/env.lst

@@ -7,31 +7,54 @@
 # clang-cl does not currently support targeting /MDd or /MTd.
 RUNALL_INCLUDE ..\prefix.lst
 RUNALL_CROSSLIST
-PM_CL="-fsanitize=address /Zi /wd4611 /w14640 /Zc:threadSafeInit-" PM_LINK="/debug"
+PM_CL="/Zi /wd4611 /w14640 /Zc:threadSafeInit-" PM_LINK="/debug"
 RUNALL_CROSSLIST
-PM_CL="/BE /c /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
-PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/BE /c /EHsc /MT /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/BE /c /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MD /std:c++17 /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MD /std:c++20 /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MD /std:c++latest /permissive- /Zc:char8_t- /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MD /std:c++latest /permissive- /Zc:noexceptTypes- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MDd /std:c++14 /fp:except /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MDd /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MDd /std:c++latest /permissive- /Zc:wchar_t- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MT /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MT /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MTd /std:c++latest /permissive /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
-PM_CL="/EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++14"
-PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++17"
-PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MT /std:c++latest /permissive-"
-PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MT /std:c++latest /permissive- /D_HAS_CXX23 /fp:strict"
+PM_CL="-fsanitize=address /BE /c /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /BE /c /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /BE /c /EHsc /MT /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /BE /c /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MD /std:c++17 /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MD /std:c++20 /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MD /std:c++latest /permissive- /Zc:char8_t- /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MD /std:c++latest /permissive- /Zc:noexceptTypes- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MDd /std:c++14 /fp:except /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MDd /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MDd /std:c++latest /permissive- /Zc:wchar_t- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MT /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MT /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="-fsanitize=address /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MT /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MD /std:c++17 /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MD /std:c++20 /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MD /std:c++latest /permissive- /Zc:char8_t- /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MD /std:c++latest /permissive- /Zc:noexceptTypes- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MDd /std:c++14 /fp:except /Zc:preprocessor /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MDd /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MDd /std:c++latest /permissive- /Zc:wchar_t- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MT /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MT /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
+# TRANSITION, clang-cl does not support /alternatename so we cannot test /D_ANNOTATE_VECTOR without -fsanitize=address
+PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++14"
+PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++17"
+PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MT /std:c++latest /permissive-"
+PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MT /std:c++latest /permissive- /D_HAS_CXX23 /fp:strict"

tests/std/tests/GH_002030_asan_annotate_vector/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-// REQUIRES: asan, x64 || x86
+// REQUIRES: x64 || x86
 
 #include <cassert>
 #include <cstddef>
@@ -14,10 +14,20 @@
 
 using namespace std;
 
+#ifndef __SANITIZE_ADDRESS__
+#if defined(__clang__) && defined(__has_feature)
+#if __has_feature(address_sanitizer)
+#define __SANITIZE_ADDRESS__
+#endif
+#endif
+#endif
+
+#ifdef __SANITIZE_ADDRESS__
 extern "C" {
 void* __sanitizer_contiguous_container_find_bad_address(const void* beg, const void* mid, const void* end) noexcept;
 void __asan_describe_address(void*) noexcept;
 }
+#endif // ASan instrumentation enabled
 
 struct non_trivial_can_throw {
     non_trivial_can_throw() {}
@@ -115,6 +125,7 @@ class input_iterator_tester {
 
 template <class T, class Alloc>
 bool verify_vector(vector<T, Alloc>& vec) {
+#ifdef __SANITIZE_ADDRESS__
     size_t buffer_bytes = vec.capacity() * sizeof(T);
     void* buffer        = vec.data();
     void* aligned_start = align(8, 1, buffer, buffer_bytes);
@@ -145,6 +156,10 @@ bool verify_vector(vector<T, Alloc>& vec) {
     __asan_describe_address(bad_address);
 
     return false;
+#else // ^^^ ASan instrumentation enabled ^^^ // vvv ASan instrumentation disabled vvv
+    (void) vec;
+    return true;
+#endif // Asan instrumentation disabled
 }
 
 // Note: This class does not satisfy all the allocator requirements but is sufficient for this test.
@@ -880,7 +895,9 @@ void run_allocator_matrix() {
 }
 
 int main() {
+    // Do some work even when we aren't instrumented
     run_allocator_matrix<char>();
+#ifdef __SANITIZE_ADDRESS__
     run_allocator_matrix<int>();
     run_allocator_matrix<double>();
     run_allocator_matrix<non_trivial_can_throw>();
@@ -896,4 +913,5 @@ int main() {
     test_resize_throw();
     test_insert_n_throw();
 #endif // !__clang__
+#endif // ASan instrumentation enabled
 }

tests/utils/stl/test/tests.py

@@ -290,31 +290,7 @@ def _parseFlags(self, litConfig):
 
         # clang doesn't know how to link in the VS version of the asan runtime automatically
         if 'asan' in self.config.available_features and 'clang' in self.config.available_features:
-            targetArch = litConfig.target_arch.casefold()
-            archString = str()
-            if targetArch == 'x86'.casefold():
-                archString = 'i386'
-            elif targetArch == 'x64'.casefold():
-                archString = 'x86_64'
-
-            dbgString = str()
-            if 'debug_CRT' in self.config.available_features:
-                dbgString = '_dbg'
-
-            if 'dynamic_CRT' in self.config.available_features:
-                self.linkFlags.append('/wholearchive:clang_rt.asan' + dbgString + '_dynamic_runtime_thunk-' +
-                                      archString + '.lib')
-                self.linkFlags.append('clang_rt.asan' + dbgString + '_dynamic-' + archString + '.lib')
-
-                if targetArch == 'x86'.casefold():
-                    self.linkFlags.append('/include:___asan_seh_interceptor')
-                elif targetArch == 'x64'.casefold():
-                    self.linkFlags.append('/include:__asan_seh_interceptor')
-            else:
-                self.linkFlags.append('/wholearchive:clang_rt.asan' + dbgString + '-' + archString + '.lib')
-                self.linkFlags.append('clang_rt.asan_cxx' + dbgString + '-' + archString + '.lib')
-
-            self.linkFlags.append('/incremental:no')
+            self.linkFlags.append("/INFERASANLIBS")
 
 
 class LibcxxTest(STLTest):