Ignore:
Timestamp:
2009-07-05T08:34:06+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r487,r491,r492,r495 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/processor/processor.m4

    r617 r618  
    7979        *dst = *src;
    8080        zval_copy_ctor(dst);
    81         ZVAL_REFCOUNT(dst) = 1;
     81        Z_SET_REFCOUNT(*dst, 1);
    8282        DONE(value)
    8383        DONE(type)
     
    9696dnl {{{ zvalue_value
    9797        DISABLECHECK(`
    98         switch (src->type & ~IS_CONSTANT_INDEX) {
     98        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
    9999            case IS_LONG:
    100100            case IS_RESOURCE:
     
    756756#ifdef HAVE_XCACHE_CONSTANT
    757757    DISPATCH(zend_uint, constinfo_cnt)
    758     STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
     758    IFRESTORE(`
     759        COPY(constinfos)
     760    ', `
     761        STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
     762    ')
    759763#endif
    760764
     
    769773    ')
    770774    STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
     775    popdef(`BEFORE_LOOP')
    771776#ifdef ZEND_ENGINE_2_1
    772777    DISPATCH(zend_uint, autoglobal_cnt)
    773     STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
     778    IFRESTORE(`
     779        COPY(autoglobals)
     780    ', `
     781        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
     782    ')
    774783#endif
    775784    DISPATCH(zend_bool, have_early_binding)
    776     popdef(`BEFORE_LOOP')
    777785')
    778786dnl }}}
Note: See TracChangeset for help on using the changeset viewer.