From 698f2db2240c81a21b9cad56d46fbc1ea02c7042 Mon Sep 17 00:00:00 2001
From: ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 18 Sep 2017 08:21:08 +0000
Subject: vm.c: fix `cfp consistency error' which occurs when raising exception
 in bmethod call event

* vm.c (invoke_bmethod): set FINISH flag just before calling vm_exec.
  [ruby-dev:50162] [Bug #13705]

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

(limited to 'test/ruby')

diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 2b32a155d5..c274a25cac 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -1741,4 +1741,25 @@ class TestSetTraceFunc < Test::Unit::TestCase
                  tp_return_value(:f_break_in_rescue),
                  '[Bug #13369]'
   end
+
+  def test_trace_point_raising_exception_in_bmethod_call
+    bug13705 = '[ruby-dev:50162]'
+    assert_normal_exit %q{
+      define_method(:m) {}
+
+      tp = TracePoint.new(:call) do
+        raise ''
+      end
+
+      tap do
+        tap do
+          begin
+            tp.enable
+            m
+          rescue
+          end
+        end
+      end
+    }, bug13705
+  end
 end
-- 
cgit v1.2.3