Merge branch 'PHP-8.3'

iluuu1994 · iluuu1994 · commit c2456e97f507 · 2024-04-15T17:44:10.000+02:00
* PHP-8.3:
  Fixed missed exception
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -5189,6 +5189,9 @@ ZEND_API bool zend_may_throw_ex(const zend_op opline, const zend_ssa_op ssa_op`
`5189`	`5189`	`return 1;`
`5190`	`5190`	`}`
`5191`	`5191`	`}`
	`5192`	`+ if (t1 & (MAY_BE_ARRAY_OF_OBJECT\|MAY_BE_ARRAY_OF_RESOURCE\|MAY_BE_ARRAY_OF_ARRAY\|MAY_BE_ARRAY_OF_REF)) {`
	`5193`	`+ return 1;`
	`5194`	`+ }`
`5192`	`5195`	`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 \|\|`
`5193`	`5196`	`(t2 & (MAY_BE_UNDEF\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE));`
`5194`	`5197`	`case ZEND_ASSIGN_OBJ:`