runtime: fix GDB tests on s390x running Ubuntu 18.04

On Ubuntu 18.04 I am seeing GDB fail to restore the stack pointer
during this test because stack unwinding can't find the PC. This CL
is essentially a partial revert of CL 23940 and fixes the issue on
s390x.

Fixes #33757

Change-Id: Ib4c41162dc85dc882eb6e248330f4082c3fa94c3
Reviewed-on: https://go-review.googlesource.com/c/go/+/169857
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
(cherry picked from commit d91f7e6637cc96029cd5a360a0a74153b39a3ae6)
Reviewed-on: https://go-review.googlesource.com/c/go/+/200039
Run-TryBot: Katie Hockman <katie@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Michael Munday <mike.munday@ibm.com>

diff --git a/src/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py
index 48960b7f6133f5d5ed4d12ba0b0b5d3279a35f12..72645d289e646df4f80afdfe73c0b7188e0a8559 100644 (file)
--- a/src/runtime/runtime-gdb.py
+++ b/src/runtime/runtime-gdb.py
@@ -540,8 +540,8 @@ class GoroutineCmd(gdb.Command):
                        # In GDB, assignments to sp must be done from the
                        # top-most frame, so select frame 0 first.
                        gdb.execute('select-frame 0')
-                       gdb.parse_and_eval('$sp = $save_sp')
                        gdb.parse_and_eval('$pc = $save_pc')
+                       gdb.parse_and_eval('$sp = $save_sp')
                        save_frame.select()