From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 15 Jun 2018 21:37:29 +0000 (+0200)
Subject: Revert "bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection... 
X-Git-Tag: v3.6.7rc1~280
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74565aa6d54344d4994c6b81d6fd05a4258283ab;p=thirdparty%2FPython%2Fcpython.git

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

This reverts commit 9b7c74ca32d1bec7128d550a9ab1b2ddc7046287.
---

diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 2b1c6cd0c388..b7554d698c9d 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -168,11 +168,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']
 
@@ -863,12 +859,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"<method-wrapper u?'__init__' of MyList object at ")
 
diff --git a/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst b/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
deleted file mode 100644
index 97328ebafe6e..000000000000
--- a/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.