[php-src] master: Merge branch 'PHP-8.3'

From: Date: Mon, 15 Apr 2024 15:28:12 +0000
Subject: [php-src] master: Merge branch 'PHP-8.3'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128116@lists.php.net to get a copy of this message
Author: Dmitry Stogov (dstogov) Date: 2024-04-15T18:27:57+03:00 Commit: https://github.com/php/php-src/commit/f9ec3e27d16779565bc83ad3066e981f357b8f2a Raw diff: https://github.com/php/php-src/commit/f9ec3e27d16779565bc83ad3066e981f357b8f2a.diff Merge branch 'PHP-8.3' * PHP-8.3: Fixed missed exception Changed paths: M Zend/Optimizer/zend_inference.c Diff: diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c index 6b929c5d471dd..3a42f544d282f 100644 --- a/Zend/Optimizer/zend_inference.c +++ b/Zend/Optimizer/zend_inference.c @@ -5189,6 +5189,9 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op return 1; } } + if (t1 & (MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_REF)) { + return 1; + } return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_TRUE|MAY_BE_FALSE|MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE)) || opline->op2_type == IS_UNUSED || (t2 & (MAY_BE_UNDEF|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)); case ZEND_ASSIGN_OBJ:

« previous php.cvs (#128116) next »