mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/trunk@24574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
95e77269a9
commit
38a22404db
3 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
|||
Tue Aug 18 11:37:24 2009 wanabe <s.wanabe@gmail.com>
|
||||
|
||||
* vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.
|
||||
[Bug #1588]
|
||||
|
||||
* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
|
||||
follow above.
|
||||
|
||||
Tue Aug 18 01:57:00 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* range.c (range_step): treat symbols specially so that iterating
|
||||
|
|
|
@ -167,6 +167,8 @@ class TestSetTraceFunc < Test::Unit::TestCase
|
|||
events.shift)
|
||||
assert_equal(["raise", 5, :test_raise, TestSetTraceFunc],
|
||||
events.shift)
|
||||
assert_equal(["c-return", 5, :raise, Kernel],
|
||||
events.shift)
|
||||
assert_equal(["c-call", 6, :===, Module],
|
||||
events.shift)
|
||||
assert_equal(["c-return", 6, :===, Module],
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue