diff options
author | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 12:06:14 +0000 |
---|---|---|
committer | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-13 12:06:14 +0000 |
commit | c8909ba6016524f1a857e8b1528471a3fd7aab76 (patch) | |
tree | 8b3534a075f189e2325bc580752477e9f0936151 | |
parent | c29206461f2d0c610eafed50e6658202aeb050ec (diff) | |
download | ruby-c8909ba6016524f1a857e8b1528471a3fd7aab76.tar.gz |
* vm.c (vm_exec): returning from lambda runs ensure section.
[Bug #1729]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | vm.c | 21 |
2 files changed, 22 insertions, 4 deletions
@@ -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> * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling to yes @@ -1134,10 +1134,23 @@ vm_exec(rb_thread_t *th) SET_THROWOBJ_STATE(err, state = TAG_BREAK); } else { - result = GET_THROWOBJ_VAL(err); - th->errinfo = Qnil; - th->cfp += 2; - goto finish_vme; + 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); + th->errinfo = Qnil; + th->cfp += 2; + goto finish_vme; + } } /* through */ } |