[gdb] Update llvm::Optional

Reviewers: dblaikie

Subscribers: llvm-commits

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@335303 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/gdb-scripts/prettyprinters.py b/utils/gdb-scripts/prettyprinters.py
index 1a549f8..2f9b688 100644 (file)
--- a/utils/gdb-scripts/prettyprinters.py
+++ b/utils/gdb-scripts/prettyprinters.py
@@ -124,12 +124,13 @@ class OptionalPrinter:
       return ('value', self.member.dereference())
 
   def children(self):
-    if not self.value['hasVal']:
+    if not self.value['Storage']['hasVal']:
       return self._iterator('', True)
-    return self._iterator(self.value['storage']['buffer'].address.cast(self.value.type.template_argument(0).pointer()), False)
+    return self._iterator(self.value['Storage']['storage']['buffer'].address.cast(
+        self.value.type.template_argument(0).pointer()), False)
 
   def to_string(self):
-    return 'llvm::Optional is %sinitialized' % ('' if self.value['hasVal'] else 'not ')
+    return 'llvm::Optional is %sinitialized' % ('' if self.value['Storage']['hasVal'] else 'not ')
 
 class DenseMapPrinter:
   "Print a DenseMap"