runtime: rename _defer struct _panic field to panicStack
The gc version of the _defer struct has a _panic field that has a
completely different meaning. We are going to want that bring that new
meaning into the gofrontend to improve panic reports with nested
panic calls. Simplify that by first renaming the existing _panic field.
Change-Id: I9ae03cacaa501c72de0d049e9bf36da5b736423c
Reviewed-on: https://go-review.googlesource.com/46454
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/libgo/go/runtime/panic.go b/libgo/go/runtime/panic.go
index aa196ae..bbd34b4 100644
--- a/libgo/go/runtime/panic.go
+++ b/libgo/go/runtime/panic.go
@@ -90,13 +90,13 @@
// pfn is a C function pointer.
// arg is a value to pass to pfn.
func deferproc(frame *bool, pfn uintptr, arg unsafe.Pointer) {
- n := newdefer()
- n.frame = frame
- n._panic = getg()._panic
- n.pfn = pfn
- n.arg = arg
- n.retaddr = 0
- n.makefunccanrecover = false
+ d := newdefer()
+ d.frame = frame
+ d.panicStack = getg()._panic
+ d.pfn = pfn
+ d.arg = arg
+ d.retaddr = 0
+ d.makefunccanrecover = false
}
// Allocate a Defer, usually using per-P pool.
@@ -502,7 +502,7 @@
// the panic stack. We do not want to recover it if that panic
// was on the top of the panic stack when this function was
// deferred.
- if d._panic == gp._panic {
+ if d.panicStack == gp._panic {
return nil
}
@@ -731,7 +731,7 @@
// function like recover.
func deferredrecover() interface{} {
gp := getg()
- if gp._defer == nil || gp._defer._panic != gp._panic {
+ if gp._defer == nil || gp._defer.panicStack != gp._panic {
return nil
}
return gorecover()
diff --git a/libgo/go/runtime/runtime2.go b/libgo/go/runtime/runtime2.go
index 8bfdcbc..f532a3b 100644
--- a/libgo/go/runtime/runtime2.go
+++ b/libgo/go/runtime/runtime2.go
@@ -698,7 +698,7 @@
// deferred. This function can not recover this value from
// the panic stack. This can happen if a deferred function
// has a defer statement itself.
- _panic *_panic
+ panicStack *_panic
// The function to call.
pfn uintptr
