Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* vm_insnhelper.c (vm_throw): check a class frame.

  Fixes Bug #4648.
  The patch is contributed by Kazuki Tsujimoto.
* bootstraptest/test_proc.rb: add tests for above.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 9cf9d5eaf7923498a3ece7f6757c9010aaa55e71 1 parent b9a13f4
@ko1 ko1 authored
Showing with 43 additions and 0 deletions.
  1. +8 −0 ChangeLog
  2. +27 −0 bootstraptest/test_proc.rb
  3. +8 −0 vm_insnhelper.c
View
8 ChangeLog
@@ -1,3 +1,11 @@
+Sun Jul 10 16:57:08 2011 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_throw): check a class frame.
+ Fixes Bug #4648.
+ The patch is contributed by Kazuki Tsujimoto.
+
+ * bootstraptest/test_proc.rb: add tests for above.
+
Sun Jul 10 17:28:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instad of
View
27 bootstraptest/test_proc.rb
@@ -429,3 +429,30 @@ def o.write(s); end
raise "ok"
}
+assert_equal 'ok', %q{
+ lambda do
+ class A
+ class B
+ proc{return :ng}.call
+ end
+ end
+ end.call
+ :ok
+}
+
+assert_equal 'ok', %q{
+ $proc = proc{return}
+ begin
+ lambda do
+ class A
+ class B
+ $proc.call
+ end
+ end
+ end.call
+ :ng
+ rescue LocalJumpError
+ :ok
+ end
+}
+
View
8 vm_insnhelper.c
@@ -1541,6 +1541,7 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
rb_control_frame_t *cfp = GET_CFP();
VALUE *dfp = GET_DFP();
VALUE *lfp = GET_LFP();
+ int in_class_frame = 0;
/* check orphan and get dfp */
while ((VALUE *) cfp < th->stack + th->stack_size) {
@@ -1548,6 +1549,7 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
lfp = cfp->lfp;
}
if (cfp->dfp == lfp && cfp->iseq->type == ISEQ_TYPE_CLASS) {
+ in_class_frame = 1;
lfp = 0;
}
@@ -1555,6 +1557,12 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_LAMBDA) {
VALUE *tdfp = dfp;
+ if (in_class_frame) {
+ /* lambda {class A; ... return ...; end} */
+ dfp = cfp->dfp;
+ goto valid_return;
+ }
+
while (lfp != tdfp) {
if (cfp->dfp == tdfp) {
/* in lambda */
Please sign in to comment.
Something went wrong with that request. Please try again.