[Visualizers] Add natvis visualizers for various internal llvm classes

Also improve DisplayStrings for array and string types.

Differential Revision: https://reviews.llvm.org/D135685

diff --git a/llvm/utils/LLVMVisualizers/llvm.natvis b/llvm/utils/LLVMVisualizers/llvm.natvis
index 622ea77..2a34702 100644 (file)
--- a/llvm/utils/LLVMVisualizers/llvm.natvis
+++ b/llvm/utils/LLVMVisualizers/llvm.natvis
@@ -2,25 +2,16 @@
 <!--\r
 Visual Studio Native Debugging Visualizers for LLVM\r
 \r
-For Visual Studio 2013 only, put this file into \r
+For Visual Studio 2013 only, put this file into\r
 "%USERPROFILE%\Documents\Visual Studio 2013\Visualizers" or create a symbolic link so it updates automatically.\r
 \r
 For later versions of Visual Studio, no setup is required.\r
 -->\r
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">\r
   <Type Name="llvm::SmallVectorImpl&lt;*&gt;">\r
-    <DisplayString IncludeView ="elt0" Condition="Size == 0"></DisplayString>\r
-    <DisplayString IncludeView ="elt0">{((value_type*)BeginX)[0]}{*this,view(elt1)}</DisplayString>\r
-    <DisplayString IncludeView ="elt1" Condition="Size == 1"></DisplayString>\r
-    <DisplayString IncludeView ="elt1">, {((value_type*)BeginX)[1]}{*this,view(elt2)}</DisplayString>\r
-    <DisplayString IncludeView ="elt2" Condition="Size == 2"></DisplayString>\r
-    <DisplayString IncludeView ="elt2">, {((value_type*)BeginX)[2]}{*this,view(elt3)}</DisplayString>\r
-    <DisplayString IncludeView ="elt3" Condition="Size == 3"></DisplayString>\r
-    <DisplayString IncludeView ="elt3">, {((value_type*)BeginX)[3]}{*this,view(elt4)}</DisplayString>\r
-    <DisplayString IncludeView ="elt4" Condition="Size == 4"></DisplayString>\r
-    <DisplayString IncludeView ="elt4">, /* {Size - 4} more*/ </DisplayString>\r
     <DisplayString Condition="Size == 0">empty</DisplayString>\r
-    <DisplayString Condition="Size != 0">{{{*this,view(elt0)}}}</DisplayString>\r
+    <DisplayString Condition="Size &amp;&amp; Size &lt; 4">{(value_type*)BeginX,[Size]}</DisplayString>\r
+    <DisplayString Condition="Size &gt; 3">{Size} elements</DisplayString>\r
     <DisplayString>Uninitialized</DisplayString>\r
     <Expand>\r
       <Item Name="[size]">Size</Item>\r
@@ -37,8 +28,9 @@ For later versions of Visual Studio, no setup is required.
     <DisplayString>Cannot visualize APInts longer than 64 bits</DisplayString>\r
   </Type>\r
   <Type Name="llvm::ArrayRef&lt;*&gt;">\r
-    <DisplayString Condition="Length == 0">empty</DisplayString>\r
-    <DisplayString Condition="Length != 0">{{ size={Length} }}</DisplayString>\r
+    <DisplayString Condition="Length &lt; 4">{Data,[Length]}</DisplayString>\r
+    <DisplayString Condition="Length &gt; 3">{Length} elements</DisplayString>\r
+    <DisplayString>Uninitialized</DisplayString>\r
     <Expand>\r
       <Item Name="[size]">Length</Item>\r
       <ArrayItems>\r
@@ -48,7 +40,7 @@ For later versions of Visual Studio, no setup is required.
     </Expand>\r
   </Type>\r
   <Type Name="llvm::SmallString&lt;*&gt;">\r
-    <DisplayString>{(const char*)BeginX,[Size] na}</DisplayString>\r
+    <DisplayString>{(const char*)BeginX,[Size]s8}</DisplayString>\r
     <StringView>(const char*)BeginX,[Size]</StringView>\r
     <Expand>\r
       <Item Name="[size]">Size</Item>\r
@@ -61,12 +53,12 @@ For later versions of Visual Studio, no setup is required.
   </Type>\r
 \r
   <Type Name="StringView">\r
-    <DisplayString>{First,[Last - First]s}</DisplayString>\r
+    <DisplayString>{First,[Last - First]s8}</DisplayString>\r
   </Type>\r
-  \r
+\r
   <Type Name="llvm::StringRef">\r
-    <DisplayString>{Data,[Length]s}</DisplayString>\r
-    <StringView>Data,[Length]s</StringView>\r
+    <DisplayString>{Data,[Length]s8}</DisplayString>\r
+    <StringView>Data,[Length]s8</StringView>\r
     <Expand>\r
       <Item Name="[size]">Length</Item>\r
       <ArrayItems>\r
@@ -121,7 +113,7 @@ For later versions of Visual Studio, no setup is required.
       </Item>\r
     </Expand>\r
   </Type>\r
- \r
+\r
   <Type Name="llvm::iplist&lt;*,*&gt;">\r
     <DisplayString Condition="Head == 0">{{ empty }}</DisplayString>\r
     <DisplayString Condition="Head != 0">{{ head={Head} }}</DisplayString>\r
@@ -184,7 +176,7 @@ For later versions of Visual Studio, no setup is required.
 \r
   <Type Name="llvm::StringMapEntry&lt;*&gt;">\r
     <DisplayString Condition="StrLen == 0">empty</DisplayString>\r
-    <DisplayString Condition="StrLen != 0">({this+1,s}, {second})</DisplayString>\r
+    <DisplayString Condition="StrLen != 0">({this+1,s8}, {second})</DisplayString>\r
     <Expand>\r
       <Item Name="[key]">this+1,s</Item>\r
       <Item Name="[value]" Condition="StrLen != 0">second</Item>\r
@@ -194,7 +186,7 @@ For later versions of Visual Studio, no setup is required.
   <Type Name="llvm::Triple">\r
     <DisplayString>{Data}</DisplayString>\r
   </Type>\r
-  \r
+\r
   <Type Name="llvm::Optional&lt;*&gt;">\r
     <DisplayString Condition="!Storage.hasVal">None</DisplayString>\r
     <DisplayString Condition="Storage.hasVal">{Storage.value}</DisplayString>\r
@@ -227,24 +219,24 @@ For later versions of Visual Studio, no setup is required.
       <Item Name="[Raw Bytes]" Condition="sizeof($T1)==8">(unsigned char *)Value.buffer,8</Item>\r
     </Expand>\r
   </Type>\r
-  \r
+\r
   <!-- Now handle the hard case of big endian.  We need to do the swizzling here, but\r
        we need to specialize it based on the size of the value type. -->\r
   <Type Name="llvm::support::detail::packed_endian_specific_integral&lt;*,0,1&gt;">\r
     <DisplayString Condition="sizeof($T1)==1">{{ big endian value = {*(unsigned char *)Value.buffer} }}</DisplayString>\r
-    <DisplayString Condition="sizeof($T1)==2">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 8) \r
+    <DisplayString Condition="sizeof($T1)==2">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 8)\r
                                                                     | ($T1)(*((unsigned char *)Value.buffer+1))} }}</DisplayString>\r
-    <DisplayString Condition="sizeof($T1)==4">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 24) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+1)) &lt;&lt; 16) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+2)) &lt;&lt; 8) \r
+    <DisplayString Condition="sizeof($T1)==4">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 24)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+1)) &lt;&lt; 16)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+2)) &lt;&lt; 8)\r
                                                                     |  ($T1)(*((unsigned char *)Value.buffer+3))} }}</DisplayString>\r
-    <DisplayString Condition="sizeof($T1)==8">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 56) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+1)) &lt;&lt; 48) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+2)) &lt;&lt; 40) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+3)) &lt;&lt; 32) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+4)) &lt;&lt; 24) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+5)) &lt;&lt; 16) \r
-                                                                    | (($T1)(*((unsigned char *)Value.buffer+6)) &lt;&lt; 8) \r
+    <DisplayString Condition="sizeof($T1)==8">{{ big endian value = {(($T1)(*(unsigned char *)Value.buffer) &lt;&lt; 56)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+1)) &lt;&lt; 48)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+2)) &lt;&lt; 40)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+3)) &lt;&lt; 32)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+4)) &lt;&lt; 24)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+5)) &lt;&lt; 16)\r
+                                                                    | (($T1)(*((unsigned char *)Value.buffer+6)) &lt;&lt; 8)\r
                                                                     |  ($T1)(*((unsigned char *)Value.buffer+7))} }}</DisplayString>\r
     <Expand>\r
       <Item Name="[Raw Bytes]" Condition="sizeof($T1)==1">(unsigned char *)Value.buffer,1</Item>\r
@@ -304,4 +296,107 @@ For later versions of Visual Studio, no setup is required.
       <Item Name="Context">Context</Item>\r
     </Expand>\r
   </Type>\r
+\r
+  <Type Name="llvm::ConstantSDNode">\r
+    <DisplayString>$(Type) {*Value}</DisplayString>\r
+  </Type>\r
+\r
+  <Type Name="llvm::SDNode">\r
+    <DisplayString>$(Type) {(llvm::ISD::NodeType)this->NodeType}</DisplayString>\r
+    <Expand>\r
+      <ArrayItems>\r
+        <Size>NumOperands</Size>\r
+        <ValuePointer>OperandList</ValuePointer>\r
+      </ArrayItems>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::ConstantInt">\r
+    <DisplayString>i{Val.BitWidth} {Val.VAL}</DisplayString>\r
+  </Type>\r
+\r
+  <Type Name="llvm::IntegerType">\r
+    <DisplayString>{IDAndSubclassData >> 8}bit integer type</DisplayString>\r
+  </Type>\r
+\r
+  <Type Name="llvm::Value">\r
+    <DisplayString Condition="HasName">$(Type) {*VTy} {this->getName()} {SubclassData}</DisplayString>\r
+    <DisplayString Condition="!HasName">$(Type) {*VTy} anon {SubclassData}</DisplayString>\r
+    <Expand>\r
+      <Item Name="[Inst]" Condition="SubclassID > InstructionVal">(Instruction*)this</Item>\r
+      <Item Name="Operands">(User*)this</Item>\r
+      <LinkedListItems>\r
+        <HeadPointer>UseList</HeadPointer>\r
+        <NextPointer>Next</NextPointer>\r
+        <ValueNode>Prev.Value &amp; 3 == 3 ? (User*)(this + 1) : (User*)(this + 2)</ValueNode>\r
+      </LinkedListItems>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::Use">\r
+    <Expand>\r
+      <Item Name="Value">Val</Item>\r
+      <!--\r
+      <LinkedListItems>\r
+        <HeadPointer>this</HeadPointer>\r
+        <NextPointer>Next</NextPointer>\r
+        <ValueNode>Prev.Value &amp; 3 == 3 ? (User*)(this + 1) : (User*)(this + 2)</ValueNode>\r
+      </LinkedListItems>\r
+      -->\r
+    </Expand>\r
+  </Type>\r
+\r
+  <!-- uses other values, like Operands -->\r
+  <Type Name="llvm::User">\r
+    <DisplayString Condition="HasName">$(Type) {*VTy} {this->getName()} {SubclassData}</DisplayString>\r
+    <DisplayString Condition="!HasName">$(Type) {*VTy} anon {SubclassData}</DisplayString>\r
+    <Expand>\r
+      <Item Name="[Value]">(Value*)this,nd</Item>\r
+      <Item Name="[Type]">*VTy</Item>\r
+      <ArrayItems Condition="!HasHungOffUses">\r
+        <Size>NumUserOperands</Size>\r
+        <ValuePointer>(llvm::Use*)this - NumUserOperands</ValuePointer>\r
+      </ArrayItems>\r
+      <ArrayItems Condition="HasHungOffUses">\r
+        <Size>NumUserOperands</Size>\r
+        <ValuePointer>*((llvm::Use**)this - 1)</ValuePointer>\r
+      </ArrayItems>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::Instruction">\r
+    <DisplayString>{getOpcodeName(SubclassID - InstructionVal)}</DisplayString>\r
+    <Expand>\r
+      <Item Name="[User]">(User*)this,nd</Item>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::GlobalValue">\r
+    <DisplayString>{this->getName()} {(LinkageTypes)Linkage} {(VisibilityTypes)Visibility} {(DLLStorageClassTypes)DllStorageClass} {(llvm::GlobalValue::ThreadLocalMode) ThreadLocal}</DisplayString>\r
+  </Type>\r
+\r
+  <!-- TODO doesn't work cause it doesn't know the dynamic type -->\r
+  <Type Name="llvm::ilist_node">\r
+    <Expand>\r
+      <LinkedListItems>\r
+        <HeadPointer>this</HeadPointer>\r
+        <NextPointer>Next</NextPointer>\r
+        <ValueNode>this</ValueNode>\r
+      </LinkedListItems>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::LLVMContext">\r
+    <Expand>\r
+      <ExpandedItem>pImpl</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
+\r
+  <Type Name="llvm::Module">\r
+    <DisplayString>{ModuleID,s8} {TargetTriple}</DisplayString>\r
+  </Type>\r
+\r
+  <Type Name="llvm::Pass">\r
+    <DisplayString>$(Type) {PassID} {Kind}</DisplayString>\r
+  </Type>\r
 </AutoVisualizer>\r