Modernize to range-based loop

[oota-llvm.git] / utils / llvm.natvis

diff --git a/utils/llvm.natvis b/utils/llvm.natvis
index 373bf963e193a76caceb8c4b78978e99c628afc8..6c410a40ecbdc98eb43ad18163da4175ed66fa8f 100644 (file)
--- a/utils/llvm.natvis
+++ b/utils/llvm.natvis
@@ -108,14 +108,6 @@ or create a symbolic link so it updates automatically.
     </Expand>\r
   </Type>\r
 \r
-  <Type Name="llvm::OwningPtr&lt;*&gt;">\r
-    <DisplayString Condition="Ptr == 0">empty</DisplayString>\r
-    <DisplayString Condition="Ptr != 0">OwningPtr {*Ptr}</DisplayString>\r
-    <Expand>\r
-      <ExpandedItem Condition="Ptr != 0">Ptr</ExpandedItem>\r
-    </Expand>\r
-  </Type>\r
-\r
   <Type Name="llvm::SmallPtrSet&lt;*,*&gt;">\r
     <DisplayString Condition="CurArray == SmallArray">{{ [Small Mode] size={NumElements}, capacity={CurArraySize} }}</DisplayString>\r
     <DisplayString Condition="CurArray != SmallArray">{{ [Big Mode] size={NumElements}, capacity={CurArraySize} }}</DisplayString>\r
@@ -143,9 +135,9 @@ or create a symbolic link so it updates automatically.
   </Type>\r
 \r
   <Type Name="llvm::StringMap&lt;*,*&gt;">\r
-    <DisplayString>{{ size={ItemSize}, buckets={NumBuckets} }}</DisplayString>\r
+    <DisplayString>{{ size={NumItems}, buckets={NumBuckets} }}</DisplayString>\r
     <Expand>\r
-      <Item Name="[size]">ItemSize</Item>\r
+      <Item Name="[size]">NumItems</Item>\r
       <Item Name="[buckets]">NumBuckets</Item>\r
       <ArrayItems>\r
         <Size>NumBuckets</Size>\r
@@ -166,4 +158,12 @@ or create a symbolic link so it updates automatically.
   <Type Name="llvm::Triple">\r
     <DisplayString>{Data}</DisplayString>\r
   </Type>\r
+  \r
+  <Type Name="llvm::Optional&lt;*&gt;">\r
+    <DisplayString Condition="!hasVal">empty</DisplayString>\r
+    <DisplayString Condition="hasVal">{*(($T1 *)(unsigned char *)storage.buffer)}</DisplayString>\r
+    <Expand>\r
+      <Item Name="[underlying]" Condition="hasVal">*(($T1 *)(unsigned char *)storage.buffer)</Item>\r
+    </Expand>\r
+  </Type>\r
 </AutoVisualizer>\r