From 5c50c50a3a5fcb07d5360947baa45ec1977ffa0b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 29 Aug 2024 09:35:14 +0200
Subject: add minimal patch for 8.4.0beta3 from

  https://github.com/derickr/vld/pull/83
---
 vld-pr83.patch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 vld-pr83.patch

(limited to 'vld-pr83.patch')

diff --git a/vld-pr83.patch b/vld-pr83.patch
new file mode 100644
index 0000000..376b342
--- /dev/null
+++ b/vld-pr83.patch
@@ -0,0 +1,39 @@
+From d1d9b0823ec8048dfabea506f4fcd337c047deac Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 22 Aug 2024 08:34:30 +0200
+Subject: [PATCH] minimal fix for 8.4.0beta3
+
+---
+ srm_oparray.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/srm_oparray.c b/srm_oparray.c
+index 3bd6dce..e5fd05f 100644
+--- a/srm_oparray.c
++++ b/srm_oparray.c
+@@ -1116,7 +1116,9 @@ int vld_find_jumps(zend_op_array *opa, unsigned int position, size_t *jump_count
+ 
+ 	} else if (
+ 		opcode.opcode == ZEND_GENERATOR_RETURN ||
++#if PHP_VERSION_ID < 80400
+ 		opcode.opcode == ZEND_EXIT ||
++#endif
+ 		opcode.opcode == ZEND_THROW ||
+ #if PHP_VERSION_ID >= 80000
+ 		opcode.opcode == ZEND_MATCH_ERROR ||
+@@ -1265,6 +1267,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned int position, vld_set *set,
+ 			break;
+ 		}
+ 
++#if PHP_VERSION_ID < 80400
+ 		/* See if we have an exit instruction */
+ 		if (opa->opcodes[position].opcode == ZEND_EXIT) {
+ 			VLD_PRINT(1, "Exit found\n");
+@@ -1272,6 +1275,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned int position, vld_set *set,
+ 			branch_info->branches[position].start_lineno = opa->opcodes[position].lineno;
+ 			break;
+ 		}
++#endif
+ 		/* See if we have a return instruction */
+ 		if (
+ 			opa->opcodes[position].opcode == ZEND_RETURN
-- 
cgit