From b11945b73fc1139d3cf1115907717813930cedbf Mon Sep 17 00:00:00 2001 From: DadTech Date: Mon, 31 Jan 2022 21:44:40 -0500 Subject: [PATCH] Changed `_Unfancy_maybe_null()` to `_Unfancy()` (#2508) Co-authored-by: Casey Carter --- stl/inc/vector | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/stl/inc/vector b/stl/inc/vector index 39a312af2a..2427b95dca 100644 --- a/stl/inc/vector +++ b/stl/inc/vector @@ -550,6 +550,11 @@ 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(_End_ != nullptr); + _STL_INTERNAL_CHECK(_Old_last_ != nullptr); + _STL_INTERNAL_CHECK(_New_last_ != nullptr); + #if _HAS_CXX20 if (_STD is_constant_evaluated()) { return; @@ -560,10 +565,10 @@ private: return; } - const auto _First = reinterpret_cast(_Unfancy_maybe_null(_First_)); - const auto _End = reinterpret_cast(_Unfancy_maybe_null(_End_)); - const auto _Old_last = reinterpret_cast(_Unfancy_maybe_null(_Old_last_)); - const auto _New_last = reinterpret_cast(_Unfancy_maybe_null(_New_last_)); + const auto _First = reinterpret_cast(_Unfancy(_First_)); + const auto _End = reinterpret_cast(_Unfancy(_End_)); + const auto _Old_last = reinterpret_cast(_Unfancy(_Old_last_)); + const auto _New_last = reinterpret_cast(_Unfancy(_New_last_)); if constexpr (_Has_minimum_allocation_alignment) { __sanitizer_annotate_contiguous_container(_First, _End, _Old_last, _New_last); } else {