From: Nikita Popov <nikic@php.net>
Date: Sat, 6 Feb 2016 15:43:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~21^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abc06b91cdc7bfee7cdd7822063fbb9d1465e809;p=php

Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_compile.c
---

abc06b91cdc7bfee7cdd7822063fbb9d1465e809
diff --cc Zend/zend_compile.c
index 8ac9819135,58be2ed2e8..f324e52874
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -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");