Merge branch 'PHP-7.4'

nikic · nikic · commit c05bfa362bd0 · 2020-07-09T11:54:44.000+02:00
* PHP-7.4:
  Switch back to FREE_UNFETCHED_OP_DATA
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2601,7 +2601,7 @@ ZEND_VM_C_LABEL(try_assign_dim_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));
 			}

Original file line number	Diff line number	Diff line change
`@@ -2601,7 +2601,7 @@ ZEND_VM_C_LABEL(try_assign_dim_array):`
`2601`	`2601`	`zend_use_scalar_as_array();`
`2602`	`2602`	`dim = GET_OP2_ZVAL_PTR(BP_VAR_R);`
`2603`	`2603`	`ZEND_VM_C_LABEL(assign_dim_error):`
`2604`		`- FREE_OP_DATA();`
	`2604`	`+ FREE_UNFETCHED_OP_DATA();`
`2605`	`2605`	`if (UNEXPECTED(RETURN_VALUE_USED(opline))) {`
`2606`	`2606`	`ZVAL_NULL(EX_VAR(opline->result.var));`
`2607`	`2607`	`}`