Skip to content

Commit 67cbe09

Browse files
GirgiasGirgias
authored
Zend/Optimizer/zend_dump: minor refactorings (#21540)
- add const qualifiers - reduce variable scope - use bool type instead of int type
1 parent 8df516c commit 67cbe09

File tree

2 files changed

+26
-39
lines changed

2 files changed

+26
-39
lines changed

‎Zend/Optimizer/zend_dump.c‎

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "zend_dump.h"
2626
#include "zend_smart_str.h"
2727

28-
void zend_dump_ht(HashTable *ht)
28+
void zend_dump_ht(const HashTable *ht)
2929
{
3030
zend_ulong index;
3131
zend_string *key;
@@ -190,7 +190,7 @@ static void zend_dump_range(const zend_ssa_range *r)
190190
}
191191
}
192192

193-
static void zend_dump_type_info(uint32_t info, zend_class_entry *ce, int is_instanceof, uint32_t dump_flags)
193+
static void zend_dump_type_info(uint32_t info, const zend_class_entry *ce, bool is_instanceof, uint32_t dump_flags)
194194
{
195195
bool first = true;
196196

@@ -482,7 +482,7 @@ ZEND_API void zend_dump_op(const zend_op_array *op_array, const zend_basic_block
482482
}
483483

484484
if (ZEND_OP_IS_FRAMELESS_ICALL(opline->opcode)) {
485-
zend_function *func = ZEND_FLF_FUNC(opline);
485+
const zend_function *func = ZEND_FLF_FUNC(opline);
486486
fprintf(stderr, "(%s)", ZSTR_VAL(func->common.function_name));
487487
}
488488

@@ -674,13 +674,13 @@ ZEND_API void zend_dump_op(const zend_op_array *op_array, const zend_basic_block
674674
}
675675

676676
if (opline->op2_type == IS_CONST) {
677-
zval *op = CRT_CONSTANT(opline->op2);
677+
const zval *op = CRT_CONSTANT(opline->op2);
678678
if (
679679
opline->opcode == ZEND_SWITCH_LONG
680680
|| opline->opcode == ZEND_SWITCH_STRING
681681
|| opline->opcode == ZEND_MATCH
682682
) {
683-
HashTable *jumptable = Z_ARRVAL_P(op);
683+
const HashTable *jumptable = Z_ARRVAL_P(op);
684684
zend_string *key;
685685
zend_ulong num_key;
686686
zval *zv;
@@ -778,7 +778,7 @@ ZEND_API void zend_dump_op_line(const zend_op_array *op_array, const zend_basic_
778778
{
779779
int len = 0;
780780
const zend_ssa *ssa = NULL;
781-
zend_ssa_op *ssa_op = NULL;
781+
const zend_ssa_op *ssa_op = NULL;
782782

783783
if (dump_flags & ZEND_DUMP_LINE_NUMBERS) {
784784
fprintf(stderr, "L%04u ", opline->lineno);
@@ -800,7 +800,7 @@ ZEND_API void zend_dump_op_line(const zend_op_array *op_array, const zend_basic_
800800

801801
static void zend_dump_block_info(const zend_cfg *cfg, int n, uint32_t dump_flags)
802802
{
803-
zend_basic_block *b = cfg->blocks + n;
803+
const zend_basic_block *b = cfg->blocks + n;
804804

805805
if (n > 0) {
806806
fprintf(stderr, "\n");
@@ -856,8 +856,8 @@ static void zend_dump_block_info(const zend_cfg *cfg, int n, uint32_t dump_flags
856856
fprintf(stderr, "\n");
857857

858858
if (b->predecessors_count) {
859-
int *p = cfg->predecessors + b->predecessor_offset;
860-
int *end = p + b->predecessors_count;
859+
const int *p = cfg->predecessors + b->predecessor_offset;
860+
const int *end = p + b->predecessors_count;
861861

862862
fprintf(stderr, " ; from=(BB%d", *p);
863863
for (p++; p < end; p++) {
@@ -867,9 +867,8 @@ static void zend_dump_block_info(const zend_cfg *cfg, int n, uint32_t dump_flags
867867
}
868868

869869
if (b->successors_count > 0) {
870-
int s;
871870
fprintf(stderr, " ; to=(BB%d", b->successors[0]);
872-
for (s = 1; s < b->successors_count; s++) {
871+
for (int s = 1; s < b->successors_count; s++) {
873872
fprintf(stderr, ", BB%d", b->successors[s]);
874873
}
875874
fprintf(stderr, ")\n");
@@ -900,16 +899,14 @@ static void zend_dump_block_header(const zend_cfg *cfg, const zend_op_array *op_
900899
{
901900
zend_dump_block_info(cfg, n, dump_flags);
902901
if (ssa && ssa->blocks && ssa->blocks[n].phis) {
903-
zend_ssa_phi *p = ssa->blocks[n].phis;
902+
const zend_ssa_phi *p = ssa->blocks[n].phis;
904903

905904
do {
906-
int j;
907-
908905
fprintf(stderr, " ");
909906
zend_dump_ssa_var(op_array, ssa, p->ssa_var, 0, p->var, dump_flags);
910907
if (p->pi < 0) {
911908
fprintf(stderr, " = Phi(");
912-
for (j = 0; j < cfg->blocks[n].predecessors_count; j++) {
909+
for (int j = 0; j < cfg->blocks[n].predecessors_count; j++) {
913910
if (j > 0) {
914911
fprintf(stderr, ", ");
915912
}
@@ -949,7 +946,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
949946
{
950947
const zend_cfg *cfg = NULL;
951948
const zend_ssa *ssa = NULL;
952-
zend_func_info *func_info = NULL;
949+
const zend_func_info *func_info = NULL;
953950
uint32_t func_flags = 0;
954951

955952
if (dump_flags & (ZEND_DUMP_CFG|ZEND_DUMP_SSA)) {
@@ -1040,11 +1037,8 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
10401037
}
10411038

10421039
if (cfg) {
1043-
int n;
1044-
zend_basic_block *b;
1045-
1046-
for (n = 0; n < cfg->blocks_count; n++) {
1047-
b = cfg->blocks + n;
1040+
for (int n = 0; n < cfg->blocks_count; n++) {
1041+
const zend_basic_block *b = cfg->blocks + n;
10481042
if (!(dump_flags & ZEND_DUMP_HIDE_UNREACHABLE) || (b->flags & ZEND_BB_REACHABLE)) {
10491043
const zend_op *opline;
10501044
const zend_op *end;
@@ -1180,13 +1174,11 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
11801174

11811175
void zend_dump_dominators(const zend_op_array *op_array, const zend_cfg *cfg)
11821176
{
1183-
int j;
1184-
11851177
fprintf(stderr, "\nDOMINATORS-TREE for \"");
11861178
zend_dump_op_array_name(op_array);
11871179
fprintf(stderr, "\"\n");
1188-
for (j = 0; j < cfg->blocks_count; j++) {
1189-
zend_basic_block *b = cfg->blocks + j;
1180+
for (int j = 0; j < cfg->blocks_count; j++) {
1181+
const zend_basic_block *b = cfg->blocks + j;
11901182
if (b->flags & ZEND_BB_REACHABLE) {
11911183
zend_dump_block_info(cfg, j, 0);
11921184
}
@@ -1195,14 +1187,12 @@ void zend_dump_dominators(const zend_op_array *op_array, const zend_cfg *cfg)
11951187

11961188
void zend_dump_ssa_variables(const zend_op_array *op_array, const zend_ssa *ssa, uint32_t dump_flags)
11971189
{
1198-
int j;
1199-
12001190
if (ssa->vars) {
12011191
fprintf(stderr, "\nSSA Variable for \"");
12021192
zend_dump_op_array_name(op_array);
12031193
fprintf(stderr, "\"\n");
12041194

1205-
for (j = 0; j < ssa->vars_count; j++) {
1195+
for (int j = 0; j < ssa->vars_count; j++) {
12061196
fprintf(stderr, " ");
12071197
zend_dump_ssa_var(op_array, ssa, j, IS_CV, ssa->vars[j].var, dump_flags);
12081198
if (ssa->vars[j].scc >= 0) {
@@ -1221,10 +1211,9 @@ void zend_dump_ssa_variables(const zend_op_array *op_array, const zend_ssa *ssa,
12211211
static void zend_dump_var_set(const zend_op_array *op_array, const char *name, zend_bitset set)
12221212
{
12231213
bool first = true;
1224-
uint32_t i;
12251214

12261215
fprintf(stderr, " ; %s = {", name);
1227-
for (i = 0; i < op_array->last_var + op_array->T; i++) {
1216+
for (uint32_t i = 0; i < op_array->last_var + op_array->T; i++) {
12281217
if (zend_bitset_in(set, i)) {
12291218
if (first) {
12301219
first = false;
@@ -1239,12 +1228,11 @@ static void zend_dump_var_set(const zend_op_array *op_array, const char *name, z
12391228

12401229
void zend_dump_dfg(const zend_op_array *op_array, const zend_cfg *cfg, const zend_dfg *dfg)
12411230
{
1242-
int j;
12431231
fprintf(stderr, "\nVariable Liveness for \"");
12441232
zend_dump_op_array_name(op_array);
12451233
fprintf(stderr, "\"\n");
12461234

1247-
for (j = 0; j < cfg->blocks_count; j++) {
1235+
for (int j = 0; j < cfg->blocks_count; j++) {
12481236
fprintf(stderr, " BB%d:\n", j);
12491237
zend_dump_var_set(op_array, "def", DFG_BITSET(dfg->def, dfg->size, j));
12501238
zend_dump_var_set(op_array, "use", DFG_BITSET(dfg->use, dfg->size, j));
@@ -1255,17 +1243,16 @@ void zend_dump_dfg(const zend_op_array *op_array, const zend_cfg *cfg, const zen
12551243

12561244
void zend_dump_phi_placement(const zend_op_array *op_array, const zend_ssa *ssa)
12571245
{
1258-
int j;
1259-
zend_ssa_block *ssa_blocks = ssa->blocks;
1246+
const zend_ssa_block *ssa_blocks = ssa->blocks;
12601247
int blocks_count = ssa->cfg.blocks_count;
12611248

12621249
fprintf(stderr, "\nSSA Phi() Placement for \"");
12631250
zend_dump_op_array_name(op_array);
12641251
fprintf(stderr, "\"\n");
1265-
for (j = 0; j < blocks_count; j++) {
1252+
for (int j = 0; j < blocks_count; j++) {
12661253
if (ssa_blocks && ssa_blocks[j].phis) {
1267-
zend_ssa_phi *p = ssa_blocks[j].phis;
1268-
int first = 1;
1254+
const zend_ssa_phi *p = ssa_blocks[j].phis;
1255+
bool first = true;
12691256

12701257
fprintf(stderr, " BB%d:\n", j);
12711258
if (p->pi >= 0) {
@@ -1275,7 +1262,7 @@ void zend_dump_phi_placement(const zend_op_array *op_array, const zend_ssa *ssa)
12751262
}
12761263
do {
12771264
if (first) {
1278-
first = 0;
1265+
first = false;
12791266
} else {
12801267
fprintf(stderr, ", ");
12811268
}

‎Zend/Optimizer/zend_dump.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ZEND_API void zend_dump_ssa_var(const zend_op_array *op_array, const zend_ssa *s
4444
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);
47-
void zend_dump_ht(HashTable *ht);
47+
void zend_dump_ht(const HashTable *ht);
4848

4949
END_EXTERN_C()
5050

0 commit comments

Comments
 (0)