yugui	2009-10-28 23:15:16 +0900 (Wed, 28 Oct 2009)

  New Revision: 25536

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25536

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/test/ruby/test_settracefunc.rb
    branches/ruby_1_9_1/version.h
    branches/ruby_1_9_1/vm_insnhelper.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25535)
+++ ruby_1_9_1/ChangeLog	(revision 25536)
@@ -1,3 +1,11 @@
+Tue Aug 18 11:37:24 2009  wanabe  <s.wanabe@g...>
+
+	* 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@r...>
 
 	* parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string):
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25535)
+++ ruby_1_9_1/version.h	(revision 25536)
@@ -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
Index: ruby_1_9_1/vm_insnhelper.c
===================================================================
--- ruby_1_9_1/vm_insnhelper.c	(revision 25535)
+++ ruby_1_9_1/vm_insnhelper.c	(revision 25536)
@@ -365,7 +365,7 @@
 
     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 {
Index: ruby_1_9_1/test/ruby/test_settracefunc.rb
===================================================================
--- ruby_1_9_1/test/ruby/test_settracefunc.rb	(revision 25535)
+++ ruby_1_9_1/test/ruby/test_settracefunc.rb	(revision 25536)
@@ -167,6 +167,8 @@
                  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],

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/