kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN

Browse source 
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
This commit is contained in:
mame 2010-01-26 11:28:38 +00:00
parent e92661e647
commit b71cab7fa0
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Jan 26 20:21:28 2010 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/eq.rb: fix circular requrie in drb. * lib/drb/eq.rb: fix circular requrie in drb.

15
vm.c
View file

@ -608,21 +608,6 @@ rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
th->safe_level = stored_safe; 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) { if (state) {
JUMP_TAG(state); JUMP_TAG(state);
} }