diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-10-30 18:17:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-10-30 18:17:41 +0800 |
| commit | db4eb541490c1582a250f1e027bf2257f00b222e (patch) | |
| tree | 50db2d77d3d634c8231553da181cd02ec23101c6 | |
| parent | e5179054fb073c541dc05fd95742fcffe40f11d1 (diff) | |
| parent | a3286a8ee47cd0622acad0f11108582d10340d5a (diff) | |
| download | php-git-db4eb541490c1582a250f1e027bf2257f00b222e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use abbrev
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index fa20795690..943620cf11 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -3083,8 +3083,7 @@ static int zend_update_type_info(const zend_op_array *op_array, } j = zend_ssa_next_use(ssa_ops, ssa_ops[i].result_def, j); } - if ((tmp & MAY_BE_ARRAY) - && (tmp & (MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING))) { + if ((tmp & MAY_BE_ARRAY) && (tmp & MAY_BE_ARRAY_KEY_ANY)) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); } else { /* invalid key type */ |