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 (vm_exec): returning from lambda runs ensure section.

Browse source 
[Bug #1729]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
wanabe 2009-08-13 12:06:14 +00:00
parent c29206461f
commit c8909ba601
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Aug 13 21:01:03 2009 wanabe <s.wanabe@gmail.com>
* vm.c (vm_exec): returning from lambda runs ensure section.
[Bug #1729]
Thu Aug 13 18:40:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 13 18:40:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes

13
vm.c
View file

@ -1134,11 +1134,24 @@ vm_exec(rb_thread_t *th)
SET_THROWOBJ_STATE(err, state = TAG_BREAK); SET_THROWOBJ_STATE(err, state = TAG_BREAK);
} }
else { else {
for (i = 0; i < cfp->iseq->catch_table_size; i++) {
entry = &cfp->iseq->catch_table[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_ENSURE) {
catch_iseqval = entry->iseq;
cont_pc = entry->cont;
cont_sp = entry->sp;
break;
}
}
}
if (!catch_iseqval) {
result = GET_THROWOBJ_VAL(err); result = GET_THROWOBJ_VAL(err);
th->errinfo = Qnil; th->errinfo = Qnil;
th->cfp += 2; th->cfp += 2;
goto finish_vme; goto finish_vme;
} }
}
/* through */ /* through */
} }
else { else {