Remove zend_jit_set_ip_ex

arnaud-lb · arnaud-lb · commit f013aa16e69d · 2025-03-17T10:57:05.000+01:00
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -1030,11 +1030,6 @@ static int zend_jit_set_ip(zend_jit_ctx *jit, const zend_op *target)
 	return 1;
 }
 
-static int zend_jit_set_ip_ex(zend_jit_ctx *jit, const zend_op *target, bool set_ip_reg)
-{
-	return zend_jit_set_ip(jit, target);
-}
-
 static void jit_SET_EX_OPLINE(zend_jit_ctx *jit, const zend_op *target)
 {
 	if (jit->last_valid_opline == target) {
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -7438,7 +7438,7 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n
 				original_handler = 1;
 			}
 		}
-		zend_jit_set_ip_ex(&ctx, opline, original_handler);
+		zend_jit_set_ip(&ctx, opline);
 	}
 
 	zend_jit_trace_return(&ctx, original_handler, opline);

Original file line number	Diff line number	Diff line change
`@@ -1030,11 +1030,6 @@ static int zend_jit_set_ip(zend_jit_ctx jit, const zend_op target)`
`1030`	`1030`	`return 1;`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`		`-static int zend_jit_set_ip_ex(zend_jit_ctx jit, const zend_op target, bool set_ip_reg)`
`1034`		`-{`
`1035`		`- return zend_jit_set_ip(jit, target);`
`1036`		`-}`
`1037`		`-`
`1038`	`1033`	`static void jit_SET_EX_OPLINE(zend_jit_ctx jit, const zend_op target)`
`1039`	`1034`	`{`
`1040`	`1035`	`if (jit->last_valid_opline == target) {`
Original file line number	Diff line number	Diff line change
`@@ -7438,7 +7438,7 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n`
`7438`	`7438`	`original_handler = 1;`
`7439`	`7439`	`}`
`7440`	`7440`	`}`
`7441`		`- zend_jit_set_ip_ex(&ctx, opline, original_handler);`
	`7441`	`+ zend_jit_set_ip(&ctx, opline);`
`7442`	`7442`	`}`
`7443`	`7443`
`7444`	`7444`	`zend_jit_trace_return(&ctx, original_handler, opline);`