* 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

2 files changed, 5 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 4418c83cf7..c49d62de2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 26 20:23:22 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN
+	  because vm_exec does.  This caused rubyspec error.  [ruby-dev:40158]
+
 Tue Jan 26 20:21:28 2010  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/eq.rb: fix circular requrie in drb.
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;