From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 9 Jul 2020 09:54:44 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c05bfa362bd0935b761c8077a5c303ef79463dea;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Switch back to FREE_UNFETCHED_OP_DATA
---

c05bfa362bd0935b761c8077a5c303ef79463dea
diff --cc Zend/zend_vm_def.h
index c891736870,827548504c..67e202b9d7
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -2598,10 -2700,12 +2598,10 @@@ ZEND_VM_C_LABEL(try_assign_dim_array)
  				ZEND_VM_C_GOTO(try_assign_dim_array);
  			}
  		} else {
 -			if (OP1_TYPE != IS_VAR || EXPECTED(!Z_ISERROR_P(object_ptr))) {
 -				zend_use_scalar_as_array();
 -			}
 +			zend_use_scalar_as_array();
  			dim = GET_OP2_ZVAL_PTR(BP_VAR_R);
  ZEND_VM_C_LABEL(assign_dim_error):
- 			FREE_OP_DATA();
+ 			FREE_UNFETCHED_OP_DATA();
  			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
  				ZVAL_NULL(EX_VAR(opline->result.var));
  			}