diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 75260f08a6..1d1a5516d9 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1084,6 +1084,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
_Ptr,na
+ {*_Ptr}
- _Ptr
@@ -1227,14 +1228,27 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
+
+
_Ptr,na
+ {*_Ptr}
- _Ptr
+
+
+
+
+ _Ptr,na
+ end
+ {*_Ptr}
+
+ - _Ptr
+
+
@@ -1837,13 +1851,25 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
+
+
_Myptr,na
+ {*_Myptr}
- _Myptr
+
+
+ _Myptr,na
+ end
+ {*_Myptr}
+
+ - _Myptr
+
+
+
default sentinel
diff --git a/stl/inc/vector b/stl/inc/vector
index 16964a7609..f41507e04a 100644
--- a/stl/inc/vector
+++ b/stl/inc/vector
@@ -39,7 +39,8 @@ public:
using pointer = typename _Myvec::const_pointer;
using reference = const value_type&;
- using _Tptr = typename _Myvec::pointer;
+ using _Tptr = typename _Myvec::pointer;
+ using _Myvec_t = _Myvec; // helper for expression evaluator
_CONSTEXPR20 _Vector_const_iterator() noexcept : _Ptr() {}