diff options
-rw-r--r-- | compile.c | 16 | ||||
-rw-r--r-- | test/ruby/test_eval.rb | 10 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 1 | ||||
-rw-r--r-- | vm_insnhelper.c | 16 |
4 files changed, 39 insertions, 4 deletions
@@ -5657,15 +5657,23 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popp if (is) { enum iseq_type type = is->body->type; const rb_iseq_t *parent_iseq = is->body->parent_iseq; - enum iseq_type parent_type = parent_iseq ? parent_iseq->body->type : type; + enum iseq_type parent_type; - if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN || - ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && - (parent_type == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN))) { + if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN) { ADD_ADJUST(ret, line, 0); ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, leave); } + else if ((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) && + parent_iseq && + ((parent_type = parent_iseq->body->type) == ISEQ_TYPE_TOP || + parent_type == ISEQ_TYPE_MAIN)) { + ADD_INSN(ret, line, putnil); + ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN)); + if (popped) { + ADD_INSN(ret, line, pop); + } + } else { LABEL *splabel = 0; diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index fc08d61ef5..a2029bb9b5 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -525,4 +525,14 @@ class TestEval < Test::Unit::TestCase b.eval('yield') }, '[Bug #10368]' end + + def test_return_in_eval_proc + x = proc {eval("return :ng")} + assert_raise(LocalJumpError) {x.call} + end + + def test_return_in_eval_lambda + x = lambda {eval("return :ok")} + assert_equal(:ok, x.call) + end end diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 243d381e7e..57e0b29162 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -976,6 +976,7 @@ eom return 1; raise "#{return}" raise((return; "should not raise")) + begin raise; ensure return; end; self end; all_assertions(feature4840) do |a| code.each_line do |s| diff --git a/vm_insnhelper.c b/vm_insnhelper.c index eea16d730e..b678b02884 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1126,6 +1126,7 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru const VALUE *current_ep = GET_EP(); const VALUE *target_lep = VM_EP_LEP(current_ep); int in_class_frame = 0; + int toplevel = 1; escape_cfp = reg_cfp; while (escape_cfp < eocfp) { @@ -1144,6 +1145,7 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru if (lep == target_lep) { if (VM_FRAME_LAMBDA_P(escape_cfp)) { + toplevel = 0; if (in_class_frame) { /* lambda {class A; ... return ...; end} */ goto valid_return; @@ -1160,6 +1162,20 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru } } } + else if (VM_FRAME_RUBYFRAME_P(escape_cfp)) { + switch (escape_cfp->iseq->body->type) { + case ISEQ_TYPE_TOP: + case ISEQ_TYPE_MAIN: + if (toplevel) goto valid_return; + break; + case ISEQ_TYPE_EVAL: + case ISEQ_TYPE_CLASS: + toplevel = 0; + break; + default: + break; + } + } } if (escape_cfp->ep == target_lep && escape_cfp->iseq->body->type == ISEQ_TYPE_METHOD) { |