Improve existing visualizers by:

- Properly displaying non null terminated StringRef.
- Auto expanding pointer types.
- Displaying real type names for PointerUnions.
- Using "size" and "capacity" across all containers.
- Simplifying code where possible.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201004 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 46 insertions, 58 deletions

diff --git a/utils/llvm.natvis b/utils/llvm.natvis
index 6b4ef83c67e2..373bf963e193 100644
--- a/utils/llvm.natvis
+++ b/utils/llvm.natvis
@@ -6,22 +6,10 @@ Put this file into "%USERPROFILE%\Documents\Visual Studio 2012\Visualizers"
 or create a symbolic link so it updates automatically.

 -->

 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">

-  <Type Name="llvm::SmallVector&lt;*,*&gt;">

-    <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) == 0">empty</DisplayString>

-    <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">{{ size={($T1*)EndX - ($T1*)BeginX} }}</DisplayString>

-    <Expand>

-      <Item Name="[size]">($T1*)EndX - ($T1*)BeginX</Item>

-      <Item Name="[capacity]">($T1*)CapacityX - ($T1*)BeginX</Item>

-      <ArrayItems>

-        <Size>($T1*)EndX - ($T1*)BeginX</Size>

-        <ValuePointer>($T1*)BeginX</ValuePointer>

-      </ArrayItems>

-    </Expand>

-  </Type>

 

   <Type Name="llvm::SmallVectorImpl&lt;*&gt;">

     <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) == 0">empty</DisplayString>

-    <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">[{($T1*)EndX - ($T1*)BeginX}]</DisplayString>

+    <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">{{ size={($T1*)EndX - ($T1*)BeginX} }}</DisplayString>

     <Expand>

       <Item Name="[size]">($T1*)EndX - ($T1*)BeginX</Item>

       <Item Name="[capacity]">($T1*)CapacityX - ($T1*)BeginX</Item>

@@ -46,10 +34,10 @@ or create a symbolic link so it updates automatically.
   </Type>

 

   <Type Name="llvm::StringRef">

-    <DisplayString>[{Length}] {Data,s}</DisplayString>

-    <StringView>Data,s</StringView>

+    <DisplayString>{Data,[Length]s}</DisplayString>

+    <StringView>Data,[Length]s</StringView>

     <Expand>

-      <Item Name="[length]">Length</Item>

+      <Item Name="[size]">Length</Item>

       <ArrayItems>

         <Size>Length</Size>

         <ValuePointer>Data</ValuePointer>

@@ -58,43 +46,43 @@ or create a symbolic link so it updates automatically.
   </Type>

 

   <Type Name="llvm::PointerIntPair&lt;*,*,*,*&gt;">

-    <DisplayString>{Value &amp; PointerBitMask} [{(Value &gt;&gt; IntShift) &amp; IntMask}]</DisplayString>

+    <DisplayString>{(void*)(Value &amp; PointerBitMask)} [{($T3)((Value &gt;&gt; IntShift) &amp; IntMask)}]</DisplayString>

     <Expand>

-      <Item Name="[ptr]">Value &amp; PointerBitMask</Item>

-      <Item Name="[int]">(Value &gt;&gt; IntShift) &amp; IntMask</Item>

+      <Item Name="[ptr]">($T1*)(Value &amp; PointerBitMask)</Item>

+      <Item Name="[int]">($T3)((Value &gt;&gt; IntShift) &amp; IntMask)</Item>

     </Expand>

   </Type>

 

   <Type Name="llvm::PointerUnion&lt;*,*&gt;">

-    <DisplayString Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) == 0">[P1] {($T1)(Val.Value &amp; Val.PointerBitMask)}</DisplayString>

-    <DisplayString Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) != 0">[P2] {($T2)(Val.Value &amp; Val.PointerBitMask)}</DisplayString>

+    <DisplayString Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) == 0">{"$T1", s8b} {(void*)(Val.Value &amp; Val.PointerBitMask)}</DisplayString>

+    <DisplayString Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) != 0">{"$T2", s8b} {(void*)(Val.Value &amp; Val.PointerBitMask)}</DisplayString>

     <Expand>

-      <Item Name="[ptr]" Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) == 0">($T1)(Val.Value &amp; Val.PointerBitMask)</Item>

-      <Item Name="[ptr]" Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) != 0">($T2)(Val.Value &amp; Val.PointerBitMask)</Item>

+      <ExpandedItem Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) == 0">($T1)(Val.Value &amp; Val.PointerBitMask)</ExpandedItem>

+      <ExpandedItem Condition="((Val.Value &gt;&gt; Val.IntShift) &amp; Val.IntMask) != 0">($T2)(Val.Value &amp; Val.PointerBitMask)</ExpandedItem>

     </Expand>

   </Type>

 

   <Type Name="llvm::PointerUnion3&lt;*,*,*&gt;">

-    <DisplayString Condition="(Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">[P1] {($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

-    <DisplayString Condition="(Val.Val.Value &amp; 2) == 2">[P2] {($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

-    <DisplayString Condition="(Val.Val.Value &amp; 1) == 1">[P3] {($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">{"$T1", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 2) == 2">{"$T2", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 1) == 1">{"$T3", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

     <Expand>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 2) == 2">($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 1) == 1">($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 2) == 2">($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 1) == 1">($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

     </Expand>

   </Type>

 

   <Type Name="llvm::PointerUnion4&lt;*,*,*,*&gt;">

-    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">[P1] {($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

-    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) == 2">[P2] {($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

-    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 1) == 1">[P3] {($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

-    <DisplayString Condition="(Val.Val.Value &amp; 3) == 3">[P4] {($T4)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">{"$T1", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) == 2">{"$T2", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 1) == 1">{"$T3", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

+    <DisplayString Condition="(Val.Val.Value &amp; 3) == 3">{"$T4", s8b} {(void*)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)}</DisplayString>

     <Expand>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) == 2">($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 1) == 1">($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

-      <Item Name="[ptr]" Condition="(Val.Val.Value &amp; 3) == 3">($T4)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</Item>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) != 2 &amp;&amp; (Val.Val.Value &amp; 1) != 1">($T1)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 2) == 2">($T2)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 3) != 3 &amp;&amp; (Val.Val.Value &amp; 1) == 1">($T3)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

+      <ExpandedItem Condition="(Val.Val.Value &amp; 3) == 3">($T4)((Val.Val.Value &gt;&gt; 2) &lt;&lt; 2)</ExpandedItem>

     </Expand>

   </Type>

 

@@ -116,7 +104,7 @@ or create a symbolic link so it updates automatically.
     <DisplayString Condition="(Obj != 0) &amp;&amp; (Obj-&gt;ref_cnt != 1)">RefPtr [{Obj-&gt;ref_cnt} refs] {*Obj}</DisplayString>

     <Expand>

       <Item Condition="Obj != 0" Name="[refs]">Obj-&gt;ref_cnt</Item>

-      <Item Condition="Obj != 0" Name="[ptr]">Obj</Item>

+      <ExpandedItem Condition="Obj != 0">Obj</ExpandedItem>

     </Expand>

   </Type>

 

@@ -124,29 +112,29 @@ or create a symbolic link so it updates automatically.
     <DisplayString Condition="Ptr == 0">empty</DisplayString>

     <DisplayString Condition="Ptr != 0">OwningPtr {*Ptr}</DisplayString>

     <Expand>

-      <Item Condition="Ptr != 0" Name="[ptr]">Ptr</Item>

+      <ExpandedItem Condition="Ptr != 0">Ptr</ExpandedItem>

     </Expand>

   </Type>

 

   <Type Name="llvm::SmallPtrSet&lt;*,*&gt;">

-    <DisplayString Condition="CurArray == SmallArray">{{ [Small Mode] elements={NumElements}, arraySize={CurArraySize} }}</DisplayString>

-    <DisplayString Condition="CurArray != SmallArray">{{ [Big Mode] elements={NumElements}, arraySize={CurArraySize} }}</DisplayString>

+    <DisplayString Condition="CurArray == SmallArray">{{ [Small Mode] size={NumElements}, capacity={CurArraySize} }}</DisplayString>

+    <DisplayString Condition="CurArray != SmallArray">{{ [Big Mode] size={NumElements}, capacity={CurArraySize} }}</DisplayString>

     <Expand>

-      <Item Name="[NumElements]">NumElements</Item>

-      <Item Name="[CurArraySize]">CurArraySize</Item>

-      <IndexListItems>

-        <Size>CurArraySize + 1</Size>

-        <ValueNode>($T1*)&amp;CurArray[$i]</ValueNode>

-      </IndexListItems>

+      <Item Name="[size]">NumElements</Item>

+      <Item Name="[capacity]">CurArraySize</Item>

+      <ArrayItems>

+        <Size>CurArraySize</Size>

+        <ValuePointer>($T1*)CurArray</ValuePointer>

+      </ArrayItems>

     </Expand>

   </Type>

 

   <Type Name="llvm::DenseMap&lt;*,*,*&gt;">

     <DisplayString Condition="NumEntries == 0">empty</DisplayString>

-    <DisplayString Condition="NumEntries != 0">{{ entries={NumEntries}, buckets={NumBuckets} }}</DisplayString>

+    <DisplayString Condition="NumEntries != 0">{{ size={NumEntries}, buckets={NumBuckets} }}</DisplayString>

     <Expand>

-      <Item Name="[NumEntries]">NumEntries</Item>

-      <Item Name="[NumBuckets]">NumBuckets</Item>

+      <Item Name="[size]">NumEntries</Item>

+      <Item Name="[buckets]">NumBuckets</Item>

       <ArrayItems>

         <Size>NumBuckets</Size>

         <ValuePointer>Buckets</ValuePointer>

@@ -155,22 +143,22 @@ or create a symbolic link so it updates automatically.
   </Type>

 

   <Type Name="llvm::StringMap&lt;*,*&gt;">

-    <DisplayString>{{ NumBuckets={NumBuckets}, ItemSize={ItemSize} }}</DisplayString>

+    <DisplayString>{{ size={ItemSize}, buckets={NumBuckets} }}</DisplayString>

     <Expand>

-      <Item Name="[NumBuckets]">NumBuckets</Item>

-      <Item Name="[ItemSize]">ItemSize</Item>

-      <IndexListItems>

+      <Item Name="[size]">ItemSize</Item>

+      <Item Name="[buckets]">NumBuckets</Item>

+      <ArrayItems>

         <Size>NumBuckets</Size>

-        <ValueNode>(llvm::StringMapEntry&lt;$T1&gt;*)TheTable[$i]</ValueNode>

-      </IndexListItems>

+        <ValuePointer>(MapEntryTy**)TheTable</ValuePointer>

+      </ArrayItems>

     </Expand>

   </Type>

 

   <Type Name="llvm::StringMapEntry&lt;*&gt;">

     <DisplayString Condition="StrLen == 0">empty</DisplayString>

-    <DisplayString Condition="StrLen != 0">({((llvm::StringMapEntry&lt;$T1&gt;*)this)+1,s}, {second})</DisplayString>

+    <DisplayString Condition="StrLen != 0">({this+1,s}, {second})</DisplayString>

     <Expand>

-      <Item Name="[key]">((llvm::StringMapEntry&lt;$T1&gt;*)this)+1,s</Item>

+      <Item Name="[key]">this+1,s</Item>

       <Item Name="[value]" Condition="StrLen != 0">second</Item>

     </Expand>

   </Type>