Skip to content

Commit 49ff6e4

Browse files
committed
Zend: Convert _zend_op_array.last_live_range field to uint32_t
1 parent 0d62c3f commit 49ff6e4

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

Zend/Optimizer/zend_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
10561056
}
10571057
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
10581058
fprintf(stderr, "LIVE RANGES:\n");
1059-
for (int i = 0; i < op_array->last_live_range; i++) {
1059+
for (uint32_t i = 0; i < op_array->last_live_range; i++) {
10601060
fprintf(stderr,
10611061
" %u: %04u - %04u ",
10621062
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK),
@@ -1116,7 +1116,7 @@ ZEND_API void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_fl
11161116
}
11171117
if (op_array->last_live_range && (dump_flags & ZEND_DUMP_LIVE_RANGES)) {
11181118
fprintf(stderr, "LIVE RANGES:\n");
1119-
for (int i = 0; i < op_array->last_live_range; i++) {
1119+
for (uint32_t i = 0; i < op_array->last_live_range; i++) {
11201120
fprintf(stderr,
11211121
" %u: %04u - %04u ",
11221122
EX_VAR_TO_NUM(op_array->live_range[i].var & ~ZEND_LIVE_MASK),

Zend/zend_compile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ struct _zend_op_array {
540540

541541
uint32_t *refcount;
542542

543-
int last_live_range;
543+
uint32_t last_live_range;
544544
int last_try_catch;
545545
zend_live_range *live_range;
546546
zend_try_catch_element *try_catch_array;

ext/opcache/jit/zend_jit.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,13 +1263,12 @@ static void zend_jit_allocate_registers(zend_jit_ctx *ctx, const zend_op_array *
12631263
&& ssa->vars[i].definition >= 0
12641264
&& ssa->ops[op_num].result_def == i) {
12651265
const zend_live_range *range = op_array->live_range;
1266-
int j;
12671266

12681267
op_num++;
12691268
if (op_array->opcodes[op_num].opcode == ZEND_OP_DATA) {
12701269
op_num++;
12711270
}
1272-
for (j = 0; j < op_array->last_live_range; range++, j++) {
1271+
for (uint32_t j = 0; j < op_array->last_live_range; range++, j++) {
12731272
if (range->start > op_num) {
12741273
/* further blocks will not be relevant... */
12751274
break;

ext/opcache/jit/zend_jit_trace.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6564,10 +6564,9 @@ static zend_vm_opcode_handler_t zend_jit_trace(zend_jit_trace_rec *trace_buffer,
65646564
uint32_t var_num = opline->result.var;
65656565
uint32_t op_num = opline - op_array->opcodes;
65666566
const zend_live_range *range = op_array->live_range;
6567-
int j;
65686567

65696568
op_num += zend_jit_trace_op_len(opline);
6570-
for (j = 0; j < op_array->last_live_range; range++, j++) {
6569+
for (uint32_t j = 0; j < op_array->last_live_range; range++, j++) {
65716570
if (range->start > op_num) {
65726571
/* further blocks will not be relevant... */
65736572
break;

0 commit comments

Comments
 (0)