mspertus updated this revision to Diff 51762. mspertus added a comment. Incorporating ariccio's comments and fixing some html
http://reviews.llvm.org/D18498 Files: CMakeLists.txt utils/ClangVisualizers/CMakeLists.txt utils/ClangVisualizers/clang.natvis utils/clang.natvis www/hacking.html
Index: www/hacking.html =================================================================== --- www/hacking.html +++ www/hacking.html @@ -98,14 +98,16 @@ <!--=====================================================================--> <p>The files - <a href="http://llvm.org/svn/llvm-project/llvm/trunk/utils/llvm.natvis";> - <tt>utils/llvm.natvis</tt></a> and - <a href="http://llvm.org/svn/llvm-project/cfe/trunk/utils/clang.natvis";> - <tt>utils/clang.natvis</tt></a> provide debugger visualizers + <a href="http://llvm.org/svn/llvm-project/llvm/trunk/utils/LLVMVisualizers/llvm.natvis";> + <tt>utils/LLVMVisualizers/llvm.natvis</tt></a> and + <a href="http://llvm.org/svn/llvm-project/cfe/trunk/utils/ClangVisualizers/clang.natvis";> + <tt>utils/ClangVisualizers/clang.natvis</tt></a> provide debugger visualizers that make debugging of more complex data types much easier.</p> - <p>Put the files into - <tt>%USERPROFILE%\Documents\Visual Studio 2012\Visualizers</tt> or + <p>For Visual Studio 2013 only, put the files into + <tt>%USERPROFILE%\Documents\Visual Studio 2013\Visualizers</tt> or create a symbolic link so they update automatically.</p> + <p>For later versions of Visual Studio, no installation is required. + Note also that later versions of Visual Studio also display better visualizations.</p> <!--=====================================================================--> <h2 id="testing">Testing</h2> Index: utils/clang.natvis =================================================================== --- utils/clang.natvis +++ utils/clang.natvis @@ -1,361 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Visual Studio Native Debugging Visualizers for LLVM - -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"> - <!-- To visualize clang::Types, we need to look at TypeBits.TC to determine the actual - type subclass and manually dispatch accordingly (Visual Studio can't identify the real type - because clang::Type has no virtual members hence no RTTI). - - Views: - "cmn": Visualization that is common to all clang::Type subclasses - "poly": Visualization that is specific to the actual clang::Type subclass. The subtype-specific - <DisplayString> is typically as C++-like as possible (like in dump()) with <Expand> - containing all the gory details. - "cpp": Only occasionally used when we need to distinguish between an ordinary view and a C++-like view. - --> - <DisplayString IncludeView="cmn">{(clang::Type::TypeClass)TypeBits.TC, en}Type</DisplayString> - <!-- Dispatch to visualizers for the actual Type subclass --> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Builtin" IncludeView="poly">{*(clang::BuiltinType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Pointer" IncludeView="poly">{*(clang::PointerType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::LValueReference" IncludeView="poly">{*(clang::LValueReferenceType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::RValueReference" IncludeView="poly">{*(clang::RValueReferenceType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Attributed" IncludeView="poly">{*(clang::AttributedType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::TemplateTypeParm" IncludeView="poly">{*(clang::TemplateTypeParmType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm" IncludeView="poly">{*(clang::SubstTemplateTypeParmType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Record" IncludeView="poly">{*(clang::RecordType *)this}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::Record" IncludeView="cpp">{*(clang::RecordType *)this,view(cpp)}</DisplayString> - <DisplayString Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto" IncludeView="poly">{*(clang::FunctionProtoType *)this}</DisplayString> - <DisplayString IncludeView="cpp">{*this,view(poly)}</DisplayString> - <DisplayString IncludeView="poly">{*this,view(cmn)}"</DisplayString> <!-- Not yet implemented Type subclass --> - <DisplayString>{*this,view(cmn)} {{{*this,view(poly)}}}</DisplayString> - <Expand> - <Item Name="TypeClass" IncludeView="cmn">(clang::Type::TypeClass)TypeBits.TC</Item> - <Item Name="Flags" IncludeView="cmn">TypeBits</Item> - <Item Name="Canonical" IncludeView="cmn">CanonicalType</Item> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Builtin">*(clang::BuiltinType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Pointer">*(clang::PointerType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::LValueReference">*(clang::LValueReferenceType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::RValueReference">*(clang::RValueReferenceType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Attributed">*(clang::AttributedType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::TemplateTypeParm">(clang::TemplateTypeParmType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::SubstTemplateTypeParm">(clang::SubstTemplateTypeParmType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::Record">(clang::RecordType *)this</ExpandedItem> - <ExpandedItem ExcludeView="cmn" Condition="TypeBits.TC==clang::Type::TypeClass::FunctionProto">(clang::FunctionProtoType *)this</ExpandedItem> - </Expand> - </Type> - <Type Name="clang::PointerType"> - <DisplayString>{PointeeType, view(poly)} *</DisplayString> - <Expand> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - <Item Name="PointeeType">PointeeType</Item> - </Expand> - </Type> - <!-- We visualize all inner types for clang reference types. So a rvalue reference to an lvalue reference - to an int would visual as int & && This is a little different than GetPointeeType(), - but more clearly displays the data structure and seems natural --> - <Type Name="clang::LValueReferenceType"> - <DisplayString>{((clang::ReferenceType *)this)->PointeeType,view(cpp)} &</DisplayString> - <Expand> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - <Item Name="PointeeType">PointeeType</Item> - </Expand> - </Type> - <Type Name="clang::RValueReferenceType"> - <DisplayString>{((clang::ReferenceType *)this)->PointeeType,view(cpp)} &&</DisplayString> - <Expand> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - <Item Name="PointeeType">PointeeType</Item> - </Expand> - </Type> - <Type Name="clang::AttributedType"> - <DisplayString>{ModifiedType} Attribute={(clang::AttributedType::Kind)AttributedTypeBits.AttrKind}</DisplayString> - </Type> - - <!-- Unfortunately, Visual Studio has trouble seeing the PointerBitMask member PointerIntUnion, so I hardwire it to 2 bits--> - <Type Name="clang::DeclContext"> - <DisplayString>{(clang::Decl::Kind)DeclKind,en}Decl</DisplayString> - <Expand> - <Item Name="DeclKind">(clang::Decl::Kind)DeclKind,en</Item> - <Synthetic Name="Members"> - <DisplayString></DisplayString> - <Expand> - <LinkedListItems> - <HeadPointer>FirstDecl</HeadPointer> - <NextPointer>(clang::Decl *)(NextInContextAndBits.Value & ~3)</NextPointer> - <ValueNode>*this</ValueNode> - </LinkedListItems> - </Expand> - </Synthetic> - </Expand> - </Type> - <Type Name="clang::FieldDecl"> - <DisplayString>Field {{{*(clang::DeclaratorDecl *)this,view(cpp)nd}}}</DisplayString> - </Type> - <Type Name="clang::CXXMethodDecl"> - <DisplayString IncludeView="cpp">{*(clang::FunctionDecl *)this,nd}</DisplayString> - <DisplayString>Method {{{*this,view(cpp)}}}</DisplayString> - </Type> - <Type Name="clang::CXXConstructorDecl"> - <DisplayString>Constructor {{{Name,view(cpp)}({*(clang::FunctionDecl *)this,view(parm0)nd})}}</DisplayString> - </Type> - <Type Name="clang::CXXDestructorDecl"> - <DisplayString>Destructor {{~{Name,view(cpp)}()}}</DisplayString> - </Type> - <Type Name="clang::NamedDecl" > - <DisplayString IncludeView="cpp">{Name,view(cpp)}</DisplayString> - <DisplayString>{Name}</DisplayString> - </Type> - <Type Name="clang::TagDecl"> - <DisplayString IncludeView="implicit" Condition="Implicit">implicit{" ",sb}</DisplayString> - <DisplayString IncludeView="implicit"></DisplayString> - <DisplayString IncludeView="modifiers">{*this,view(implicit)}</DisplayString> - <DisplayString IncludeView="cpp">{*this,view(modifiers)}{Name,view(cpp)}</DisplayString> - <DisplayString Condition="TagDeclKind==clang::TagTypeKind::TTK_Struct">{*this,view(modifiers)}struct {Name,view(cpp)}</DisplayString> - <DisplayString Condition="TagDeclKind==clang::TagTypeKind::TTK_Interface">{*this,view(modifiers)}interface {Name,view(cpp)}</DisplayString> - <DisplayString Condition="TagDeclKind==clang::TagTypeKind::TTK_Union">{*this,view(modifiers)}union {Name,view(cpp)}</DisplayString> - <DisplayString Condition="TagDeclKind==clang::TagTypeKind::TTK_Class">{*this,view(modifiers)}class {Name,view(cpp)}</DisplayString> - <DisplayString Condition="TagDeclKind==clang::TagTypeKind::TTK_Enum">{*this,view(modifiers)}enum {Name,view(cpp)}</DisplayString> - <Expand> - <ExpandedItem>(clang::DeclContext *)this</ExpandedItem> - </Expand> - </Type> - <Type Name="clang::TagType"> - <DisplayString IncludeView="cpp">{*decl,view(cpp)}</DisplayString> - <DisplayString>{*decl}</DisplayString> - <Expand> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - <Item Name="decl">decl</Item> - </Expand> - </Type> - <Type Name="clang::RecordType"> - <DisplayString IncludeView="cpp">{*(clang::TagType *)this,view(cpp)}</DisplayString> - <DisplayString>{*(clang::TagType *)this}</DisplayString> - <Expand> - <Item Name="TagType">*(clang::TagType *)this</Item> - </Expand> - </Type> - <Type Name="clang::SubstTemplateTypeParmType"> - <DisplayString>{*Replaced,view(cpp)} <= {CanonicalType,view(cpp)}</DisplayString> - <Expand> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - <Item Name="Replaced">*Replaced</Item> - </Expand> - </Type> - <!-- We only show the first 5 parameter types in the display string (can't figure out how to loop in DisplayString) - but the expansion has all parameters --> - <Type Name="clang::FunctionProtoType"> - <DisplayString IncludeView="retType">{ResultType,view(cpp)}</DisplayString> - <DisplayString IncludeView="parm0" Condition="NumParams==0"></DisplayString> - <DisplayString IncludeView="parm0">{*(clang::QualType *)(this+1),view(cpp)}{*this,view(parm1)}</DisplayString> - <DisplayString IncludeView="parm1" Condition="NumParams==1"></DisplayString> - <DisplayString IncludeView="parm1">, {*((clang::QualType *)(this+1)+1),view(cpp)}{*this,view(parm2)}</DisplayString> - <DisplayString IncludeView="parm2" Condition="NumParams==2"></DisplayString> - <DisplayString IncludeView="parm2">, {*((clang::QualType *)(this+1)+2),view(cpp)}{*this,view(parm3)}</DisplayString> - <DisplayString IncludeView="parm3" Condition="NumParams==3"></DisplayString> - <DisplayString IncludeView="parm3">, {*((clang::QualType *)(this+1)+3),view(cpp)}{*this,view(parm4)}</DisplayString> - <DisplayString IncludeView="parm4" Condition="NumParams==4"></DisplayString> - <DisplayString IncludeView="parm4">, {*((clang::QualType *)(this+1)+4),view(cpp)}{*this,view(parm5)}</DisplayString> - <DisplayString IncludeView="parm5" Condition="NumParams==5"></DisplayString> - <DisplayString IncludeView="parm5">, /* expand for more params */</DisplayString> - <DisplayString>{*this,view(retType)}({*this,view(parm0)})</DisplayString> - <Expand> - <Item Name="ReturnType">ResultType</Item> - <Synthetic Name="Parameter Types"> - <DisplayString>{*this,view(parm0)}</DisplayString> - <Expand> - <ArrayItems> - <Size>NumParams</Size> - <ValuePointer>(clang::QualType *)(this+1)</ValuePointer> - </ArrayItems> - </Expand> - </Synthetic> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - </Expand> - </Type> - <Type Name="clang::TemplateTypeParmType"> - <DisplayString>typename {*TTPDecl,view(cpp)}</DisplayString> - </Type> - <Type Name="clang::QualType"> - <!-- When VS2013 support is deprecated, change 4 to clang::TypeAlignmentInBits (not properly recognized by VS2013) --> - <DisplayString IncludeView="poly">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 << 4) - 1)))->BaseType,view(poly)}{*this,view(fastQuals)}</DisplayString> - <DisplayString IncludeView="cpp">{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 << 4) - 1)))->BaseType,view(cpp)}{*this,view(fastQuals)}</DisplayString> - <!-- For the Fast Qualifiers, it is simpler (and probably more efficient) just to list all 8 cases than create - views for each qualifier. TODO: Non-fast qualifiers --> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==0"></DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==1">{" ",sb}const</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==2">{" ",sb}restrict</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==3">{" ",sb}const restrict</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==4">{" ",sb}volatile</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==5">{" ",sb}const volatile</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==6">{" ",sb}volatile restrict</DisplayString> - <DisplayString IncludeView="fastQuals" Condition="(Value.Value & 15)==7">{" ",sb}const volatile restrict</DisplayString> - <DisplayString IncludeView="fastQuals">Cannot visualize non-fast qualifiers</DisplayString> - <DisplayString>{*((clang::ExtQualsTypeCommonBase *)(((uintptr_t)Value.Value) & ~(uintptr_t)((1 << 4) - 1)))->BaseType}{*this,view(fastQuals)}</DisplayString> - <Expand> - <Item Name="Fast Quals">*this,view(fastQuals)</Item> - <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> - <!-- Builtin types that have C++ keywords are manually displayed as that keyword. Otherwise, just use the enum name --> - <Type Name="clang::BuiltinType"> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Void">void</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Bool">bool</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Char_U">char</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::UChar">unsigned char</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::WChar_U">wchar_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Char16">char16_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Char32">char32_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::UShort">unsigned short</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::UInt">unsigned int</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::ULong">unsigned long</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::ULongLong">unsigned long long</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::UInt128">__uint128_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Char_S">char</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::SChar">signed char</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::WChar_S">wchar_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Short">short</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Int">int</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Long">long</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::LongLong">long long</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Int128">__int128_t</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Half">__fp16</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Float">float</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::Double">double</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::LongDouble">long double</DisplayString> - <DisplayString Condition="BuiltinTypeBits.Kind==clang::BuiltinType::NullPtr">nullptr_t</DisplayString> - <DisplayString>{(clang::BuiltinType::Kind)BuiltinTypeBits.Kind, en}</DisplayString> - <Expand> - <Item Name="Kind">(clang::BuiltinType::Kind)BuiltinTypeBits.Kind</Item> - </Expand> - </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,sb}</DisplayString> - <Expand> - <Item Condition="Entry != 0" Name="[Identifier]">((llvm::StringMapEntry<clang::IdentifierInfo *>*)Entry)+1,s</Item> - <Item Name="Token Kind">(clang::tok::TokenKind)TokenID</Item> - </Expand> - </Type> - <Type Name="clang::DeclarationName"> - <DisplayString Condition="Ptr == 0" IncludeView="cpp"></DisplayString> - <DisplayString Condition="Ptr == 0">Empty</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredIdentifier" IncludeView="cpp">{*(clang::IdentifierInfo *)(Ptr & ~PtrMask)}</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredIdentifier">{{Identifier ({*(clang::IdentifierInfo *)(Ptr & ~PtrMask)})}}</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredObjCZeroArgSelector">{{ObjC Zero Arg Selector (*{(clang::IdentifierInfo *)(Ptr & ~PtrMask)})}}</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredObjCOneArgSelector">{{ObjC One Arg Selector (*{(clang::IdentifierInfo *)(Ptr & ~PtrMask)})}}</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra" - IncludeView="cpp">{*(clang::DeclarationNameExtra *)(Ptr & ~PtrMask),view(cpp)}</DisplayString> - <DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra">{{Extra ({*(clang::DeclarationNameExtra *)(Ptr & ~PtrMask)})}}</DisplayString> - <Expand> - <Item Condition="(Ptr & PtrMask) == StoredIdentifier" Name="[Identifier]">*(clang::IdentifierInfo *)(Ptr & ~PtrMask)</Item> - <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 *)(Ptr & ~PtrMask)</Item> - </Expand> - </Type> - <Type Name="clang::DeclarationNameExtra"> - <DisplayString IncludeView="cpp" - Condition="ExtraKindOrNumArgs >= clang::DeclarationNameExtra::CXXConstructor - && ExtraKindOrNumArgs <= clang::DeclarationNameExtra::CXXConversionFunction" - >{((clang::CXXSpecialName *)this)->Type,view(cpp)}</DisplayString> - <DisplayString>{(clang::DeclarationNameExtra::ExtraKind)ExtraKindOrNumArgs,en}{" ",sb}{*this,view(cpp)}</DisplayString> - </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> - </Type> - <Type Name="clang::FileEntry"> - <DisplayString>{Name,s}</DisplayString> - </Type> - <Type Name="clang::DirectoryEntry"> - <DisplayString>{Name,s}</DisplayString> - </Type> - <Type Name="clang::VarDecl::VarDeclBitfields"> - <Expand> - <Item Name="StorageClass">(clang::StorageClass)SClass</Item> - <Item Name="ThreadStorageClass">(clang::ThreadStorageClassSpecifier)TSCSpec</Item> - <Item Name="InitStyle">(clang::VarDecl::InitializationStyle)InitStyle</Item> - </Expand> - </Type> - <Type Name="clang::DeclaratorDecl"> - <DisplayString>{DeclType,view(cpp)} {Name,view(cpp)}</DisplayString> - </Type> - <Type Name="clang::VarDecl"> - <DisplayString>{*(DeclaratorDecl*)this,nd}</DisplayString> - <Expand> - <ExpandedItem>*(DeclaratorDecl*)this,nd</ExpandedItem> - <Item Name="VarDeclBits">VarDeclBits</Item> - </Expand> - </Type> - <Type Name="clang::ParmVarDecl"> - <DisplayString>{*(VarDecl*)this,nd}</DisplayString> - <Expand> - <Item Name="ParmVarDeclBits">ParmVarDeclBits</Item> - <ExpandedItem>*(VarDecl*)this,nd</ExpandedItem> - </Expand> - </Type> - <Type Name="clang::FunctionDecl"> - <DisplayString IncludeView="retType">{*(clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType,view(retType)}</DisplayString> - <DisplayString IncludeView="parm0" Condition="0 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm0">{*ParamInfo[0]}{*this,view(parm1)nd}</DisplayString> - <DisplayString IncludeView="parm1" Condition="1 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm1">, {*ParamInfo[1]}{*this,view(parm2)nd}</DisplayString> - <DisplayString IncludeView="parm2" Condition="2 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm2">, {*ParamInfo[2]}{*this,view(parm3)nd}</DisplayString> - <DisplayString IncludeView="parm3" Condition="3 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm3">, {*ParamInfo[3]}{*this,view(parm4)nd}</DisplayString> - <DisplayString IncludeView="parm4" Condition="4 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm4">, {*ParamInfo[4]}{*this,view(parm5)nd}</DisplayString> - <DisplayString IncludeView="parm5" Condition="5 == ((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams"></DisplayString> - <DisplayString IncludeView="parm5">, /* expand for more params */</DisplayString> - <DisplayString>{*this,view(retType)nd} {Name,view(cpp)nd}({*this,view(parm0)nd})</DisplayString> - <Expand> - <Item Name="ReturnType">*this,view(retType)nd</Item> - <Synthetic Name="Parameter Types"> - <DisplayString>{*this,view(parm0)nd}</DisplayString> - <Expand> - <ArrayItems> - <Size>((clang::FunctionProtoType *)((clang::ExtQualsTypeCommonBase *)(((uintptr_t)DeclType.Value.Value) & ~15))->BaseType)->NumParams</Size> - <ValuePointer>ParamInfo</ValuePointer> - </ArrayItems> - </Expand> - </Synthetic> - <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem> - </Expand> - </Type> - <Type Name="clang::OpaquePtr<*>"> - <DisplayString>{($T1 *)Ptr</DisplayString> - <Expand> - <ExpandedItem>($T1 *)Ptr</ExpandedItem> - </Expand> - </Type> -</AutoVisualizer> Index: utils/ClangVisualizers/clang.natvis =================================================================== --- utils/ClangVisualizers/clang.natvis +++ utils/ClangVisualizers/clang.natvis @@ -2,9 +2,10 @@ <!-- Visual Studio Native Debugging Visualizers for LLVM -Put this file into "%USERPROFILE%\Documents\Visual Studio 20xx\Visualizers" -or create a symbolic link so it updates automatically. ---> +For Visual Studio 2013 only, put this file into +"%USERPROFILE%\Documents\Visual Studio 2013\Visualizers" or create a symbolic link so it updates automatically. + +For later versions of Visual Studio, no setup is required--> <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010";> <Type Name="clang::Type"> Index: utils/ClangVisualizers/CMakeLists.txt =================================================================== --- utils/ClangVisualizers/CMakeLists.txt +++ utils/ClangVisualizers/CMakeLists.txt @@ -0,0 +1,7 @@ +# Do this by hand instead of using add_llvm_utilities(), which +# tries to create a corresponding executable, which we don't want. +if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION) + set(CLANG_VISUALIZERS clang.natvis) + add_custom_target(ClangVisualizers SOURCES ${CLANG_VISUALIZERS}) + set_target_properties(ClangVisualizers PROPERTIES FOLDER "Utils") +endif() Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -817,3 +817,7 @@ ExternalProject_Add_StepTargets(${NEXT_CLANG_STAGE} ${target}) endforeach() endif() + +if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION) + add_subdirectory(utils/ClangVisualizers) +endif()
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
