diff options
| author | Michael Pratt <mpratt@google.com> | 2022-07-20 11:38:29 -0400 |
|---|---|---|
| committer | Michael Pratt <mpratt@google.com> | 2022-08-02 18:51:32 +0000 |
| commit | 4240ff764b14de9007fe26aaa9147c6c0ade91c9 (patch) | |
| tree | c2a37ebdddd6299ea2f66a305a3c0f1a80721247 | |
| parent | 8666d89ca85fb0be4e41917dee31ad487e0f4ee6 (diff) | |
| download | go-4240ff764b14de9007fe26aaa9147c6c0ade91c9.tar.gz go-4240ff764b14de9007fe26aaa9147c6c0ade91c9.zip | |
runtime: tricky replacements of _g_ in signal_windows.go
winthrow is always called on g0.
Change-Id: Ia23276a5bd545993faf4d75368c171f6ea7a3034
Reviewed-on: https://go-review.googlesource.com/c/go/+/418581
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Austin Clements <austin@google.com>
| -rw-r--r-- | src/runtime/signal_windows.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/runtime/signal_windows.go b/src/runtime/signal_windows.go index f732d1d5c0..b20cac8a8b 100644 --- a/src/runtime/signal_windows.go +++ b/src/runtime/signal_windows.go @@ -199,9 +199,10 @@ func lastcontinuehandler(info *exceptionrecord, r *context, gp *g) int32 { return 0 // not reached } +// Always called on g0. gp is the G where the exception occurred. //go:nosplit func winthrow(info *exceptionrecord, r *context, gp *g) { - _g_ := getg() + g0 := getg() if panicking != 0 { // traceback already printed exit(2) @@ -211,23 +212,23 @@ func winthrow(info *exceptionrecord, r *context, gp *g) { // In case we're handling a g0 stack overflow, blow away the // g0 stack bounds so we have room to print the traceback. If // this somehow overflows the stack, the OS will trap it. - _g_.stack.lo = 0 - _g_.stackguard0 = _g_.stack.lo + _StackGuard - _g_.stackguard1 = _g_.stackguard0 + g0.stack.lo = 0 + g0.stackguard0 = g0.stack.lo + _StackGuard + g0.stackguard1 = g0.stackguard0 print("Exception ", hex(info.exceptioncode), " ", hex(info.exceptioninformation[0]), " ", hex(info.exceptioninformation[1]), " ", hex(r.ip()), "\n") print("PC=", hex(r.ip()), "\n") - if _g_.m.incgo && gp == _g_.m.g0 && _g_.m.curg != nil { + if g0.m.incgo && gp == g0.m.g0 && g0.m.curg != nil { if iscgo { print("signal arrived during external code execution\n") } - gp = _g_.m.curg + gp = g0.m.curg } print("\n") - _g_.m.throwing = throwTypeRuntime - _g_.m.caughtsig.set(gp) + g0.m.throwing = throwTypeRuntime + g0.m.caughtsig.set(gp) level, _, docrash := gotraceback() if level > 0 { |