Ignore:
Timestamp:
2009-07-05T11:01:49+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r541:559 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/processor/processor.m4

    r623 r625  
    506506    dnl main op_array && have early binding
    507507    zend_uint ii;
    508     if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && processor->xce_src->data.php->have_early_binding)) {
     508#ifdef ZEND_COMPILE_DELAYED_BINDING
     509    zend_bool need_early_binding = 0;
     510#else
     511    zend_bool need_early_binding = processor->xce_src->data.php->have_early_binding;
     512#endif
     513    if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && need_early_binding)) {
    509514        /* really fast shallow copy */
    510515        memcpy(dst, src, sizeof(src[0]));
     
    633638    PROC_ZSTRING_L(, doc_comment, doc_comment_len)
    634639#endif
     640#ifdef ZEND_COMPILE_DELAYED_BINDING
     641    DISPATCH(zend_uint, early_binding);
     642#endif
    635643
    636644    /* reserved */
     
    730738    STRUCT(zend_class_entry, cest)
    731739#endif
     740#ifndef ZEND_COMPILE_DELAYED_BINDING
    732741    DISPATCH(int, oplineno)
     742#endif
    733743')
    734744dnl }}}
     
    783793    ')
    784794#endif
     795#ifndef ZEND_COMPILE_DELAYED_BINDING
    785796    DISPATCH(zend_bool, have_early_binding)
     797#endif
     798    DISPATCH(zend_bool, have_references)
    786799')
    787800dnl }}}
Note: See TracChangeset for help on using the changeset viewer.