bpo-45637: Remove broken fallback in gdb helpers to obtain frame variable (GH-29257)

This commit is contained in:
Pablo Galindo Salgado 2021-11-09 11:19:47 +00:00 committed by GitHub
parent 6a1cc8bf8a
commit f4c03484da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions

View file

@ -823,6 +823,8 @@ def test_bt_full(self):
foo\(1, 2, 3\)
''')
@unittest.skipIf(python_is_optimized(),
"Python was compiled with optimizations")
def test_threads(self):
'Verify that "py-bt" indicates threads that are waiting for the GIL'
cmd = '''

View file

@ -1801,17 +1801,13 @@ def get_pyop(self):
frame = PyFramePtr(frame)
if not frame.is_optimized_out():
return frame
# gdb is unable to get the "frame" argument of PyEval_EvalFrameEx()
# because it was "optimized out". Try to get "frame" from the frame
# of the caller, _PyEval_Vector().
orig_frame = frame
caller = self._gdbframe.older()
if caller:
frame = caller.read_var('frame')
frame = PyFramePtr(frame)
if not frame.is_optimized_out():
return frame
return orig_frame
cframe = self._gdbframe.read_var('cframe')
if cframe is None:
return None
frame = PyFramePtr(cframe["current_frame"].dereference())
if frame and not frame.is_optimized_out():
return frame
return None
except ValueError:
return None