From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Sun, 21 Nov 2021 02:06:16 +0000 (+0000)
Subject: Reactivate primary mechanism to retrieve frames in the gdb helpers (GH-29682)
X-Git-Tag: v3.11.0a3~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cf65240ae3fbd0e85d8b1e1a9e35f4065843c8c;p=thirdparty%2FPython%2Fcpython.git

Reactivate primary mechanism to retrieve frames in the gdb helpers (GH-29682)
---

diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index 71c99b516b34..a105e58b4af9 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1797,10 +1797,10 @@ 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
@@ -1865,6 +1865,7 @@ class Frame(object):
                         break
                 else:
                     sys.stdout.write('#%i (unable to read python frame information)\n' % self.get_index())
+                    break
                 interp_frame = interp_frame.previous()
         else:
             info = self.is_other_python_frame()
@@ -1887,6 +1888,7 @@ class Frame(object):
                         break
                 else:
                     sys.stdout.write('  (unable to read python frame information)\n')
+                    break
                 interp_frame = interp_frame.previous()
         else:
             info = self.is_other_python_frame()