or create a symbolic link so it updates automatically.\r
-->\r
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">\r
- <Type Name="llvm::SmallVector<*,*>">\r
- <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) == 0">empty</DisplayString>\r
- <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">{{ size={($T1*)EndX - ($T1*)BeginX} }}</DisplayString>\r
- <Expand>\r
- <Item Name="[size]">($T1*)EndX - ($T1*)BeginX</Item>\r
- <Item Name="[capacity]">($T1*)CapacityX - ($T1*)BeginX</Item>\r
- <ArrayItems>\r
- <Size>($T1*)EndX - ($T1*)BeginX</Size>\r
- <ValuePointer>($T1*)BeginX</ValuePointer>\r
- </ArrayItems>\r
- </Expand>\r
- </Type>\r
\r
<Type Name="llvm::SmallVectorImpl<*>">\r
<DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) == 0">empty</DisplayString>\r
- <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">[{($T1*)EndX - ($T1*)BeginX}]</DisplayString>\r
+ <DisplayString Condition="(($T1*)EndX - ($T1*)BeginX) != 0">{{ size={($T1*)EndX - ($T1*)BeginX} }}</DisplayString>\r
<Expand>\r
<Item Name="[size]">($T1*)EndX - ($T1*)BeginX</Item>\r
<Item Name="[capacity]">($T1*)CapacityX - ($T1*)BeginX</Item>\r
</Type>\r
\r
<Type Name="llvm::StringRef">\r
- <DisplayString>[{Length}] {Data,s}</DisplayString>\r
- <StringView>Data,s</StringView>\r
+ <DisplayString>{Data,[Length]s}</DisplayString>\r
+ <StringView>Data,[Length]s</StringView>\r
<Expand>\r
- <Item Name="[length]">Length</Item>\r
+ <Item Name="[size]">Length</Item>\r
<ArrayItems>\r
<Size>Length</Size>\r
<ValuePointer>Data</ValuePointer>\r
</Type>\r
\r
<Type Name="llvm::PointerIntPair<*,*,*,*>">\r
- <DisplayString>{Value & PointerBitMask} [{(Value >> IntShift) & IntMask}]</DisplayString>\r
+ <DisplayString>{(void*)(Value & PointerBitMask)} [{($T3)((Value >> IntShift) & IntMask)}]</DisplayString>\r
<Expand>\r
- <Item Name="[ptr]">Value & PointerBitMask</Item>\r
- <Item Name="[int]">(Value >> IntShift) & IntMask</Item>\r
+ <Item Name="[ptr]">($T1*)(Value & PointerBitMask)</Item>\r
+ <Item Name="[int]">($T3)((Value >> IntShift) & IntMask)</Item>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::PointerUnion<*,*>">\r
- <DisplayString Condition="((Val.Value >> Val.IntShift) & Val.IntMask) == 0">[P1] {($T1)(Val.Value & Val.PointerBitMask)}</DisplayString>\r
- <DisplayString Condition="((Val.Value >> Val.IntShift) & Val.IntMask) != 0">[P2] {($T2)(Val.Value & Val.PointerBitMask)}</DisplayString>\r
+ <DisplayString Condition="((Val.Value >> Val.IntShift) & Val.IntMask) == 0">{"$T1", s8b} {(void*)(Val.Value & Val.PointerBitMask)}</DisplayString>\r
+ <DisplayString Condition="((Val.Value >> Val.IntShift) & Val.IntMask) != 0">{"$T2", s8b} {(void*)(Val.Value & Val.PointerBitMask)}</DisplayString>\r
<Expand>\r
- <Item Name="[ptr]" Condition="((Val.Value >> Val.IntShift) & Val.IntMask) == 0">($T1)(Val.Value & Val.PointerBitMask)</Item>\r
- <Item Name="[ptr]" Condition="((Val.Value >> Val.IntShift) & Val.IntMask) != 0">($T2)(Val.Value & Val.PointerBitMask)</Item>\r
+ <ExpandedItem Condition="((Val.Value >> Val.IntShift) & Val.IntMask) == 0">($T1)(Val.Value & Val.PointerBitMask)</ExpandedItem>\r
+ <ExpandedItem Condition="((Val.Value >> Val.IntShift) & Val.IntMask) != 0">($T2)(Val.Value & Val.PointerBitMask)</ExpandedItem>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::PointerUnion3<*,*,*>">\r
- <DisplayString Condition="(Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">[P1] {($T1)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
- <DisplayString Condition="(Val.Val.Value & 2) == 2">[P2] {($T2)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
- <DisplayString Condition="(Val.Val.Value & 1) == 1">[P3] {($T3)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">{"$T1", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 2) == 2">{"$T2", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 1) == 1">{"$T3", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
<Expand>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">($T1)((Val.Val.Value >> 2) << 2)</Item>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 2) == 2">($T2)((Val.Val.Value >> 2) << 2)</Item>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 1) == 1">($T3)((Val.Val.Value >> 2) << 2)</Item>\r
+ <ExpandedItem Condition="(Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">($T1)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
+ <ExpandedItem Condition="(Val.Val.Value & 2) == 2">($T2)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
+ <ExpandedItem Condition="(Val.Val.Value & 1) == 1">($T3)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::PointerUnion4<*,*,*,*>">\r
- <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">[P1] {($T1)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
- <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) == 2">[P2] {($T2)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
- <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 1) == 1">[P3] {($T3)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
- <DisplayString Condition="(Val.Val.Value & 3) == 3">[P4] {($T4)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">{"$T1", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) == 2">{"$T2", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 1) == 1">{"$T3", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
+ <DisplayString Condition="(Val.Val.Value & 3) == 3">{"$T4", s8b} {(void*)((Val.Val.Value >> 2) << 2)}</DisplayString>\r
<Expand>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">($T1)((Val.Val.Value >> 2) << 2)</Item>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) == 2">($T2)((Val.Val.Value >> 2) << 2)</Item>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 1) == 1">($T3)((Val.Val.Value >> 2) << 2)</Item>\r
- <Item Name="[ptr]" Condition="(Val.Val.Value & 3) == 3">($T4)((Val.Val.Value >> 2) << 2)</Item>\r
+ <ExpandedItem Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) != 2 && (Val.Val.Value & 1) != 1">($T1)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
+ <ExpandedItem Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 2) == 2">($T2)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
+ <ExpandedItem Condition="(Val.Val.Value & 3) != 3 && (Val.Val.Value & 1) == 1">($T3)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
+ <ExpandedItem Condition="(Val.Val.Value & 3) == 3">($T4)((Val.Val.Value >> 2) << 2)</ExpandedItem>\r
</Expand>\r
</Type>\r
\r
<DisplayString Condition="(Obj != 0) && (Obj->ref_cnt != 1)">RefPtr [{Obj->ref_cnt} refs] {*Obj}</DisplayString>\r
<Expand>\r
<Item Condition="Obj != 0" Name="[refs]">Obj->ref_cnt</Item>\r
- <Item Condition="Obj != 0" Name="[ptr]">Obj</Item>\r
- </Expand>\r
- </Type>\r
-\r
- <Type Name="llvm::OwningPtr<*>">\r
- <DisplayString Condition="Ptr == 0">empty</DisplayString>\r
- <DisplayString Condition="Ptr != 0">OwningPtr {*Ptr}</DisplayString>\r
- <Expand>\r
- <Item Condition="Ptr != 0" Name="[ptr]">Ptr</Item>\r
+ <ExpandedItem Condition="Obj != 0">Obj</ExpandedItem>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::SmallPtrSet<*,*>">\r
- <DisplayString Condition="CurArray == SmallArray">{{ [Small Mode] elements={NumElements}, arraySize={CurArraySize} }}</DisplayString>\r
- <DisplayString Condition="CurArray != SmallArray">{{ [Big Mode] elements={NumElements}, arraySize={CurArraySize} }}</DisplayString>\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
<Expand>\r
- <Item Name="[NumElements]">NumElements</Item>\r
- <Item Name="[CurArraySize]">CurArraySize</Item>\r
- <IndexListItems>\r
- <Size>CurArraySize + 1</Size>\r
- <ValueNode>($T1*)&CurArray[$i]</ValueNode>\r
- </IndexListItems>\r
+ <Item Name="[size]">NumElements</Item>\r
+ <Item Name="[capacity]">CurArraySize</Item>\r
+ <ArrayItems>\r
+ <Size>CurArraySize</Size>\r
+ <ValuePointer>($T1*)CurArray</ValuePointer>\r
+ </ArrayItems>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::DenseMap<*,*,*>">\r
<DisplayString Condition="NumEntries == 0">empty</DisplayString>\r
- <DisplayString Condition="NumEntries != 0">{{ entries={NumEntries}, buckets={NumBuckets} }}</DisplayString>\r
+ <DisplayString Condition="NumEntries != 0">{{ size={NumEntries}, buckets={NumBuckets} }}</DisplayString>\r
<Expand>\r
- <Item Name="[NumEntries]">NumEntries</Item>\r
- <Item Name="[NumBuckets]">NumBuckets</Item>\r
+ <Item Name="[size]">NumEntries</Item>\r
+ <Item Name="[buckets]">NumBuckets</Item>\r
<ArrayItems>\r
<Size>NumBuckets</Size>\r
<ValuePointer>Buckets</ValuePointer>\r
</Type>\r
\r
<Type Name="llvm::StringMap<*,*>">\r
- <DisplayString>{{ NumBuckets={NumBuckets}, ItemSize={ItemSize} }}</DisplayString>\r
+ <DisplayString>{{ size={NumItems}, buckets={NumBuckets} }}</DisplayString>\r
<Expand>\r
- <Item Name="[NumBuckets]">NumBuckets</Item>\r
- <Item Name="[ItemSize]">ItemSize</Item>\r
- <IndexListItems>\r
+ <Item Name="[size]">NumItems</Item>\r
+ <Item Name="[buckets]">NumBuckets</Item>\r
+ <ArrayItems>\r
<Size>NumBuckets</Size>\r
- <ValueNode>(llvm::StringMapEntry<$T1>*)TheTable[$i]</ValueNode>\r
- </IndexListItems>\r
+ <ValuePointer>(MapEntryTy**)TheTable</ValuePointer>\r
+ </ArrayItems>\r
</Expand>\r
</Type>\r
\r
<Type Name="llvm::StringMapEntry<*>">\r
<DisplayString Condition="StrLen == 0">empty</DisplayString>\r
- <DisplayString Condition="StrLen != 0">({((llvm::StringMapEntry<$T1>*)this)+1,s}, {second})</DisplayString>\r
+ <DisplayString Condition="StrLen != 0">({this+1,s}, {second})</DisplayString>\r
<Expand>\r
- <Item Name="[key]">((llvm::StringMapEntry<$T1>*)this)+1,s</Item>\r
+ <Item Name="[key]">this+1,s</Item>\r
<Item Name="[value]" Condition="StrLen != 0">second</Item>\r
</Expand>\r
</Type>\r
<Type Name="llvm::Triple">\r
<DisplayString>{Data}</DisplayString>\r
</Type>\r
+ \r
+ <Type Name="llvm::Optional<*>">\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