diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-25 12:23:01 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-25 12:23:01 +0300 |
| commit | 2a33e357cd294b6625aa0d0c379dc5ebac55c0aa (patch) | |
| tree | a31a2036488a0f9d8689c34442d7fa8ae8ea2c0f | |
| parent | 801cdb8945a377b7c556835651407dbd96b448b7 (diff) | |
| parent | 550595c085e9e887b449659725388f98c4cd5d4a (diff) | |
| download | php-git-2a33e357cd294b6625aa0d0c379dc5ebac55c0aa.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Added missed ~
| -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 b897b42a2b..fcce3ba087 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2332,7 +2332,7 @@ static int zend_update_type_info(const zend_op_array *op_array, if (opline->op1_type == IS_CV) { if (!(orig & MAY_BE_REF)) { if (orig & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { - orig &= (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); + orig &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); orig |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN; } if (orig & MAY_BE_OBJECT) { |