vm.c: pass through thrown objects

* vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
  [ruby-dev:46234] [Bug #7185]
* vm_eval.c (rb_eval_cmd): if state is non-zero, val should be nil and
  rb_vm_jump_tag_but_local_jump() just jump tag.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e34487b65..9801c367df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct 19 22:22:01 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
+	  [ruby-dev:46234] [Bug #7185]
+
+	* vm_eval.c (rb_eval_cmd): if state is non-zero, val should be nil and
+	  rb_vm_jump_tag_but_local_jump() just jump tag.
+
 Fri Oct 19 22:11:55 2012  Benoit Daloze  <eregontp@gmail.com>
 
 	* pack.c (pack_unpack): set encoding of the
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index 17492706ed..a39e2c7723 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -104,7 +104,16 @@ class TestException < Test::Unit::TestCase
              end
              false
            })
+  end
 
+  def test_catch_throw_in_require
+    bug7185 = '[ruby-dev:46234]'
+    t = Tempfile.open(["dep", ".rb"])
+    t.puts("throw :extdep, 42")
+    t.close
+    assert_equal(42, catch(:extdep) {require t.path}, bug7185)
+  ensure
+    t.close! if t
   end
 
   def test_else_no_exception
diff --git a/vm.c b/vm.c
index ae201dcd7f..f8d59ba563 100644
--- a/vm.c
+++ b/vm.c
@@ -916,7 +916,7 @@ rb_vm_jump_tag_but_local_jump(int state, VALUE val)
 {
     if (val != Qnil) {
 	VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, val);
-	rb_exc_raise(exc);
+	if (!NIL_P(exc)) rb_exc_raise(exc);
     }
     JUMP_TAG(state);
 }
diff --git a/vm_eval.c b/vm_eval.c
index 2bc19c804a..0cf82b2020 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1335,7 +1335,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
     POP_TAG();
 
     rb_set_safe_level_force(safe);
-    if (state) rb_vm_jump_tag_but_local_jump(state, val);
+    if (state) JUMP_TAG(state);
     return val;
 }