Skip to content

Commit 1a6bcd0

Browse files
shqkingdstogov
authored andcommitted
Fix commit 8143a49: macro ADD_SUB_64_WITH_CONST_32 should be used
"(struct.._offset+offsetof(zend_..struct, field))" might exceed the range of ADD_SUB_IMM, leading to DynASM error DASM_S_RANGE_I for ZTS+CALL test variant. Using macro ADD_SUB_64_WITH_CONST_32 would fix it. Change-Id: I3233cefbcd1ddea16e7de6725c2dc5ff43373916
1 parent 44220c5 commit 1a6bcd0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static int logical_immediate_p (uint64_t value, uint32_t reg_size)
641641
| SAFE_MEM_ACC_WITH_UOFFSET ldr, IP, IP, (struct.._offset+offsetof(zend_..struct, field)), tmp_reg
642642
|| } else {
643643
| LOAD_TSRM_CACHE RX
644-
| add RX, RX, #(struct.._offset+offsetof(zend_..struct, field))
644+
| ADD_SUB_64_WITH_CONST_32 add, RX, RX, (struct.._offset+offsetof(zend_..struct, field)), tmp_reg
645645
| str RX, EX->opline
646646
|| }
647647
| .else

0 commit comments

Comments
 (0)