This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
utils/ClangVisualizers/
-
ClangVisualizers/
-
clang.natvis

Differential D55737

[Utils] Attempt to fix clang.natvis following "[AST] Various optimizations in DeclarationName(Table)"
AbandonedPublic

Authored by riccibruno on Dec 15 2018, 5:46 AM.

Download Raw Diff

Details

Reviewers

aaron.ballman

Summary

[AST] Various optimizations in DeclarationName(Table) changed how DeclarationNames
are represented. Therefore clang.natvis needs to be updated to reflect these changes.

This is completely untested since I actually don't have access to a windows machine.
However it should be close enough to a working fix.

Diff Detail

Repository: rC Clang

Event Timeline

riccibruno created this revision.Dec 15 2018, 5:46 AM

Herald added a subscriber: cfe-commits. · View Herald TranscriptDec 15 2018, 5:46 AM

There was a bit more work to be done here, but this got me started. I commit extra fixes on top of your work in r349547 since I was able to test the behavior locally. Thank you for the help!

In D55737#1335245, @aaron.ballman wrote:

There was a bit more work to be done here, but this got me started. I commit extra fixes on top of your work in r349547 since I was able to test the behavior locally. Thank you for the help!

Nice ! I see that you fixed the FunctionProtoType case too.

Revision Contents

Path

Size

utils/

ClangVisualizers/

clang.natvis

33 lines

Diff 178358

utils/ClangVisualizers/clang.natvis

Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Lines	<Expand>
<Item Condition="Entry != 0" Name="[Identifier]">((llvm::StringMapEntry<clang::IdentifierInfo >)Entry)+1,s</Item>		<Item Condition="Entry != 0" Name="[Identifier]">((llvm::StringMapEntry<clang::IdentifierInfo >)Entry)+1,s</Item>
<Item Name="Token Kind">(clang::tok::TokenKind)TokenID</Item>		<Item Name="Token Kind">(clang::tok::TokenKind)TokenID</Item>
</Expand>		</Expand>
</Type>		</Type>
<Type Name="clang::DeclarationName">		<Type Name="clang::DeclarationName">
<DisplayString Condition="Ptr == 0" IncludeView="cpp"></DisplayString>		<DisplayString Condition="Ptr == 0" IncludeView="cpp"></DisplayString>
<DisplayString Condition="Ptr == 0">Empty</DisplayString>		<DisplayString Condition="Ptr == 0">Empty</DisplayString>
<DisplayString Condition="(Ptr & PtrMask) == StoredIdentifier" IncludeView="cpp">{(clang::IdentifierInfo )(Ptr & ~PtrMask)}</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) == 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) == 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) == StoredObjCOneArgSelector">ObjC One Arg Selector {(clang::IdentifierInfo )(Ptr & ~PtrMask)}</DisplayString>
		<DisplayString Condition="(Ptr & PtrMask) == StoredCXXConstructorName">C++ Constructor {(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)}</DisplayString>
		<DisplayString Condition="(Ptr & PtrMask) == StoredCXXDestructorName">C++ Destructor {(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)}</DisplayString>
		<DisplayString Condition="(Ptr & PtrMask) == StoredCXXConversionFunctionName">C++ Conversion function {(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)}</DisplayString>
		<DisplayString Condition="(Ptr & PtrMask) == StoredCXXOperatorName">C++ Operator {(clang::detail::CXXOperatorIdName )(Ptr & ~PtrMask)}</DisplayString>
<DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra"		<DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra"
IncludeView="cpp">{(clang::DeclarationNameExtra )(Ptr & ~PtrMask),view(cpp)}</DisplayString>		IncludeView="cpp">{(clang::DeclarationNameExtra )(Ptr & ~PtrMask),view(cpp)}</DisplayString>
<DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra">{{Extra ({(clang::DeclarationNameExtra )(Ptr & ~PtrMask)})}}</DisplayString>		<DisplayString Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra">Extra {(clang::detail::DeclarationNameExtra )(Ptr & ~PtrMask)}</DisplayString>
<Expand>		<Expand>
<Item Condition="(Ptr & PtrMask) == StoredIdentifier" Name="[Identifier]">(clang::IdentifierInfo )(Ptr & ~PtrMask)</Item>		<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) == 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) == StoredObjCOneArgSelector" Name="[ObjC One Arg Selector]">(clang::IdentifierInfo )(Ptr & ~PtrMask)</Item>
<Item Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra" Name="[Extra]">(clang::DeclarationNameExtra *)(Ptr & ~PtrMask)</Item>		<Item Condition="(Ptr & PtrMask) == StoredCXXConstructorName" Name="[C++ Constructor]">(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)</Item>
		<Item Condition="(Ptr & PtrMask) == StoredCXXDestructorName" Name="[C++ Destructor]">(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)</Item>
		<Item Condition="(Ptr & PtrMask) == StoredCXXConversionFunctionName" Name="[C++ Conversion function]">(clang::detail::CXXSpecialNameExtra )(Ptr & ~PtrMask)</Item>
		<Item Condition="(Ptr & PtrMask) == StoredCXXOperatorName" Name="[C++ Operator]">(clang::detail::CXXOperatorIdName )(Ptr & ~PtrMask)</Item>
		<Item Condition="(Ptr & PtrMask) == StoredDeclarationNameExtra" Name="[Extra]">(clang::detail::DeclarationNameExtra )(Ptr & ~PtrMask)</Item>
</Expand>		</Expand>
</Type>		</Type>
<Type Name="clang::DeclarationNameExtra">		<Type Name="clang::detail::DeclarationNameExtra">
<DisplayString IncludeView="cpp"		<DisplayString Condition="ExtraKindOrNumArgs == CXXDeductionGuideName">C++ Deduction guide</DisplayString>
Condition="ExtraKindOrNumArgs >= clang::DeclarationNameExtra::CXXConstructor		<DisplayString Condition="ExtraKindOrNumArgs == CXXLiteralOperatorName">C++ Literal operator</DisplayString>
&& ExtraKindOrNumArgs <= clang::DeclarationNameExtra::CXXConversionFunction"		<DisplayString Condition="ExtraKindOrNumArgs == CXXUsingDirective">C++ Using directive</DisplayString>
>{((clang::CXXSpecialName *)this)->Type,view(cpp)}</DisplayString>		<DisplayString>{(clang::detail::DeclarationNameExtra::ExtraKind)ExtraKindOrNumArgs,en}{" ",sb}{*this,view(cpp)}</DisplayString>
<DisplayString>{(clang::DeclarationNameExtra::ExtraKind)ExtraKindOrNumArgs,en}{" ",sb}{*this,view(cpp)}</DisplayString>
</Type>		</Type>
<Type Name="clang::Token">		<Type Name="clang::Token">
<DisplayString Condition="Kind != clang::tok::identifier">{(clang::tok::TokenKind)Kind,en}</DisplayString>		<DisplayString Condition="Kind != clang::tok::identifier">{(clang::tok::TokenKind)Kind,en}</DisplayString>
<DisplayString Condition="Kind == clang::tok::identifier">{{Identifier ({(clang::IdentifierInfo )(PtrData)})}}</DisplayString>		<DisplayString Condition="Kind == clang::tok::identifier">{{Identifier ({(clang::IdentifierInfo )(PtrData)})}}</DisplayString>
</Type>		</Type>
<Type Name="clang::DeclSpec">		<Type Name="clang::DeclSpec">
<DisplayString>[{(clang::DeclSpec::SCS)StorageClassSpec}], [{(clang::TypeSpecifierType)TypeSpecType}]</DisplayString>		<DisplayString>[{(clang::DeclSpec::SCS)StorageClassSpec}], [{(clang::TypeSpecifierType)TypeSpecType}]</DisplayString>
</Type>		</Type>
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines