Various improvements to Clang MSVC Visualizer

This change adds/improves MSVC visualizers for many Clang types, including array types, trailing return types in function, deduction guides, a fix for OpaquePtr, etc. It also replaces all of the view(deref) with the "na" formatter, which is a better built-in natvis technique for doing the same thing.

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

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

diff --git a/utils/ClangVisualizers/clang.natvis b/utils/ClangVisualizers/clang.natvis
index 17556f9cabb1df5ab577102eab3dfabcc7eb4bbf..dab3c3158899193f4d5b7b0dfb3d70306c66917e 100644 (file)
--- a/utils/ClangVisualizers/clang.natvis
+++ b/utils/ClangVisualizers/clang.natvis
@@ -27,18 +27,32 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Pointer" IncludeView="poly">{*(clang::PointerType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::LValueReference" IncludeView="poly">{*(clang::LValueReferenceType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::RValueReference" IncludeView="poly">{*(clang::RValueReferenceType *)this}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::ConstantArray" IncludeView="poly">{(clang::ConstantArrayType *)this,na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::ConstantArray" IncludeView="left">{(clang::ConstantArrayType *)this,view(left)na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::ConstantArray" IncludeView="right">{(clang::ConstantArrayType *)this,view(right)na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::IncompleteArray" IncludeView="poly">{(clang::IncompleteArrayType *)this,na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::IncompleteArray" IncludeView="left">{(clang::IncompleteArrayType *)this,view(left)na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::IncompleteArray" IncludeView="right">{(clang::IncompleteArrayType *)this,view(right)na}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Attributed" IncludeView="poly">{*(clang::AttributedType *)this}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Decayed" IncludeView="poly">{(clang::DecayedType *)this,na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Decayed" IncludeView="left">{(clang::DecayedType *)this,view(left)na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Decayed" IncludeView="right">{(clang::DecayedType *)this,view(right)na}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::TemplateTypeParm" IncludeView="poly">{*(clang::TemplateTypeParmType *)this}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::TemplateTypeParm" IncludeView="cpp">{*(clang::TemplateTypeParmType *)this,view(cpp)}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm" IncludeView="poly">{*(clang::SubstTemplateTypeParmType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Record" IncludeView="poly">{*(clang::RecordType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Record" IncludeView="cpp">{*(clang::RecordType *)this,view(cpp)}</DisplayString>\r
-    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto" IncludeView="poly">{*(clang::FunctionProtoType *)this}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto" IncludeView="poly">{(clang::FunctionProtoType *)this,na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto" IncludeView="left">{(clang::FunctionProtoType *)this,view(left)na}</DisplayString>\r
+    <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto" IncludeView="right">{(clang::FunctionProtoType *)this,view(right)na}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::TemplateSpecialization" IncludeView="poly">{*(clang::TemplateSpecializationType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::DeducedTemplateSpecialization" IncludeView="poly">{*(clang::DeducedTemplateSpecializationType *)this}</DisplayString>\r
     <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::InjectedClassName" IncludeView="poly">{*(clang::InjectedClassNameType *)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 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
     <DisplayString IncludeView="Dependent" Condition="TypeBits.Dependent">Dependent{" ",sb}</DisplayString>\r
     <DisplayString IncludeView="Dependent"></DisplayString>\r
@@ -62,13 +76,16 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString>{*this,view(cmn)}  {{{*this,view(poly)}}}</DisplayString>\r
     <Expand>\r
       <Item Name="TypeClass" IncludeView="cmn">(clang::Type::TypeClass)TypeBits.TC</Item>\r
-      <Item Name="Flags" IncludeView="cmn">*this,view(flags)</Item>\r
+      <Item Name="Flags" IncludeView="cmn">this,view(flags)na</Item>\r
       <Item Name="Canonical" IncludeView="cmn">CanonicalType</Item>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Builtin">*(clang::BuiltinType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Pointer">*(clang::PointerType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::LValueReference">*(clang::LValueReferenceType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::RValueReference">*(clang::RValueReferenceType *)this</ExpandedItem>\r
+      <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::ConstantArray">(clang::ConstantArrayType *)this</ExpandedItem>\r
+      <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::IncompleteArray">(clang::IncompleteArrayType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Attributed">*(clang::AttributedType *)this</ExpandedItem>\r
+      <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Decayed">(clang::DecayedType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::TemplateTypeParm">(clang::TemplateTypeParmType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm">(clang::SubstTemplateTypeParmType *)this</ExpandedItem>\r
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Record">(clang::RecordType *)this</ExpandedItem>\r
@@ -80,6 +97,28 @@ For later versions of Visual Studio, no setup is required-->
       <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::LocInfoType::LocInfo">(clang::LocInfoType *)this</ExpandedItem>\r
     </Expand>\r
   </Type>\r
+  <Type Name="clang::ArrayType">\r
+    <Expand>\r
+      <Item Name="ElementType">ElementType</Item>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::ConstantArrayType">\r
+    <DisplayString IncludeView="left">{ElementType,view(cpp)}</DisplayString>\r
+    <DisplayString IncludeView="right">[{Size}]</DisplayString>\r
+    <DisplayString>{ElementType,view(cpp)}[{Size}]</DisplayString>\r
+    <Expand>\r
+      <Item Name="Size">Size</Item>\r
+      <ExpandedItem>(clang::ArrayType *)this</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::IncompleteArrayType">\r
+    <DisplayString IncludeView="left">{ElementType,view(cpp)}</DisplayString>\r
+    <DisplayString IncludeView="right">[]</DisplayString>\r
+    <DisplayString>{ElementType,view(cpp)}[]</DisplayString>\r
+    <Expand>\r
+      <ExpandedItem>(clang::ArrayType *)this</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
   <Type Name="clang::PointerType">\r
     <DisplayString>{PointeeType, view(poly)} *</DisplayString>\r
     <Expand>\r
@@ -110,9 +149,9 @@ For later versions of Visual Studio, no setup is required-->
   \r
   <!-- Unfortunately, Visual Studio has trouble seeing the PointerBitMask member PointerIntUnion, so I hardwire it to 2 bits-->\r
   <Type Name="clang::DeclContext">\r
-    <DisplayString>{(clang::Decl::Kind)DeclKind,en}Decl</DisplayString>\r
+    <DisplayString>{(clang::Decl::Kind)DeclContextBits.DeclKind,en}Decl</DisplayString>\r
     <Expand>\r
-      <Item Name="DeclKind">(clang::Decl::Kind)DeclKind,en</Item>\r
+      <Item Name="DeclKind">(clang::Decl::Kind)DeclContextBits.DeclKind,en</Item>\r
       <Synthetic Name="Members">\r
         <DisplayString></DisplayString>\r
         <Expand>\r
@@ -147,10 +186,14 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString>{*this,view(TorC)} {*this,view(MaybeEllipses)}{Name,view(cpp)}</DisplayString> \r
   </Type>\r
   <Type Name="clang::TemplateDecl">\r
-    <DisplayString>template{TemplateParams,view(deref)} {*TemplatedDecl};</DisplayString>\r
+    <DisplayString>template{TemplateParams,na} {*TemplatedDecl};</DisplayString>\r
+    <Expand>\r
+      <Item Name="TemplateParams">TemplateParams,na</Item>\r
+      <Item Name="TemplatedDecl">TemplatedDecl,na</Item>\r
+    </Expand>\r
   </Type>\r
   <Type Name="clang::TemplateName">\r
-    <DisplayString>{Storage,view(deref)}</DisplayString>\r
+    <DisplayString>{Storage,na}</DisplayString>\r
     <Expand>\r
       <ExpandedItem>Storage</ExpandedItem>\r
     </Expand>\r
@@ -174,7 +217,7 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::TagType">\r
-    <DisplayString IncludeView="cpp">{*decl,view(cpp)}</DisplayString>\r
+    <DisplayString IncludeView="cpp">{decl,view(cpp)na}</DisplayString>\r
     <DisplayString>{*decl}</DisplayString>\r
     <Expand>\r
       <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
@@ -182,8 +225,8 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::RecordType">\r
-    <DisplayString IncludeView="cpp">{*(clang::TagType *)this,view(cpp)}</DisplayString>\r
-    <DisplayString>{*(clang::TagType *)this}</DisplayString>\r
+    <DisplayString IncludeView="cpp">{(clang::TagType *)this,view(cpp)na}</DisplayString>\r
+    <DisplayString>{(clang::TagType *)this,na}</DisplayString>\r
     <Expand>\r
       <Item Name="TagType">*(clang::TagType *)this</Item>\r
     </Expand>\r
@@ -198,7 +241,8 @@ For later versions of Visual Studio, no setup is required-->
   <!-- We only show the first 5 parameter types in the display string (can't figure out how to loop in DisplayString)\r
        but the expansion has all parameters -->\r
   <Type Name="clang::FunctionProtoType">\r
-    <DisplayString IncludeView="retType">{ResultType,view(cpp)}</DisplayString>\r
+    <DisplayString IncludeView="left" Condition="FunctionTypeBits.HasTrailingReturn"></DisplayString>\r
+    <DisplayString IncludeView="left">{ResultType,view(cpp)}</DisplayString>\r
     <DisplayString IncludeView="parm0" Condition="FunctionTypeBits.NumParams==0"></DisplayString>\r
     <DisplayString IncludeView="parm0">{*(clang::QualType *)(this+1),view(cpp)}{*this,view(parm1)}</DisplayString>\r
     <DisplayString IncludeView="parm1" Condition="FunctionTypeBits.NumParams==1"></DisplayString>\r
@@ -211,7 +255,9 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString IncludeView="parm4">, {*((clang::QualType *)(this+1)+4),view(cpp)}{*this,view(parm5)}</DisplayString>\r
     <DisplayString IncludeView="parm5" Condition="FunctionTypeBits.NumParams==5"></DisplayString>\r
     <DisplayString IncludeView="parm5">, /* expand for more params */</DisplayString>\r
-    <DisplayString>{*this,view(retType)}({*this,view(parm0)})</DisplayString>\r
+    <DisplayString IncludeView="right" Condition="FunctionTypeBits.HasTrailingReturn">({*this,view(parm0)}) -&gt; {ResultType,view(cpp)}</DisplayString>\r
+    <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
       <Synthetic Name="Parameter Types">\r
@@ -226,8 +272,24 @@ For later versions of Visual Studio, no setup is required-->
       <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>\r
     </Expand>\r
   </Type>\r
+\r
+  <Type Name="clang::AdjustedType">\r
+    <DisplayString>{OriginalTy} adjusted to {AdjustedTy}</DisplayString>\r
+    <Expand>\r
+      <Item Name="OriginalTy">OriginalTy</Item>\r
+      <Item Name="AdjustedTy">AdjustedTy</Item>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::DecayedType">\r
+    <DisplayString IncludeView="left">{OriginalTy,view(left)}</DisplayString>\r
+    <DisplayString IncludeView="right">{OriginalTy,view(right)}</DisplayString>\r
+    <DisplayString>{OriginalTy}</DisplayString>\r
+    <Expand>\r
+      <ExpandedItem>(clang::AdjustedType *)this</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
   <Type Name="clang::TemplateTypeParmType">\r
-    <DisplayString IncludeView="cpp" Condition="CanonicalType.Value.Value != this">{*TTPDecl}</DisplayString>\r
+    <DisplayString IncludeView="cpp" Condition="CanonicalType.Value.Value != this">{TTPDecl->Name,view(cpp)}</DisplayString>\r
     <DisplayString Condition="CanonicalType.Value.Value != this">Non-canonical: {*TTPDecl}</DisplayString>\r
     <DisplayString>Canonical: {CanTTPTInfo}</DisplayString>\r
     <Expand>\r
@@ -253,6 +315,8 @@ For later versions of Visual Studio, no setup is required-->
     <!-- When VS2013 support is deprecated, change 4 to clang::TypeAlignmentInBits (not properly recognized by VS2013) -->\r
     <DisplayString IncludeView="poly">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType,view(poly)}{*this,view(fastQuals)}</DisplayString>\r
     <DisplayString IncludeView="cpp">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType,view(cpp)}{*this,view(fastQuals)}</DisplayString>\r
+    <DisplayString IncludeView="left">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType,view(left)}{*this,view(fastQuals)}</DisplayString>\r
+    <DisplayString IncludeView="right">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType,view(right)}{*this,view(fastQuals)}</DisplayString>\r
     <!-- For the Fast Qualifiers, it is simpler (and probably more efficient) just to list all 8 cases than create\r
           views for each qualifier. TODO: Non-fast qualifiers -->\r
     <DisplayString IncludeView="fastQuals" Condition="(Value.Value &amp; 15)==0"></DisplayString>\r
@@ -265,10 +329,10 @@ For later versions of Visual Studio, no setup is required-->
     <DisplayString IncludeView="fastQuals" Condition="(Value.Value &amp; 15)==7">{" ",sb}const volatile restrict</DisplayString>\r
     <DisplayString IncludeView="fastQuals">Cannot visualize non-fast qualifiers</DisplayString>\r
     <DisplayString Condition="(uintptr_t)Value.Value == 0">Null</DisplayString>\r
-    <DisplayString>{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType}{*this,view(fastQuals)}</DisplayString>\r
+    <DisplayString>{((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType,na}{*this,view(fastQuals)}</DisplayString>\r
     <Expand>\r
       <Item Name="Fast Quals">*this,view(fastQuals)</Item>\r
-      <ExpandedItem>*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType</ExpandedItem>\r
+      <ExpandedItem>((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) &amp; ~(uintptr_t)((1 &lt;&lt; 4) - 1)))-&gt;BaseType</ExpandedItem>\r
     </Expand>\r
   </Type>\r
   <Type Name="clang::LocInfoType">\r
@@ -396,19 +460,20 @@ For later versions of Visual Studio, no setup is required-->
   </Type>\r
 \r
   <Type Name="clang::TemplateSpecializationType">\r
-    <DisplayString IncludeView="arg0" Condition="NumArgs==0"></DisplayString>\r
+    <DisplayString IncludeView="arg0" Condition="TemplateSpecializationTypeBits.NumArgs==0"></DisplayString>\r
     <DisplayString IncludeView="arg0">{((clang::TemplateArgument *)(this+1))[0],view(cpp)}{*this,view(arg1)}</DisplayString>\r
-    <DisplayString IncludeView="arg1" Condition="NumArgs==1"></DisplayString>\r
+    <DisplayString IncludeView="arg1" Condition="TemplateSpecializationTypeBits.NumArgs==1"></DisplayString>\r
     <DisplayString IncludeView="arg1">, {((clang::TemplateArgument *)(this+1))[1],view(cpp)}{*this,view(arg2)}</DisplayString>\r
-    <DisplayString IncludeView="arg2" Condition="NumArgs==2"></DisplayString>\r
+    <DisplayString IncludeView="arg2" Condition="TemplateSpecializationTypeBits.NumArgs==2"></DisplayString>\r
     <DisplayString IncludeView="arg2">, {((clang::TemplateArgument *)(this+1))[2],view(cpp)}{*this,view(arg3)}</DisplayString>\r
-    <DisplayString Condition="(Template.Storage.Val.Val.Value &amp; 3) == 0">\r
-      {*((clang::TemplateDecl *)((Template.Storage.Val.Val.Value &gt;&gt; 2) &lt;&lt; 2))->TemplatedDecl,view(cpp)}&lt;{*this,view(arg0)}&gt;\r
+    <DisplayString Condition="(Template.Storage.Val.Value &amp; 3) == 0">\r
+      {*((clang::TemplateDecl *)(Template.Storage.Val.Value))->TemplatedDecl,view(cpp)}&lt;{*this,view(arg0)}&gt;\r
     </DisplayString>\r
+    <DisplayString>Can't visualize this TemplateSpecializationType</DisplayString>\r
     <Expand>\r
       <Item Name="Template">Template.Storage</Item>\r
       <ArrayItems>\r
-        <Size>NumArgs</Size>\r
+        <Size>TemplateSpecializationTypeBits.NumArgs</Size>\r
         <ValuePointer>(clang::TemplateArgument *)(this+1)</ValuePointer>\r
       </ArrayItems>\r
     </Expand>\r
@@ -469,6 +534,7 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::detail::DeclarationNameExtra">\r
+    <DisplayString Condition="ExtraKindOrNumArgs == CXXDeductionGuideName" IncludeView="cpp">{(NamedDecl *)(((CXXDeductionGuideNameExtra *)this)->Template),view(cpp)nand}</DisplayString>\r
     <DisplayString Condition="ExtraKindOrNumArgs == CXXDeductionGuideName">C++ Deduction guide</DisplayString>\r
     <DisplayString Condition="ExtraKindOrNumArgs == CXXLiteralOperatorName">C++ Literal operator</DisplayString>\r
     <DisplayString Condition="ExtraKindOrNumArgs == CXXUsingDirective">C++ Using directive</DisplayString>  \r
@@ -498,16 +564,16 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::DeclaratorDecl">\r
-    <DisplayString>{DeclType,view(cpp)} {Name,view(cpp)}</DisplayString>\r
+    <DisplayString>{DeclType,view(left)} {Name,view(cpp)}{DeclType,view(right)}</DisplayString>\r
     <Expand>\r
       <Item Name="Name">Name</Item>\r
       <Item Name="DeclType">DeclType</Item>\r
     </Expand>\r
   </Type>\r
   <Type Name="clang::VarDecl">\r
-    <DisplayString>{*(DeclaratorDecl*)this,nd}</DisplayString>\r
+    <DisplayString>{(DeclaratorDecl*)this,nand}</DisplayString>\r
     <Expand>\r
-      <ExpandedItem>*(DeclaratorDecl*)this,nd</ExpandedItem>\r
+      <ExpandedItem>(DeclaratorDecl*)this,nd</ExpandedItem>\r
       <Item Name="VarDeclBits">VarDeclBits</Item>\r
     </Expand>\r
   </Type>\r
@@ -518,22 +584,32 @@ For later versions of Visual Studio, no setup is required-->
       <ExpandedItem>*(VarDecl*)this,nd</ExpandedItem>\r
     </Expand>\r
   </Type>\r
+  <Type Name="clang::CXXDeductionGuideDecl">\r
+    <DisplayString>{Name,view(cpp)nd}({(FunctionDecl*)this,view(parm0)nd}) -&gt; {((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)->ResultType,view(cpp)}</DisplayString>\r
+    <Expand>\r
+      <ExpandedItem>(FunctionDecl*)this,nd</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
   <Type Name="clang::FunctionDecl">\r
-    <DisplayString IncludeView="retType">{*(clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType,view(retType)}</DisplayString>\r
+    <DisplayString IncludeView="retType">{((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)->ResultType,view(cpp)}</DisplayString>\r
     <DisplayString IncludeView="parm0" Condition="0 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
-    <DisplayString IncludeView="parm0">{*ParamInfo[0]}{*this,view(parm1)nd}</DisplayString>\r
+    <DisplayString IncludeView="parm0">{ParamInfo[0],na}{*this,view(parm1)nd}</DisplayString>\r
     <DisplayString IncludeView="parm1" Condition="1 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
-    <DisplayString IncludeView="parm1">, {*ParamInfo[1]}{*this,view(parm2)nd}</DisplayString>\r
+    <DisplayString IncludeView="parm1">, {ParamInfo[1],na}{*this,view(parm2)nd}</DisplayString>\r
     <DisplayString IncludeView="parm2" Condition="2 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
-    <DisplayString IncludeView="parm2">, {*ParamInfo[2]}{*this,view(parm3)nd}</DisplayString>\r
+    <DisplayString IncludeView="parm2">, {ParamInfo[2],na}{*this,view(parm3)nd}</DisplayString>\r
     <DisplayString IncludeView="parm3" Condition="3 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
-    <DisplayString IncludeView="parm3">, {*ParamInfo[3]}{*this,view(parm4)nd}</DisplayString>\r
+    <DisplayString IncludeView="parm3">, {ParamInfo[3],na}{*this,view(parm4)nd}</DisplayString>\r
     <DisplayString IncludeView="parm4" Condition="4 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
-    <DisplayString IncludeView="parm4">, {*ParamInfo[4]}{*this,view(parm5)nd}</DisplayString>\r
+    <DisplayString IncludeView="parm4">, {ParamInfo[4],na}{*this,view(parm5)nd}</DisplayString>\r
     <DisplayString IncludeView="parm5" Condition="5 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.NumParams"></DisplayString>\r
     <DisplayString IncludeView="parm5">, /* expand for more params */</DisplayString>\r
-    <DisplayString>{*this,view(retType)nd} {Name,view(cpp)nd}({*this,view(parm0)nd})</DisplayString>\r
+    <DisplayString Condition="((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)-&gt;FunctionTypeBits.HasTrailingReturn">\r
+      auto {Name,view(cpp)nd}({*this,view(parm0)nd}) -&gt; {((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) &amp; ~15))-&gt;BaseType)->ResultType,view(cpp)}\r
+    </DisplayString>\r
+    <DisplayString>{this,view(retType)nand} {Name,view(cpp)nd}({*this,view(parm0)nd})</DisplayString>\r
     <Expand>\r
+      <ExpandedItem>(clang::DeclaratorDecl *)this,nd</ExpandedItem>\r
       <Item Name="ReturnType">*this,view(retType)nd</Item>\r
       <Synthetic Name="Parameter Types">\r
         <DisplayString>{*this,view(parm0)nd}</DisplayString>\r
@@ -547,9 +623,9 @@ For later versions of Visual Studio, no setup is required-->
     </Expand>\r
   </Type>\r
   <Type Name="clang::OpaquePtr&lt;*&gt;">\r
-    <DisplayString>{($T1 *)Ptr}</DisplayString>\r
+    <DisplayString>{*($T1*)&amp;Ptr}</DisplayString>\r
     <Expand>\r
-      <ExpandedItem>($T1 *)Ptr</ExpandedItem>\r
+      <ExpandedItem>($T1*)&amp;Ptr</ExpandedItem>\r
     </Expand>\r
   </Type>\r
   <Type Name="clang::UnionOpaquePtr&lt;*&gt;">\r
@@ -600,6 +676,47 @@ For later versions of Visual Studio, no setup is required-->
       <Item Name="decl">*(clang::NamedDecl *)(Ptr&amp;~Mask)</Item>\r
     </Expand>\r
   </Type>\r
+  <Type Name="clang::UnqualifiedId">\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_Identifier">[IK_Identifier] {*Identifier}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_OperatorFunctionId">[IK_OperatorFunctionId] {OperatorFunctionId}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_ConversionFunctionId">[IK_ConversionFunctionId] {ConversionFunctionId}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_ConstructorName">[IK_ConstructorName] {ConstructorName}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_DestructorName">[IK_DestructorName] {DestructorName}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_DeductionGuideName">[IK_DeductionGuideName] {TemplateName}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_TemplateId">[IK_TemplateId] {TemplateId}</DisplayString>\r
+    <DisplayString Condition="Kind==UnqualifiedIdKind::IK_ConstructorTemplateId">[IK_ConstructorTemplateId] {TemplateId}</DisplayString>\r
+    <DisplayString>Kind</DisplayString>\r
+    <Expand>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_Identifier">Identifier</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_OperatorFunctionId">OperatorFunctionId</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_ConversionFunctionId">ConversionFunctionId</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_ConstructorName">ConstructorName</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_DestructorName">DestructorName</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_DeductionGuideName">TemplateName</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_TemplateId">TemplateId</ExpandedItem>\r
+      <ExpandedItem Condition="Kind==UnqualifiedIdKind::IK_ConstructorTemplateId">TemplateId</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::DeclGroup">\r
+    <DisplayString>NumDecls={NumDecls}</DisplayString>\r
+    <Expand>\r
+      <ArrayItems>\r
+        <Size>NumDecls</Size>\r
+        <ValuePointer>(Decl **)(this+1)</ValuePointer>\r
+      </ArrayItems>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::DeclGroupRef">\r
+    <DisplayString Condition="(Kind)((uintptr_t)D&amp;1)==SingleDeclKind">{*D}</DisplayString>\r
+    <DisplayString>{*(DeclGroup *)((uintptr_t)D&amp;~1)}</DisplayString>\r
+    <Expand>\r
+      <ExpandedItem Condition="(Kind)((uintptr_t)D&amp;1)==SingleDeclKind">D</ExpandedItem>\r
+      <ExpandedItem Condition="(Kind)((uintptr_t)D&amp;1)==DeclGroupKind">(DeclGroup *)((uintptr_t)D&amp;~1)</ExpandedItem>\r
+    </Expand>\r
+  </Type>\r
+  <Type Name="clang::Declarator">\r
+    <DisplayString>{DS} {Name}</DisplayString>\r
+  </Type>\r
   <Type Name="clang::UnresolvedSet&lt;*&gt;">\r
     <DisplayString>{Decls}</DisplayString>\r
     <Expand>\r