com php-src: Merge branch 'PHP-7.0': Zend/zend_compile.c
| From: | Nikita Popov | Date: | Sat, 06 Feb 2016 15:43:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90960@lists.php.net to get a copy of this message | ||
Commit: abc06b91cdc7bfee7cdd7822063fbb9d1465e809
Author: Nikita Popov <nikic@php.net> Sat, 6 Feb 2016 16:43:54 +0100
Parents: 81721a7ddd60922b2ff882567db9cc3cc4c5d5db 9f82f21d018aafbfea723960a335f435202bff77
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abc06b91cdc7bfee7cdd7822063fbb9d1465e809
Log:
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend_compile.c
Diff:
diff --cc Zend/zend_compile.c
index 8ac9819,58be2ed..f324e528
--- 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");