]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: don't do a plain throw when throwsplit == true
authorIan Lance Taylor <iant@golang.org>
Mon, 16 May 2016 22:39:43 +0000 (15:39 -0700)
committerIan Lance Taylor <iant@golang.org>
Thu, 19 May 2016 04:37:45 +0000 (04:37 +0000)
The test case in #15639 somehow causes an invalid syscall frame. The
failure is obscured because the throw occurs when throwsplit == true,
which causes a "stack split at bad time" error when trying to print the
throw message.

This CL fixes the "stack split at bad time" by using systemstack. No
test because there shouldn't be any way to trigger this error anyhow.

Update #15639.

Change-Id: I4240f3fd01bdc3c112f3ffd1316b68504222d9e1
Reviewed-on: https://go-review.googlesource.com/23153
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
src/runtime/proc.go

index d7e51d7deb872ad025bb83e0b0c089250b81ddae..15dcb95c9c6960c155e28ae73cd11d56eb9559eb 100644 (file)
@@ -2445,7 +2445,12 @@ func exitsyscall(dummy int32) {
 
        _g_.m.locks++ // see comment in entersyscall
        if getcallersp(unsafe.Pointer(&dummy)) > _g_.syscallsp {
-               throw("exitsyscall: syscall frame is no longer valid")
+               // throw calls print which may try to grow the stack,
+               // but throwsplit == true so the stack can not be grown;
+               // use systemstack to avoid that possible problem.
+               systemstack(func() {
+                       throw("exitsyscall: syscall frame is no longer valid")
+               })
        }
 
        _g_.waitsince = 0