diff options
| author | Cherry Mui <cherryyz@google.com> | 2021-06-14 12:39:14 -0400 |
|---|---|---|
| committer | Cherry Mui <cherryyz@google.com> | 2021-06-16 15:27:43 +0000 |
| commit | a4121d7dd66b0bca91cc1619721f69e9027af041 (patch) | |
| tree | ad86230708e2fd1b375bc82a91dc6f62983112bf /src/runtime/runtime2.go | |
| parent | 4d6f9d60cf597a49b918fc1d445251d6b643f860 (diff) | |
| download | go-a4121d7dd66b0bca91cc1619721f69e9027af041.tar.xz | |
[dev.typeparams] Revert "[dev.typeparams] runtime: make deferproc take a func() argument"
Temprary revert CL 325918.
Delve relies on the _defer.fn.fn field to get defer frames.
CL 325918 changes the type of _defer.fn to func(), which no
longer has an fn field.
Change-Id: If6c71b15a27bac579593f5273c9a49715e6e35b2
Reviewed-on: https://go-review.googlesource.com/c/go/+/327775
Trust: Cherry Mui <cherryyz@google.com>
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dan Scales <danscales@google.com>
Diffstat (limited to 'src/runtime/runtime2.go')
| -rw-r--r-- | src/runtime/runtime2.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go index 75c4818599..f13c649a09 100644 --- a/src/runtime/runtime2.go +++ b/src/runtime/runtime2.go @@ -953,10 +953,10 @@ type _defer struct { // defers. We have only one defer record for the entire frame (which may // currently have 0, 1, or more defers active). openDefer bool - sp uintptr // sp at time of defer - pc uintptr // pc at time of defer - fn func() // can be nil for open-coded defers - _panic *_panic // panic that is running defer + sp uintptr // sp at time of defer + pc uintptr // pc at time of defer + fn *funcval // can be nil for open-coded defers + _panic *_panic // panic that is running defer link *_defer // If openDefer is true, the fields below record values about the stack |