aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Munday <mike.munday@ibm.com>2019-03-28 08:05:43 -0400
committerKatie Hockman <katie@golang.org>2019-10-09 15:48:47 +0000
commitdf92229d39361fedc53192dbd75da35955024d3a (patch)
treefb65fc6edbfd8ffbce52813c5a37b3d714e76ee5
parent434ddfa5d9772da508f840690c7bb1174560f336 (diff)
downloadgo-df92229d39361fedc53192dbd75da35955024d3a.tar.gz
go-df92229d39361fedc53192dbd75da35955024d3a.zip
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>
-rw-r--r--src/runtime/runtime-gdb.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/runtime-gdb.py b/src/runtime/runtime-gdb.py
index 48960b7f61..72645d289e 100644
--- 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()