diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:16 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 14:15:16 +0000 |
| commit | 3b6e807a017588117ede7bb1fa883fe504e89ca6 (patch) | |
| tree | 3c4a14c523f64209692e49719deaa839a265366c /vm_insnhelper.c | |
| parent | 60a8777de7d5cf8f52272748df2e8af6a16383aa (diff) | |
merges r24574 from trunk into ruby_1_9_1.
--
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 2a48dba4ad..316f52aeb1 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -365,7 +365,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass); TH_PUSH_TAG(th); - if (th->event_flags & RUBY_EVENT_C_RETURN) { + if (th->event_flags & (RUBY_EVENT_C_RETURN | RUBY_EVENT_VM)) { state = TH_EXEC_TAG(); } else { |