Zend: Convert _zend_op_array.last_try_catch field to uint32_t

Girgias · Girgias · commit 93cf649d425d · 2025-08-14T21:58:18.000+01:00
diff --git a/Zend/Optimizer/block_pass.c b/Zend/Optimizer/block_pass.c
@@ -1117,7 +1117,7 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
 
 	/* adjust exception jump targets & remove unused try_catch_array entries */
 	if (op_array->last_try_catch) {
-		int i, j;
+		uint32_t i, j;
 		uint32_t *map;
 		ALLOCA_FLAG(use_heap);
 
@@ -1157,7 +1157,7 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
 				while (opline < end) {
 					if (opline->opcode == ZEND_FAST_RET &&
 					    opline->op2.num != (uint32_t)-1 &&
-					    opline->op2.num < (uint32_t)j) {
+					    opline->op2.num < j) {
 						opline->op2.num = map[opline->op2.num];
 					}
 					opline++;
diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c
@@ -226,7 +226,7 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa, zend_op
 		}
 
 		/* update try/catch array */
-		for (j = 0; j < op_array->last_try_catch; j++) {
+		for (uint32_t j = 0; j < op_array->last_try_catch; j++) {
 			op_array->try_catch_array[j].try_op -= shiftlist[op_array->try_catch_array[j].try_op];
 			op_array->try_catch_array[j].catch_op -= shiftlist[op_array->try_catch_array[j].catch_op];
 			if (op_array->try_catch_array[j].finally_op) {
diff --git a/Zend/Optimizer/nop_removal.c b/Zend/Optimizer/nop_removal.c
@@ -34,7 +34,6 @@ void zend_optimizer_nop_removal(zend_op_array *op_array, zend_optimizer_ctx *ctx
 {
 	zend_op *end, *opline;
 	uint32_t new_count, i, shift;
-	int j;
 	uint32_t *shiftlist;
 	ALLOCA_FLAG(use_heap);
 
@@ -81,7 +80,7 @@ void zend_optimizer_nop_removal(zend_op_array *op_array, zend_optimizer_ctx *ctx
 		}
 
 		/* update try/catch array */
-		for (j = 0; j < op_array->last_try_catch; j++) {
+		for (uint32_t j = 0; j < op_array->last_try_catch; j++) {
 			op_array->try_catch_array[j].try_op -= shiftlist[op_array->try_catch_array[j].try_op];
 			op_array->try_catch_array[j].catch_op -= shiftlist[op_array->try_catch_array[j].catch_op];
 			if (op_array->try_catch_array[j].finally_op) {
diff --git a/Zend/Optimizer/zend_cfg.c b/Zend/Optimizer/zend_cfg.c
@@ -274,7 +274,6 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
 {
 	uint32_t flags = 0;
 	uint32_t i;
-	int j;
 	uint32_t *block_map;
 	zend_function *fn;
 	int blocks_count = 0;
@@ -449,7 +448,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
 	}
 
 	if (op_array->last_try_catch) {
-		for (j = 0; j < op_array->last_try_catch; j++) {
+		for (uint32_t j = 0; j < op_array->last_try_catch; j++) {
 			BB_START(op_array->try_catch_array[j].try_op);
 			if (op_array->try_catch_array[j].catch_op) {
 				BB_START(op_array->try_catch_array[j].catch_op);
@@ -494,7 +493,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
 	blocks_count++;
 
 	/* Build CFG, Step 3: Calculate successors */
-	for (j = 0; j < blocks_count; j++) {
+	for (int j = 0; j < blocks_count; j++) {
 		zend_basic_block *block = &blocks[j];
 		zend_op *opline;
 		if (block->len == 0) {
diff --git a/Zend/Optimizer/zend_dump.c b/Zend/Optimizer/zend_dump.c
@@ -1083,7 +1083,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
 		}
 		if (op_array->last_try_catch) {
 			fprintf(stderr, "EXCEPTION TABLE:\n");
-			for (int i = 0; i < op_array->last_try_catch; i++) {
+			for (uint32_t i = 0; i < op_array->last_try_catch; i++) {
 				fprintf(stderr, "        BB%u",
 					cfg->map[op_array->try_catch_array[i].try_op]);
 				if (op_array->try_catch_array[i].catch_op) {
@@ -1143,7 +1143,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
 		}
 		if (op_array->last_try_catch) {
 			fprintf(stderr, "EXCEPTION TABLE:\n");
-			for (int i = 0; i < op_array->last_try_catch; i++) {
+			for (uint32_t i = 0; i < op_array->last_try_catch; i++) {
 				fprintf(stderr,
 					"     %04u",
 					op_array->try_catch_array[i].try_op);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5863,7 +5863,7 @@ static void zend_compile_break_continue(zend_ast *ast) /* {{{ */
 void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline) /* {{{ */
 {
 	zend_label *dest;
-	int current, remove_oplines = opline->op1.num;
+	int remove_oplines = opline->op1.num;
 	zval *label;
 	uint32_t opnum = opline - op_array->opcodes;
 
@@ -5880,7 +5880,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline) /* {{{ */
 	zval_ptr_dtor_str(label);
 	ZVAL_NULL(label);
 
-	current = opline->extended_value;
+	uint32_t current = opline->extended_value;
 	for (; current != dest->brk_cont; current = CG(context).brk_cont_array[current].parent) {
 		if (current == -1) {
 			CG(in_compilation) = 1;
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -541,7 +541,7 @@ struct _zend_op_array {
 	uint32_t *refcount;
 
 	uint32_t last_live_range;
-	int last_try_catch;
+	uint32_t last_try_catch;
 	zend_live_range *live_range;
 	zend_try_catch_element *try_catch_array;
 
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -244,7 +244,6 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 	zend_generator *current_generator = zend_generator_get_current(generator);
 	zend_execute_data *ex = generator->execute_data;
 	uint32_t op_num, try_catch_offset;
-	int i;
 
 	/* If current_generator is running in a fiber, there are 2 cases to consider:
 	 *  - If generator is also marked with ZEND_GENERATOR_IN_FIBER, then the
@@ -289,7 +288,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 	try_catch_offset = -1;
 
 	/* Find the innermost try/catch that we are inside of. */
-	for (i = 0; i < ex->func->op_array.last_try_catch; i++) {
+	for (uint32_t i = 0; i < ex->func->op_array.last_try_catch; i++) {
 		zend_try_catch_element *try_catch = &ex->func->op_array.try_catch_array[i];
 		if (op_num < try_catch->try_op) {
 			break;
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -686,9 +686,7 @@ static void zend_extension_op_array_handler(zend_extension *extension, zend_op_a
 
 static void zend_check_finally_breakout(zend_op_array *op_array, uint32_t op_num, uint32_t dst_num)
 {
-	int i;
-
-	for (i = 0; i < op_array->last_try_catch; i++) {
+	for (uint32_t i = 0; i < op_array->last_try_catch; i++) {
 		if ((op_num < op_array->try_catch_array[i].finally_op ||
 					op_num >= op_array->try_catch_array[i].finally_end)
 				&& (dst_num >= op_array->try_catch_array[i].finally_op &&
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -23,6 +23,8 @@
  * php zend_vm_gen.php
  */
 
+#include <stdint.h>
+
 ZEND_VM_HELPER(zend_add_helper, ANY, ANY, zval *op_1, zval *op_2)
 {
 	USE_OPLINE
@@ -8151,7 +8153,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 	}
 
 	uint32_t throw_op_num = throw_op - EX(func)->op_array.opcodes;
-	int i, current_try_catch_offset = -1;
+	uint32_t current_try_catch_offset = -1;
 
 	if ((throw_op->opcode == ZEND_FREE || throw_op->opcode == ZEND_FE_FREE)
 		&& throw_op->extended_value & ZEND_FREE_ON_RETURN) {
@@ -8162,7 +8164,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		const zend_live_range *range = find_live_range(
 			&EX(func)->op_array, throw_op_num, throw_op->op1.var);
 		/* free op1 of the corresponding RETURN */
-		for (i = throw_op_num; i < range->end; i++) {
+		for (uint32_t i = throw_op_num; i < range->end; i++) {
 			if (EX(func)->op_array.opcodes[i].opcode == ZEND_FREE
 			 || EX(func)->op_array.opcodes[i].opcode == ZEND_FE_FREE) {
 				/* pass */
@@ -8178,7 +8180,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 	}
 
 	/* Find the innermost try/catch/finally the exception was thrown in */
-	for (i = 0; i < EX(func)->op_array.last_try_catch; i++) {
+	for (uint32_t i = 0; i < EX(func)->op_array.last_try_catch; i++) {
 		zend_try_catch_element *try_catch = &EX(func)->op_array.try_catch_array[i];
 		if (try_catch->try_op > throw_op_num) {
 			/* further blocks will not be relevant... */
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
@@ -612,7 +612,7 @@ int phpdbg_is_auto_global(char *name, int len) {
 PHPDBG_API bool phpdbg_check_caught_ex(zend_execute_data *execute_data, zend_object *exception) {
 	const zend_op *op;
 	zend_op *cur;
-	uint32_t op_num, i;
+	uint32_t op_num;
 	zend_op_array *op_array = &execute_data->func->op_array;
 
 	if (execute_data->opline >= EG(exception_op) && execute_data->opline < EG(exception_op) + 3 && EG(opline_before_exception)) {
@@ -623,7 +623,7 @@ PHPDBG_API bool phpdbg_check_caught_ex(zend_execute_data *execute_data, zend_obj
 
 	op_num = op - op_array->opcodes;
 
-	for (i = 0; i < op_array->last_try_catch && op_array->try_catch_array[i].try_op <= op_num; i++) {
+	for (uint32_t i = 0; i < op_array->last_try_catch && op_array->try_catch_array[i].try_op <= op_num; i++) {
 		uint32_t catch = op_array->try_catch_array[i].catch_op, finally = op_array->try_catch_array[i].finally_op;
 		if (op_num <= catch || op_num <= finally) {
 			if (finally) {

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ static void zend_ssa_remove_nops(zend_op_array op_array, zend_ssa ssa, zend_op`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`/* update try/catch array */`
`229`		`- for (j = 0; j < op_array->last_try_catch; j++) {`
	`229`	`+ for (uint32_t j = 0; j < op_array->last_try_catch; j++) {`
`230`	`230`	`op_array->try_catch_array[j].try_op -= shiftlist[op_array->try_catch_array[j].try_op];`
`231`	`231`	`op_array->try_catch_array[j].catch_op -= shiftlist[op_array->try_catch_array[j].catch_op];`
`232`	`232`	`if (op_array->try_catch_array[j].finally_op) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ void zend_optimizer_nop_removal(zend_op_array op_array, zend_optimizer_ctx ctx`
`34`	`34`	`{`
`35`	`35`	`zend_op end, opline;`
`36`	`36`	`uint32_t new_count, i, shift;`
`37`		`- int j;`
`38`	`37`	`uint32_t *shiftlist;`
`39`	`38`	`ALLOCA_FLAG(use_heap);`
`40`	`39`
`@@ -81,7 +80,7 @@ void zend_optimizer_nop_removal(zend_op_array op_array, zend_optimizer_ctx ctx`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`/* update try/catch array */`
`84`		`- for (j = 0; j < op_array->last_try_catch; j++) {`
	`83`	`+ for (uint32_t j = 0; j < op_array->last_try_catch; j++) {`
`85`	`84`	`op_array->try_catch_array[j].try_op -= shiftlist[op_array->try_catch_array[j].try_op];`
`86`	`85`	`op_array->try_catch_array[j].catch_op -= shiftlist[op_array->try_catch_array[j].catch_op];`
`87`	`86`	`if (op_array->try_catch_array[j].finally_op) {`