]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 9 Jul 2020 09:54:44 +0000 (11:54 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 9 Jul 2020 09:54:44 +0000 (11:54 +0200)
* PHP-7.4:
  Switch back to FREE_UNFETCHED_OP_DATA

1  2 
Zend/zend_vm_def.h

index c89173687036df12070af559c5ebc6e6bcaea373,827548504cc291115577ae62afc9e6aff69f6b4b..67e202b9d7bf75bdd57674285c4039be9c3b77df
@@@ -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));
                        }