From ab3e21d12b58190bf6ffa9f9bbab8e81bb286af2 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Tue, 5 Jul 2022 13:12:36 -0700
Subject: [PATCH 1/3] .natvis: Add view for unique_ptr/vector of chars

This PR adds .natvis entries using `std::unique_ptr`/`std::vector` to hold various character types so that these are displayed as null terminated strings instead as generic arrays. This is useful when debugging code that uses one of these types as a character buffer, for example in order to call a Windows API.

NOTE: For std::vector, I considered setting the display string to use `[size()]` or similar as a format specifier in order to better handle the case that the string wasn't null terminated. But this winds up with a worse result if it is null terminated, so I wound up deciding to leave it as-is.
---
 stl/debugger/STL.natvis | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 1a377d313d7..85f2a6e8b05 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -337,6 +337,18 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
       </Expand>
   </Type>
 
+  <Type Name="std::unique_ptr&lt;wchar_t [0],*&gt;">
+    <AlternativeType Name="std::unique_ptr&lt;char [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char8_t [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char16_t [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char32_t [0],*&gt;"/>
+    <DisplayString Condition="_Mypair._Myval2 == nullptr">{{empty}}</DisplayString>
+    <DisplayString Condition="_Mypair._Myval2 != nullptr">{_Mypair._Myval2}</DisplayString>
+    <StringView>_Mypair._Myval2</StringView>
+    <Expand>
+      <ExpandedItem Condition="_Mypair._Myval2 != nullptr">_Mypair._Myval2,hv</ExpandedItem>
+    </Expand>
+  </Type>
 
   <Type Name="std::_Ref_count&lt;*&gt;">
       <DisplayString>default</DisplayString>
@@ -1182,6 +1194,27 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     </Expand>
   </Type>
 
+  <Type Name="std::vector&lt;wchar_t,*&gt;">
+    <AlternativeType Name="std::vector&lt;char,*&gt;" />
+    <AlternativeType Name="std::vector&lt;char8_t,*&gt;" />
+    <AlternativeType Name="std::vector&lt;char16_t,*&gt;" />
+    <AlternativeType Name="std::vector&lt;char32_t,*&gt;" />
+    <Intrinsic Name="data" Expression="_Mypair._Myval2._Myfirst" />
+    <Intrinsic Name="size" Expression="(size_t)(_Mypair._Myval2._Mylast - _Mypair._Myval2._Myfirst)" />
+    <Intrinsic Name="capacity" Expression="(size_t)(_Mypair._Myval2._Myend - _Mypair._Myval2._Myfirst)" />
+    <SmartPointer Usage="Indexable" DefaultExpansion="false">data()</SmartPointer>
+    <DisplayString Condition="size() > 0">{data(),na} (size = {size()})</DisplayString>
+    <DisplayString Condition="size() == 0">{{empty}}</DisplayString>
+    <Expand>
+      <Item Name="[capacity]" ExcludeView="simple">capacity()</Item>
+      <Item Name="[allocator]" ExcludeView="simple">_Mypair</Item>
+      <ArrayItems>
+        <Size>size()</Size>
+        <ValuePointer>data()</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
+
   <Type Name="std::_Vector_iterator&lt;*&gt;">
       <AlternativeType Name="std::_Vector_const_iterator&lt;*&gt;" />
       <SmartPointer Usage="Indexable">_Ptr,na</SmartPointer>

From 7113f40e70229e354d20b8b1d8d97fa15b099eae Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Wed, 6 Jul 2022 10:35:52 -0700
Subject: [PATCH 2/3] Add '[deleter]'

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index 85f2a6e8b05..c911976e21a 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -346,6 +346,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     <DisplayString Condition="_Mypair._Myval2 != nullptr">{_Mypair._Myval2}</DisplayString>
     <StringView>_Mypair._Myval2</StringView>
     <Expand>
+      <Item Condition="_Mypair._Myval2 != nullptr" Name="[deleter]">_Mypair</Item>
       <ExpandedItem Condition="_Mypair._Myval2 != nullptr">_Mypair._Myval2,hv</ExpandedItem>
     </Expand>
   </Type>

From 917d25037f4d95fc37a854605a9aebd42e4bba20 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Wed, 6 Jul 2022 16:12:12 -0700
Subject: [PATCH 3/3] Add const versions

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

diff --git a/stl/debugger/STL.natvis b/stl/debugger/STL.natvis
index c911976e21a..ef806a198e3 100644
--- a/stl/debugger/STL.natvis
+++ b/stl/debugger/STL.natvis
@@ -342,6 +342,11 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     <AlternativeType Name="std::unique_ptr&lt;char8_t [0],*&gt;"/>
     <AlternativeType Name="std::unique_ptr&lt;char16_t [0],*&gt;"/>
     <AlternativeType Name="std::unique_ptr&lt;char32_t [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;wchar_t const [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char const [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char8_t const [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char16_t const [0],*&gt;"/>
+    <AlternativeType Name="std::unique_ptr&lt;char32_t const [0],*&gt;"/>
     <DisplayString Condition="_Mypair._Myval2 == nullptr">{{empty}}</DisplayString>
     <DisplayString Condition="_Mypair._Myval2 != nullptr">{_Mypair._Myval2}</DisplayString>
     <StringView>_Mypair._Myval2</StringView>