runtime: let stack copier update Panic structs for us
It already is updating parts of them; we're just getting lucky
retraversing them and not finding much to do.
Change argp to a pointer so that it will be updated too.
Existing tests break if you apply the change to adjustpanics
without also updating the type of argp.
LGTM=khr
R=khr
CC=golang-codereviews
https://golang.org/cl/139380043
diff --git a/src/runtime/panic.go b/src/runtime/panic.go
index a5a8fbd..52ab654 100644
--- a/src/runtime/panic.go
+++ b/src/runtime/panic.go
@@ -287,9 +287,9 @@
gp._defer = (*_defer)(noescape(unsafe.Pointer(&dabort)))
p._defer = d
- p.argp = getargp(0)
+ p.argp = unsafe.Pointer(getargp(0))
reflectcall(unsafe.Pointer(d.fn), unsafe.Pointer(&d.args), uint32(d.siz), uint32(d.siz))
- p.argp = 0
+ p.argp = nil
// reflectcall did not panic. Remove dabort.
if gp._defer != &dabort {
@@ -362,7 +362,7 @@
// If they match, the caller is the one who can recover.
gp := getg()
p := gp._panic
- if p != nil && !p.recovered && argp == p.argp {
+ if p != nil && !p.recovered && argp == uintptr(p.argp) {
p.recovered = true
return p.arg
}
