Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Update and enhance python-gdb.py 

Issue #29259:

* Detect PyCFunction is the current frame, not only in the older frame
* Ignore PyCFunction_Call() since it now calls _PyCFunction_FastCallDict(), and
  _PyCFunction_FastCallDict() is already detected
This commit is contained in:
Victor Stinner 2017-01-18 17:20:01 +01:00
parent e69f0e6111
commit fa025f112f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_gdb.py
View File

@ -845,7 +845,7 @@ id(42)
breakpoint='time_gmtime',
cmds_after_breakpoint=['py-bt-full'],
)
self.assertIn('#0 <built-in method gmtime', gdb_output)
self.assertIn('#1 <built-in method gmtime', gdb_output)
class PyPrintTests(DebuggerTests):

26
Tools/gdb/libpython.py
View File

@ -1497,15 +1497,17 @@ class Frame(object):
return 'Garbage-collecting'
# Detect invocations of PyCFunction instances:
older = self.older()
if not older:
return False
caller = older._gdbframe.name()
frame = self._gdbframe
caller = frame.name()
if not caller:
return False
if caller == 'PyCFunction_Call':
if caller in ('_PyCFunction_FastCallDict',
'_PyCFunction_FastCallKeywords'):
if caller == '_PyCFunction_FastCallKeywords':
arg_name = 'func_obj'
else:
arg_name = 'func'
# Within that frame:
# "func" is the local containing the PyObject* of the
# PyCFunctionObject instance
@ -1513,18 +1515,10 @@ class Frame(object):
# "self" is the (PyObject*) of the 'self'
try:
# Use the prettyprinter for the func:
func = older._gdbframe.read_var('func')
func = frame.read_var(arg_name)
return str(func)
except RuntimeError:
return 'PyCFunction invocation (unable to read "func")'
elif caller in ('_PyCFunction_FastCallDict',
'_PyCFunction_FastCallKeywords'):
try:
func = older._gdbframe.read_var('func_obj')
return str(func)
except RuntimeError:
return 'PyCFunction invocation (unable to read "func_obj")'
return 'PyCFunction invocation (unable to read %s)' % arg_name
# This frame isn't worth reporting:
return False