Improve MSVC visualization of annot_template_id tokens

Now shows the actual annotated template. E.g.,
{annot_template_id (A<int, double>)}

Also a few miscellaneous fixes to visualizers of other types

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

diff --git a/utils/ClangVisualizers/clang.natvis b/utils/ClangVisualizers/clang.natvis
index fdfd45184d577cfb2e6ffead229b3e62c04b954f..42b674e7d7bb26d582b44de71213162e7910497f 100644 (file)
--- a/utils/ClangVisualizers/clang.natvis
+++ b/utils/ClangVisualizers/clang.natvis
@@ -52,8 +52,9 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::InjectedClassName" IncludeView="poly">{*(clang::InjectedClassNameType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::DependentName" IncludeView="poly">{*(clang::DependentNameType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::PackExpansion" IncludeView="poly">{*(clang::PackExpansionType *)this}</DisplayString>\r
-    <DisplayString Condition="TypeBits.TC==clang::LocInfoType::LocInfo" IncludeView="poly">{*(clang::LocInfoType *)this}</DisplayString>\r
-    <DisplayString IncludeView="cpp">{*this,view(poly)}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::LocInfoType::LocInfo" IncludeView="poly">{(clang::LocInfoType *)this,na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::LocInfoType::LocInfo" IncludeView="cpp">{(clang::LocInfoType *)this,view(cpp)na}</DisplayString>\r
+    <DisplayString IncludeView="cpp">{this,view(poly)na}</DisplayString>\r
     <DisplayString IncludeView="left">{*this,view(cpp)}</DisplayString>\r
     <DisplayString IncludeView="right"></DisplayString>\r
     <DisplayString IncludeView="poly">No visualizer yet for {(clang::Type::TypeClass)TypeBits.TC,en}Type</DisplayString> <!-- Not yet implemented Type subclass -->\r
@@ -222,7 +223,31 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString IncludeView="cpp">{(TypedefNameDecl *)this,view(name)nand}</DisplayString>\r
     <DisplayString>using {(TypedefNameDecl *)this,view(name)nand} = {(TypedefNameDecl *)this,view(type)nand}</DisplayString>\r
   </Type>\r
-\r
+  <Type Name="clang::AssumedTemplateStorage">\r
+    <DisplayString>{Name}</DisplayString>\r
+  </Type>\r
+  <Type Name="clang::UncommonTemplateNameStorage::BitsTag">\r
+    <DisplayString>Kind={(UncommonTemplateNameStorage::Kind)Kind,en}, Size={Size}</DisplayString>\r
+    <Expand>\r
+      <Item Name="Kind">(UncommonTemplateNameStorage::Kind)Kind</Item>\r
+      <Item Name="Size">Size</Item>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::UncommonTemplateNameStorage">\r
+    <DisplayString IncludeView="cmn">{Bits},</DisplayString>\r
+    <DisplayString Condition="Bits.Kind==UncommonTemplateNameStorage::Overloaded">{this,view(cmn)na},{(OverloadedTemplateStorage*)this,na}</DisplayString>\r
+    <DisplayString Condition="Bits.Kind==UncommonTemplateNameStorage::Assumed">{this,view(cmn)na},{(AssumedTemplateStorage*)this,na}</DisplayString>\r
+    <DisplayString Condition="Bits.Kind==UncommonTemplateNameStorage::SubstTemplateTemplateParm">{this,view(cmn)na},{(SubstTemplateTemplateParmStorage*)this,na}</DisplayString>\r
+    <DisplayString Condition="Bits.Kind==UncommonTemplateNameStorage::SubstTemplateTemplateParmPack">{this,view(cmn)na},{(SubstTemplateTemplateParmPackStorage*)this,na}</DisplayString>\r
+    <DisplayString>{this,view(cmn)na}</DisplayString>\r
+    <Expand>\r
+      <Item Name="Bits">Bits</Item>\r
+      <ExpandedItem Condition="Bits.Kind==UncommonTemplateNameStorage::Overloaded">(OverloadedTemplateStorage*)this</ExpandedItem>\r
+      <ExpandedItem Condition="Bits.Kind==UncommonTemplateNameStorage::Assumed">(AssumedTemplateStorage*)this</ExpandedItem>\r
+      <ExpandedItem Condition="Bits.Kind==UncommonTemplateNameStorage::SubstTemplateTemplateParm">(SubstTemplateTemplateParmStorage*)this</ExpandedItem>\r
+      <ExpandedItem Condition="Bits.Kind==UncommonTemplateNameStorage::SubstTemplateTemplateParmPack">(SubstTemplateTemplateParmPackStorage*)this</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
   <Type Name="clang::TemplateName">\r
     <DisplayString>{Storage,na}</DisplayString>\r
     <Expand>\r
@@ -290,7 +315,7 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString IncludeView="right">({*this,view(parm0)})</DisplayString>\r
     <DisplayString>{this,view(left)na}{this,view(right)na}</DisplayString>\r
     <Expand>\r
-      <Item Name="ReturnType">ResultType</Item>\r
+      <Item Name="ResultType">ResultType</Item>\r
       <Synthetic Name="Parameter Types">\r
         <DisplayString>{*this,view(parm0)}</DisplayString>\r
         <Expand>\r
@@ -324,10 +349,11 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString Condition="CanonicalType.Value.Value != this">Non-canonical: {*TTPDecl}</DisplayString>\r
     <DisplayString>Canonical: {CanTTPTInfo}</DisplayString>\r
     <Expand>\r
+      <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
     </Expand>\r
   </Type>\r
   <Type Name="clang::InjectedClassNameType">\r
-    <DisplayString>{*Decl,view(cpp)}</DisplayString>\r
+    <DisplayString>{InjectedType,view(cpp)}</DisplayString>\r
     <Expand>\r
       <Item Name="Decl">Decl</Item>\r
       <Item Name="InjectedType">InjectedType</Item>\r
@@ -384,7 +410,8 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::LocInfoType">\r
-    <DisplayString>{*DeclInfo}</DisplayString>\r
+    <DisplayString IncludeView="cpp">{DeclInfo,view(cpp)na}</DisplayString>\r
+    <DisplayString>{DeclInfo,na}</DisplayString>\r
     <Expand>\r
       <Item Name="DeclInfo">DeclInfo</Item>\r
       <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
@@ -420,9 +447,11 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString IncludeView="arg2cpp">, {Args.Args[2],view(cpp)}, ...</DisplayString>\r
     <DisplayString IncludeView="cpp" Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Pack">{*this,view(arg0cpp)}</DisplayString>\r
     <DisplayString Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Pack">{*this,view(arg0)}</DisplayString>\r
+    <DisplayString Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Expression">{(clang::Expr *)TypeOrValue.V,view(cpp)na}</DisplayString>\r
     <DisplayString>{(clang::TemplateArgument::ArgKind)TypeOrValue.Kind,en}</DisplayString>\r
     <Expand>\r
       <Item Name="QualType" Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Type">*(clang::QualType *)&amp;TypeOrValue.V</Item>\r
+      <Item Name="Expression" Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Expression">(clang::Expr *)TypeOrValue.V</Item>\r
       <ArrayItems Condition="Integer.Kind == clang::TemplateArgument::ArgKind::Pack">\r
         <Size>Args.NumArgs</Size>\r
         <ValuePointer>Args.Args</ValuePointer>\r
@@ -468,6 +497,7 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::ParsedTemplateArgument">\r
+    <DisplayString Condition="Kind==clang::ParsedTemplateArgument::Type" IncludeView="cpp">{(clang::QualType *)Arg,view(cpp)na}</DisplayString>\r
     <DisplayString Condition="Kind==clang::ParsedTemplateArgument::Type">Type template argument: {*(clang::QualType *)Arg}</DisplayString>\r
     <DisplayString Condition="Kind==clang::ParsedTemplateArgument::NonType">Non-type template argument: {*(clang::Expr *)Arg}</DisplayString>\r
     <DisplayString Condition="Kind==clang::ParsedTemplateArgument::Template">Template template argument: {*(clang::TemplateName *)Arg</DisplayString>\r
@@ -604,7 +634,7 @@ For later versions of Visual Studio, no setup is required-->
   </Type>\r
   <Type Name="clang::detail::CXXDeductionGuideNameExtra">\r
     <DisplayString IncludeView="cpp">{Template->TemplatedDecl,view(cpp)}</DisplayString>\r
-    <DisplayString>C++ Deduction guide for {Template->TemplatedDecl,view(cpp)}</DisplayString>\r
+    <DisplayString>C++ Deduction guide for {Template->TemplatedDecl,view(cpp)na}</DisplayString>\r
   </Type>\r
   <Type Name="clang::detail::CXXSpecialNameExtra">\r
     <DisplayString IncludeView="cpp">{Type,view(cpp)}</DisplayString>\r
@@ -613,9 +643,32 @@ For later versions of Visual Studio, no setup is required-->
   <Type Name="clang::DeclarationNameInfo">\r
     <DisplayString>{Name}</DisplayString>\r
   </Type>\r
+  <Type Name="clang::TemplateIdAnnotation">\r
+    <DisplayString IncludeView="arg0" Condition="NumArgs==0"></DisplayString>\r
+    <DisplayString IncludeView="arg0">{(ParsedTemplateArgument *)(this+1),view(cpp)na}{this,view(arg1)na}</DisplayString>\r
+    <DisplayString IncludeView="arg1" Condition="NumArgs==1"></DisplayString>\r
+    <DisplayString IncludeView="arg1">, {((ParsedTemplateArgument *)(this+1))+1,view(cpp)na}{this,view(arg2)na}</DisplayString>\r
+    <DisplayString IncludeView="arg2" Condition="NumArgs==2"></DisplayString>\r
+    <DisplayString IncludeView="arg1">, ...</DisplayString>\r
+    <DisplayString>{Name,na}&lt;{this,view(arg0)na}&gt;</DisplayString>\r
+    <Expand>\r
+      <Item Name="Name">Name</Item>\r
+      <Synthetic Name="Arguments">\r
+        <DisplayString>{this,view(arg0)na}</DisplayString>\r
+        <Expand>\r
+          <ArrayItems>\r
+            <Size>NumArgs</Size>\r
+            <ValuePointer>(ParsedTemplateArgument *)(this+1)</ValuePointer>\r
+          </ArrayItems>\r
+        </Expand>\r
+      </Synthetic>\r
+      <Item Name="Operator">Operator</Item>\r
+    </Expand>\r
+  </Type>\r
   <Type Name="clang::Token">\r
-    <DisplayString Condition="Kind != clang::tok::identifier">{(clang::tok::TokenKind)Kind,en}</DisplayString>\r
-    <DisplayString Condition="Kind == clang::tok::identifier">{{Identifier ({*(clang::IdentifierInfo *)(PtrData)})}}</DisplayString>\r
+    <DisplayString Condition="Kind == clang::tok::annot_template_id">{{annot_template_id ({(clang::TemplateIdAnnotation *)(PtrData),na})}}</DisplayString>\r
+    <DisplayString Condition="Kind == clang::tok::identifier">{{Identifier ({(clang::IdentifierInfo *)(PtrData),na})}}</DisplayString>\r
+    <DisplayString>{(clang::tok::TokenKind)Kind,en}</DisplayString>\r
   </Type>\r
   <Type Name="clang::DeclSpec">\r
     <DisplayString>[{(clang::DeclSpec::SCS)StorageClassSpec}], [{(clang::TypeSpecifierType)TypeSpecType}]</DisplayString>\r