[Visualizers] Fix Optional visualizer.
authorMarek Kurdej <marek.kurdej+llvm.org@gmail.com>
Tue, 25 Jan 2022 13:12:30 +0000 (14:12 +0100)
committerMarek Kurdej <marek.kurdej+llvm.org@gmail.com>
Tue, 25 Jan 2022 13:16:03 +0000 (14:16 +0100)
As discussed in https://reviews.llvm.org/D118105#3268773, OptionalStorage has been changed in commit https://github.com/llvm/llvm-project/commit/fb9730575086b3c2ba38a1aabf3106b01339888b, but the visualizer still tries to use old members.

Reviewed By: RKSimon

Differential Revision: https://reviews.llvm.org/D118117

llvm/utils/LLVMVisualizers/llvm.natvis

index 6e75ebd..108f191 100644 (file)
@@ -197,9 +197,9 @@ For later versions of Visual Studio, no setup is required.
   \r
   <Type Name="llvm::Optional&lt;*&gt;">\r
     <DisplayString Condition="!Storage.hasVal">None</DisplayString>\r
-    <DisplayString Condition="Storage.hasVal">{*(($T1 *)(unsigned char *)Storage.storage.buffer)}</DisplayString>\r
+    <DisplayString Condition="Storage.hasVal">{Storage.value}</DisplayString>\r
     <Expand>\r
-      <Item Name="[underlying]" Condition="Storage.hasVal">*(($T1 *)(unsigned char *)Storage.storage.buffer)</Item>\r
+      <Item Name="[underlying]" Condition="Storage.hasVal">Storage.value</Item>\r
     </Expand>\r
   </Type>\r
 \r