From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Wed, 10 Nov 2021 13:41:22 +0000 (+0000)
Subject: bpo-45637: Fix cframe-based fallback in the gdb helpers (GH-29515)
X-Git-Tag: v3.11.0a3~271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20205ad2b5be7eb3361224fd2502d1ba09c8ae4a;p=thirdparty%2FPython%2Fcpython.git

bpo-45637: Fix cframe-based fallback in the gdb helpers (GH-29515)
---

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index f4b27f115216..71c99b516b34 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1797,14 +1797,14 @@ class Frame(object):
 
     def get_pyop(self):
         try:
-            frame = self._gdbframe.read_var('frame')
-            frame = PyFramePtr(frame)
-            if not frame.is_optimized_out():
-                return frame
+            # frame = self._gdbframe.read_var('frame')
+            # frame = PyFramePtr(frame)
+            # if not frame.is_optimized_out():
+            #     return frame
             cframe = self._gdbframe.read_var('cframe')
             if cframe is None:
                 return None
-            frame = PyFramePtr(cframe["current_frame"].dereference())
+            frame = PyFramePtr(cframe["current_frame"])
             if frame and not frame.is_optimized_out():
                 return frame
             return None