Commit bd9b48384d4 for php
commit bd9b48384d4e2616fe5f39476bf8aacd1d60a06f
Merge: bd2a955b340 47ae17db183
Author: Jorg Sowa <jorg.sowa@gmail.com>
Date: Sat Nov 7 16:35:18 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
# Conflicts:
# Zend/Optimizer/zend_inference.c
diff --cc Zend/Optimizer/zend_inference.c
index 1ac62c85928,93e69e56636..9aa6b2a46a7
--- a/Zend/Optimizer/zend_inference.c
+++ b/Zend/Optimizer/zend_inference.c
@@@ -5268,9 -5268,9 +5271,9 @@@ ZEND_API bool zend_may_throw_ex(const z
case ZEND_ROPE_END:
return t2 & (MAY_BE_ARRAY|MAY_BE_OBJECT);
case ZEND_INIT_ARRAY:
- return (opline->op2_type != IS_UNUSED) && (t2 & (MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
+ return (opline->op2_type != IS_UNUSED) && (t2 & MAY_BE_THROWING_KEY);
case ZEND_ADD_ARRAY_ELEMENT:
- return (opline->op2_type == IS_UNUSED) || (t2 & (MAY_BE_NULL|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE));
- return (opline->op2_type == IS_UNUSED) || (t2 & MAY_BE_THROWING_KEY);
++ return (opline->op2_type == IS_UNUSED) || (t2 & (MAY_BE_NULL|MAY_BE_THROWING_KEY));
case ZEND_STRLEN:
return (t1 & MAY_BE_ANY) != MAY_BE_STRING;
case ZEND_COUNT: