Merge branch 'PHP-8.3'

iluuu1994 · iluuu1994 · commit c6debd788fa9 · 2024-07-04T15:07:34.000+02:00
* PHP-8.3:
  Fix syntax error in SWITCH VM
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -8057,7 +8057,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 
 	/* Exception was thrown before executing any op */
 	if (UNEXPECTED(!throw_op)) {
-		ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, 0, 0);
+		ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, op_num, 0);
 	}
 
 	uint32_t throw_op_num = throw_op - EX(func)->op_array.opcodes;

Original file line number	Diff line number	Diff line change
`@@ -8057,7 +8057,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)`
`8057`	`8057`
`8058`	`8058`	`/* Exception was thrown before executing any op */`
`8059`	`8059`	`if (UNEXPECTED(!throw_op)) {`
`8060`		`- ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, 0, 0);`
	`8060`	`+ ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, op_num, 0);`
`8061`	`8061`	`}`
`8062`	`8062`
`8063`	`8063`	`uint32_t throw_op_num = throw_op - EX(func)->op_array.opcodes;`