Skip to content

Commit 1685b9c

Browse files
committed
Zend/Optimizer: Use type uint32_t instead of int for zend_call_graph.op_arrays_count
1 parent 3fbfc33 commit 1685b9c

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Zend/Optimizer/zend_call_graph.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,12 @@ static void zend_analyze_recursion(zend_call_graph *call_graph)
200200
zend_op_array *op_array;
201201
zend_func_info *func_info;
202202
zend_call_info *call_info;
203-
int i;
204203
int set_len = zend_bitset_len(call_graph->op_arrays_count);
205204
zend_bitset visited;
206205
ALLOCA_FLAG(use_heap);
207206

208207
visited = ZEND_BITSET_ALLOCA(set_len, use_heap);
209-
for (i = 0; i < call_graph->op_arrays_count; i++) {
208+
for (uint32_t i = 0; i < call_graph->op_arrays_count; i++) {
210209
op_array = call_graph->op_arrays[i];
211210
func_info = call_graph->func_infos + i;
212211
call_info = func_info->caller_info;
@@ -252,9 +251,7 @@ ZEND_API void zend_build_call_graph(zend_arena **arena, zend_script *script, zen
252251

253252
ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph) /* {{{ */
254253
{
255-
int i;
256-
257-
for (i = 0; i < call_graph->op_arrays_count; i++) {
254+
for (uint32_t i = 0; i < call_graph->op_arrays_count; i++) {
258255
zend_analyze_calls(arena, script, 0, call_graph->op_arrays[i], call_graph->func_infos + i);
259256
}
260257
zend_analyze_recursion(call_graph);

Zend/Optimizer/zend_call_graph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct _zend_func_info {
5454
};
5555

5656
typedef struct _zend_call_graph {
57-
int op_arrays_count;
57+
uint32_t op_arrays_count;
5858
zend_op_array **op_arrays;
5959
zend_func_info *func_infos;
6060
} zend_call_graph;

Zend/Optimizer/zend_optimizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ ZEND_API void zend_optimize_script(zend_script *script, zend_long optimization_l
16091609
zend_call_graph call_graph;
16101610
zend_build_call_graph(&ctx.arena, script, &call_graph);
16111611

1612-
int i;
1612+
uint32_t i;
16131613
zend_func_info *func_info;
16141614

16151615
for (i = 0; i < call_graph.op_arrays_count; i++) {

0 commit comments

Comments
 (0)