Skip to content

Commit b7d6276

Browse files
GirgiasGirgias
committed
Zend/Optimizer: Fix some [-Wsign-compare] warnings
1 parent c7730b5 commit b7d6276

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

‎Zend/Optimizer/dfa_pass.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ static int zend_dfa_optimize_jmps(zend_op_array *op_array, zend_ssa *ssa)
10081008
static bool zend_dfa_try_to_replace_result(zend_op_array *op_array, zend_ssa *ssa, int def, int cv_var)
10091009
{
10101010
int result_var = ssa->ops[def].result_def;
1011-
int cv = EX_NUM_TO_VAR(ssa->vars[cv_var].var);
1011+
uint32_t cv = EX_NUM_TO_VAR(ssa->vars[cv_var].var);
10121012

10131013
if (result_var >= 0
10141014
&& !(ssa->var_info[cv_var].type & MAY_BE_REF)

‎Zend/Optimizer/zend_dump.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static void zend_dump_unused_op(const zend_op *opline, znode_op op, uint32_t fla
137137
}
138138
}
139139

140-
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, int var_num)
140+
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, uint32_t var_num)
141141
{
142142
if (var_type == IS_CV && var_num < op_array->last_var) {
143143
fprintf(stderr, "CV%d($%s)", var_num, op_array->vars[var_num]->val);
@@ -366,7 +366,7 @@ static void zend_dump_ssa_var_info(const zend_ssa *ssa, int ssa_var_num, uint32_
366366
dump_flags);
367367
}
368368

369-
ZEND_API void zend_dump_ssa_var(const zend_op_array *op_array, const zend_ssa *ssa, int ssa_var_num, uint8_t var_type, int var_num, uint32_t dump_flags)
369+
ZEND_API void zend_dump_ssa_var(const zend_op_array *op_array, const zend_ssa *ssa, int ssa_var_num, uint8_t var_type, uint32_t var_num, uint32_t dump_flags)
370370
{
371371
if (ssa_var_num >= 0) {
372372
fprintf(stderr, "#%d.", ssa_var_num);
@@ -929,7 +929,6 @@ void zend_dump_op_array_name(const zend_op_array *op_array)
929929

930930
ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, const char *msg, const void *data)
931931
{
932-
int i;
933932
const zend_cfg *cfg = NULL;
934933
const zend_ssa *ssa = NULL;
935934
zend_func_info *func_info = NULL;
@@ -1015,7 +1014,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
10151014
}
10161015

10171016
if (ssa && ssa->var_info) {
1018-
for (i = 0; i < op_array->last_var; i++) {
1017+
for (uint32_t i = 0; i < op_array->last_var; i++) {
10191018
fprintf(stderr, " ; ");
10201019
zend_dump_ssa_var(op_array, ssa, i, IS_CV, i, dump_flags);
10211020
fprintf(stderr, "\n");
@@ -1043,7 +1042,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
10431042
}
10441043
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
10451044
fprintf(stderr, "LIVE RANGES:\n");
1046-
for (i = 0; i < op_array->last_live_range; i++) {
1045+
for (int i = 0; i < op_array->last_live_range; i++) {
10471046
fprintf(stderr,
10481047
" %u: %04u - %04u ",
10491048
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK),
@@ -1070,7 +1069,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
10701069
}
10711070
if (op_array->last_try_catch) {
10721071
fprintf(stderr, "EXCEPTION TABLE:\n");
1073-
for (i = 0; i < op_array->last_try_catch; i++) {
1072+
for (int i = 0; i < op_array->last_try_catch; i++) {
10741073
fprintf(stderr, " BB%u",
10751074
cfg->map[op_array->try_catch_array[i].try_op]);
10761075
if (op_array->try_catch_array[i].catch_op) {
@@ -1103,7 +1102,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
11031102
}
11041103
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
11051104
fprintf(stderr, "LIVE RANGES:\n");
1106-
for (i = 0; i < op_array->last_live_range; i++) {
1105+
for (int i = 0; i < op_array->last_live_range; i++) {
11071106
fprintf(stderr,
11081107
" %u: %04u - %04u ",
11091108
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK),
@@ -1130,7 +1129,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
11301129
}
11311130
if (op_array->last_try_catch) {
11321131
fprintf(stderr, "EXCEPTION TABLE:\n");
1133-
for (i = 0; i < op_array->last_try_catch; i++) {
1132+
for (int i = 0; i < op_array->last_try_catch; i++) {
11341133
fprintf(stderr,
11351134
" %04u",
11361135
op_array->try_catch_array[i].try_op);

‎Zend/Optimizer/zend_dump.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ void zend_dump_dominators(const zend_op_array *op_array, const zend_cfg *cfg);
4040
void zend_dump_dfg(const zend_op_array *op_array, const zend_cfg *cfg, const zend_dfg *dfg);
4141
void zend_dump_phi_placement(const zend_op_array *op_array, const zend_ssa *ssa);
4242
void zend_dump_ssa_variables(const zend_op_array *op_array, const zend_ssa *ssa, uint32_t dump_flags);
43-
ZEND_API void zend_dump_ssa_var(const zend_op_array *op_array, const zend_ssa *ssa, int ssa_var_num, uint8_t var_type, int var_num, uint32_t dump_flags);
44-
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, int var_num);
43+
ZEND_API void zend_dump_ssa_var(const zend_op_array *op_array, const zend_ssa *ssa, int ssa_var_num, uint8_t var_type, uint32_t var_num, uint32_t dump_flags);
44+
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, uint32_t var_num);
4545
void zend_dump_op_array_name(const zend_op_array *op_array);
4646
void zend_dump_const(const zval *zv);
4747
void zend_dump_ht(HashTable *ht);

0 commit comments

Comments
 (0)