Skip to content

Commit 0d55456

Browse files
dstogovdstogov
committed
Use "const" qualifier
1 parent cef1960 commit 0d55456

File tree

5 files changed

+78
-78
lines changed

5 files changed

+78
-78
lines changed

‎ext/opcache/jit/zend_jit.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ static const void *zend_jit_profile_jit_handler = NULL;
9999
static const void *zend_jit_func_counter_handler = NULL;
100100
static const void *zend_jit_loop_counter_handler = NULL;
101101

102-
static int zend_may_overflow(const zend_op *opline, zend_op_array *op_array, zend_ssa *ssa);
102+
static int zend_may_overflow(const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa);
103103
static void ZEND_FASTCALL zend_runtime_jit(void);
104104

105-
static zend_bool zend_ssa_is_last_use(zend_op_array *op_array, const zend_ssa *ssa, int var, int use)
105+
static zend_bool zend_ssa_is_last_use(const zend_op_array *op_array, const zend_ssa *ssa, int var, int use)
106106
{
107107
if (ssa->vars[var].phi_use_chain) {
108108
zend_ssa_phi *phi = ssa->vars[var].phi_use_chain;
@@ -175,7 +175,7 @@ ZEND_EXT_API void zend_jit_status(zval *ret)
175175
add_assoc_zval(ret, "jit", &stats);
176176
}
177177

178-
static zend_string *zend_jit_func_name(zend_op_array *op_array)
178+
static zend_string *zend_jit_func_name(const zend_op_array *op_array)
179179
{
180180
smart_str buf = {0};
181181

@@ -204,7 +204,7 @@ static zend_string *zend_jit_func_name(zend_op_array *op_array)
204204
}
205205

206206
static void *dasm_link_and_encode(dasm_State **dasm_state,
207-
zend_op_array *op_array,
207+
const zend_op_array *op_array,
208208
zend_ssa *ssa,
209209
const zend_op *rt_opline,
210210
zend_lifetime_interval **ra,
@@ -399,7 +399,7 @@ static void *dasm_link_and_encode(dasm_State **dasm_state,
399399
return entry;
400400
}
401401

402-
static int zend_may_overflow(const zend_op *opline, zend_op_array *op_array, zend_ssa *ssa)
402+
static int zend_may_overflow(const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa)
403403
{
404404
uint32_t num;
405405
int res;
@@ -571,7 +571,7 @@ static int zend_may_overflow(const zend_op *opline, zend_op_array *op_array, zen
571571
}
572572
}
573573

574-
static int zend_jit_build_cfg(zend_op_array *op_array, zend_cfg *cfg)
574+
static int zend_jit_build_cfg(const zend_op_array *op_array, zend_cfg *cfg)
575575
{
576576
uint32_t flags;
577577

@@ -605,7 +605,7 @@ static int zend_jit_build_cfg(zend_op_array *op_array, zend_cfg *cfg)
605605
return SUCCESS;
606606
}
607607

608-
static int zend_jit_op_array_analyze1(zend_op_array *op_array, zend_script *script, zend_ssa *ssa)
608+
static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script *script, zend_ssa *ssa)
609609
{
610610
if (zend_jit_build_cfg(op_array, &ssa->cfg) != SUCCESS) {
611611
return FAILURE;
@@ -643,7 +643,7 @@ static int zend_jit_op_array_analyze1(zend_op_array *op_array, zend_script *scri
643643
return SUCCESS;
644644
}
645645

646-
static int zend_jit_op_array_analyze2(zend_op_array *op_array, zend_script *script, zend_ssa *ssa)
646+
static int zend_jit_op_array_analyze2(const zend_op_array *op_array, zend_script *script, zend_ssa *ssa)
647647
{
648648
if ((zend_jit_level >= ZEND_JIT_LEVEL_OPT_FUNC)
649649
&& ssa->cfg.blocks
@@ -993,7 +993,7 @@ static void zend_jit_add_hint(zend_lifetime_interval **intervals, int dst, int s
993993

994994
/* See "Linear Scan Register Allocation on SSA Form", Christian Wimmer and
995995
Michael Franz, CGO'10 (2010), Figure 4. */
996-
static int zend_jit_compute_liveness(zend_op_array *op_array, zend_ssa *ssa, zend_bitset candidates, zend_lifetime_interval **list)
996+
static int zend_jit_compute_liveness(const zend_op_array *op_array, zend_ssa *ssa, zend_bitset candidates, zend_lifetime_interval **list)
997997
{
998998
int set_size, i, j, k, l;
999999
uint32_t n;
@@ -1338,7 +1338,7 @@ static uint32_t zend_interval_intersection(zend_lifetime_interval *ival1, zend_l
13381338

13391339
/* See "Optimized Interval Splitting in a Linear Scan Register Allocator",
13401340
Christian Wimmer VEE'05 (2005), Figure 4. Allocation without spilling */
1341-
static int zend_jit_try_allocate_free_reg(zend_op_array *op_array, zend_ssa *ssa, zend_lifetime_interval *current, zend_regset available, zend_regset *hints, zend_lifetime_interval *active, zend_lifetime_interval *inactive, zend_lifetime_interval **list, zend_lifetime_interval **free)
1341+
static int zend_jit_try_allocate_free_reg(const zend_op_array *op_array, zend_ssa *ssa, zend_lifetime_interval *current, zend_regset available, zend_regset *hints, zend_lifetime_interval *active, zend_lifetime_interval *inactive, zend_lifetime_interval **list, zend_lifetime_interval **free)
13421342
{
13431343
zend_lifetime_interval *it;
13441344
uint32_t freeUntilPos[ZREG_NUM];
@@ -1557,7 +1557,7 @@ static int zend_jit_allocate_blocked_reg(void)
15571557

15581558
/* See "Optimized Interval Splitting in a Linear Scan Register Allocator",
15591559
Christian Wimmer VEE'10 (2005), Figure 2. */
1560-
static zend_lifetime_interval* zend_jit_linear_scan(zend_op_array *op_array, zend_ssa *ssa, zend_lifetime_interval *list)
1560+
static zend_lifetime_interval* zend_jit_linear_scan(const zend_op_array *op_array, zend_ssa *ssa, zend_lifetime_interval *list)
15611561
{
15621562
zend_lifetime_interval *unhandled, *active, *inactive, *handled, *free;
15631563
zend_lifetime_interval *current, **p, *q;
@@ -1646,7 +1646,7 @@ static zend_lifetime_interval* zend_jit_linear_scan(zend_op_array *op_array, zen
16461646
return handled;
16471647
}
16481648

1649-
static zend_lifetime_interval** zend_jit_allocate_registers(zend_op_array *op_array, zend_ssa *ssa)
1649+
static zend_lifetime_interval** zend_jit_allocate_registers(const zend_op_array *op_array, zend_ssa *ssa)
16501650
{
16511651
void *checkpoint;
16521652
int set_size, candidates_count, i;
@@ -1899,7 +1899,7 @@ static zend_lifetime_interval** zend_jit_allocate_registers(zend_op_array *op_ar
18991899
return NULL;
19001900
}
19011901

1902-
static void zend_calc_checked_this_r(zend_bitset checked_this, zend_op_array *op_array, zend_cfg *cfg, int b, int checked)
1902+
static void zend_calc_checked_this_r(zend_bitset checked_this, const zend_op_array *op_array, zend_cfg *cfg, int b, int checked)
19031903
{
19041904
zend_op *opline = &op_array->opcodes[cfg->blocks[b].start];
19051905
zend_op *end = opline + cfg->blocks[b].len;
@@ -1949,7 +1949,7 @@ static void zend_calc_checked_this_r(zend_bitset checked_this, zend_op_array *op
19491949
}
19501950
}
19511951

1952-
static zend_bitset zend_calc_checked_this(zend_arena **arena, zend_op_array *op_array, zend_cfg *cfg)
1952+
static zend_bitset zend_calc_checked_this(zend_arena **arena, const zend_op_array *op_array, zend_cfg *cfg)
19531953
{
19541954
uint32_t bitset_len = zend_bitset_len(op_array->last);
19551955
zend_bitset checked_this = zend_arena_calloc(arena, bitset_len, ZEND_BITSET_ELM_SIZE);
@@ -1959,7 +1959,7 @@ static zend_bitset zend_calc_checked_this(zend_arena **arena, zend_op_array *op_
19591959
return checked_this;
19601960
}
19611961

1962-
static int zend_jit(zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_opline)
1962+
static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op *rt_opline)
19631963
{
19641964
int b, i, end;
19651965
zend_op *opline;
@@ -3225,7 +3225,7 @@ ZEND_EXT_API void zend_jit_deactivate(void)
32253225

32263226
#else /* HAVE_JIT */
32273227

3228-
ZEND_EXT_API int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
3228+
ZEND_EXT_API int zend_jit_op_array(const zend_op_array *op_array, zend_script *script)
32293229
{
32303230
return FAILURE;
32313231
}

‎ext/opcache/jit/zend_jit_disasm_x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static int zend_jit_cmp_labels(Bucket *b1, Bucket *b2)
249249

250250
static int zend_jit_disasm(const char *name,
251251
const char *filename,
252-
zend_op_array *op_array,
252+
const zend_op_array *op_array,
253253
zend_cfg *cfg,
254254
const void *start,
255255
size_t size)

‎ext/opcache/jit/zend_jit_gdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static void zend_gdbjit_buildobj(zend_gdbjit_ctx *ctx)
456456
}
457457

458458
static int zend_jit_gdb_register(const char *name,
459-
zend_op_array *op_array,
459+
const zend_op_array *op_array,
460460
const void *start,
461461
size_t size)
462462
{

‎ext/opcache/jit/zend_jit_helpers.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "Zend/zend_API.h"
2020

21-
static zend_never_inline zend_function* ZEND_FASTCALL _zend_jit_init_func_run_time_cache(zend_op_array *op_array) /* {{{ */
21+
static zend_never_inline zend_function* ZEND_FASTCALL _zend_jit_init_func_run_time_cache(const zend_op_array *op_array) /* {{{ */
2222
{
2323
void **run_time_cache;
2424

@@ -1111,7 +1111,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_global_helper(zend_execute_data *execu
11111111
return value;
11121112
}
11131113

1114-
static void ZEND_FASTCALL zend_jit_verify_arg_object(zval *arg, zend_op_array *op_array, uint32_t arg_num, zend_arg_info *arg_info, void **cache_slot)
1114+
static void ZEND_FASTCALL zend_jit_verify_arg_object(zval *arg, const zend_op_array *op_array, uint32_t arg_num, zend_arg_info *arg_info, void **cache_slot)
11151115
{
11161116
zend_class_entry *ce;
11171117
if (EXPECTED(*cache_slot)) {
@@ -1129,7 +1129,7 @@ static void ZEND_FASTCALL zend_jit_verify_arg_object(zval *arg, zend_op_array *o
11291129
}
11301130
}
11311131

1132-
static void ZEND_FASTCALL zend_jit_verify_arg_slow(zval *arg, zend_op_array *op_array, uint32_t arg_num, zend_arg_info *arg_info, void **cache_slot)
1132+
static void ZEND_FASTCALL zend_jit_verify_arg_slow(zval *arg, const zend_op_array *op_array, uint32_t arg_num, zend_arg_info *arg_info, void **cache_slot)
11331133
{
11341134
zend_class_entry *ce = NULL;
11351135
uint32_t type_mask;

0 commit comments

Comments
 (0)