diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-28 16:41:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-28 16:41:08 +0200 |
| commit | 817b50826ef49d7a3c55abd57eb7273dc31583c8 (patch) | |
| tree | 788d489e8854a36bd77333ab1ffb3e73f917a469 /ext/opcache/Optimizer | |
| parent | dee977b7a7cc585000218c70dd846126306ea24d (diff) | |
| parent | 59dfaa3f99b9be8b0848fe7bafce3c52a821a1fc (diff) | |
| download | php-git-817b50826ef49d7a3c55abd57eb7273dc31583c8.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/opcache/Optimizer')
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index f5d3b677d9..b352ab0889 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2895,8 +2895,10 @@ static int zend_update_type_info(const zend_op_array *op_array, tmp = t1; if (t1 & MAY_BE_ARRAY) { tmp |= MAY_BE_RC1 | MAY_BE_RCN; - /* SEND_UNPACK may acquire references into the array */ - tmp |= MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + if (t1 & MAY_BE_ARRAY_OF_ANY) { + /* SEND_UNPACK may acquire references into the array */ + tmp |= MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + } } if (t1 & MAY_BE_OBJECT) { tmp |= MAY_BE_RC1 | MAY_BE_RCN; |