Skip to content

Commit 49c1e6e

Browse files
MaxKellermannMaxKellermann
authored
Make various pointers const in Zend/ (#10608)
* Zend/zend_operators: pass const pointers to zend_is_identical() * Zend/zend_operators: pass const pointers to zend_get_{long,double}() * Zend/Optimizer/sccp: make pointers const * Zend/Optimizer/scdf: make pointers const * Zend/Optimizer/zend_worklist: make pointers const * Zend/Optimizer/zend_optimizer: make pointers const * Zend/zend_compile: make pointers const
1 parent 1e769bd commit 49c1e6e

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

‎Zend/Optimizer/sccp.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static void empty_partial_array(zval *zv)
122122
Z_ARR_P(zv) = zend_new_array(8);
123123
}
124124

125-
static void dup_partial_array(zval *dst, zval *src)
125+
static void dup_partial_array(zval *dst, const zval *src)
126126
{
127127
MAKE_PARTIAL_ARRAY(dst);
128128
Z_ARR_P(dst) = zend_array_dup(Z_ARR_P(src));
@@ -134,7 +134,7 @@ static void empty_partial_object(zval *zv)
134134
Z_ARR_P(zv) = zend_new_array(8);
135135
}
136136

137-
static void dup_partial_object(zval *dst, zval *src)
137+
static void dup_partial_object(zval *dst, const zval *src)
138138
{
139139
MAKE_PARTIAL_OBJECT(dst);
140140
Z_ARR_P(dst) = zend_array_dup(Z_ARR_P(src));
@@ -146,7 +146,7 @@ static inline bool value_known(zval *zv) {
146146

147147
/* Sets new value for variable and ensures that it is lower or equal
148148
* the previous one in the constant propagation lattice. */
149-
static void set_value(scdf_ctx *scdf, sccp_ctx *ctx, int var, zval *new) {
149+
static void set_value(scdf_ctx *scdf, sccp_ctx *ctx, int var, const zval *new) {
150150
zval *value = &ctx->values[var];
151151
if (IS_BOT(value) || IS_TOP(new)) {
152152
return;
@@ -186,7 +186,7 @@ static void set_value(scdf_ctx *scdf, sccp_ctx *ctx, int var, zval *new) {
186186
#endif
187187
}
188188

189-
static zval *get_op1_value(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op) {
189+
static zval *get_op1_value(sccp_ctx *ctx, zend_op *opline, const zend_ssa_op *ssa_op) {
190190
if (opline->op1_type == IS_CONST) {
191191
return CT_CONSTANT_EX(ctx->scdf.op_array, opline->op1.constant);
192192
} else if (ssa_op->op1_use != -1) {
@@ -196,7 +196,7 @@ static zval *get_op1_value(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op)
196196
}
197197
}
198198

199-
static zval *get_op2_value(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op) {
199+
static zval *get_op2_value(sccp_ctx *ctx, const zend_op *opline, const zend_ssa_op *ssa_op) {
200200
if (opline->op2_type == IS_CONST) {
201201
return CT_CONSTANT_EX(ctx->scdf.op_array, opline->op2.constant);
202202
} else if (ssa_op->op2_use != -1) {
@@ -207,7 +207,7 @@ static zval *get_op2_value(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op)
207207
}
208208

209209
static bool can_replace_op1(
210-
const zend_op_array *op_array, zend_op *opline, zend_ssa_op *ssa_op) {
210+
const zend_op_array *op_array, const zend_op *opline, const zend_ssa_op *ssa_op) {
211211
switch (opline->opcode) {
212212
case ZEND_PRE_INC:
213213
case ZEND_PRE_DEC:
@@ -441,7 +441,7 @@ static inline zend_result ct_eval_isset_dim(zval *result, uint32_t extended_valu
441441
}
442442
}
443443

444-
static inline zend_result ct_eval_del_array_elem(zval *result, zval *key) {
444+
static inline zend_result ct_eval_del_array_elem(zval *result, const zval *key) {
445445
ZEND_ASSERT(IS_PARTIAL_ARRAY(result));
446446

447447
switch (Z_TYPE_P(key)) {
@@ -475,7 +475,7 @@ static inline zend_result ct_eval_del_array_elem(zval *result, zval *key) {
475475
return SUCCESS;
476476
}
477477

478-
static inline zend_result ct_eval_add_array_elem(zval *result, zval *value, zval *key) {
478+
static inline zend_result ct_eval_add_array_elem(zval *result, zval *value, const zval *key) {
479479
if (!key) {
480480
SEPARATE_ARRAY(result);
481481
if ((value = zend_hash_next_index_insert(Z_ARR_P(result), value))) {
@@ -546,7 +546,7 @@ static inline zend_result ct_eval_add_array_unpack(zval *result, zval *array) {
546546
return SUCCESS;
547547
}
548548

549-
static inline zend_result ct_eval_assign_dim(zval *result, zval *value, zval *key) {
549+
static inline zend_result ct_eval_assign_dim(zval *result, zval *value, const zval *key) {
550550
switch (Z_TYPE_P(result)) {
551551
case IS_NULL:
552552
case IS_FALSE:
@@ -622,7 +622,7 @@ static inline zend_result ct_eval_isset_obj(zval *result, uint32_t extended_valu
622622
}
623623
}
624624

625-
static inline zend_result ct_eval_del_obj_prop(zval *result, zval *key) {
625+
static inline zend_result ct_eval_del_obj_prop(zval *result, const zval *key) {
626626
ZEND_ASSERT(IS_PARTIAL_OBJECT(result));
627627

628628
switch (Z_TYPE_P(key)) {
@@ -636,7 +636,7 @@ static inline zend_result ct_eval_del_obj_prop(zval *result, zval *key) {
636636
return SUCCESS;
637637
}
638638

639-
static inline zend_result ct_eval_add_obj_prop(zval *result, zval *value, zval *key) {
639+
static inline zend_result ct_eval_add_obj_prop(zval *result, zval *value, const zval *key) {
640640
switch (Z_TYPE_P(key)) {
641641
case IS_STRING:
642642
value = zend_symtable_update(Z_ARR_P(result), Z_STR_P(key), value);
@@ -649,7 +649,7 @@ static inline zend_result ct_eval_add_obj_prop(zval *result, zval *value, zval *
649649
return SUCCESS;
650650
}
651651

652-
static inline zend_result ct_eval_assign_obj(zval *result, zval *value, zval *key) {
652+
static inline zend_result ct_eval_assign_obj(zval *result, zval *value, const zval *key) {
653653
switch (Z_TYPE_P(result)) {
654654
case IS_NULL:
655655
case IS_FALSE:

‎Zend/Optimizer/scdf.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ uint32_t scdf_remove_unreachable_blocks(scdf_ctx *scdf);
5353

5454
/* Add uses to worklist */
5555
static inline void scdf_add_to_worklist(scdf_ctx *scdf, int var_num) {
56-
zend_ssa *ssa = scdf->ssa;
57-
zend_ssa_var *var = &ssa->vars[var_num];
56+
const zend_ssa *ssa = scdf->ssa;
57+
const zend_ssa_var *var = &ssa->vars[var_num];
5858
int use;
5959
zend_ssa_phi *phi;
6060
FOREACH_USE(var, use) {
@@ -67,16 +67,16 @@ static inline void scdf_add_to_worklist(scdf_ctx *scdf, int var_num) {
6767

6868
/* This should usually not be necessary, however it's used for type narrowing. */
6969
static inline void scdf_add_def_to_worklist(scdf_ctx *scdf, int var_num) {
70-
zend_ssa_var *var = &scdf->ssa->vars[var_num];
70+
const zend_ssa_var *var = &scdf->ssa->vars[var_num];
7171
if (var->definition >= 0) {
7272
zend_bitset_incl(scdf->instr_worklist, var->definition);
7373
} else if (var->definition_phi) {
7474
zend_bitset_incl(scdf->phi_var_worklist, var_num);
7575
}
7676
}
7777

78-
static inline uint32_t scdf_edge(zend_cfg *cfg, int from, int to) {
79-
zend_basic_block *to_block = cfg->blocks + to;
78+
static inline uint32_t scdf_edge(const zend_cfg *cfg, int from, int to) {
79+
const zend_basic_block *to_block = cfg->blocks + to;
8080
int i;
8181

8282
for (i = 0; i < to_block->predecessors_count; i++) {
@@ -89,7 +89,7 @@ static inline uint32_t scdf_edge(zend_cfg *cfg, int from, int to) {
8989
ZEND_UNREACHABLE();
9090
}
9191

92-
static inline bool scdf_is_edge_feasible(scdf_ctx *scdf, int from, int to) {
92+
static inline bool scdf_is_edge_feasible(const scdf_ctx *scdf, int from, int to) {
9393
uint32_t edge = scdf_edge(&scdf->ssa->cfg, from, to);
9494
return zend_bitset_in(scdf->feasible_edges, edge);
9595
}

‎Zend/Optimizer/zend_optimizer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ zend_result zend_optimizer_eval_cast(zval *result, uint32_t type, zval *op1) /*
113113
}
114114
/* }}} */
115115

116-
zend_result zend_optimizer_eval_strlen(zval *result, zval *op1) /* {{{ */
116+
zend_result zend_optimizer_eval_strlen(zval *result, const zval *op1) /* {{{ */
117117
{
118118
if (Z_TYPE_P(op1) != IS_STRING) {
119119
return FAILURE;
@@ -231,7 +231,7 @@ void zend_optimizer_convert_to_free_op1(zend_op_array *op_array, zend_op *opline
231231
}
232232
}
233233

234-
int zend_optimizer_add_literal(zend_op_array *op_array, zval *zv)
234+
int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv)
235235
{
236236
int i = op_array->last_literal;
237237
op_array->last_literal++;

‎Zend/Optimizer/zend_optimizer_internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ static inline bool zend_optimizer_is_loop_var_free(const zend_op *opline) {
7777
}
7878

7979
void zend_optimizer_convert_to_free_op1(zend_op_array *op_array, zend_op *opline);
80-
int zend_optimizer_add_literal(zend_op_array *op_array, zval *zv);
80+
int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv);
8181
bool zend_optimizer_get_persistent_constant(zend_string *name, zval *result, int copy);
8282
void zend_optimizer_collect_constant(zend_optimizer_ctx *ctx, zval *name, zval* value);
8383
bool zend_optimizer_get_collected_constant(HashTable *constants, zval *name, zval* value);
8484
zend_result zend_optimizer_eval_binary_op(zval *result, zend_uchar opcode, zval *op1, zval *op2);
8585
zend_result zend_optimizer_eval_unary_op(zval *result, zend_uchar opcode, zval *op1);
8686
zend_result zend_optimizer_eval_cast(zval *result, uint32_t type, zval *op1);
87-
zend_result zend_optimizer_eval_strlen(zval *result, zval *op1);
87+
zend_result zend_optimizer_eval_strlen(zval *result, const zval *op1);
8888
zend_result zend_optimizer_eval_special_func_call(
8989
zval *result, zend_string *name, zend_string *arg);
9090
bool zend_optimizer_update_op1_const(zend_op_array *op_array,

‎Zend/Optimizer/zend_worklist.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static inline void zend_worklist_stack_push(zend_worklist_stack *stack, int i)
5252
stack->buf[stack->len++] = i;
5353
}
5454

55-
static inline int zend_worklist_stack_peek(zend_worklist_stack *stack)
55+
static inline int zend_worklist_stack_peek(const zend_worklist_stack *stack)
5656
{
5757
ZEND_ASSERT(stack->len);
5858
return stack->buf[stack->len - 1];
@@ -87,7 +87,7 @@ static inline void zend_worklist_prepare(zend_arena **arena, zend_worklist *work
8787
zend_worklist_stack_prepare(arena, &worklist->stack, len);
8888
}
8989

90-
static inline int zend_worklist_len(zend_worklist *worklist)
90+
static inline int zend_worklist_len(const zend_worklist *worklist)
9191
{
9292
return worklist->stack.len;
9393
}
@@ -105,7 +105,7 @@ static inline bool zend_worklist_push(zend_worklist *worklist, int i)
105105
return 1;
106106
}
107107

108-
static inline int zend_worklist_peek(zend_worklist *worklist)
108+
static inline int zend_worklist_peek(const zend_worklist *worklist)
109109
{
110110
return zend_worklist_stack_peek(&worklist->stack);
111111
}

‎Zend/zend_compile.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ static inline bool class_name_refers_to_active_ce(zend_string *class_name, uint3
16111611
}
16121612
/* }}} */
16131613

1614-
uint32_t zend_get_class_fetch_type(zend_string *name) /* {{{ */
1614+
uint32_t zend_get_class_fetch_type(const zend_string *name) /* {{{ */
16151615
{
16161616
if (zend_string_equals_literal_ci(name, "self")) {
16171617
return ZEND_FETCH_CLASS_SELF;
@@ -8519,7 +8519,7 @@ static bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
85198519
}
85208520
/* }}} */
85218521

8522-
ZEND_API bool zend_is_op_long_compatible(zval *op)
8522+
ZEND_API bool zend_is_op_long_compatible(const zval *op)
85238523
{
85248524
if (Z_TYPE_P(op) == IS_ARRAY) {
85258525
return false;
@@ -8541,7 +8541,7 @@ ZEND_API bool zend_is_op_long_compatible(zval *op)
85418541
return true;
85428542
}
85438543

8544-
ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, zval *op1, zval *op2) /* {{{ */
8544+
ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, const zval *op1, const zval *op2) /* {{{ */
85458545
{
85468546
if ((opcode == ZEND_CONCAT || opcode == ZEND_FAST_CONCAT)) {
85478547
/* Array to string warning. */
@@ -8614,7 +8614,7 @@ static inline bool zend_try_ct_eval_binary_op(zval *result, uint32_t opcode, zva
86148614
}
86158615
/* }}} */
86168616

8617-
ZEND_API bool zend_unary_op_produces_error(uint32_t opcode, zval *op)
8617+
ZEND_API bool zend_unary_op_produces_error(uint32_t opcode, const zval *op)
86188618
{
86198619
if (opcode == ZEND_BW_NOT) {
86208620
/* BW_NOT on string does not convert the string into an integer. */

‎Zend/zend_compile.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ ZEND_API void pass_two(zend_op_array *op_array);
896896
ZEND_API bool zend_is_compiling(void);
897897
ZEND_API char *zend_make_compiled_string_description(const char *name);
898898
ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_handlers);
899-
uint32_t zend_get_class_fetch_type(zend_string *name);
899+
uint32_t zend_get_class_fetch_type(const zend_string *name);
900900
ZEND_API zend_uchar zend_get_call_op(const zend_op *init_op, zend_function *fbc);
901901
ZEND_API bool zend_is_smart_branch(const zend_op *opline);
902902

@@ -1205,8 +1205,8 @@ END_EXTERN_C()
12051205
/* The default value for CG(compiler_options) during eval() */
12061206
#define ZEND_COMPILE_DEFAULT_FOR_EVAL 0
12071207

1208-
ZEND_API bool zend_is_op_long_compatible(zval *op);
1209-
ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, zval *op1, zval *op2);
1210-
ZEND_API bool zend_unary_op_produces_error(uint32_t opcode, zval *op);
1208+
ZEND_API bool zend_is_op_long_compatible(const zval *op);
1209+
ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, const zval *op1, const zval *op2);
1210+
ZEND_API bool zend_unary_op_produces_error(uint32_t opcode, const zval *op);
12111211

12121212
#endif /* ZEND_COMPILE_H */

‎Zend/zend_operators.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ ZEND_API void ZEND_COLD zend_incompatible_string_to_long_error(const zend_string
865865
zend_error(E_DEPRECATED, "Implicit conversion from float-string \"%s\" to int loses precision", ZSTR_VAL(s));
866866
}
867867

868-
ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_strict) /* {{{ */
868+
ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(const zval *op, bool is_strict) /* {{{ */
869869
{
870870
try_again:
871871
switch (Z_TYPE_P(op)) {
@@ -935,7 +935,7 @@ ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_strict) /*
935935
}
936936
/* }}} */
937937

938-
ZEND_API double ZEND_FASTCALL zval_get_double_func(zval *op) /* {{{ */
938+
ZEND_API double ZEND_FASTCALL zval_get_double_func(const zval *op) /* {{{ */
939939
{
940940
try_again:
941941
switch (Z_TYPE_P(op)) {
@@ -2304,7 +2304,7 @@ static int hash_zval_identical_function(zval *z1, zval *z2) /* {{{ */
23042304
}
23052305
/* }}} */
23062306

2307-
ZEND_API bool ZEND_FASTCALL zend_is_identical(zval *op1, zval *op2) /* {{{ */
2307+
ZEND_API bool ZEND_FASTCALL zend_is_identical(const zval *op1, const zval *op2) /* {{{ */
23082308
{
23092309
if (Z_TYPE_P(op1) != Z_TYPE_P(op2)) {
23102310
return 0;

‎Zend/zend_operators.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ZEND_API zend_result ZEND_FASTCALL shift_left_function(zval *result, zval *op1,
5656
ZEND_API zend_result ZEND_FASTCALL shift_right_function(zval *result, zval *op1, zval *op2);
5757
ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2);
5858

59-
ZEND_API bool ZEND_FASTCALL zend_is_identical(zval *op1, zval *op2);
59+
ZEND_API bool ZEND_FASTCALL zend_is_identical(const zval *op1, const zval *op2);
6060

6161
ZEND_API zend_result ZEND_FASTCALL is_equal_function(zval *result, zval *op1, zval *op2);
6262
ZEND_API zend_result ZEND_FASTCALL is_identical_function(zval *result, zval *op1, zval *op2);
@@ -275,18 +275,18 @@ ZEND_API void ZEND_FASTCALL convert_to_boolean(zval *op);
275275
ZEND_API void ZEND_FASTCALL convert_to_array(zval *op);
276276
ZEND_API void ZEND_FASTCALL convert_to_object(zval *op);
277277

278-
ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(zval *op, bool is_strict);
279-
ZEND_API double ZEND_FASTCALL zval_get_double_func(zval *op);
278+
ZEND_API zend_long ZEND_FASTCALL zval_get_long_func(const zval *op, bool is_strict);
279+
ZEND_API double ZEND_FASTCALL zval_get_double_func(const zval *op);
280280
ZEND_API zend_string* ZEND_FASTCALL zval_get_string_func(zval *op);
281281
ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op);
282282

283-
static zend_always_inline zend_long zval_get_long(zval *op) {
283+
static zend_always_inline zend_long zval_get_long(const zval *op) {
284284
return EXPECTED(Z_TYPE_P(op) == IS_LONG) ? Z_LVAL_P(op) : zval_get_long_func(op, false);
285285
}
286-
static zend_always_inline zend_long zval_get_long_ex(zval *op, bool is_strict) {
286+
static zend_always_inline zend_long zval_get_long_ex(const zval *op, bool is_strict) {
287287
return EXPECTED(Z_TYPE_P(op) == IS_LONG) ? Z_LVAL_P(op) : zval_get_long_func(op, is_strict);
288288
}
289-
static zend_always_inline double zval_get_double(zval *op) {
289+
static zend_always_inline double zval_get_double(const zval *op) {
290290
return EXPECTED(Z_TYPE_P(op) == IS_DOUBLE) ? Z_DVAL_P(op) : zval_get_double_func(op);
291291
}
292292
static zend_always_inline zend_string *zval_get_string(zval *op) {

0 commit comments

Comments
 (0)