From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 24 Jul 2019 15:52:55 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30886007c1ab099221be10f3cdbeb29fd106d0f7;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Reordering
---

30886007c1ab099221be10f3cdbeb29fd106d0f7
diff --cc Zend/zend_vm_def.h
index 01336ea53a,045aae1892..5839ca0f38
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -5162,10 -5179,9 +5162,8 @@@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, CO
  {
  	USE_OPLINE
  	zval *arg, *param;
 -	zend_free_op free_op1;
  
  	SAVE_OPLINE();
- 	arg = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
- 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  
  	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
  		zend_param_must_be_ref(EX(call)->func, opline->op2.num);
diff --cc Zend/zend_vm_execute.h
index 50829da98d,0162029b5f..20fc5450c4
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -3782,9 -3813,8 +3782,7 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  	USE_OPLINE
  	zval *arg, *param;
  
 -
  	SAVE_OPLINE();
- 	arg = RT_CONSTANT(opline, opline->op1);
- 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  
  	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
  		zend_param_must_be_ref(EX(call)->func, opline->op2.num);
@@@ -17794,18 -17872,18 +17794,17 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  {
  	USE_OPLINE
  	zval *arg, *param;
 -	zend_free_op free_op1;
  
  	SAVE_OPLINE();
- 	arg = _get_zval_ptr_tmp(opline->op1.var EXECUTE_DATA_CC);
- 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  
  	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
  		zend_param_must_be_ref(EX(call)->func, opline->op2.num);
  	}
  
 -	arg = _get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC);
++	arg = _get_zval_ptr_tmp(opline->op1.var EXECUTE_DATA_CC);
+ 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  	ZVAL_COPY(param, arg);
- 
 -	zval_ptr_dtor_nogc(free_op1);
 +	zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
  	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
@@@ -20879,18 -21016,18 +20878,17 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  {
  	USE_OPLINE
  	zval *arg, *param;
 -	zend_free_op free_op1;
  
  	SAVE_OPLINE();
- 	arg = _get_zval_ptr_var_deref(opline->op1.var EXECUTE_DATA_CC);
- 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  
  	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
  		zend_param_must_be_ref(EX(call)->func, opline->op2.num);
  	}
  
 -	arg = _get_zval_ptr_var_deref(opline->op1.var, &free_op1 EXECUTE_DATA_CC);
++	arg = _get_zval_ptr_var_deref(opline->op1.var EXECUTE_DATA_CC);
+ 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  	ZVAL_COPY(param, arg);
- 
 -	zval_ptr_dtor_nogc(free_op1);
 +	zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
  	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
  }
  
@@@ -37774,9 -37296,8 +37772,7 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  	USE_OPLINE
  	zval *arg, *param;
  
 -
  	SAVE_OPLINE();
- 	arg = _get_zval_ptr_cv_deref_BP_VAR_R(opline->op1.var EXECUTE_DATA_CC);
- 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
  
  	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
  		zend_param_must_be_ref(EX(call)->func, opline->op2.num);