[ruby-dev:38710] 例外発生時のRUBY_EVENT_C_RETURNのフック

ワナベと申します。
メソッド中で例外が発生したときも RUBY_EVENT_C_RETURN が
フックされたほうがありがたいのですがどうでしょうか。
パッチを添付します。

Index: vm_eval.c
===================================================================
--- vm_eval.c	(revision 23834)
+++ vm_eval.c	(working copy)
@@ -59,12 +59,16 @@
 	break;
       }
       case NODE_CFUNC: {
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);
-	{
+	int state;
+
+	TH_PUSH_TAG(th);
+	state = TH_EXEC_TAG();
+	if (state == 0) {
 	    rb_control_frame_t *reg_cfp = th->cfp;
 	    rb_control_frame_t *cfp =
 		vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC,
 			      recv, (VALUE)blockptr, 0, reg_cfp->sp, 0, 1);
+	    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);

 	    cfp->method_id = oid;
 	    cfp->method_class = klass;
@@ -79,7 +83,9 @@
 	    }
 	    vm_pop_frame(th);
 	}
+	TH_POP_TAG();
 	EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass);
+	if (state) TH_JUMP_TAG(th, state);
 	break;
       }
       case NODE_ATTRSET:{
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 23834)
+++ vm_insnhelper.c	(working copy)
@@ -360,13 +360,16 @@
 	      int num, ID id, ID oid, VALUE recv, VALUE klass,
 	      VALUE flag, const NODE *mn, const rb_block_t *blockptr)
 {
-    VALUE val;
+    VALUE val = 0;
+    int state;

-    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);
-    {
+    TH_PUSH_TAG(th);
+    state = TH_EXEC_TAG();
+    if (state == 0) {
 	rb_control_frame_t *cfp =
 	    vm_push_frame(th, 0, VM_FRAME_MAGIC_CFUNC,
 			  recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1);
+	EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass);

 	cfp->method_id = oid;
 	cfp->method_class = klass;
@@ -381,7 +384,9 @@

 	vm_pop_frame(th);
     }
+    TH_POP_TAG();
     EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, recv, id, klass);
+    if (state) TH_JUMP_TAG(th, state);

     return val;
 }

-- 
ワナベ