Changeset 189 for trunk/processor/processor.m4

Timestamp:

09/20/2006 02:24:42 AM (7 years ago)

Author:

moo

Message:

call op_array_ctor handler on restore to be more compatible with other zend_extension

Files:

• trunk/processor/processor.m4 (modified) (3 diffs)

trunk/processor/processor.m4

@@ -474 +474 @@
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
         define(`SKIPASSERT_ONCE')
-
-    IFRESTORE(`
-#ifdef ZEND_ENGINE_2
-        if (dst->scope) {
-            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
-            xc_fix_method(processor, dst);
-        }
-#endif
-    ')
-
     }
     else
@@ -496 +486 @@
     PROC_ZSTRING(, function_name)
 #ifdef ZEND_ENGINE_2
-    IFRESTORE(`
-        if (dst->scope) {
-            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
-            xc_fix_method(processor, dst);
-        }
-        DONE(scope)
-    ', `
-        PROC_CLASS_ENTRY_P(scope)
-    ')
     DISPATCH(zend_uint, fn_flags)
     dnl mark it as -1 on store, and lookup parent on restore
@@ -637 +618 @@
 #endif
     } while (0);
+
+    IFRESTORE(`
+#ifdef ZEND_ENGINE_2
+        if (dst->scope) {
+            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
+            xc_fix_method(processor, dst);
+        }
+        DONE(scope)
+#endif
+    ', `
+#ifdef ZEND_ENGINE_2
+        PROC_CLASS_ENTRY_P(scope)
+#endif
+    ')
+
+    IFRESTORE(`
+        if (xc_have_op_array_ctor) {
+            zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) xc_zend_extension_op_array_ctor_handler, dst TSRMLS_CC);
+        }
+    ')
 ')
 dnl }}}