From bd09aa628ade497a2359de09ff6a73bf20dfcdef Mon Sep 17 00:00:00 2001
From: wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Aug 2009 02:44:10 +0000
Subject: * vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.   [Bug
 #1588]

* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
  follow above.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_insnhelper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vm_insnhelper.c')

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index be8b07ed1..5da3f1783 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -370,7 +370,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
 #if defined(__cplusplus) || (__STDC_VERSION__ >= 199901L)
     // TODO: fix me.  separate event
 #endif
-    if (th->event_flags & RUBY_EVENT_C_RETURN) {
+    if (th->event_flags & (RUBY_EVENT_C_RETURN | RUBY_EVENT_VM)) {
 	state = TH_EXEC_TAG();
     }
     else {
-- 
cgit