From 4135b0cdb9f1e47fc17d962b5f12b068ae05f561 Mon Sep 17 00:00:00 2001
From: Casey Carter <cacarter@microsoft.com>
Date: Fri, 7 Aug 2020 09:55:02 -0700
Subject: [PATCH 1/2] <deque>: Use _Next_iter and _Prev_iter

Fixes DevCom-1134328 / AB#1166791.
---
 stl/inc/deque                                 | 12 ++++++------
 .../test.cpp                                  | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index 73a74b7a717..296b3fb18d7 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -836,10 +836,10 @@ public:
 
         if (_Off <= _Mysize() / 2) { // closer to front, push to front then rotate
             emplace_front(_STD forward<_Valty>(_Val)...);
-            _STD rotate(begin(), begin() + 1, begin() + static_cast<difference_type>(1 + _Off));
+            _STD rotate(begin(), _Next_iter(begin()), begin() + static_cast<difference_type>(1 + _Off));
         } else { // closer to back, push to back then rotate
             emplace_back(_STD forward<_Valty>(_Val)...);
-            _STD rotate(begin() + static_cast<difference_type>(_Off), end() - 1, end());
+            _STD rotate(begin() + static_cast<difference_type>(_Off), _Prev_iter(end()), end());
         }
         return begin() + static_cast<difference_type>(_Off);
     }
@@ -1064,7 +1064,7 @@ public:
         _STL_VERIFY(!empty(), "back() called on empty deque");
 #endif // _CONTAINER_DEBUG_LEVEL > 0
 
-        return *(_Unchecked_end() - 1);
+        return *(_Prev_iter(_Unchecked_end()));
     }
 
     _NODISCARD const_reference back() const noexcept /* strengthened */ {
@@ -1072,7 +1072,7 @@ public:
         _STL_VERIFY(!empty(), "back() called on empty deque");
 #endif // _CONTAINER_DEBUG_LEVEL > 0
 
-        return *(_Unchecked_end() - 1);
+        return *(_Prev_iter(_Unchecked_end()));
     }
 
     void push_front(const _Ty& _Val) {
@@ -1197,10 +1197,10 @@ public:
 
         if (_Off <= _Mysize() / 2) { // closer to front, push to front then copy
             push_front(_Val);
-            _STD rotate(begin(), begin() + 1, begin() + static_cast<difference_type>(1 + _Off));
+            _STD rotate(begin(), _Next_iter(begin()), begin() + static_cast<difference_type>(1 + _Off));
         } else { // closer to back, push to back then copy
             push_back(_Val);
-            _STD rotate(begin() + static_cast<difference_type>(_Off), end() - 1, end());
+            _STD rotate(begin() + static_cast<difference_type>(_Off), _Prev_iter(end()), end());
         }
 
         return begin() + static_cast<difference_type>(_Off);
diff --git a/tests/std/tests/Dev10_500860_overloaded_address_of/test.cpp b/tests/std/tests/Dev10_500860_overloaded_address_of/test.cpp
index b0abff0aebc..bece898adbf 100644
--- a/tests/std/tests/Dev10_500860_overloaded_address_of/test.cpp
+++ b/tests/std/tests/Dev10_500860_overloaded_address_of/test.cpp
@@ -282,7 +282,7 @@ constexpr bool can_addressof = false;
 template <typename T>
 constexpr bool can_addressof<T, void_t<decltype(addressof(declval<T>()))>> = true;
 
-void test_LWG_2598() {
+void test_LWG_2598() { // COMPILE-ONLY
     STATIC_ASSERT(can_addressof<int&>);
     STATIC_ASSERT(can_addressof<const int&>);
     STATIC_ASSERT(can_addressof<volatile int&>);
@@ -292,3 +292,20 @@ void test_LWG_2598() {
     STATIC_ASSERT(!can_addressof<volatile int>);
     STATIC_ASSERT(!can_addressof<const volatile int>);
 }
+
+// Also test DevCom-1134328, in which `deque<S*>::_Unchecked_iterator{} - 1` finds
+// operator-(const S&, int) by argument-dependent lookup causing overload resolution
+// to fail due to ambiguity when compiling 64-bit.
+struct S {
+    S() = default;
+
+    template <typename T>
+    S(T&&);
+};
+
+S operator-(const S&, int);
+
+void test_DevCom_1134328() { // COMPILE-ONLY
+    deque<S*> d{nullptr};
+    (void) d.back();
+}

From 42e5a90cf85781b1a0ee4359e29334a51f1395b5 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@nuwen.net>
Date: Wed, 12 Aug 2020 00:26:27 -0700
Subject: [PATCH 2/2] Apply suggestions from code review

---
 stl/inc/deque | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stl/inc/deque b/stl/inc/deque
index 296b3fb18d7..49f4bcefda5 100644
--- a/stl/inc/deque
+++ b/stl/inc/deque
@@ -1064,7 +1064,7 @@ public:
         _STL_VERIFY(!empty(), "back() called on empty deque");
 #endif // _CONTAINER_DEBUG_LEVEL > 0
 
-        return *(_Prev_iter(_Unchecked_end()));
+        return *_Prev_iter(_Unchecked_end());
     }
 
     _NODISCARD const_reference back() const noexcept /* strengthened */ {
@@ -1072,7 +1072,7 @@ public:
         _STL_VERIFY(!empty(), "back() called on empty deque");
 #endif // _CONTAINER_DEBUG_LEVEL > 0
 
-        return *(_Prev_iter(_Unchecked_end()));
+        return *_Prev_iter(_Unchecked_end());
     }
 
     void push_front(const _Ty& _Val) {