Reinit ExceptionHandler for reuse

parrot · Jan 24, 2011 · 0fc33b1 · 0fc33b1
1 parent df6436f
commit 0fc33b1
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/ops/experimental.ops b/src/ops/experimental.ops
@@ -355,6 +355,11 @@ op push_cached_eh(in INT, inconst LABEL) {
         VTABLE_set_pointer(interp, eh, CUR_OPCODE + $2);
         VTABLE_set_pmc_keyed_int(interp, sub->eh_cache, PTR2INTVAL(CUR_OPCODE), eh);
     }
+    else {
+        /* Reinit handler */
+        VTABLE_init(interp, eh);
+        VTABLE_set_pointer(interp, eh, CUR_OPCODE + $2);
+    }
 
     /* Actually push ExceptionHandler */
     Parrot_cx_add_handler_local(interp, eh);
@@ -381,6 +386,11 @@ op push_cached_eh(inconst LABEL) {
         VTABLE_set_pointer(interp, eh, CUR_OPCODE + $1);
         VTABLE_set_pmc_keyed_int(interp, sub->eh_cache, PTR2INTVAL(CUR_OPCODE), eh);
     }
+    else {
+        /* Reinit handler */
+        VTABLE_init(interp, eh);
+        VTABLE_set_pointer(interp, eh, CUR_OPCODE + $1);
+    }
 
     /* Actually push ExceptionHandler */
     Parrot_cx_add_handler_local(interp, eh);