1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.

Browse Source 
[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:
wanabe 2009-08-18 02:44:10 +00:00
parent 95e77269a9
commit 38a22404db
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Tue Aug 18 01:57:00 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* range.c (range_step): treat symbols specially so that iterating * range.c (range_step): treat symbols specially so that iterating

2
test/ruby/test_settracefunc.rb
View File

@ -167,6 +167,8 @@ class TestSetTraceFunc < Test::Unit::TestCase
events.shift) events.shift)
assert_equal(["raise", 5, :test_raise, TestSetTraceFunc], assert_equal(["raise", 5, :test_raise, TestSetTraceFunc],
events.shift) events.shift)
assert_equal(["c-return", 5, :raise, Kernel],
events.shift)
assert_equal(["c-call", 6, :===, Module], assert_equal(["c-call", 6, :===, Module],
events.shift) events.shift)
assert_equal(["c-return", 6, :===, Module], assert_equal(["c-return", 6, :===, Module],

2
vm_insnhelper.c
View File

@ -370,7 +370,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
#if defined(__cplusplus) || (__STDC_VERSION__ >= 199901L) #if defined(__cplusplus) || (__STDC_VERSION__ >= 199901L)
// TODO: fix me. separate event // TODO: fix me. separate event
#endif #endif
if (th->event_flags & RUBY_EVENT_C_RETURN) { if (th->event_flags & (RUBY_EVENT_C_RETURN | RUBY_EVENT_VM)) {
state = TH_EXEC_TAG(); state = TH_EXEC_TAG();
} }
else { else {