Zend: Convert _zend_op_array.last_var field to uint32_t

Author: Girgias

Zend/Optimizer/compact_vars.c

@@ -23,7 +23,7 @@
 /* This pass removes all CVs and temporaries that are completely unused. It does *not* merge any CVs or TMPs.
  * This pass does not operate on SSA form anymore. */
 void zend_optimizer_compact_vars(zend_op_array *op_array) {
-	int i;
+	uint32_t i;
 
 	ALLOCA_FLAG(use_heap1);
 	ALLOCA_FLAG(use_heap2);

Zend/Optimizer/dfa_pass.c

@@ -1042,7 +1042,6 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 
 	if (ssa->var_info) {
 		int op_1;
-		int v;
 		int remove_nops = 0;
 		zend_op *opline;
 		zend_ssa_op *ssa_op;
@@ -1092,7 +1091,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 #endif
 		}
 
-		for (v = op_array->last_var; v < ssa->vars_count; v++) {
+		for (uint32_t v = op_array->last_var; v < ssa->vars_count; v++) {
 
 			op_1 = ssa->vars[v].definition;
 

Zend/Optimizer/optimize_temp_vars_5.c

@@ -43,7 +43,7 @@
 void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
 	uint32_t T = op_array->T;
-	int offset = op_array->last_var;
+	uint32_t offset = op_array->last_var;
 	uint32_t bitset_len;
 	zend_bitset taken_T;	/* T index in use */
 	zend_op **start_of_T;	/* opline where T is first used */

Zend/Optimizer/zend_dump.c

@@ -968,7 +968,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
 	fprintf(stderr, ":\n     ; (lines=%d, args=%d",
 		op_array->last,
 		op_array->num_args);
-	fprintf(stderr, ", vars=%d, tmps=%d", op_array->last_var, op_array->T);
+	fprintf(stderr, ", vars=%" PRIu32 ", tmps=%d", op_array->last_var, op_array->T);
 	if (ssa) {
 		fprintf(stderr, ", ssa_vars=%d", ssa->vars_count);
 	}

Zend/zend_compile.c

@@ -538,7 +538,7 @@ static zend_always_inline uint32_t get_temporary_variable(void) /* {{{ */
 
 static uint32_t lookup_cv(zend_string *name) /* {{{ */{
 	zend_op_array *op_array = CG(active_op_array);
-	int i = 0;
+	uint32_t i = 0;
 	zend_ulong hash_value = zend_string_hash_val(name);
 
 	while (i < op_array->last_var) {
@@ -8192,9 +8192,8 @@ static void zend_compile_closure_uses(zend_ast *ast) /* {{{ */
 		ZVAL_NULL(&zv);
 
 		{
-			int i;
-			for (i = 0; i < op_array->last_var; i++) {
-				if (zend_string_equals(op_array->vars[i], var_name)) {
+			for (uint32_t j = 0; j < op_array->last_var; j++) {
+				if (zend_string_equals(op_array->vars[j], var_name)) {
 					zend_error_noreturn_unchecked(E_COMPILE_ERROR,
 						"Cannot use lexical variable $%S as a parameter name", var_name);
 				}

Zend/zend_compile.h

@@ -531,7 +531,7 @@ struct _zend_op_array {
 	/* END of common elements */
 
 	uint32_t cache_size; /* number of run_time_cache_slots * sizeof(void*) */
-	int last_var;        /* number of CV variables */
+	uint32_t last_var;        /* number of CV variables */
 	uint32_t last;       /* number of opcodes */
 
 	zend_op *opcodes;

Zend/zend_execute.c

@@ -4271,7 +4271,7 @@ ZEND_API void zend_clean_and_cache_symbol_table(zend_array *symbol_table) /* {{{
 static zend_always_inline void i_free_compiled_variables(zend_execute_data *execute_data) /* {{{ */
 {
 	zval *cv = EX_VAR_NUM(0);
-	int count = EX(func)->op_array.last_var;
+	uint32_t count = EX(func)->op_array.last_var;
 	while (EXPECTED(count != 0)) {
 		i_zval_ptr_dtor(cv);
 		cv++;
@@ -4984,8 +4984,8 @@ ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_d
 	zend_op_array *op_array = &EX(func)->op_array;
 
 	if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) {
-		uint32_t i, num_cvs = EX(func)->op_array.last_var;
-		for (i = 0; i < num_cvs; i++) {
+		uint32_t num_cvs = EX(func)->op_array.last_var;
+		for (uint32_t i = 0; i < num_cvs; i++) {
 			zend_get_gc_buffer_add_zval(gc_buffer, EX_VAR_NUM(i));
 		}
 	}

ext/opcache/jit/zend_jit.c

@@ -2915,9 +2915,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 			left_frame = true;
 		}
 		if (!left_frame) {
-			int j;
-
-			for (j = 0 ; j < op_array->last_var; j++) {
+			for (uint32_t j = 0 ; j < op_array->last_var; j++) {
 				uint32_t info = zend_ssa_cv_info(op_array, ssa, j);
 
 				if (info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF)) {

ext/opcache/zend_persist.c

@@ -680,9 +680,8 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
 	}
 
 	if (op_array->vars) {
-		int i;
 		op_array->vars = zend_shared_memdup_put_free(op_array->vars, sizeof(zend_string*) * op_array->last_var);
-		for (i = 0; i < op_array->last_var; i++) {
+		for (uint32_t i = 0; i < op_array->last_var; i++) {
 			zend_accel_store_interned_string(op_array->vars[i]);
 		}
 	}

ext/opcache/zend_persist_calc.c

@@ -324,10 +324,8 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array)
 	}
 
 	if (op_array->vars) {
-		int i;
-
 		ADD_SIZE(sizeof(zend_string*) * op_array->last_var);
-		for (i = 0; i < op_array->last_var; i++) {
+		for (uint32_t i = 0; i < op_array->last_var; i++) {
 			ADD_INTERNED_STRING(op_array->vars[i]);
 		}
 	}