Fix merge into master

nielsdos · nielsdos · commit 23db89538b18 · 2024-09-09T21:00:05.000+02:00
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -2541,7 +2541,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 				case ZEND_MATCH:
 					/* We have to exit to the VM because the MATCH handler performs an N-way jump for
 					 * which we can't generate simple (opcache.jit=1201) JIT code. */
-					if (!zend_jit_tail_handler(&dasm_state, opline)) {
+					if (!zend_jit_tail_handler(&ctx, opline)) {
 						goto jit_failure;
 					}
 					break;

Original file line number	Diff line number	Diff line change
`@@ -2541,7 +2541,7 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`2541`	`2541`	`case ZEND_MATCH:`
`2542`	`2542`	`/* We have to exit to the VM because the MATCH handler performs an N-way jump for`
`2543`	`2543`	`* which we can't generate simple (opcache.jit=1201) JIT code. */`
`2544`		`- if (!zend_jit_tail_handler(&dasm_state, opline)) {`
	`2544`	`+ if (!zend_jit_tail_handler(&ctx, opline)) {`
`2545`	`2545`	`goto jit_failure;`
`2546`	`2546`	`}`
`2547`	`2547`	`break;`