Skip to content

Commit 5ccb26f

Browse files
bunglegithub-actions[bot]
authored andcommitted
chore(patches): make arm64 reg allow patches apply cleanly (#11886)
### Summary Before: ``` patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h Hunk #1 succeeded at 1133 (offset 26 lines). Hunk #2 succeeded at 1142 (offset 26 lines). ``` After: ``` patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h ``` Signed-off-by: Aapo Talvensaari <[email protected]> (cherry picked from commit dda623d)
1 parent 8d25a20 commit 5ccb26f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/openresty/patches/LuaJIT-2.1-20230410_06_arm64_reg_alloc_fix.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h b/bundle/LuaJIT-2.1-2
1212
index 3889883d..c216fced 100644
1313
--- a/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
1414
+++ b/bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
15-
@@ -1107,6 +1107,8 @@ static void asm_ahuvload(ASMState *as, IRIns *ir)
15+
@@ -1133,6 +1133,8 @@ static void asm_ahuvload(ASMState *as, IRIns *ir)
1616
}
1717
type = ra_scratch(as, rset_clear(gpr, tmp));
1818
idx = asm_fuseahuref(as, ir->op1, &ofs, rset_clear(gpr, type), A64I_LDRx);
@@ -21,7 +21,7 @@ index 3889883d..c216fced 100644
2121
if (ir->o == IR_VLOAD) ofs += 8 * ir->op2;
2222
/* Always do the type check, even if the load result is unused. */
2323
asm_guardcc(as, irt_isnum(ir->t) ? CC_LS : CC_NE);
24-
@@ -1114,7 +1116,7 @@ static void asm_ahuvload(ASMState *as, IRIns *ir)
24+
@@ -1140,7 +1142,7 @@ static void asm_ahuvload(ASMState *as, IRIns *ir)
2525
lj_assertA(irt_isinteger(ir->t) || irt_isnum(ir->t),
2626
"bad load type %d", irt_type(ir->t));
2727
emit_nm(as, A64I_CMPx | A64F_SH(A64SH_LSR, 32),

0 commit comments

Comments
 (0)