From: Michael Pratt <mpratt@google.com>
Date: Wed, 20 Jul 2022 17:18:54 +0000 (-0400)
Subject: runtime: tricky replacements of g in traceback.go
X-Git-Tag: go1.20rc1~1825
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=399f50c9d773e17221e0c80ba1d739c5575c8460;p=gostls13.git

runtime: tricky replacements of g in traceback.go

Change-Id: I80e847451b697de049a01df051a73b5976b39d4a
Reviewed-on: https://go-review.googlesource.com/c/go/+/418589
Reviewed-by: Austin Clements <austin@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go
index 9a5d9363ff..6df0bbfabe 100644
--- a/src/runtime/traceback.go
+++ b/src/runtime/traceback.go
@@ -923,8 +923,8 @@ func gcallers(gp *g, skip int, pcbuf []uintptr) int {
 // showframe reports whether the frame with the given characteristics should
 // be printed during a traceback.
 func showframe(f funcInfo, gp *g, firstFrame bool, funcID, childID funcID) bool {
-	g := getg()
-	if g.m.throwing >= throwTypeRuntime && gp != nil && (gp == g.m.curg || gp == g.m.caughtsig.ptr()) {
+	mp := getg().m
+	if mp.throwing >= throwTypeRuntime && gp != nil && (gp == mp.curg || gp == mp.caughtsig.ptr()) {
 		return true
 	}
 	return showfuncinfo(f, firstFrame, funcID, childID)