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

Timestamp:

2009-07-05T08:34:06+02:00 (4 years ago)

Author:

moo

Message:

merged r487,r491,r492,r495 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/processor/processor.m4

@@ -79 +79 @@
         *dst = *src;
         zval_copy_ctor(dst);
-        ZVAL_REFCOUNT(dst) = 1;
+        Z_SET_REFCOUNT(*dst, 1);
         DONE(value)
         DONE(type)
@@ -96 +96 @@
 dnl {{{ zvalue_value
         DISABLECHECK(`
-        switch (src->type & ~IS_CONSTANT_INDEX) {
+        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
             case IS_LONG:
             case IS_RESOURCE:
@@ -756 +756 @@
 #ifdef HAVE_XCACHE_CONSTANT
     DISPATCH(zend_uint, constinfo_cnt)
-    STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    IFRESTORE(`
+        COPY(constinfos)
+    ', `
+        STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    ')
 #endif
 
@@ -769 +773 @@
     ')
     STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
+    popdef(`BEFORE_LOOP')
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(zend_uint, autoglobal_cnt)
-    STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    IFRESTORE(`
+        COPY(autoglobals)
+    ', `
+        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    ')
 #endif
     DISPATCH(zend_bool, have_early_binding)
-    popdef(`BEFORE_LOOP')
 ')
 dnl }}}