Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix GH-22280: Ignore non-finally try blocks (#22286)

Author: TimWolla

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.8
 
+- Core:
+  . Fixed bug GH-22280 (Incorrect compile error for goto to label preceding
+    try/finally block). (Pratik Bhujel)
+
 - BCMath:
   . Fixed issues with oversized allocations and signed overflow in bcround()
     and BcMath\Number::round(). (edorian)

Zend/tests/try/gh22280.phpt

@@ -0,0 +1,19 @@
+--TEST--
+GH-22280: goto to label before try/finally after try/catch
+--FILE--
+<?php
+goto d;
+try {
+} catch (Throwable) {
+}
+d: try {
+	echo "try\n";
+} finally {
+	echo "finally\n";
+}
+echo "done\n";
+?>
+--EXPECT--
+try
+finally
+done

Zend/zend_opcode.c

@@ -689,6 +689,10 @@ static void zend_check_finally_breakout(zend_op_array *op_array, uint32_t op_num
 	int i;
 
 	for (i = 0; i < op_array->last_try_catch; i++) {
+		if (!op_array->try_catch_array[i].finally_op) {
+			continue;
+		}
+
 		if ((op_num < op_array->try_catch_array[i].finally_op ||
 					op_num >= op_array->try_catch_array[i].finally_end)
 				&& (dst_num >= op_array->try_catch_array[i].finally_op &&