diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 9e0eaea8c8f6921..d341a17f1fec80f 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -162,7 +162,11 @@ def get_stack_trace(self, source=None, script=None, commands += ['set print entry-values no'] if cmds_after_breakpoint: - commands += cmds_after_breakpoint + # bpo-32962: When Python is compiled with -mcet -fcf-protection, + # arguments are unusable before running the first instruction + # of the function entry point. The 'next' command makes the + # required first step. + commands += ['next'] + cmds_after_breakpoint else: commands += ['backtrace'] @@ -847,9 +851,12 @@ def __init__(self): id("first break point") l = MyList() ''') + # bpo-32962: same case as in get_stack_trace(): + # we need an additional 'next' command in order to read + # arguments of the innermost function of the call stack. # Verify with "py-bt": gdb_output = self.get_stack_trace(cmd, - cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt']) + cmds_after_breakpoint=['break wrapper_call', 'continue', 'next', 'py-bt']) self.assertRegex(gdb_output, r"' def safe_tp_name(self): try: return self.field('self')['ob_type']['tp_name'].string() - except (NullPyObjectPtr, RuntimeError): + except (NullPyObjectPtr, RuntimeError, UnicodeDecodeError): return '' def safe_self_addresss(self): @@ -1552,15 +1558,22 @@ def is_other_python_frame(self): # Use the prettyprinter for the func: func = frame.read_var(arg_name) return str(func) + except ValueError: + return ('PyCFunction invocation (unable to read %s: ' + 'missing debuginfos?)' % arg_name) except RuntimeError: return 'PyCFunction invocation (unable to read %s)' % arg_name if caller == 'wrapper_call': + arg_name = 'wp' try: - func = frame.read_var('wp') + func = frame.read_var(arg_name) return str(func) + except ValueError: + return ('' % arg_name) except RuntimeError: - return '' + return '' % arg_name # This frame isn't worth reporting: return False