Various cleanups (#3533)

Author: StephanTLavavej

stl/inc/__msvc_int128.hpp

@@ -10,10 +10,11 @@
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 #include <cstdint>
-#include _STL_INTRIN_HEADER
 #include <limits>
 #include <type_traits>
 
+#include _STL_INTRIN_HEADER
+
 #if _HAS_CXX20
 #include <bit>
 #include <compare>

stl/inc/bit

@@ -12,11 +12,12 @@
 _EMIT_STL_WARNING(STL4038, "The contents of <bit> are available only with C++20 or later.");
 #else // ^^^ !_HAS_CXX20 / _HAS_CXX20 vvv
 
-#include _STL_INTRIN_HEADER
 #include <isa_availability.h>
 #include <limits>
 #include <type_traits>
 
+#include _STL_INTRIN_HEADER
+
 #pragma pack(push, _CRT_PACKING)
 #pragma warning(push, _STL_WARNING_LEVEL)
 #pragma warning(disable : _STL_DISABLED_WARNINGS)

stl/inc/charconv

@@ -13,13 +13,14 @@
 _EMIT_STL_WARNING(STL4038, "The contents of <charconv> are available only with C++17 or later.");
 #else // ^^^ !_HAS_CXX17 / _HAS_CXX17 vvv
 #include <cstring>
-#include _STL_INTRIN_HEADER
 #include <xbit_ops.h>
 #include <xcharconv.h>
 #include <xcharconv_ryu.h>
 #include <xcharconv_tables.h>
 #include <xutility>
 
+#include _STL_INTRIN_HEADER
+
 #pragma pack(push, _CRT_PACKING)
 #pragma warning(push, _STL_WARNING_LEVEL)
 #pragma warning(disable : _STL_DISABLED_WARNINGS)

stl/inc/limits

@@ -11,10 +11,11 @@
 #include <cfloat>
 #include <climits>
 #include <cwchar>
-#include _STL_INTRIN_HEADER
 #include <isa_availability.h>
 #include <xstddef>
 
+#include _STL_INTRIN_HEADER
+
 // TRANSITION, GH-2129, move down to _Arm64_popcount
 #if (defined(_M_ARM64) || defined(_M_ARM64EC)) && !defined(_M_CEE_PURE) && !defined(__CUDACC__) \
     && !defined(__INTEL_COMPILER) && !defined(__clang__) // TRANSITION, LLVM-51488

stl/inc/memory_resource

@@ -576,18 +576,18 @@ namespace pmr {
 
         void release() noexcept /* strengthened */ {
             lock_guard<mutex> _Guard{_Mtx};
-            this->unsynchronized_pool_resource::release();
+            unsynchronized_pool_resource::release();
         }
 
     protected:
         void* do_allocate(const size_t _Bytes, const size_t _Align) override {
             lock_guard<mutex> _Guard{_Mtx};
-            return this->unsynchronized_pool_resource::do_allocate(_Bytes, _Align);
+            return unsynchronized_pool_resource::do_allocate(_Bytes, _Align);
         }
 
         void do_deallocate(void* const _Ptr, const size_t _Bytes, const size_t _Align) override {
             lock_guard<mutex> _Guard{_Mtx};
-            this->unsynchronized_pool_resource::do_deallocate(_Ptr, _Bytes, _Align);
+            unsynchronized_pool_resource::do_deallocate(_Ptr, _Bytes, _Align);
         }
 
     private:

stl/inc/ranges

@@ -3539,6 +3539,17 @@ namespace ranges {
         _EXPORT_STD inline constexpr _Drop_while_fn drop_while;
     } // namespace views
 
+#ifdef __clang__
+    template <class _Rng> // TRANSITION, LLVM-47414
+    concept _Can_const_join = forward_range<const _Rng> && is_reference_v<range_reference_t<const _Rng>>
+                           && input_range<range_reference_t<const _Rng>>;
+#endif // ^^^ workaround ^^^
+
+    template <class _Ty>
+    _NODISCARD constexpr _Ty& _As_lvalue(_Ty&& _Val) noexcept {
+        return static_cast<_Ty&>(_Val);
+    }
+
     _EXPORT_STD template <input_range _Vw>
         requires view<_Vw> && input_range<range_reference_t<_Vw>>
     class join_view;
@@ -3559,17 +3570,6 @@ namespace ranges {
         /* [[no_unique_address]] */ _Non_propagating_cache<_Cache_wrapper, false> _Inner{};
     };
 
-#ifdef __clang__
-    template <class _Rng> // TRANSITION, LLVM-47414
-    concept _Can_const_join = forward_range<const _Rng> && is_reference_v<range_reference_t<const _Rng>>
-                           && input_range<range_reference_t<const _Rng>>;
-#endif // ^^^ workaround ^^^
-
-    template <class _Ty>
-    _NODISCARD constexpr _Ty& _As_lvalue(_Ty&& _Val) noexcept {
-        return static_cast<_Ty&>(_Val);
-    }
-
     template <class _Vw>
         requires is_reference_v<range_reference_t<_Vw>>
     class _Join_view_base<_Vw> : public view_interface<join_view<_Vw>> {};

stl/inc/regex

@@ -628,7 +628,7 @@ public:
     }
 
     void swap(sub_match& _Other) noexcept(_Is_nothrow_swappable<_BidIt>::value) {
-        this->_Mybase::swap(_Other);
+        _Mybase::swap(_Other);
         _STD swap(matched, _Other.matched);
     }
 

stl/inc/type_traits

@@ -1610,7 +1610,7 @@ _CONSTEXPR17 auto invoke(_Callable&& _Obj, _Ty1&& _Arg1, _Types2&&... _Args2) no
     } else if constexpr (_Invoker1<_Callable, _Ty1>::_Strategy == _Invoker_strategy::_Pmd_refwrap) {
         return _Arg1.get().*_Obj;
     } else {
-        static_assert(_Invoker1<_Callable, _Ty1>::_Strategy == _Invoker_strategy::_Pmd_pointer, "bug in invoke");
+        _STL_INTERNAL_STATIC_ASSERT(_Invoker1<_Callable, _Ty1>::_Strategy == _Invoker_strategy::_Pmd_pointer);
         return (*static_cast<_Ty1&&>(_Arg1)).*_Obj;
     }
 }

stl/inc/xatomic.h

@@ -9,9 +9,10 @@
 #include <yvals_core.h>
 #if _STL_COMPILER_PREPROCESSOR
 
-#include _STL_INTRIN_HEADER
 #include <type_traits>
 
+#include _STL_INTRIN_HEADER
+
 #pragma pack(push, _CRT_PACKING)
 #pragma warning(push, _STL_WARNING_LEVEL)
 #pragma warning(disable : _STL_DISABLED_WARNINGS)

stl/inc/xbit_ops.h

@@ -10,6 +10,7 @@
 #if _STL_COMPILER_PREPROCESSOR
 
 #include <cstdint>
+
 #include _STL_INTRIN_HEADER
 
 #pragma pack(push, _CRT_PACKING)