Zend: Convert certain fields to uint32_t

Author: Girgias

Zend/zend_compile.c

@@ -535,9 +535,9 @@ static zend_always_inline uint32_t get_temporary_variable(void) /* {{{ */
 }
 /* }}} */
 
-static int lookup_cv(zend_string *name) /* {{{ */{
+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) {

Zend/zend_compile.h

@@ -197,7 +197,7 @@ typedef struct _zend_oparray_context {
 	struct _zend_oparray_context *prev;
 	zend_op_array *op_array;
 	uint32_t   opcodes_size;
-	int        vars_size;
+	uint32_t   vars_size;
 	int        literals_size;
 	uint32_t   fast_call_var;
 	uint32_t   try_catch_offset;
@@ -529,9 +529,9 @@ struct _zend_op_array {
 	const zend_property_info *prop_info; /* The corresponding prop_info if this is a hook. */
 	/* END of common elements */
 
-	int cache_size;     /* number of run_time_cache_slots * sizeof(void*) */
-	int last_var;       /* number of CV variables */
-	uint32_t last;      /* number of opcodes */
+	uint32_t cache_size; /* number of run_time_cache_slots * sizeof(void*) */
+	uint32_t last_var;   /* number of CV variables */
+	uint32_t last;       /* number of opcodes */
 
 	zend_op *opcodes;
 	ZEND_MAP_PTR_DEF(HashTable *, static_variables_ptr);
@@ -695,16 +695,16 @@ ZEND_STATIC_ASSERT(ZEND_MM_ALIGNED_SIZE(sizeof(zval)) == sizeof(zval),
                    "zval must be aligned by ZEND_MM_ALIGNMENT");
 /* A number of call frame slots (zvals) reserved for zend_execute_data. */
 #define ZEND_CALL_FRAME_SLOT \
-	((int)((sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval)))
+	((sizeof(zend_execute_data) + sizeof(zval) - 1) / sizeof(zval))
 
 #define ZEND_CALL_VAR(call, n) \
-	((zval*)(((char*)(call)) + ((int)(n))))
+	((zval*)(((char*)(call)) + (n)))
 
 #define ZEND_CALL_VAR_NUM(call, n) \
-	(((zval*)(call)) + (ZEND_CALL_FRAME_SLOT + ((int)(n))))
+	(((zval*)(call)) + (ZEND_CALL_FRAME_SLOT + (n)))
 
 #define ZEND_CALL_ARG(call, n) \
-	ZEND_CALL_VAR_NUM(call, ((int)(n)) - 1)
+	ZEND_CALL_VAR_NUM(call, (n) - 1)
 
 #define EX(element) 			((execute_data)->element)