diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-30 19:50:40 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-30 19:50:40 +0200 |
| commit | 34deda13a8ff13df825d412312232f845d1cf387 (patch) | |
| tree | 46991c8c726019371802702ea519e9872cb3f9d8 | |
| parent | e2285eb5426161b89217a7929321084f4b75091e (diff) | |
| parent | 2eb6a541a9d4141dcad427799cf8acbeba3f2777 (diff) | |
| download | php-git-34deda13a8ff13df825d412312232f845d1cf387.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index facfc6bede..f3251f7e14 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2480,7 +2480,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); } |