@@ -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. + Mon Aug 17 14:35:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string): ChangeLog @@ -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], test/ruby/test_settracefunc.rb @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 295 +#define RUBY_PATCHLEVEL 296 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 version.h @@ -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 { vm_insnhelper.c 60a8777de7d5cf8f52272748df2e8af6a16383aa yugui yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e http://github.com/yugui/ruby/commit/3b6e807a017588117ede7bb1fa883fe504e89ca6 3b6e807a017588117ede7bb1fa883fe504e89ca6 2009-10-28T07:15:16-07:00 2009-10-28T07:15:16-07:00 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 3c4a14c523f64209692e49719deaa839a265366c yugui yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e