Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 36c87a712e4b · 2024-04-15T18:27:48.000+03:00
* PHP-8.2:
  Fixed missed exception
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -5055,6 +5055,9 @@ ZEND_API bool zend_may_throw_ex(const zend_op opline, const zend_ssa_op ssa_op`
`5055`	`5055`	`return 1;`
`5056`	`5056`	`}`
`5057`	`5057`	`}`
	`5058`	`+ if (t1 & (MAY_BE_ARRAY_OF_OBJECT\|MAY_BE_ARRAY_OF_RESOURCE\|MAY_BE_ARRAY_OF_ARRAY\|MAY_BE_ARRAY_OF_REF)) {`
	`5059`	`+ return 1;`
	`5060`	`+ }`
`5058`	`5061`	`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 \|\|`
`5059`	`5062`	`(t2 & (MAY_BE_UNDEF\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE));`
`5060`	`5063`	`case ZEND_ASSIGN_OBJ:`