From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 1 Aug 2019 08:11:02 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e63093e547bdd11ebf585cd9bdd81bf8488a9b0f;p=php

Merge branch 'PHP-7.4'
---

e63093e547bdd11ebf585cd9bdd81bf8488a9b0f
diff --cc Zend/zend_vm_execute.h
index a2915ab64b,6dfa6f2899..8cbd2011c2
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -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: