Revert "bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-6754)" (#7724)

This reverts commit 9b7c74ca32.
This commit is contained in:
Victor Stinner 2018-06-15 23:37:33 +02:00 committed by GitHub
parent ce1bda774e
commit ba67b4f7cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions

View file

@ -162,11 +162,7 @@ def get_stack_trace(self, source=None, script=None,
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 @@ 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', 'next', 'py-bt'])
cmds_after_breakpoint=['break wrapper_call', 'continue', 'py-bt'])
self.assertRegex(gdb_output,
r"<method-wrapper u?'__init__' of MyList object at ")

View file

@ -1 +0,0 @@
Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.