Skip to content

Commit 3b265fb

Browse files
MaxKellermannMaxKellermann
committed
Zend/Optimizer: make pointers const
1 parent 751cd30 commit 3b265fb

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎ext/opcache/jit/zend_jit.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ static bool zend_jit_is_constant_cmp_long_long(const zend_op *opline,
338338
return false;
339339
}
340340

341-
static bool zend_jit_needs_call_chain(zend_call_info *call_info, uint32_t b, const zend_op_array *op_array, zend_ssa *ssa, const zend_ssa_op *ssa_op, const zend_op *opline, int call_level, zend_jit_trace_rec *trace)
341+
static bool zend_jit_needs_call_chain(zend_call_info *call_info, uint32_t b, const zend_op_array *op_array, const zend_ssa *ssa, const zend_ssa_op *ssa_op, const zend_op *opline, int call_level, zend_jit_trace_rec *trace)
342342
{
343343
if (trace) {
344344
zend_jit_trace_rec *p = trace;
@@ -517,7 +517,7 @@ static bool zend_jit_needs_call_chain(zend_call_info *call_info, uint32_t b, con
517517
}
518518
}
519519

520-
static uint32_t skip_valid_arguments(const zend_op_array *op_array, zend_ssa *ssa, const zend_call_info *call_info)
520+
static uint32_t skip_valid_arguments(const zend_op_array *op_array, const zend_ssa *ssa, const zend_call_info *call_info)
521521
{
522522
uint32_t num_args = 0;
523523
zend_function *func = call_info->callee_func;
@@ -529,8 +529,8 @@ static uint32_t skip_valid_arguments(const zend_op_array *op_array, zend_ssa *ss
529529

530530
if (ZEND_TYPE_IS_SET(arg_info->type)) {
531531
if (ZEND_TYPE_IS_ONLY_MASK(arg_info->type)) {
532-
zend_op *opline = call_info->arg_info[num_args].opline;
533-
zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
532+
const zend_op *opline = call_info->arg_info[num_args].opline;
533+
const zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
534534
uint32_t type_mask = ZEND_TYPE_PURE_MASK(arg_info->type);
535535
if ((OP1_INFO() & (MAY_BE_ANY|MAY_BE_UNDEF)) & ~type_mask) {
536536
break;
@@ -544,7 +544,7 @@ static uint32_t skip_valid_arguments(const zend_op_array *op_array, zend_ssa *ss
544544
return num_args;
545545
}
546546

547-
static uint32_t zend_ssa_cv_info(const zend_op_array *op_array, zend_ssa *ssa, uint32_t var)
547+
static uint32_t zend_ssa_cv_info(const zend_op_array *op_array, const zend_ssa *ssa, uint32_t var)
548548
{
549549
uint32_t info;
550550

‎ext/opcache/jit/zend_jit_trace.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static void zend_jit_trace_send_type(const zend_op *opline, zend_jit_trace_stack
489489
return;
490490
}
491491
if (op_array->fn_flags & ZEND_ACC_HAS_TYPE_HINTS) {
492-
zend_arg_info *arg_info;
492+
const zend_arg_info *arg_info;
493493

494494
ZEND_ASSERT(arg_num <= op_array->num_args);
495495
arg_info = &op_array->arg_info[arg_num-1];
@@ -816,7 +816,7 @@ static int zend_jit_trace_add_ret_phis(zend_jit_trace_rec *trace_buffer, uint32_
816816
return ssa_vars_count;
817817
}
818818

819-
static bool zend_jit_trace_copy_ssa_var_info(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op **tssa_opcodes, zend_ssa *tssa, int ssa_var)
819+
static bool zend_jit_trace_copy_ssa_var_info(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *const *tssa_opcodes, zend_ssa *tssa, int ssa_var)
820820
{
821821
int var, use;
822822
zend_ssa_op *op;
@@ -858,7 +858,7 @@ static bool zend_jit_trace_copy_ssa_var_info(const zend_op_array *op_array, cons
858858
return false;
859859
}
860860

861-
static void zend_jit_trace_propagate_range(const zend_op_array *op_array, const zend_op **tssa_opcodes, zend_ssa *tssa, int ssa_var)
861+
static void zend_jit_trace_propagate_range(const zend_op_array *op_array, const zend_op *const *tssa_opcodes, zend_ssa *tssa, int ssa_var)
862862
{
863863
zend_ssa_range tmp;
864864
int def = tssa->vars[ssa_var].definition;
@@ -873,7 +873,7 @@ static void zend_jit_trace_propagate_range(const zend_op_array *op_array, const
873873
}
874874
}
875875

876-
static void zend_jit_trace_copy_ssa_var_range(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op **tssa_opcodes, zend_ssa *tssa, int ssa_var)
876+
static void zend_jit_trace_copy_ssa_var_range(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *const*tssa_opcodes, zend_ssa *tssa, int ssa_var)
877877
{
878878
int def;
879879
zend_ssa_op *op;
@@ -923,7 +923,7 @@ static void zend_jit_trace_copy_ssa_var_range(const zend_op_array *op_array, con
923923
}
924924
}
925925

926-
static bool zend_jit_trace_restrict_ssa_var_info(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op **tssa_opcodes, zend_ssa *tssa, int ssa_var)
926+
static bool zend_jit_trace_restrict_ssa_var_info(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *const*tssa_opcodes, zend_ssa *tssa, int ssa_var)
927927
{
928928
int def;
929929
zend_ssa_op *op;
@@ -1071,7 +1071,7 @@ static const zend_op *zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec *p, c
10711071
return NULL;
10721072
}
10731073

1074-
static bool is_checked_guard(const zend_ssa *tssa, const zend_op **ssa_opcodes, uint32_t var, uint32_t phi_var)
1074+
static bool is_checked_guard(const zend_ssa *tssa, const zend_op *const*ssa_opcodes, uint32_t var, uint32_t phi_var)
10751075
{
10761076
if ((tssa->var_info[phi_var].type & MAY_BE_ANY) == MAY_BE_LONG
10771077
&& !(tssa->var_info[var].type & MAY_BE_REF)) {
@@ -1536,7 +1536,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
15361536
ssa_vars[i].alias = zend_jit_var_may_alias(op_array, ssa, i);
15371537
}
15381538
if (op_array->arg_info) {
1539-
zend_arg_info *arg_info = &op_array->arg_info[i];
1539+
const zend_arg_info *arg_info = &op_array->arg_info[i];
15401540
zend_class_entry *ce;
15411541
uint32_t tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
15421542

@@ -2001,7 +2001,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
20012001
info = ssa_var_info[ssa_ops[idx].op1_use].type & ~MAY_BE_GUARD;
20022002
}
20032003
if (frame->call->func->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) {
2004-
zend_arg_info *arg_info;
2004+
const zend_arg_info *arg_info;
20052005

20062006
ZEND_ASSERT(frame->call->func->op_array.arg_info);
20072007
arg_info = &frame->call->func->op_array.arg_info[opline->op2.num - 1];
@@ -2344,7 +2344,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
23442344
} else {
23452345
ssa_vars[v].alias = zend_jit_var_may_alias(op_array, ssa, i);
23462346
if (op_array->arg_info) {
2347-
zend_arg_info *arg_info = &op_array->arg_info[i];
2347+
const zend_arg_info *arg_info = &op_array->arg_info[i];
23482348
zend_class_entry *ce;
23492349
uint32_t tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
23502350

@@ -2513,7 +2513,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
25132513
if (opline->result_type != IS_UNDEF) {
25142514
zend_class_entry *ce;
25152515
const zend_function *func = p->func;
2516-
zend_arg_info *ret_info = func->common.arg_info - 1;
2516+
const zend_arg_info *ret_info = func->common.arg_info - 1;
25172517
uint32_t ret_type = zend_fetch_arg_info_type(NULL, ret_info, &ce);
25182518

25192519
ssa_var_info[ssa_ops[idx-1].result_def].type &= ret_type;
@@ -3856,7 +3856,7 @@ static void zend_jit_trace_update_condition_ranges(const zend_op *opline, const
38563856
}
38573857
}
38583858

3859-
static bool zend_jit_may_skip_comparison(const zend_op *opline, const zend_ssa_op *ssa_op, const zend_ssa *ssa, const zend_op **ssa_opcodes, const zend_op_array *op_array)
3859+
static bool zend_jit_may_skip_comparison(const zend_op *opline, const zend_ssa_op *ssa_op, const zend_ssa *ssa, const zend_op *const*ssa_opcodes, const zend_op_array *op_array)
38603860
{
38613861
zend_uchar prev_opcode;
38623862

0 commit comments

Comments
 (0)