diff options
| author | Mike Spertus <mike@spertus.com> | 2019-01-03 23:24:39 +0000 |
|---|---|---|
| committer | Mike Spertus <mike@spertus.com> | 2019-01-03 23:24:39 +0000 |
| commit | c2024f6ec2c636a7da713bf50a19a5990746aa4a (patch) | |
| tree | 1058ce8e7924f0bd9c73e9b5d6f99dfc6a221830 /utils | |
| parent | 5fb6331bb72954ba8799595aba6d5ee35cfe3af9 (diff) | |
Fix MSVC visualizations for ActionResult and OpaquePtr
Mainly just fixing buggy code. Also removed unnecessary visualizers
for specializations of OpaquePtr
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@350371 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ClangVisualizers/clang.natvis | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/utils/ClangVisualizers/clang.natvis b/utils/ClangVisualizers/clang.natvis index 7ddcb5db5f..24c4715cca 100644 --- a/utils/ClangVisualizers/clang.natvis +++ b/utils/ClangVisualizers/clang.natvis @@ -492,18 +492,6 @@ For later versions of Visual Studio, no setup is required--> <ExpandedItem>*(clang::Type *)this, view(cmn)</ExpandedItem>
</Expand>
</Type>
- <Type Name="clang::OpaquePtr<clang::QualType>">
- <DisplayString>{*(clang::QualType *)this}</DisplayString>
- <Expand>
- <Item Name="Ptr">*(clang::QualType *)this</Item>
- </Expand>
- </Type>
- <Type Name="clang::UnionOpaquePtr<clang::QualType>">
- <DisplayString>{*(clang::QualType *)this}</DisplayString>
- <Expand>
- <Item Name="Ptr">*(clang::QualType *)this</Item>
- </Expand>
- </Type>
<Type Name="clang::OpaquePtr<*>">
<DisplayString>{($T1 *)Ptr}</DisplayString>
<Expand>
@@ -568,30 +556,18 @@ For later versions of Visual Studio, no setup is required--> <DisplayString Condition="ResultKind == clang::LookupResult::Ambiguous">{Ambiguity,en}: {Decls}</DisplayString>
<DisplayString>{ResultKind,en}: {Decls}</DisplayString>
</Type>
- <Type Name="clang::ActionResult<*>" IncludeView="packedValidity">
- <DisplayString Condition="PtrWithInvalid&1">Invalid</DisplayString>
- <DisplayString Condition="!(PtrWithInvalid&1)">Valid</DisplayString>
- </Type>
- <Type Name="clang::ActionResult<*>" IncludeView="unpackedValidity">
+ <Type Name="clang::ActionResult<*, 0>">
<DisplayString Condition="Invalid">Invalid</DisplayString>
- <DisplayString Condition="!Invalid">Valid</DisplayString>
+ <DisplayString Condition="!*(void **)&Val">Unset</DisplayString>
+ <DisplayString>{Val}</DisplayString>
</Type>
- <Type Name="clang::ActionResult<*>" IncludeView="packed">
- <DisplayString>{*this,view(packedValidity)}: {($T1 *)(PtrWithInvalid&~1)}</DisplayString>
+ <Type Name="clang::ActionResult<*, 1>">
+ <DisplayString Condition="PtrWithInvalid&1">Invalid</DisplayString>
+ <DisplayString Condition="!PtrWithInvalid">Unset</DisplayString>
+ <DisplayString>{($T1)(PtrWithInvalid&~1)}</DisplayString>
<Expand>
<Item Name="Invalid">(bool)(PtrWithInvalid&1)</Item>
- <Item Name="Val">($T1 *)(PtrWithInvalid&~1)</Item>
- </Expand>
- </Type>
- <Type Name="clang::ActionResult<*>" IncludeView="unpacked">
- <DisplayString>{*this,view(unpackedValidity)}: {Val}</DisplayString>
- </Type>
- <Type Name="clang::ActionResult<*>">
- <DisplayString Condition="$T2">{*this,view(packed)}</DisplayString>
- <DisplayString Condition="!$T2">{*this,view(unpacked)}</DisplayString>
- <Expand>
- <ExpandedItem Condition="$T2">*this,view(packed)</ExpandedItem>
- <ExpandedItem Condition="!$T2">*this,view(unpacked)</ExpandedItem>
+ <Item Name="Val">($T1)(PtrWithInvalid&~1)</Item>
</Expand>
</Type>
</AutoVisualizer>
|