From 0ed248a5c5d27f75413e1f64d672b8f4fa196a4a Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Sat, 4 Nov 2017 15:17:57 -0400
Subject: Natvis file update for improved debugging view of IR constructs

---
 source/slang/slang.natvis | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/source/slang/slang.natvis b/source/slang/slang.natvis
index 31ffa5e80..5bf8a1b09 100644
--- a/source/slang/slang.natvis
+++ b/source/slang/slang.natvis
@@ -35,8 +35,25 @@
   <Type Name="Slang::NameLoc">
     <DisplayString>{{name={(char*)((*name).text.buffer.pointer+1), s} loc={loc.raw}}}</DisplayString>
   </Type>
-  
-  <Type Name="Slang::IRInst">
+  <Type Name="Slang::IRValue">
+    <DisplayString>{{{op}}}</DisplayString>
+    <Expand>
+      <Item Name="[OpCode]">op</Item>
+      <Item Name="[Type]">type</Item>
+      <Item Name="[IRInst]">(Slang::IRInst*)this</Item>
+      <ExpandedItem Condition="op==kIROp_decl_ref">(Slang::IRDeclRef*)this</ExpandedItem>
+      <ExpandedItem Condition="op==kIROp_Func">(Slang::IRFunc*)this</ExpandedItem>
+      <ExpandedItem Condition="op==kIROp_Block">(Slang::IRBlock*)this</ExpandedItem>
+      <Item Name="====Uses====">"-------"</Item>
+      <LinkedListItems>
+        <HeadPointer>firstUse</HeadPointer>
+        <NextPointer>nextUse</NextPointer>
+        <ValueNode>usedValue</ValueNode>
+      </LinkedListItems> 
+    
+  </Expand>
+  </Type>
+  <Type Name="Slang::IRUser">
     <DisplayString>{{{op}}}</DisplayString>
     <Expand>
       <Item Name="[OpCode]">op</Item>
@@ -65,4 +82,19 @@
       <Item Name="[FirstBlock]">firstBlock</Item>
     </Expand>
   </Type>
+  
+  <Type Name="Slang::IRDeclRef">
+    <DisplayString>{{IRDeclRef {declRef}}}</DisplayString>
+    <Expand>
+      <Item Name="[OpCode]">op</Item>
+      <ExpandedItem>declRef</ExpandedItem>
+    </Expand>
+  </Type>
+  <Type Name="Slang::IRUse">
+    <DisplayString>{{IRUse {usedValue}}}</DisplayString>
+    <Expand>
+      <Item Name="[NextUse]">nextUse</Item>
+      <ExpandedItem>usedValue</ExpandedItem>
+    </Expand>
+  </Type>
 </AutoVisualizer>
\ No newline at end of file
-- 
cgit v1.2.3