Skip to content

Commit 3014cf4

Browse files
committed
Fix compilation warnings
1 parent ee08686 commit 3014cf4

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
11191119
|| has_concrete_type(src_info & MAY_BE_ANY)) {
11201120
|| if (Z_MODE(dst_addr) == IS_MEM_ZVAL) {
11211121
|| if ((dst_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_GUARD)) != (src_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_GUARD))) {
1122-
|| zend_uchar type = concrete_type(src_info);
1122+
|| uint32_t type = concrete_type(src_info);
11231123
| SET_ZVAL_TYPE_INFO dst_addr, type, Rw(tmp_reg1), Rx(tmp_reg2)
11241124
|| }
11251125
|| }
@@ -1206,7 +1206,7 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
12061206
|| }
12071207
|| if ((src_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE)) &&
12081208
|| has_concrete_type(src_info & MAY_BE_ANY)) {
1209-
|| zend_uchar type = concrete_type(src_info);
1209+
|| uint32_t type = concrete_type(src_info);
12101210
|| if (Z_MODE(dst_addr) == IS_MEM_ZVAL) {
12111211
|| if ((dst_info & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_GUARD)) != (src_info & (MAY_BE_ANY|MAY_BE_UNDEF))) {
12121212
| SET_ZVAL_TYPE_INFO dst_addr, type, Rw(tmp_reg), Rx(tmp_reg2)
@@ -1227,7 +1227,6 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
12271227
|.endmacro
12281228

12291229
|.macro IF_TYPE, type, val, label
1230-
|| ZEND_ASSERT(val >=0 && val <= CMP_IMM);
12311230
|| if (val == 0) {
12321231
| cbz type, label
12331232
|| } else {
@@ -1237,7 +1236,6 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
12371236
|.endmacro
12381237

12391238
|.macro IF_NOT_TYPE, type, val, label
1240-
|| ZEND_ASSERT(val >=0 && val <= CMP_IMM);
12411239
|| if (val == 0) {
12421240
| cbnz type, label
12431241
|| } else {
@@ -1258,7 +1256,6 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
12581256

12591257
|.macro CMP_ZVAL_TYPE, addr, val, tmp_reg
12601258
|| ZEND_ASSERT(Z_MODE(addr) == IS_MEM_ZVAL);
1261-
|| ZEND_ASSERT(val <= CMP_IMM);
12621259
| SAFE_MEM_ACC_WITH_UOFFSET_BYTE ldrb, Rw(tmp_reg), Rx(Z_REG(addr)), Z_OFFSET(addr)+offsetof(zval, u1.v.type), Rx(tmp_reg)
12631260
| cmp Rw(tmp_reg), #val
12641261
|.endmacro
@@ -11349,7 +11346,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst,
1134911346

1135011347
|8:
1135111348
if (res_exit_addr) {
11352-
zend_uchar type = concrete_type(res_info);
11349+
uint32_t type = concrete_type(res_info);
1135311350
if (op1_info & MAY_BE_ARRAY_OF_REF) {
1135411351
| ZVAL_DEREF REG0, MAY_BE_REF, TMP1w
1135511352
}
@@ -12367,7 +12364,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
1236712364
zend_jit_trace_stack *stack = JIT_G(current_frame)->stack;
1236812365
int32_t exit_point;
1236912366
const void *exit_addr;
12370-
zend_uchar type;
12367+
uint32_t type;
1237112368
zend_jit_addr val_addr = ZEND_ADDR_MEM_ZVAL(ZREG_REG0, 0);
1237212369

1237312370
if ((opline->op1_type & (IS_VAR|IS_TMP_VAR))
@@ -14282,7 +14279,7 @@ static int zend_jit_fetch_constant(dasm_State **Dst,
1428214279
res_info &= ~MAY_BE_GUARD;
1428314280
ssa->var_info[ssa_op->result_def].type &= ~MAY_BE_GUARD;
1428414281

14285-
zend_uchar type = concrete_type(res_info);
14282+
uint32_t type = concrete_type(res_info);
1428614283

1428714284
if (type < IS_STRING) {
1428814285
| IF_NOT_ZVAL_TYPE const_addr, type, &exit_addr, ZREG_TMP1

0 commit comments

Comments
 (0)