diff options
| author | Austin Clements <austin@google.com> | 2017-11-24 10:12:44 -0500 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2017-11-24 15:48:04 +0000 |
| commit | be589f8d2b721aa86fd5e406733f61a5ed245d3a (patch) | |
| tree | 22e88901c20fc7f393fe5deda73bee1c4fee2b25 /src/runtime/proc.go | |
| parent | 2e1f07133d2447125cd45887d6d54e6aa53ba5b5 (diff) | |
| download | go-be589f8d2b721aa86fd5e406733f61a5ed245d3a.tar.xz | |
runtime: fix final stack split in exitsyscall
exitsyscall should be recursively nosplit, but we don't have a way to
annotate that right now (see #21314). There's exactly one remaining
place where this is violated right now: exitsyscall -> casgstatus ->
print. The other prints in casgstatus are wrapped in systemstack
calls. This fixes the remaining print.
Updates #21431 (in theory could fix it, but that would just indicate
that we have a different G status-related crash and we've *never* seen
that failure on the dashboard.)
Change-Id: I9a5e8d942adce4a5c78cfc6b306ea5bda90dbd33
Reviewed-on: https://go-review.googlesource.com/79815
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Rick Hudson <rlh@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/runtime/proc.go')
| -rw-r--r-- | src/runtime/proc.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 8cb6e57a97..5912fc61d1 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -782,8 +782,10 @@ func casgstatus(gp *g, oldval, newval uint32) { // _Grunning or _Grunning|_Gscan; either way, // we own gp.gcscanvalid, so it's safe to read. // gp.gcscanvalid must not be true when we are running. - print("runtime: casgstatus ", hex(oldval), "->", hex(newval), " gp.status=", hex(gp.atomicstatus), " gp.gcscanvalid=true\n") - throw("casgstatus") + systemstack(func() { + print("runtime: casgstatus ", hex(oldval), "->", hex(newval), " gp.status=", hex(gp.atomicstatus), " gp.gcscanvalid=true\n") + throw("casgstatus") + }) } // See http://golang.org/cl/21503 for justification of the yield delay. |