From 4100330bf4fa1c8083b02a9f4bdf53f213de0ad3 Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <mazzucan@outlook.com>
Date: Tue, 22 Nov 2022 14:45:15 -0800
Subject: [PATCH 1/4] fix stl.natvis `std::optional<*>`

`optional<*>` originally used `<Intrinsic>`s for `_Has_value` and `_Value`;
however, apparently VS doesn't like doing custom visualizers for
`<Intrinsic>` calls.

Fixes VSO-1631025 / DevCom-10155697
---
 stl/debugger/STL.natvis | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index eee583f922..a6704c2b20 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -104,12 +104,10 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   </Type>
 
   <Type Name="std::optional&lt;*&gt;">
-      <Intrinsic Name="has_value" Expression="_Has_value"/>
-      <Intrinsic Name="value" Expression="_Value"/>
-      <DisplayString Condition="!has_value()">nullopt</DisplayString>
-      <DisplayString Condition="has_value()">{value()}</DisplayString>
+      <DisplayString Condition="_Has_value">nullopt</DisplayString>
+      <DisplayString Condition="_Has_value">{_Value}</DisplayString>
       <Expand>
-          <Item Condition="has_value()" Name="value">value()</Item>
+          <Item Condition="_Has_value" Name="value">_Value</Item>
       </Expand>
   </Type>
 

From 3b3fe0fc71bd01693de99e7ade2fa46786af5e42 Mon Sep 17 00:00:00 2001
From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Date: Wed, 23 Nov 2022 10:08:51 -0800
Subject: [PATCH 2/4] Update stl/debugger/STL.natvis

Co-authored-by: S. B. Tam <cpplearner@outlook.com>
---
 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 a6704c2b20..1cc4e4d214 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -104,7 +104,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
   </Type>
 
   <Type Name="std::optional&lt;*&gt;">
-      <DisplayString Condition="_Has_value">nullopt</DisplayString>
+      <DisplayString Condition="!_Has_value">nullopt</DisplayString>
+
       <DisplayString Condition="_Has_value">{_Value}</DisplayString>
       <Expand>
           <Item Condition="_Has_value" Name="value">_Value</Item>

From 0f76aec88f4405cdcd3d700735dbde815d0cbbaf Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <mazzucan@outlook.com>
Date: Wed, 23 Nov 2022 10:19:14 -0800
Subject: [PATCH 3/4] remove extra whitespace

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 1cc4e4d214..79cc605852 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -105,8 +105,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
   <Type Name="std::optional&lt;*&gt;">
       <DisplayString Condition="!_Has_value">nullopt</DisplayString>
-
-      <DisplayString Condition="_Has_value">{_Value}</DisplayString>
+      <DisplayString Condition="_Has_value">some {_Value}</DisplayString>
       <Expand>
           <Item Condition="_Has_value" Name="value">_Value</Item>
       </Expand>

From be1c6c0b1c7285e8dd42daba955acd3bf5e52d9e Mon Sep 17 00:00:00 2001
From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:36:07 -0800
Subject: [PATCH 4/4] Update stl/debugger/STL.natvis

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 79cc605852..e1f3ec5cc2 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -105,7 +105,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
   <Type Name="std::optional&lt;*&gt;">
       <DisplayString Condition="!_Has_value">nullopt</DisplayString>
-      <DisplayString Condition="_Has_value">some {_Value}</DisplayString>
+      <DisplayString Condition="_Has_value">{_Value}</DisplayString>
       <Expand>
           <Item Condition="_Has_value" Name="value">_Value</Item>
       </Expand>