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

From: Date: Mon, 15 Apr 2024 15:28:10 +0000
Subject: [php-src] master: Merge branch 'PHP-8.2' into PHP-8.3
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128114@lists.php.net to get a copy of this message
Author: Dmitry Stogov (dstogov) Date: 2024-04-15T18:27:48+03:00 Commit: https://github.com/php/php-src/commit/36c87a712e4b8cfcc5b4ae0c9578d3e8f73198da Raw diff: https://github.com/php/php-src/commit/36c87a712e4b8cfcc5b4ae0c9578d3e8f73198da.diff Merge branch 'PHP-8.2' into PHP-8.3 * PHP-8.2: 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 34d31a38c40ce..64530327c2872 100644 --- a/Zend/Optimizer/zend_inference.c +++ b/Zend/Optimizer/zend_inference.c @@ -5055,6 +5055,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 (#128114) next »