@@ -2223,7 +2223,7 @@ private:
22232223 __annotate_contiguous_container (const void * __old_mid, const void * __new_mid) const {
22242224 (void )__old_mid;
22252225 (void )__new_mid;
2226- # if _LIBCPP_HAS_ASAN && _LIBCPP_INSTRUMENTED_WITH_ASAN
2226+ # if _LIBCPP_INSTRUMENTED_WITH_ASAN
22272227# if defined(__APPLE__)
22282228 // TODO: remove after addressing issue #96099 (https://github.com/llvm/llvm-project/issues/96099)
22292229 if (!__is_long ())
@@ -2234,34 +2234,19 @@ private:
22342234 }
22352235
22362236 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_new (size_type __current_size) const _NOEXCEPT {
2237- (void )__current_size;
2238- # if _LIBCPP_HAS_ASAN && _LIBCPP_INSTRUMENTED_WITH_ASAN
2239- if (!__libcpp_is_constant_evaluated ())
2240- __annotate_contiguous_container (data () + capacity () + 1 , data () + __current_size + 1 );
2241- # endif
2237+ __annotate_contiguous_container (data () + capacity () + 1 , data () + __current_size + 1 );
22422238 }
22432239
22442240 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_delete () const _NOEXCEPT {
2245- # if _LIBCPP_HAS_ASAN && _LIBCPP_INSTRUMENTED_WITH_ASAN
2246- if (!__libcpp_is_constant_evaluated ())
2247- __annotate_contiguous_container (data () + size () + 1 , data () + capacity () + 1 );
2248- # endif
2241+ __annotate_contiguous_container (data () + size () + 1 , data () + capacity () + 1 );
22492242 }
22502243
22512244 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_increase (size_type __n) const _NOEXCEPT {
2252- (void )__n;
2253- # if _LIBCPP_HAS_ASAN && _LIBCPP_INSTRUMENTED_WITH_ASAN
2254- if (!__libcpp_is_constant_evaluated ())
2255- __annotate_contiguous_container (data () + size () + 1 , data () + size () + 1 + __n);
2256- # endif
2245+ __annotate_contiguous_container (data () + size () + 1 , data () + size () + 1 + __n);
22572246 }
22582247
22592248 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __annotate_shrink (size_type __old_size) const _NOEXCEPT {
2260- (void )__old_size;
2261- # if _LIBCPP_HAS_ASAN && _LIBCPP_INSTRUMENTED_WITH_ASAN
2262- if (!__libcpp_is_constant_evaluated ())
2263- __annotate_contiguous_container (data () + __old_size + 1 , data () + size () + 1 );
2264- # endif
2249+ __annotate_contiguous_container (data () + __old_size + 1 , data () + size () + 1 );
22652250 }
22662251
22672252 // Disable ASan annotations and enable them again when going out of scope. It is assumed that the string is in a valid
0 commit comments