Changeset 625 for branches/1.3/processor/processor.m4

Timestamp:

07/05/2009 11:01:49 AM (4 years ago)

Author:

moo

Message:

merged r541:559 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• processor/processor.m4 (modified) (4 diffs)

branches/1.3/processor/processor.m4

@@ -506 +506 @@
     dnl main op_array && have early binding
     zend_uint ii;
-    if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && processor->xce_src->data.php->have_early_binding)) {
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+    zend_bool need_early_binding = 0;
+#else
+    zend_bool need_early_binding = processor->xce_src->data.php->have_early_binding;
+#endif
+    if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && need_early_binding)) {
         /* really fast shallow copy */
         memcpy(dst, src, sizeof(src[0]));
@@ -633 +638 @@
     PROC_ZSTRING_L(, doc_comment, doc_comment_len)
 #endif
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+    DISPATCH(zend_uint, early_binding);
+#endif
 
     /* reserved */
@@ -730 +738 @@
     STRUCT(zend_class_entry, cest)
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     DISPATCH(int, oplineno)
+#endif
 ')
 dnl }}}
@@ -783 +793 @@
     ')
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     DISPATCH(zend_bool, have_early_binding)
+#endif
+    DISPATCH(zend_bool, have_references)
 ')
 dnl }}}