Fix _Container_base12

Author: miscco

stl/inc/xmemory

@@ -1117,7 +1117,12 @@ public:
     _CONSTEXPR20_DYNALLOC _Container_base12& operator=(const _Container_base12&) = delete;
 
     _CONSTEXPR20_DYNALLOC void _Orphan_all() noexcept;
+    _CONSTEXPR20_DYNALLOC void _Orphan_all_unlocked() noexcept;
+    void _Orphan_all_locked() noexcept;
+
     _CONSTEXPR20_DYNALLOC void _Swap_proxy_and_iterators(_Container_base12&) noexcept;
+    _CONSTEXPR20_DYNALLOC void _Swap_proxy_and_iterators_unlocked(_Container_base12&) noexcept;
+    void _Swap_proxy_and_iterators_locked(_Container_base12&) noexcept;
 
     template <class _Alloc>
     _CONSTEXPR20_DYNALLOC void _Alloc_proxy(_Alloc&& _Al) {
@@ -1140,19 +1145,20 @@ public:
 };
 
 struct _Iterator_base12 { // store links to container proxy, next iterator
-    _Iterator_base12() noexcept : _Myproxy(nullptr), _Mynextiter(nullptr) {} // construct orphaned iterator
+    _CONSTEXPR20_DYNALLOC _Iterator_base12() noexcept
+        : _Myproxy(nullptr), _Mynextiter(nullptr) {} // construct orphaned iterator
 
-    _Iterator_base12(const _Iterator_base12& _Right) noexcept : _Myproxy(nullptr), _Mynextiter(nullptr) {
+    _CONSTEXPR20_DYNALLOC _Iterator_base12(const _Iterator_base12& _Right) noexcept
+        : _Myproxy(nullptr), _Mynextiter(nullptr) {
         *this = _Right;
     }
 
-    _Iterator_base12& operator=(const _Iterator_base12& _Right) noexcept {
+    _CONSTEXPR20_DYNALLOC _Iterator_base12& operator=(const _Iterator_base12& _Right) noexcept {
         if (_Myproxy != _Right._Myproxy) {
             if (_Right._Myproxy) {
                 _Adopt(_Right._Myproxy->_Mycont);
             } else { // becoming invalid, disown current parent
 #if _ITERATOR_DEBUG_LEVEL == 2
-                _Lockit _Lock(_LOCK_DEBUG);
                 _Orphan_me();
 #else // _ITERATOR_DEBUG_LEVEL == 2
                 _Myproxy = nullptr;
@@ -1163,21 +1169,19 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
         return *this;
     }
 
-    ~_Iterator_base12() noexcept {
+    _CONSTEXPR20_DYNALLOC ~_Iterator_base12() noexcept {
 #if _ITERATOR_DEBUG_LEVEL == 2
-        _Lockit _Lock(_LOCK_DEBUG);
         _Orphan_me();
 #endif // _ITERATOR_DEBUG_LEVEL == 2
     }
 
-    void _Adopt(const _Container_base12* _Parent) noexcept {
+    _CONSTEXPR20_DYNALLOC void _Adopt(const _Container_base12* _Parent) noexcept {
         if (_Parent) {
             // have a parent, do adoption
             _Container_proxy* _Parent_proxy = _Parent->_Myproxy;
 
 #if _ITERATOR_DEBUG_LEVEL == 2
             if (_Myproxy != _Parent_proxy) { // change parentage
-                _Lockit _Lock(_LOCK_DEBUG);
                 _Orphan_me();
                 _Mynextiter                 = _Parent_proxy->_Myfirstiter;
                 _Parent_proxy->_Myfirstiter = this;
@@ -1190,20 +1194,19 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
         } else {
             // no future parent, just disown current parent
 #if _ITERATOR_DEBUG_LEVEL == 2
-            _Lockit _Lock(_LOCK_DEBUG);
             _Orphan_me();
 #else // _ITERATOR_DEBUG_LEVEL == 2
             _Myproxy = nullptr;
 #endif // _ITERATOR_DEBUG_LEVEL == 2
         }
     }
 
-    const _Container_base12* _Getcont() const noexcept {
+    _CONSTEXPR20_DYNALLOC const _Container_base12* _Getcont() const noexcept {
         return _Myproxy ? _Myproxy->_Mycont : nullptr;
     }
 
 #if _ITERATOR_DEBUG_LEVEL == 2
-    void _Orphan_me() noexcept {
+    _CONSTEXPR20_DYNALLOC void _Orphan_me_unlocked() noexcept {
         if (_Myproxy) { // adopted, remove self from list
             _Iterator_base12** _Pnext = &_Myproxy->_Myfirstiter;
             while (*_Pnext && *_Pnext != this) {
@@ -1215,6 +1218,22 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
             _Myproxy = nullptr;
         }
     }
+
+    void _Orphan_me_locked() noexcept {
+        _Lockit _Lock(_LOCK_DEBUG);
+        _Orphan_me_unlocked();
+    }
+
+    _CONSTEXPR20_DYNALLOC void _Orphan_me() noexcept {
+#ifdef __cpp_lib_is_constant_evaluated
+        if (_STD is_constant_evaluated()) {
+            _Orphan_me_unlocked();
+        } else
+#endif // __cpp_lib_is_constant_evaluated
+        {
+            _Orphan_me_locked();
+        }
+    }
 #endif // _ITERATOR_DEBUG_LEVEL == 2
 
     static constexpr bool _Unwrap_when_unverified = _ITERATOR_DEBUG_LEVEL == 0;
@@ -1224,25 +1243,35 @@ struct _Iterator_base12 { // store links to container proxy, next iterator
 };
 
 // MEMBER FUNCTIONS FOR _Container_base12
-_CONSTEXPR20_DYNALLOC void _Container_base12::_Orphan_all() noexcept {
-#if 0 //_ITERATOR_DEBUG_LEVEL == 2
-    if (_Myproxy) { // proxy allocated, drain it
-        _Lockit _Lock(_LOCK_DEBUG);
-
-        for (auto _Pnext = &_Myproxy->_Myfirstiter; *_Pnext; *_Pnext = (*_Pnext)->_Mynextiter) {
-            (*_Pnext)->_Myproxy = nullptr;
-        }
-
-        _Myproxy->_Myfirstiter = nullptr;
+_CONSTEXPR20_DYNALLOC void _Container_base12::_Orphan_all_unlocked() noexcept {
+    for (auto _Pnext = &_Myproxy->_Myfirstiter; *_Pnext; *_Pnext = (*_Pnext)->_Mynextiter) {
+        (*_Pnext)->_Myproxy = nullptr;
     }
-#endif // _ITERATOR_DEBUG_LEVEL == 2
+
+    _Myproxy->_Myfirstiter = nullptr;
 }
 
-_CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators(_Container_base12& _Right) noexcept {
-#if 0 //_ITERATOR_DEBUG_LEVEL == 2
+void _Container_base12::_Orphan_all_locked() noexcept {
+#if _ITERATOR_DEBUG_LEVEL == 2
     _Lockit _Lock(_LOCK_DEBUG);
 #endif // _ITERATOR_DEBUG_LEVEL == 2
+    _Orphan_all_unlocked();
+}
 
+_CONSTEXPR20_DYNALLOC void _Container_base12::_Orphan_all() noexcept {
+    if (_Myproxy) { // proxy allocated, drain it
+#ifdef __cpp_lib_is_constant_evaluated
+        if (_STD is_constant_evaluated()) {
+            _Orphan_all_unlocked();
+        } else
+#endif // __cpp_lib_is_constant_evaluated
+        {
+            _Orphan_all_locked();
+        }
+    }
+}
+
+_CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators_unlocked(_Container_base12& _Right) noexcept {
     _Container_proxy* _Temp = _Myproxy;
     _Myproxy                = _Right._Myproxy;
     _Right._Myproxy         = _Temp;
@@ -1256,6 +1285,24 @@ _CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators(_Contain
     }
 }
 
+void _Container_base12::_Swap_proxy_and_iterators_locked(_Container_base12& _Right) noexcept {
+#if _ITERATOR_DEBUG_LEVEL == 2
+    _Lockit _Lock(_LOCK_DEBUG);
+#endif // _ITERATOR_DEBUG_LEVEL == 2
+    _Swap_proxy_and_iterators_unlocked(_Right);
+}
+
+_CONSTEXPR20_DYNALLOC void _Container_base12::_Swap_proxy_and_iterators(_Container_base12& _Right) noexcept {
+#ifdef __cpp_lib_is_constant_evaluated
+    if (_STD is_constant_evaluated()) {
+        _Swap_proxy_and_iterators_unlocked(_Right);
+    } else
+#endif // __cpp_lib_is_constant_evaluated
+    {
+        _Swap_proxy_and_iterators_locked(_Right);
+    }
+}
+
 #if _ITERATOR_DEBUG_LEVEL == 0
 using _Container_base = _Container_base0;
 using _Iterator_base  = _Iterator_base0;
@@ -1283,12 +1330,12 @@ struct _Basic_container_proxy_ptr12 {
     // smart pointer components for a _Container_proxy * that don't depend on the allocator
     _Container_proxy* _Ptr;
 
-    void _Release() noexcept { // disengage this _Basic_container_proxy_ptr12
+    _CONSTEXPR20_DYNALLOC void _Release() noexcept { // disengage this _Basic_container_proxy_ptr12
         _Ptr = nullptr;
     }
 
 protected:
-    _Basic_container_proxy_ptr12()                                    = default;
+    _CONSTEXPR20_DYNALLOC _Basic_container_proxy_ptr12()              = default;
     _Basic_container_proxy_ptr12(const _Basic_container_proxy_ptr12&) = delete;
     _Basic_container_proxy_ptr12(_Basic_container_proxy_ptr12&&)      = delete;
 };
@@ -1298,26 +1345,27 @@ struct _Container_proxy_ptr12 : _Basic_container_proxy_ptr12 {
     // smart pointer components for a _Container_proxy * for an allocator family
     _Alloc& _Al;
 
-    _Container_proxy_ptr12(_Alloc& _Al_, _Leave_proxy_unbound) : _Al(_Al_) { // create a new unbound _Container_proxy
+    _CONSTEXPR20_DYNALLOC _Container_proxy_ptr12(_Alloc& _Al_, _Leave_proxy_unbound)
+        : _Al(_Al_) { // create a new unbound _Container_proxy
         _Ptr = _Unfancy(_Al_.allocate(1));
         _Construct_in_place(*_Ptr);
     }
 
-    _Container_proxy_ptr12(_Alloc& _Al_, _Container_base12& _Mycont)
+    _CONSTEXPR20_DYNALLOC _Container_proxy_ptr12(_Alloc& _Al_, _Container_base12& _Mycont)
         : _Al(_Al_) { // create a new _Container_proxy pointing at _Mycont
         _Ptr = _Unfancy(_Al_.allocate(1));
         _Construct_in_place(*_Ptr, _STD addressof(_Mycont));
         _Mycont._Myproxy = _Ptr;
     }
 
-    void _Bind(_Alloc& _Old_alloc, _Container_base12* _Mycont) noexcept {
+    _CONSTEXPR20_DYNALLOC void _Bind(_Alloc& _Old_alloc, _Container_base12* _Mycont) noexcept {
         // Attach the proxy stored in *this to _Mycont, and destroy _Mycont's existing proxy
         // with _Old_alloc. Requires that no iterators are alive referring to _Mycont.
         _Ptr->_Mycont = _Mycont;
         _Delete_plain_internal(_Old_alloc, _STD exchange(_Mycont->_Myproxy, _STD exchange(_Ptr, nullptr)));
     }
 
-    ~_Container_proxy_ptr12() {
+    _CONSTEXPR20_DYNALLOC ~_Container_proxy_ptr12() {
         if (_Ptr) {
             _Delete_plain_internal(_Al, _Ptr);
         }