]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:52:55 +0000 (18:52 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:52:55 +0000 (18:52 +0300)
* PHP-7.4:
  Reordering

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 01336ea53a709b639a5d78988104e95fd9b650f9,045aae189230cfb946556d5f5cca6e95b020d66b..5839ca0f3829e292532f93b62455b4a5035a2c98
@@@ -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);
index 50829da98d5acba533d704be38360fc87532e567,0162029b5fe677c05aae8c9e77d7be3468c518a5..20fc5450c4b08e5861bea23f849b7add7aaa3622
@@@ -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);