From 59bdf7eac8dfaf740e2c87da93efdfc96b1c9469 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Jun 2014 09:17:21 +0000
Subject: * vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or  
 rescue clause. * vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at
 rescue/ensure. * test/ruby/test_settracefunc.rb: should not invoke b_return
 at rescue   clause.   [Bug #9957] * vm_dump.c (control_frame_dump): check
 VM_FRAME_MAGIC_RESCUE. * vm_dump.c (vm_stack_dump_each): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_settracefunc.rb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'test/ruby')

diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 970c1a650e..72e114398b 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -1202,4 +1202,40 @@ class TestSetTraceFunc < Test::Unit::TestCase
       raise if stack != [:p, :hash, :inspect]
     }, '[Bug #9940]'
   end
+
+  def method_test_rescue_should_not_cause_b_return
+    begin
+      raise
+    rescue
+      return
+    end
+  end
+
+  def method_test_ensure_should_not_cause_b_return
+    begin
+      raise
+    ensure
+      return
+    end
+  end
+
+  def test_rescue_and_ensure_should_not_cause_b_return
+    curr_thread = Thread.current
+    trace = TracePoint.new(:b_call, :b_return){
+      next if curr_thread != Thread.current
+      flunk("Should not reach here because there is no block.")
+    }
+
+    begin
+      trace.enable
+      method_test_rescue_should_not_cause_b_return
+      begin
+        method_test_ensure_should_not_cause_b_return
+      rescue
+        # ignore
+      end
+    ensure
+      trace.disable
+    end
+  end
 end
-- 
cgit v1.2.3