summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-26 11:28:38 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-26 11:28:38 +0000
commitb71cab7fa071bc2ed369526e7c579f4928c04ed4 (patch)
treeed0a6e0f017103d30f63657dd12b6387a1ca7ab5 /vm.c
parente92661e647eeeeb0c8f5a8a56c66e21f72950468 (diff)
* vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN
because vm_exec does. This caused rubyspec error. [ruby-dev:40158] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/vm.c b/vm.c
index bb19ecb511..f03cf310a8 100644
--- a/vm.c
+++ b/vm.c
@@ -609,21 +609,6 @@ rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
}
if (state) {
- if (state == TAG_RETURN && proc->is_lambda) {
- VALUE err = th->errinfo;
- VALUE *escape_dfp = GET_THROWOBJ_CATCH_POINT(err);
-
- if (escape_dfp == cfp->dfp) {
- printf("ok\n");
- state = 0;
- th->errinfo = Qnil;
- th->cfp = cfp;
- val = GET_THROWOBJ_VAL(err);
- }
- }
- }
-
- if (state) {
JUMP_TAG(state);
}
return val;