[llvm] r335303 - [gdb] Update llvm::Optional

[Fangrui Song via llvm-commits]

Author: maskray
Date: Thu Jun 21 15:34:29 2018
New Revision: 335303

URL: http://llvm.org/viewvc/llvm-project?rev=335303&view=rev
Log:
[gdb] Update llvm::Optional

Reviewers: dblaikie

Subscribers: llvm-commits

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

Modified:
    llvm/trunk/utils/gdb-scripts/prettyprinters.py

Modified: llvm/trunk/utils/gdb-scripts/prettyprinters.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gdb-scripts/prettyprinters.py?rev=335303&r1=335302&r2=335303&view=diff
==============================================================================
--- llvm/trunk/utils/gdb-scripts/prettyprinters.py (original)
+++ llvm/trunk/utils/gdb-scripts/prettyprinters.py Thu Jun 21 15:34:29 2018
@@ -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"