Skip to content

Commit ba67b4f

Browse files
authored
Revert "bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-6754)" (#7724)
This reverts commit 9b7c74c.
1 parent ce1bda7 commit ba67b4f

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Lib/test/test_gdb.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,7 @@ def get_stack_trace(self, source=None, script=None,
162162
commands += ['set print entry-values no']
163163

164164
if cmds_after_breakpoint:
165-
# bpo-32962: When Python is compiled with -mcet -fcf-protection,
166-
# arguments are unusable before running the first instruction
167-
# of the function entry point. The 'next' command makes the
168-
# required first step.
169-
commands += ['next'] + cmds_after_breakpoint
165+
commands += cmds_after_breakpoint
170166
else:
171167
commands += ['backtrace']
172168

@@ -851,12 +847,9 @@ def __init__(self):
851847
id("first break point")
852848
l = MyList()
853849
''')
854-
# bpo-32962: same case as in get_stack_trace():
855-
# we need an additional 'next' command in order to read
856-
# arguments of the innermost function of the call stack.
857850
# Verify with "py-bt":
858851
gdb_output = self.get_stack_trace(cmd,
859-
cmds_after_breakpoint=['break wrapper_call', 'continue', 'next', 'py-bt'])
852+
cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt'])
860853
self.assertRegex(gdb_output,
861854
r"<method-wrapper u?'__init__' of MyList object at ")
862855

Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)