From 40cf40220cc18073dc47b149af2789847441a44b Mon Sep 17 00:00:00 2001
From: Mike Spertus <mike@spertus.com>
Date: Sun, 30 Jun 2019 21:54:34 +0000
Subject: [PATCH] Clean up MSVC visualization of LLVM pointer types

Create separate natvis ptr and int views for PointerIntPair.
These are convenient in watch Windows and will be used by
Clang visualizers to be checked in shortly

Also, removed deref views as the MSVC na format has
done the same thing natively since MSVC2013.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364723 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/LLVMVisualizers/llvm.natvis | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/utils/LLVMVisualizers/llvm.natvis b/utils/LLVMVisualizers/llvm.natvis
index f4ed0787689..0000519ce05 100644
--- a/utils/LLVMVisualizers/llvm.natvis
+++ b/utils/LLVMVisualizers/llvm.natvis
@@ -76,37 +76,28 @@ For later versions of Visual Studio, no setup is required.
     </Expand>
   </Type>
 
+  <!-- PointerIntPair. In addition to the regular view, it is possible to view just the pointer or just the int
+    The same code is duplicated from the regular viewer to improve the performance of the common case -->
   <Type Name="llvm::PointerIntPair&lt;*&gt;">
+    <DisplayString IncludeView="ptr">{($T1)(Value &amp; $T5::PointerBitMask)}</DisplayString>
+    <DisplayString IncludeView="int">{($T3)((Value &gt;&gt; $T5::IntShift) &amp; $T5::IntMask)}</DisplayString>
     <DisplayString>{$T5::IntMask}: {($T1)(Value &amp; $T5::PointerBitMask)} [{($T3)((Value &gt;&gt; $T5::IntShift) &amp; $T5::IntMask)}]</DisplayString>
     <Expand>
       <Item Name="[ptr]">($T1)(Value &amp; $T5::PointerBitMask)</Item>
       <Item Name="[int]">($T3)((Value &gt;&gt; $T5::IntShift) &amp; $T5::IntMask)</Item>
     </Expand>
   </Type>
-  <!-- PointerUnion types - In addition to the regular view, which displays the pointer, there is a "deref" view that
-       displays the pointed to object, which is often needed by other visualizers -->
+  <!-- PointerUnion types -->
   <Type Name="llvm::pointer_union_detail::PointerUnionMembers&lt;*&gt;">
-    <DisplayString Optional="true" IncludeView="deref" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 0">
-      {*($T4)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
-    </DisplayString>
     <DisplayString Optional="true" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 0">
       {($T4)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
     </DisplayString>
-    <DisplayString Optional="true" IncludeView="deref" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 1">
-      {*($T5)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
-    </DisplayString>
     <DisplayString Optional="true" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 1">
       {($T5)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
     </DisplayString>
-    <DisplayString Optional="true" IncludeView="deref" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 2">
-      {*($T6)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
-    </DisplayString>
     <DisplayString Optional="true" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 2">
       {($T6)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
     </DisplayString>
-    <DisplayString Optional="true" IncludeView="deref" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 3">
-      {*($T7)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
-    </DisplayString>
     <DisplayString Optional="true" Condition="((Val.Value&gt;&gt;$T2::InfoTy::IntShift) &amp; $T2::InfoTy::IntMask) == 3">
       {($T7)(Val.Value &amp; $T2::InfoTy::PointerBitMask)}
     </DisplayString>
-- 
2.50.1