From 01f31a0178a4a778463b2d62fd04898f05771c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 15:03:12 +0100
Subject: [PATCH 1/4] Remove braces from visualization of std::vector::iterator

---
 stl/debugger/STL.natvis | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 75260f08a60..b79b2f11bde 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1230,6 +1230,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   <Type Name="std::_Vector_iterator&lt;*&gt;">
       <AlternativeType Name="std::_Vector_const_iterator&lt;*&gt;" />
       <SmartPointer Usage="Indexable">_Ptr,na</SmartPointer>
+      <DisplayString>{*_Ptr}</DisplayString>
       <Expand>
           <Item Name="[ptr]">_Ptr</Item>
       </Expand>

From 3b746db60a3ce23020bc714168b2f05b8df461b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 15:05:26 +0100
Subject: [PATCH 2/4] Remove braces from visualization of std::_Array_iterator
 when _ITERATOR_DEBUG_LEVEL==0

---
 stl/debugger/STL.natvis | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index b79b2f11bde..7d7eb5c0c60 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1084,6 +1084,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   <Type Name="std::_Array_iterator&lt;*&gt;" Priority="MediumLow">
       <AlternativeType Name="std::_Array_const_iterator&lt;*&gt;" />
       <SmartPointer Usage="Indexable">_Ptr,na</SmartPointer>
+      <DisplayString>{*_Ptr}</DisplayString>
       <Expand>
           <Item Name="[ptr]">_Ptr</Item>
       </Expand>

From 213cb538d6ec16b3235da455a38179b675d0feb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 15:06:40 +0100
Subject: [PATCH 3/4] Richer visualization of std::_Vector_iterator when
 _ITERATOR_DEBUG_LEVEL != 0

---
 stl/debugger/STL.natvis | 14 +++++++++++++-
 stl/inc/vector          |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 7d7eb5c0c60..29b59dc39b5 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1228,7 +1228,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     </Expand>
   </Type>
 
-  <Type Name="std::_Vector_iterator&lt;*&gt;">
+  <!-- This is for _ITERATOR_DEBUG_LEVEL == 0 and must have lower priority. -->
+  <Type Name="std::_Vector_iterator&lt;*&gt;" Priority="MediumLow">
       <AlternativeType Name="std::_Vector_const_iterator&lt;*&gt;" />
       <SmartPointer Usage="Indexable">_Ptr,na</SmartPointer>
       <DisplayString>{*_Ptr}</DisplayString>
@@ -1237,6 +1238,17 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
       </Expand>
   </Type>
 
+  <!-- This is for _ITERATOR_DEBUG_LEVEL != 0 and must have higher priority. -->
+  <Type Name="std::_Vector_iterator&lt;*&gt;" Priority="Medium">
+      <AlternativeType Name="std::_Vector_const_iterator&lt;*&gt;" />
+      <Intrinsic Name="my_cont_end" Expression="((_Myvec_t *)_Myproxy-&gt;_Mycont)-&gt;_Mylast" />
+      <SmartPointer Usage="Indexable">_Ptr,na</SmartPointer>
+      <DisplayString Condition="_Ptr == my_cont_end()">end</DisplayString>
+      <DisplayString Condition="_Ptr != my_cont_end()">{*_Ptr}</DisplayString>
+      <Expand>
+          <Item Name="[ptr]">_Ptr</Item>
+      </Expand>
+  </Type>
 
   <!-- VC 2015 -->
   <Type Name="std::map&lt;*&gt;" Priority="Medium">
diff --git a/stl/inc/vector b/stl/inc/vector
index 16964a76091..f41507e04a5 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() {}
 

From f171a4d320624f1387eae084e4af75ff8a809a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 15:06:52 +0100
Subject: [PATCH 4/4] Richer visualization of std::_Span_iterator when
 _ITERATOR_DEBUG_LEVEL != 0

---
 stl/debugger/STL.natvis | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 29b59dc39b5..1d1a5516d98 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -1851,13 +1851,25 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     </Expand>
   </Type>
 
-  <Type Name="std::_Span_iterator&lt;*&gt;">
+  <!-- This is for _ITERATOR_DEBUG_LEVEL == 0 and must have lower priority. -->
+  <Type Name="std::_Span_iterator&lt;*&gt;" Priority="MediumLow">
     <SmartPointer Usage="Indexable">_Myptr,na</SmartPointer>
+    <DisplayString>{*_Myptr}</DisplayString>
     <Expand>
       <Item Name="[ptr]">_Myptr</Item>
     </Expand>
   </Type>
 
+  <!-- This is for _ITERATOR_DEBUG_LEVEL != 0 and must have higher priority. -->
+  <Type Name="std::_Span_iterator&lt;*&gt;" Priority="Medium">
+      <SmartPointer Usage="Indexable">_Myptr,na</SmartPointer>
+      <DisplayString Condition="_Myptr == _Myend">end</DisplayString>
+      <DisplayString Condition="_Myptr != _Myend">{*_Myptr}</DisplayString>
+      <Expand>
+          <Item Name="[ptr]">_Myptr</Item>
+      </Expand>
+  </Type>
+
   <Type Name="std::default_sentinel_t">
     <DisplayString>default sentinel</DisplayString>
   </Type>