Author: mps
Date: Tue Mar 8 10:14:23 2016
New Revision: 262933
URL: http://llvm.org/viewvc/llvm-project?rev=262933&view=rev
Log:
Add Visual Studio native visualizers for several Clang types
This is one of a series of changes to improve the MSVC visualization of Clang
types.
This one focuses on Record and SubstTemplateTypeParmType meaning that, for
example,
a TemplateArgumentLoc no longer displays incomprehensibly in the locals window
as
{Argument={DeclArg={Kind=1 QT=0x033acb00 D=0xcccccccc {DeclType=???}}...
but instead much more usefully as
Type template parameter: SubstTemplateTypeParm: {Identifier (("T"))} =>
Record, {Identifier (("A"))}
Additional types and improvements will be made in subsequent commits
Modified:
cfe/trunk/utils/clang.natvis
Modified: cfe/trunk/utils/clang.natvis
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/clang.natvis?rev=262933&r1=262932&r2=262933&view=diff
==============================================================================
--- cfe/trunk/utils/clang.natvis (original)
+++ cfe/trunk/utils/clang.natvis Tue Mar 8 10:14:23 2016
@@ -1,18 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Visual Studio 2012 Native Debugging Visualizers for LLVM
+Visual Studio Native Debugging Visualizers for LLVM
-Put this file into "%USERPROFILE%\Documents\Visual Studio 2012\Visualizers"
+Put this file into "%USERPROFILE%\Documents\Visual Studio 20xx\Visualizers"
or create a symbolic link so it updates automatically.
-->
<AutoVisualizer
xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010";>
<Type Name="clang::Type">
- <DisplayString Condition="(clang::Type::TypeClass)TypeBits.TC ==
clang::Type::Builtin">Builtin
Type={(clang::BuiltinType::Kind)BuiltinTypeBits.Kind}</DisplayString>
- <DisplayString Condition="(clang::Type::TypeClass)TypeBits.TC ==
clang::Type::Attributed">Modified
Type={((clang::AttributedType*)this)->ModifiedType}
Attribute={(clang::AttributedType::Kind)AttributedTypeBits.AttrKind}</DisplayString>
- <DisplayString>Type
Class={(clang::Type::TypeClass)TypeBits.TC}</DisplayString>
+ <DisplayString
IncludeView="BaseOnly">{(clang::Type::TypeClass)TypeBits.TC, en}</DisplayString>
+ <DisplayString
Condition="TypeBits.TC==clang::Type::TypeClass::Builtin">Builtin
Type={*(clang::BuiltinType *)this}</DisplayString>
+ <DisplayString Condition="TypeBits.TC==clang::Type::Attributed">Modified
Type={((clang::AttributedType*)this)->ModifiedType}
Attribute={(clang::AttributedType::Kind)AttributedTypeBits.AttrKind}</DisplayString>
+ <DisplayString
Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm">{*(clang::SubstTemplateTypeParmType
*)this}</DisplayString>
+ <DisplayString
Condition="TypeBits.TC==clang::Type::TypeClass::Record">{*(clang::RecordType
*)this}</DisplayString>
+ <DisplayString>{(clang::Type::TypeClass)TypeBits.TC, en}</DisplayString>
+ <Expand>
+ <Item Name="TypeClass"
IncludeView="BaseOnly">(clang::Type::TypeClass)TypeBits.TC</Item>
+ <Item Name="Flags" IncludeView="BaseOnly">TypeBits</Item>
+ <Item Name="Canonical" IncludeView="BaseOnly">CanonicalType</Item>
+ <ExpandedItem ExcludeView="BaseOnly"
Condition="TypeBits.TC==clang::Type::TypeClass::Builtin">*(clang::BuiltinType
*)this</ExpandedItem>
+ <ExpandedItem ExcludeView="BaseOnly"
Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm">(clang::SubstTemplateTypeParmType
*)this</ExpandedItem>
+ <ExpandedItem ExcludeView="BaseOnly"
Condition="TypeBits.TC==clang::Type::TypeClass::Record">(clang::RecordType
*)this</ExpandedItem>
+ </Expand>
+ </Type>
+ <Type Name="clang::TagType">
+ <DisplayString>{*decl}</DisplayString>
+ <Expand>
+ <Item Name="decl">decl</Item>
+ </Expand>
+ </Type>
+ <Type Name="clang::RecordType">
+ <DisplayString>{*(clang::Type *)this, view(BaseOnly)}, {*(clang::TagType
*)this}</DisplayString>
+ <Expand>
+ <Item Name="TagType">*(clang::TagType *)this</Item>
+ </Expand>
+ </Type>
+ <Type Name="clang::SubstTemplateTypeParmType">
+ <DisplayString>{*(clang::Type *)this, view(BaseOnly)}: {*Replaced} =>
{CanonicalType}</DisplayString>
+ <Expand>
+ <ExpandedItem>*(clang::Type *)this, view(BaseOnly)</ExpandedItem>
+ <Item Name="Replaced">*Replaced</Item>
+ </Expand>
+ </Type>
+ <Type Name="clang::TemplateTypeParmType">
+ <DisplayString>{*TTPDecl}</DisplayString>
</Type>
<Type Name="clang::QualType">
- <DisplayString>{((clang::ExtQualsTypeCommonBase
*)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 <<
clang::TypeAlignmentInBits) - 1)))->BaseType}</DisplayString>
+ <!-- TODO: Qualifiers. Also, when VS2013 support is deprecated, change 4
to clang::TypeAlignmentInBits (not properly recognized by VS2013) -->
+ <DisplayString>{*((clang::ExtQualsTypeCommonBase
*)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 << 4) -
1)))->BaseType}</DisplayString>
+ <Expand>
+ <Item Name="BaseType">*((clang::ExtQualsTypeCommonBase
*)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 << 4) -
1)))->BaseType</Item>
+ </Expand>
+ </Type>
+ <Type Name="clang::TemplateArgumentLoc">
+ <DisplayString>{Argument}</DisplayString>
+ <Expand>
+ <ExpandedItem>Argument</ExpandedItem>
+ </Expand>
+ </Type>
+ <Type Name="clang::TemplateArgument">
+ <DisplayString>{(clang::TemplateArgument::ArgKind)TypeOrValue.Kind,en}
template parameter: {*(clang::QualType *)&TypeOrValue.V}</DisplayString>
+ <Expand>
+ <Item Name="QualType" Condition="Integer.Kind ==
clang::TemplateArgument::ArgKind::Type">*(clang::QualType
*)&TypeOrValue.V</Item>
+ <!-- TODO: Other kinds-->
+ </Expand>
+ </Type>
+ <Type Name="clang::BuiltinType">
+ <DisplayString>{(clang::BuiltinType::Kind)BuiltinTypeBits.Kind,
en}</DisplayString>
+ <Expand>
+ <Item Name="Kind">(clang::BuiltinType::Kind)BuiltinTypeBits.Kind</Item>
+ </Expand>
+ </Type>
+ <Type Name="clang::NamedDecl">
+ <DisplayString>{Name}</DisplayString>
+ </Type>
+ <Type Name="clang::TemplateSpecializationType">
+ <DisplayString Condition="(Template.Storage.Val.Val.Value & 3) != 3
&& (Template.Storage.Val.Val.Value & 2) != 2 &&
(Template.Storage.Val.Val.Value & 1) != 1">{(clang::TemplateDecl
*)((Template.Storage.Val.Val.Value >> 2) << 2)}</DisplayString>
+ <DisplayString>{Template.Storage}</DisplayString>
</Type>
<Type Name="clang::IdentifierInfo">
<DisplayString Condition="Entry !=
0">({((llvm::StringMapEntry<clang::IdentifierInfo
*>*)Entry)+1,s})</DisplayString>
@@ -32,14 +95,14 @@ or create a symbolic link so it updates
<Item Condition="(Ptr & PtrMask) == StoredObjCZeroArgSelector"
Name="[ObjC Zero Arg Selector]">*(clang::IdentifierInfo *)(Ptr &
~PtrMask)</Item>
<Item Condition="(Ptr & PtrMask) == StoredObjCOneArgSelector"
Name="[ObjC One Arg Selector]">*(clang::IdentifierInfo *)(Ptr &
~PtrMask)</Item>
<Item Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra"
Name="[Extra]">(clang::DeclarationNameExtra::ExtraKind)((clang::DeclarationNameExtra
*)(Ptr & ~PtrMask))->ExtraKindOrNumArgs</Item>
- </Expand>
- </Type>
- <Type Name="clang::Token">
- <DisplayString Condition="Kind !=
clang::tok::identifier">{(clang::tok::TokenKind)Kind}</DisplayString>
- <DisplayString Condition="Kind == clang::tok::identifier">{{Identifier
({*(clang::IdentifierInfo *)(PtrData)})}}</DisplayString>
- </Type>
- <Type Name="clang::DeclSpec">
- <DisplayString>[{(clang::DeclSpec::SCS)StorageClassSpec}],
[{(clang::TypeSpecifierType)TypeSpecType}]</DisplayString>
+ </Expand>
+ </Type>
+ <Type Name="clang::Token">
+ <DisplayString Condition="Kind !=
clang::tok::identifier">{(clang::tok::TokenKind)Kind,en}</DisplayString>
+ <DisplayString Condition="Kind == clang::tok::identifier">{{Identifier
({*(clang::IdentifierInfo *)(PtrData)})}}</DisplayString>
+ </Type>
+ <Type Name="clang::DeclSpec">
+ <DisplayString>[{(clang::DeclSpec::SCS)StorageClassSpec}],
[{(clang::TypeSpecifierType)TypeSpecType}]</DisplayString>
</Type>
<Type Name="clang::PragmaHandler">
<DisplayString>{Name,s}</DisplayString>
@@ -65,4 +128,10 @@ or create a symbolic link so it updates
<Item Name="ParmVarDeclBits">ParmVarDeclBits</Item>
</Expand>
</Type>
+ <Type Name="clang::OpaquePtr<*>">
+ <DisplayString>{($T1 *)Ptr</DisplayString>
+ <Expand>
+ <ExpandedItem>($T1 *)Ptr</ExpandedItem>
+ </Expand>
+ </Type>
</AutoVisualizer>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
