From 1b581d7899a5c9be76d97534cf14344000f8d40c Mon Sep 17 00:00:00 2001
From: Jakub Mazurkiewicz <mazkuba3@gmail.com>
Date: Thu, 12 Mar 2026 13:11:51 +0100
Subject: [PATCH 1/2] `STL.natvis`: add `layout_stride::mapping` visualizer

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 6c83247c72..763e1c200c 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -2299,6 +2299,14 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     </Expand>
   </Type>
 
+  <Type Name="std::layout_stride::mapping&lt;*&gt;">
+    <DisplayString>{{ rank={extents_type::_Rank}, rank_dynamic={extents_type::_Rank_dynamic} }}</DisplayString>
+    <Expand>
+      <Item Name="[extents]" Optional="true">this->_Exts</Item>
+      <Item Name="[strides]" Optional="true">this->_Array</Item>
+    </Expand>
+  </Type>
+
   <Type Name="std::flat_map&lt;*&gt;">
    <AlternativeType Name="std::flat_multimap&lt;*&gt;"/>
     <Intrinsic Name="size" Expression="_Data.keys.size()"/>

From f70576f0244ecbd49630c6fda0310f35a0dd45ef Mon Sep 17 00:00:00 2001
From: Jakub Mazurkiewicz <mazkuba3@gmail.com>
Date: Thu, 12 Mar 2026 13:26:53 +0100
Subject: [PATCH 2/2] `STL.natvis`: fix indentation in `extents`'s visualizer

---
 stl/debugger/STL.natvis | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 763e1c200c..81b59ee747 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -2275,27 +2275,27 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
         </Loop>
       </CustomListItems>
 
-    <!-- Fully dynamic extents -->
-    <CustomListItems Condition="_Rank == _Rank_dynamic" Optional="true">
-      <Variable Name="idx" InitialValue="0" />
-      <Variable Name="dynptr" InitialValue="($T1*) _Array._Elems" />
-      <Loop>
-        <Break Condition="idx == _Rank_dynamic" />
-        <Item Name="[{idx}] dynamic extent">*dynptr</Item>
-        <Exec>++idx, ++dynptr</Exec>
-      </Loop>
-    </CustomListItems>
-
-    <!-- Fully static extents -->
-    <CustomListItems Condition="_Rank_dynamic == 0" Optional="true">
-      <Variable Name="idx" InitialValue="0" />
-      <Variable Name="statptr" InitialValue="(const rank_type*) _Static_extents._Elems" />
-      <Loop>
-        <Break Condition="idx == _Rank" />
-        <Item Name="[{idx}] static extent">($T1) *statptr</Item>
-        <Exec>++idx, ++statptr</Exec>
-      </Loop>
-    </CustomListItems>
+      <!-- Fully dynamic extents -->
+      <CustomListItems Condition="_Rank == _Rank_dynamic" Optional="true">
+        <Variable Name="idx" InitialValue="0" />
+        <Variable Name="dynptr" InitialValue="($T1*) _Array._Elems" />
+        <Loop>
+          <Break Condition="idx == _Rank_dynamic" />
+          <Item Name="[{idx}] dynamic extent">*dynptr</Item>
+          <Exec>++idx, ++dynptr</Exec>
+        </Loop>
+      </CustomListItems>
+
+      <!-- Fully static extents -->
+      <CustomListItems Condition="_Rank_dynamic == 0" Optional="true">
+        <Variable Name="idx" InitialValue="0" />
+        <Variable Name="statptr" InitialValue="(const rank_type*) _Static_extents._Elems" />
+        <Loop>
+          <Break Condition="idx == _Rank" />
+          <Item Name="[{idx}] static extent">($T1) *statptr</Item>
+          <Exec>++idx, ++statptr</Exec>
+        </Loop>
+      </CustomListItems>
     </Expand>
   </Type>