From: Austin Clements Date: Thu, 23 Mar 2017 15:20:17 +0000 (-0400) Subject: runtime: improve systemstack-on-Go stack message X-Git-Tag: go1.9beta1~963 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4234d1decd853b2373c17340eb4c0033c0fe9566;p=gostls13.git runtime: improve systemstack-on-Go stack message We reused the old C stack check mechanism for the implementation of //go:systemstack, so when we execute a //go:systemstack function on a user stack, the system fails by calling morestackc. However, morestackc's message still talks about "executing C code". Fix morestackc's message to reflect its modern usage. Change-Id: I7e70e7980eab761c0520f675d3ce89486496030f Reviewed-on: https://go-review.googlesource.com/38572 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- diff --git a/src/runtime/stack.go b/src/runtime/stack.go index 92b8a2b921..830316b69a 100644 --- a/src/runtime/stack.go +++ b/src/runtime/stack.go @@ -1188,6 +1188,6 @@ func freeStackSpans() { //go:nosplit func morestackc() { systemstack(func() { - throw("attempt to execute C code on Go stack") + throw("attempt to execute system stack code on user stack") }) }