diff options
| author | Zachary Turner <zturner@google.com> | 2018-06-28 17:55:54 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2018-06-28 17:55:54 +0000 |
| commit | 148e86fdd033be2c136743f866e3ce654fb7925a (patch) | |
| tree | a522e3271cc691023f96d37f580a251aa4989f7a /llvm/utils | |
| parent | c8735fbb4c9e0d3b678d2ee804685ebdd9bef211 (diff) | |
| download | bcm5719-llvm-148e86fdd033be2c136743f866e3ce654fb7925a.tar.gz bcm5719-llvm-148e86fdd033be2c136743f866e3ce654fb7925a.zip | |
2 VS natvis improvements.
Optional<T> was broken due to a change in the class's internals.
That is fixed, and additionally a visualizer is added for
Expected<T>.
llvm-svn: 335892
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/LLVMVisualizers/llvm.natvis | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/llvm/utils/LLVMVisualizers/llvm.natvis b/llvm/utils/LLVMVisualizers/llvm.natvis index 439868a5afd..e0812a0286e 100644 --- a/llvm/utils/LLVMVisualizers/llvm.natvis +++ b/llvm/utils/LLVMVisualizers/llvm.natvis @@ -195,10 +195,19 @@ For later versions of Visual Studio, no setup is required. </Type>
<Type Name="llvm::Optional<*>">
- <DisplayString Condition="!hasVal">empty</DisplayString>
- <DisplayString Condition="hasVal">{*(($T1 *)(unsigned char *)storage.buffer)}</DisplayString>
+ <DisplayString Condition="!Storage.hasVal">None</DisplayString>
+ <DisplayString Condition="Storage.hasVal">{*(($T1 *)(unsigned char *)Storage.storage.buffer)}</DisplayString>
<Expand>
- <Item Name="[underlying]" Condition="hasVal">*(($T1 *)(unsigned char *)storage.buffer)</Item>
+ <Item Name="[underlying]" Condition="Storage.hasVal">*(($T1 *)(unsigned char *)Storage.storage.buffer)</Item>
+ </Expand>
+ </Type>
+
+ <Type Name="llvm::Expected<*>">
+ <DisplayString Condition="HasError">Error</DisplayString>
+ <DisplayString Condition="!HasError">{*((storage_type *)TStorage.buffer)}</DisplayString>
+ <Expand>
+ <Item Name="[value]" Condition="!HasError">*((storage_type *)TStorage.buffer)</Item>
+ <Item Name="[error]" Condition="HasError">*((error_type *)ErrorStorage.buffer)</Item>
</Expand>
</Type>
|
