From 2f9cbaa8b2190b6dfd3157ede9b6973523a3b939 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 15 Jun 2018 22:54:35 +0200 Subject: Revert "bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-6754)" (#7723) This reverts commit 9b7c74ca32d1bec7128d550a9ab1b2ddc7046287. --- Lib/test/test_gdb.py | 11 ++--------- .../next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index d341a17..9e0eaea 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -162,11 +162,7 @@ class DebuggerTests(unittest.TestCase): commands += ['set print entry-values no'] if 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 + commands += cmds_after_breakpoint else: commands += ['backtrace'] @@ -851,12 +847,9 @@ id(42) 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', 'next', 'py-bt']) + cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt']) self.assertRegex(gdb_output, r"