summaryrefslogtreecommitdiffstats
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authorwanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-08 11:18:54 +0000
committerwanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-08 11:18:54 +0000
commitfc8fe796b994533f47040e76ffdc823f267c9c5b (patch)
tree14e780aadde3e1cc209158320bf80729042ff4ee /vm_insnhelper.c
parent514d65881b942ff7a034a0eea518bd36a62829e7 (diff)
downloadruby-fc8fe796b994533f47040e76ffdc823f267c9c5b.tar.gz
ruby-fc8fe796b994533f47040e76ffdc823f267c9c5b.tar.xz
ruby-fc8fe796b994533f47040e76ffdc823f267c9c5b.zip
* vm_insnhelper.c (vm_throw): regard break as return in lambda.
[ruby-dev:34646] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 8a8f03241..2b32a3c94 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1234,7 +1234,8 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
if (VM_FRAME_TYPE(cfp) == FRAME_MAGIC_LAMBDA) {
/* lambda{... break ...} */
is_orphan = 0;
- pt = dfp;
+ pt = GET_LFP();
+ state = TAG_RETURN;
}
else {
dfp = GC_GUARDED_PTR_REF((VALUE *) *dfp);