Merge branch 'PHP-7.2'

This commit is contained in:
Nikita Popov 2018-06-30 19:50:56 +02:00
commit 5d7be2c2bc

View File

@ -2496,7 +2496,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
if (opline->extended_value == ZEND_ASSIGN_DIM) {
if (opline->op1_type == IS_CV) {
orig = assign_dim_result_type(orig, OP2_INFO(), tmp, opline->op1_type);
orig = assign_dim_result_type(orig, OP2_INFO(), tmp, opline->op2_type);
UPDATE_SSA_TYPE(orig, ssa_ops[i].op1_def);
COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def);
}