]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 6 Feb 2016 15:43:54 +0000 (16:43 +0100)
committerNikita Popov <nikic@php.net>
Sat, 6 Feb 2016 15:43:54 +0000 (16:43 +0100)
Conflicts:
Zend/zend_compile.c

1  2 
Zend/zend_compile.c

index 8ac98191354812a5e321376bc8360bd14dcd946e,58be2ed2e884277ea7d70ec202dadb0fd438ebd6..f324e52874ef04f6a41a9806b411f405c761196b
@@@ -2893,8 -2596,10 +2894,10 @@@ void zend_compile_assign_ref(znode *res
        }
        zend_ensure_writable_variable(target_ast);
  
-       zend_compile_var(&target_node, target_ast, BP_VAR_W);
-       zend_compile_var(&source_node, source_ast, BP_VAR_W);
+       offset = zend_delayed_compile_begin();
+       zend_delayed_compile_var(&target_node, target_ast, BP_VAR_W);
 -      zend_delayed_compile_var(&source_node, source_ast, BP_VAR_REF);
++      zend_delayed_compile_var(&source_node, source_ast, BP_VAR_W);
+       zend_delayed_compile_end(offset);
  
        if (source_node.op_type != IS_VAR && zend_is_call(source_ast)) {
                zend_error_noreturn(E_COMPILE_ERROR, "Cannot use result of built-in function in write context");