From b71cab7fa071bc2ed369526e7c579f4928c04ed4 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Jan 2010 11:28:38 +0000
Subject: * 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
---
 vm.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'vm.c')

diff --git a/vm.c b/vm.c
index bb19ecb511..f03cf310a8 100644
--- a/vm.c
+++ b/vm.c
@@ -608,21 +608,6 @@ rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
 	th->safe_level = stored_safe;
     }
 
-    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);
     }
-- 
cgit v1.2.3