diff options
| author | Remi Collet <remi@remirepo.net> | 2024-08-29 09:39:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-08-29 09:39:03 +0200 |
| commit | dea3732525a104fd45f080b88f859b41bfc4bade (patch) | |
| tree | accbdffe3a45c22690451933f20cb21a336ff5fa /vld-pr83.patch | |
| parent | 5c50c50a3a5fcb07d5360947baa45ec1977ffa0b (diff) | |
add upstream patch for PHP 8.4.0beta4
Diffstat (limited to 'vld-pr83.patch')
| -rw-r--r-- | vld-pr83.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/vld-pr83.patch b/vld-pr83.patch deleted file mode 100644 index 376b342..0000000 --- a/vld-pr83.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 |