refactor: Drop unused op_array param from zend_get_brk_cont_target() (phpGH-19117)

xepozz · web-flow · commit ea9a7b2523c2 · 2025-07-15T16:38:00.000+02:00
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -709,7 +709,7 @@ static void zend_check_finally_breakout(zend_op_array *op_array, uint32_t op_num
 	}
 }
 
-static uint32_t zend_get_brk_cont_target(const zend_op_array *op_array, const zend_op *opline) {
+static uint32_t zend_get_brk_cont_target(const zend_op *opline) {
 	int nest_levels = opline->op2.num;
 	int array_offset = opline->op1.num;
 	zend_brk_cont_element *jmp_to;
@@ -1120,7 +1120,7 @@ ZEND_API void pass_two(zend_op_array *op_array)
 			case ZEND_BRK:
 			case ZEND_CONT:
 				{
-					uint32_t jmp_target = zend_get_brk_cont_target(op_array, opline);
+					uint32_t jmp_target = zend_get_brk_cont_target(opline);
 
 					if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
 						zend_check_finally_breakout(op_array, opline - op_array->opcodes, jmp_target);

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ static void zend_check_finally_breakout(zend_op_array *op_array, uint32_t op_num`
`709`	`709`	`}`
`710`	`710`	`}`
`711`	`711`
`712`		`-static uint32_t zend_get_brk_cont_target(const zend_op_array op_array, const zend_op opline) {`
	`712`	`+static uint32_t zend_get_brk_cont_target(const zend_op *opline) {`
`713`	`713`	`int nest_levels = opline->op2.num;`
`714`	`714`	`int array_offset = opline->op1.num;`
`715`	`715`	`zend_brk_cont_element *jmp_to;`
`@@ -1120,7 +1120,7 @@ ZEND_API void pass_two(zend_op_array *op_array)`
`1120`	`1120`	`case ZEND_BRK:`
`1121`	`1121`	`case ZEND_CONT:`
`1122`	`1122`	`{`
`1123`		`- uint32_t jmp_target = zend_get_brk_cont_target(op_array, opline);`
	`1123`	`+ uint32_t jmp_target = zend_get_brk_cont_target(opline);`
`1124`	`1124`
`1125`	`1125`	`if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {`
`1126`	`1126`	`zend_check_finally_breakout(op_array, opline - op_array->opcodes, jmp_target);`