From 0ee8b95902daa00c5040e179ad4684fbacc72196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 03:16:50 +0100
Subject: [PATCH 1/3] Add visualizers for ranges::less and other comparison
 objects.

---
 stl/debugger/STL.natvis | 121 +++++++++-------------------------------
 1 file changed, 26 insertions(+), 95 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 75260f08a60..ae9cd272268 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -587,6 +587,13 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   </Type>
 
 
+  <Type Name="std::ranges::equal_to"><DisplayString>ranges::equal_to</DisplayString><Expand/></Type>
+  <Type Name="std::ranges::not_equal_to"><DisplayString>ranges::not_equal_to</DisplayString><Expand/></Type>
+  <Type Name="std::ranges::greater"><DisplayString>ranges::greater</DisplayString><Expand/></Type>
+  <Type Name="std::ranges::less"><DisplayString>ranges::less</DisplayString><Expand/></Type>
+  <Type Name="std::ranges::greater_equal"><DisplayString>ranges::greater_equal</DisplayString><Expand/></Type>
+  <Type Name="std::ranges::less_equal"><DisplayString>ranges::less_equal</DisplayString><Expand/></Type>
+
   <Type Name="std::plus&lt;void&gt;"><DisplayString>plus&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::minus&lt;void&gt;"><DisplayString>minus&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::multiplies&lt;void&gt;"><DisplayString>multiplies&lt;&gt;</DisplayString><Expand/></Type>
@@ -607,101 +614,25 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   <Type Name="std::bit_xor&lt;void&gt;"><DisplayString>bit_xor&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::bit_not&lt;void&gt;"><DisplayString>bit_not&lt;&gt;</DisplayString><Expand/></Type>
 
-
-  <Type Name="std::plus&lt;*&gt;">
-      <DisplayString>plus</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::minus&lt;*&gt;">
-      <DisplayString>minus</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::multiplies&lt;*&gt;">
-      <DisplayString>multiplies</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::divides&lt;*&gt;">
-      <DisplayString>divides</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::modulus&lt;*&gt;">
-      <DisplayString>modulus</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::negate&lt;*&gt;">
-      <DisplayString>negate</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::equal_to&lt;*&gt;">
-      <DisplayString>equal_to</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::not_equal_to&lt;*&gt;">
-      <DisplayString>not_equal_to</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::greater&lt;*&gt;">
-      <DisplayString>greater</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::less&lt;*&gt;">
-      <DisplayString>less</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::greater_equal&lt;*&gt;">
-      <DisplayString>greater_equal</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::less_equal&lt;*&gt;">
-      <DisplayString>less_equal</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::logical_and&lt;*&gt;">
-      <DisplayString>logical_and</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::logical_or&lt;*&gt;">
-      <DisplayString>logical_or</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::logical_not&lt;*&gt;">
-      <DisplayString>logical_not</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::bit_and&lt;*&gt;">
-      <DisplayString>bit_and</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::bit_or&lt;*&gt;">
-      <DisplayString>bit_or</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::bit_xor&lt;*&gt;">
-      <DisplayString>bit_xor</DisplayString>
-      <Expand/>
-  </Type>
-
-  <Type Name="std::bit_not&lt;*&gt;">
-      <DisplayString>bit_not</DisplayString>
-      <Expand/>
-  </Type>
+  <Type Name="std::plus&lt;*&gt;"><DisplayString>plus</DisplayString><Expand/></Type>
+  <Type Name="std::minus&lt;*&gt;"><DisplayString>minus</DisplayString><Expand/></Type>
+  <Type Name="std::multiplies&lt;*&gt;"><DisplayString>multiplies</DisplayString><Expand/></Type>
+  <Type Name="std::divides&lt;*&gt;"><DisplayString>divides</DisplayString><Expand/></Type>
+  <Type Name="std::modulus&lt;*&gt;"><DisplayString>modulus</DisplayString><Expand/></Type>
+  <Type Name="std::negate&lt;*&gt;"><DisplayString>negate</DisplayString><Expand/></Type>
+  <Type Name="std::equal_to&lt;*&gt;"><DisplayString>equal_to</DisplayString><Expand/></Type>
+  <Type Name="std::not_equal_to&lt;*&gt;"><DisplayString>not_equal_to</DisplayString><Expand/></Type>
+  <Type Name="std::greater&lt;*&gt;"><DisplayString>greater</DisplayString><Expand/></Type>
+  <Type Name="std::less&lt;*&gt;"><DisplayString>less</DisplayString><Expand/></Type>
+  <Type Name="std::greater_equal&lt;*&gt;"><DisplayString>greater_equal</DisplayString><Expand/></Type>
+  <Type Name="std::less_equal&lt;*&gt;"><DisplayString>less_equal</DisplayString><Expand/></Type>
+  <Type Name="std::logical_and&lt;*&gt;"><DisplayString>logical_and</DisplayString><Expand/></Type>
+  <Type Name="std::logical_or&lt;*&gt;"><DisplayString>logical_or</DisplayString><Expand/></Type>
+  <Type Name="std::logical_not&lt;*&gt;"><DisplayString>logical_not</DisplayString><Expand/></Type>
+  <Type Name="std::bit_and&lt;*&gt;"><DisplayString>bit_and</DisplayString><Expand/></Type>
+  <Type Name="std::bit_or&lt;*&gt;"><DisplayString>bit_or</DisplayString><Expand/></Type>
+  <Type Name="std::bit_xor&lt;*&gt;"><DisplayString>bit_xor</DisplayString><Expand/></Type>
+  <Type Name="std::bit_not&lt;*&gt;"><DisplayString>bit_not</DisplayString><Expand/></Type>
 
 
   <Type Name="std::unary_negate&lt;*&gt;">

From d34f6abb9557f9b18de8ccdd0e5f316feb793f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 03:22:41 +0100
Subject: [PATCH 2/3] Give names to individual groups of natvis definitions.

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index ae9cd272268..f6e8e96b004 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -586,7 +586,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
       </Expand>
   </Type>
 
-
+  <!-- std::ranges::less and similar -->
   <Type Name="std::ranges::equal_to"><DisplayString>ranges::equal_to</DisplayString><Expand/></Type>
   <Type Name="std::ranges::not_equal_to"><DisplayString>ranges::not_equal_to</DisplayString><Expand/></Type>
   <Type Name="std::ranges::greater"><DisplayString>ranges::greater</DisplayString><Expand/></Type>
@@ -594,6 +594,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   <Type Name="std::ranges::greater_equal"><DisplayString>ranges::greater_equal</DisplayString><Expand/></Type>
   <Type Name="std::ranges::less_equal"><DisplayString>ranges::less_equal</DisplayString><Expand/></Type>
 
+  <!-- std::less<> and similar -->
   <Type Name="std::plus&lt;void&gt;"><DisplayString>plus&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::minus&lt;void&gt;"><DisplayString>minus&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::multiplies&lt;void&gt;"><DisplayString>multiplies&lt;&gt;</DisplayString><Expand/></Type>
@@ -614,6 +615,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   <Type Name="std::bit_xor&lt;void&gt;"><DisplayString>bit_xor&lt;&gt;</DisplayString><Expand/></Type>
   <Type Name="std::bit_not&lt;void&gt;"><DisplayString>bit_not&lt;&gt;</DisplayString><Expand/></Type>
 
+  <!-- std::less<T> and similar -->
   <Type Name="std::plus&lt;*&gt;"><DisplayString>plus</DisplayString><Expand/></Type>
   <Type Name="std::minus&lt;*&gt;"><DisplayString>minus</DisplayString><Expand/></Type>
   <Type Name="std::multiplies&lt;*&gt;"><DisplayString>multiplies</DisplayString><Expand/></Type>

From c71df6d3f559ab4ef5b31fb2e104193d65e98a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Michal?= <vojta.michall@email.cz>
Date: Fri, 16 Jan 2026 13:28:52 +0100
Subject: [PATCH 3/3] Add visualization of compare_three_way

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index f6e8e96b004..20ac82016f4 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -586,13 +586,14 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
       </Expand>
   </Type>
 
-  <!-- std::ranges::less and similar -->
+  <!-- std::compare_three_way, std::ranges::less and similar -->
   <Type Name="std::ranges::equal_to"><DisplayString>ranges::equal_to</DisplayString><Expand/></Type>
   <Type Name="std::ranges::not_equal_to"><DisplayString>ranges::not_equal_to</DisplayString><Expand/></Type>
   <Type Name="std::ranges::greater"><DisplayString>ranges::greater</DisplayString><Expand/></Type>
   <Type Name="std::ranges::less"><DisplayString>ranges::less</DisplayString><Expand/></Type>
   <Type Name="std::ranges::greater_equal"><DisplayString>ranges::greater_equal</DisplayString><Expand/></Type>
   <Type Name="std::ranges::less_equal"><DisplayString>ranges::less_equal</DisplayString><Expand/></Type>
+  <Type Name="std::compare_three_way"><DisplayString>compare_three_way</DisplayString><Expand/></Type>
 
   <!-- std::less<> and similar -->
   <Type Name="std::plus&lt;void&gt;"><DisplayString>plus&lt;&gt;</DisplayString><Expand/></Type>