From ef697388becedf36966a2edcdcf88baca342b9e2 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Wed, 2 Oct 2019 07:56:28 -0700 Subject: Treat return in block in class/module as LocalJumpError (#2511) return directly in class/module is an error, so return in proc in class/module should also be an error. I believe the previous behavior was an unintentional oversight during the addition of top-level return in 2.4. --- vm_insnhelper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 76bc56d316..ef5a6db1af 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1258,7 +1258,10 @@ vm_throw_start(const rb_execution_context_t *ec, rb_control_frame_t *const reg_c switch (escape_cfp->iseq->body->type) { case ISEQ_TYPE_TOP: case ISEQ_TYPE_MAIN: - if (toplevel) goto valid_return; + if (toplevel) { + if (in_class_frame) goto unexpected_return; + goto valid_return; + } break; case ISEQ_TYPE_EVAL: case ISEQ_TYPE_CLASS: @@ -1276,6 +1279,7 @@ vm_throw_start(const rb_execution_context_t *ec, rb_control_frame_t *const reg_c escape_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(escape_cfp); } + unexpected_return:; rb_vm_localjump_error("unexpected return", throwobj, TAG_RETURN); valid_return:; -- cgit v1.2.3