]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 1 Aug 2019 08:11:02 +0000 (10:11 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 1 Aug 2019 08:11:02 +0000 (10:11 +0200)
1  2 
Zend/zend_compile.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/opcache/Optimizer/zend_inference.c

Simple merge
Simple merge
index a2915ab64b82082e887275d6e999eb97d8e59125,6dfa6f2899a549d058245943e136383c68a15fe1..8cbd2011c26980bda6ec9c3ba83ec042b26379ae
@@@ -1837,11 -1862,7 +1837,7 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
        int arg_num;
  
        SAVE_OPLINE();
-       if (opline->op1_type & (IS_VAR|IS_CV)) {
-               args = get_zval_ptr_ptr_undef(opline->op1_type, opline->op1, BP_VAR_RW);
-       } else {
-               args = get_zval_ptr_undef(opline->op1_type, opline->op1, BP_VAR_R);
-       }
 -      args = get_zval_ptr_undef(opline->op1_type, opline->op1, &free_op1, BP_VAR_R);
++      args = get_zval_ptr_undef(opline->op1_type, opline->op1, BP_VAR_R);
        arg_num = ZEND_CALL_NUM_ARGS(EX(call)) + 1;
  
  send_again: