archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Zend/Optimizer: Fix some [-Wsign-compare] warnings

Browse source
This commit is contained in:
Gina Peter Banyard 2024-06-03 06:10:50 +01:00
parent 194a2c1b54
commit 86a4fa3d02
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/Optimizer/dfa_pass.c
View file

@ -1008,7 +1008,7 @@ optimize_nop:
static bool zend_dfa_try_to_replace_result(zend_op_array *op_array, zend_ssa *ssa, int def, int cv_var) static bool zend_dfa_try_to_replace_result(zend_op_array *op_array, zend_ssa *ssa, int def, int cv_var)
{ {
int result_var = ssa->ops[def].result_def; int result_var = ssa->ops[def].result_def;
int cv = EX_NUM_TO_VAR(ssa->vars[cv_var].var); uint32_t cv = EX_NUM_TO_VAR(ssa->vars[cv_var].var);
if (result_var >= 0 if (result_var >= 0
&& !(ssa->var_info[cv_var].type & MAY_BE_REF) && !(ssa->var_info[cv_var].type & MAY_BE_REF)

15
Zend/Optimizer/zend_dump.c
View file

@ -137,7 +137,7 @@ static void zend_dump_unused_op(const zend_op *opline, znode_op op, uint32_t fla
} }
} }
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, int var_num) ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, uint32_t var_num)
{ {
if (var_type == IS_CV && var_num < op_array->last_var) { if (var_type == IS_CV && var_num < op_array->last_var) {
fprintf(stderr, "CV%d($%s)", var_num, op_array->vars[var_num]->val); 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_
dump_flags); dump_flags);
} }
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) 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)
{ {
if (ssa_var_num >= 0) { if (ssa_var_num >= 0) {
fprintf(stderr, "#%d.", ssa_var_num); fprintf(stderr, "#%d.", ssa_var_num);
@ -929,7 +929,6 @@ void zend_dump_op_array_name(const zend_op_array *op_array)
ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, const char *msg, const void *data) ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, const char *msg, const void *data)
{ {
int i;
const zend_cfg *cfg = NULL; const zend_cfg *cfg = NULL;
const zend_ssa *ssa = NULL; const zend_ssa *ssa = NULL;
zend_func_info *func_info = NULL; 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
} }
if (ssa && ssa->var_info) { if (ssa && ssa->var_info) {
for (i = 0; i < op_array->last_var; i++) { for (uint32_t i = 0; i < op_array->last_var; i++) {
fprintf(stderr, " ; "); fprintf(stderr, " ; ");
zend_dump_ssa_var(op_array, ssa, i, IS_CV, i, dump_flags); zend_dump_ssa_var(op_array, ssa, i, IS_CV, i, dump_flags);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@ -1043,7 +1042,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
} }
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) { if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
fprintf(stderr, "LIVE RANGES:\n"); fprintf(stderr, "LIVE RANGES:\n");
for (i = 0; i < op_array->last_live_range; i++) { for (int i = 0; i < op_array->last_live_range; i++) {
fprintf(stderr, fprintf(stderr,
" %u: %04u - %04u ", " %u: %04u - %04u ",
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK), 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
} }
if (op_array->last_try_catch) { if (op_array->last_try_catch) {
fprintf(stderr, "EXCEPTION TABLE:\n"); fprintf(stderr, "EXCEPTION TABLE:\n");
for (i = 0; i < op_array->last_try_catch; i++) { for (int i = 0; i < op_array->last_try_catch; i++) {
fprintf(stderr, " BB%u", fprintf(stderr, " BB%u",
cfg->map[op_array->try_catch_array[i].try_op]); cfg->map[op_array->try_catch_array[i].try_op]);
if (op_array->try_catch_array[i].catch_op) { 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
} }
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) { if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
fprintf(stderr, "LIVE RANGES:\n"); fprintf(stderr, "LIVE RANGES:\n");
for (i = 0; i < op_array->last_live_range; i++) { for (int i = 0; i < op_array->last_live_range; i++) {
fprintf(stderr, fprintf(stderr,
" %u: %04u - %04u ", " %u: %04u - %04u ",
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK), 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
} }
if (op_array->last_try_catch) { if (op_array->last_try_catch) {
fprintf(stderr, "EXCEPTION TABLE:\n"); fprintf(stderr, "EXCEPTION TABLE:\n");
for (i = 0; i < op_array->last_try_catch; i++) { for (int i = 0; i < op_array->last_try_catch; i++) {
fprintf(stderr, fprintf(stderr,
" %04u", " %04u",
op_array->try_catch_array[i].try_op); op_array->try_catch_array[i].try_op);

4
Zend/Optimizer/zend_dump.h
View file

@ -40,8 +40,8 @@ void zend_dump_dominators(const zend_op_array *op_array, const zend_cfg *cfg);
void zend_dump_dfg(const zend_op_array *op_array, const zend_cfg *cfg, const zend_dfg *dfg); void zend_dump_dfg(const zend_op_array *op_array, const zend_cfg *cfg, const zend_dfg *dfg);
void zend_dump_phi_placement(const zend_op_array *op_array, const zend_ssa *ssa); void zend_dump_phi_placement(const zend_op_array *op_array, const zend_ssa *ssa);
void zend_dump_ssa_variables(const zend_op_array *op_array, const zend_ssa *ssa, uint32_t dump_flags); void zend_dump_ssa_variables(const zend_op_array *op_array, const zend_ssa *ssa, uint32_t dump_flags);
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); 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);
ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, int var_num); ZEND_API void zend_dump_var(const zend_op_array *op_array, uint8_t var_type, uint32_t var_num);
void zend_dump_op_array_name(const zend_op_array *op_array); void zend_dump_op_array_name(const zend_op_array *op_array);
void zend_dump_const(const zval *zv); void zend_dump_const(const zval *zv);
void zend_dump_ht(HashTable *ht); void zend_dump_ht(HashTable *ht);