From c3e619c83dcd3223cb6d17d5a1884039b5d0cc4f Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Jun 2008 02:46:02 +0000
Subject: * vm_insnhelper.c (vm_throw): fix "return" process from "lambda". *
 bootstraptest/test_proc.rb: add a test. * bootstraptest/pending.rb: add a
 pending bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                  |  8 ++++++++
 bootstraptest/pending.rb   | 17 +++++++++++++++++
 bootstraptest/test_proc.rb | 14 ++++++++++++++
 vm_insnhelper.c            | 34 ++++++++++++++++++----------------
 4 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eeeb3bb028..bcb10d5d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 19 11:40:55 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_throw): fix "return" process from "lambda".
+
+	* bootstraptest/test_proc.rb: add a test.
+
+	* bootstraptest/pending.rb: add a pending bug.
+
 Thu Jun 19 00:33:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/etc/test_etc.rb: avoid infinite loop.  [ruby-dev:35158]
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
index 30c241619f..b894fb6b04 100644
--- a/bootstraptest/pending.rb
+++ b/bootstraptest/pending.rb
@@ -13,3 +13,20 @@ assert_equal 'A', %q{
   B.new.a = 'B'
   A.new.a
 }, '[ruby-core:17019]'
+
+assert_equal 'ok', %q{
+  def m
+    lambda{
+      proc{
+        return :ng1
+      }
+    }.call.call
+    :ng2
+  end
+
+  begin
+    m()
+  rescue LocalJumpError
+    :ok
+  end
+}
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
index 1ffd5c08ac..f384ba3510 100644
--- a/bootstraptest/test_proc.rb
+++ b/bootstraptest/test_proc.rb
@@ -364,3 +364,17 @@ assert_equal 'ok', %q{
    def12
    $x
 }, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  def m
+    pr = proc{
+      proc{
+        return :ok
+      }
+    }.call
+    pr.call
+    :ng
+  end
+  m()
+}
+
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 864801be97..bdccfd1ca1 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1279,34 +1279,36 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
 	    else if (state == TAG_RETURN) {
 		rb_control_frame_t *cfp = GET_CFP();
 		VALUE *dfp = GET_DFP();
-		int is_orphan = 1;
+		VALUE * const lfp = GET_LFP();
 
-		/**
-		 * check orphan:
-		 */
+		/* check orphan and get dfp */
 		while ((VALUE *) cfp < th->stack + th->stack_size) {
-		    if (dfp == cfp->dfp) {
+		    if (cfp->lfp == lfp) {
 			if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_LAMBDA) {
-			    /* in lambda */
-			    is_orphan = 0;
-			    break;
-			}
+			    VALUE *tdfp = dfp;
 
-			if (GET_LFP() == dfp && cfp->iseq->type == ISEQ_TYPE_METHOD) {
-			    is_orphan = 0;
-			    break;
+			    while (lfp != tdfp) {
+				if (cfp->dfp == tdfp) {
+				    /* in lambda */
+				    dfp = cfp->dfp;
+				    goto valid_return;
+				}
+				tdfp = GC_GUARDED_PTR_REF((VALUE *)*dfp);
+			    }
 			}
+		    }
 
-			dfp = GC_GUARDED_PTR_REF(dfp[0]);
+		    if (cfp->dfp == lfp && cfp->iseq->type == ISEQ_TYPE_METHOD) {
+			dfp = lfp;
+			goto valid_return;
 		    }
 
 		    cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
 		}
 
-		if (is_orphan) {
-		    vm_localjump_error("unexpected return", throwobj, TAG_RETURN);
-		}
+		vm_localjump_error("unexpected return", throwobj, TAG_RETURN);
 
+	      valid_return:
 		pt = dfp;
 	    }
 	    else {
-- 
cgit v1.2.3