diff options
Diffstat (limited to 'src/runtime/panic.go')
| -rw-r--r-- | src/runtime/panic.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/runtime/panic.go b/src/runtime/panic.go index b5133fa5b4..c265a5af79 100644 --- a/src/runtime/panic.go +++ b/src/runtime/panic.go @@ -228,6 +228,11 @@ func deferproc(siz int32, fn *funcval) { // arguments of fn follow fn throw("defer on system stack") } + if experimentRegabiDefer && siz != 0 { + // TODO: Make deferproc just take a func(). + throw("defer with non-empty frame") + } + // the arguments of fn are in a perilous state. The stack map // for deferproc does not describe them. So we can't let garbage // collection or stack copying trigger until we've copied them out @@ -280,6 +285,9 @@ func deferprocStack(d *_defer) { // go code on the system stack can't defer throw("defer on system stack") } + if experimentRegabiDefer && d.siz != 0 { + throw("defer with non-empty frame") + } // siz and fn are already set. // The other fields are junk on entry to deferprocStack and // are initialized here. @@ -824,6 +832,9 @@ func runOpenDeferFrame(gp *g, d *_defer) bool { argWidth, fd = readvarintUnsafe(fd) closureOffset, fd = readvarintUnsafe(fd) nArgs, fd = readvarintUnsafe(fd) + if experimentRegabiDefer && argWidth != 0 { + throw("defer with non-empty frame") + } if deferBits&(1<<i) == 0 { for j := uint32(0); j < nArgs; j++ { _, fd = readvarintUnsafe(fd) |