From: David Blaikie <dblaikie@gmail.com>
Date: Tue, 28 May 2019 20:22:16 +0000 (+0000)
Subject: Fix GDB pretty printer for Optional after r354246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49044733df83ee041f8f6c4343446ab62c4a2859;p=llvm

Fix GDB pretty printer for Optional after r354246

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

diff --git a/utils/gdb-scripts/prettyprinters.py b/utils/gdb-scripts/prettyprinters.py
index 7ddc33acb20..55f2b369319 100644
--- a/utils/gdb-scripts/prettyprinters.py
+++ b/utils/gdb-scripts/prettyprinters.py
@@ -129,8 +129,7 @@ class OptionalPrinter(Iterator):
     self.val = None
     if not val['Storage']['hasVal']:
       raise StopIteration
-    return ('value', val['Storage']['storage']['buffer'].address.cast(
-        val.type.template_argument(0).pointer()).dereference())
+    return ('value', val['Storage']['value'])
 
   def to_string(self):
     return 'llvm::Optional{}'.format('' if self.val['Storage']['hasVal'] else ' is not initialized')