diff --git a/src/lj_asm.c b/src/lj_asm.c index 426730be..8deddd65 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c @@ -644,6 +644,7 @@ static void ra_destreg(ASMState *as, IRIns *ir, Reg r) { Reg dest = ra_dest(as, ir, RID2RSET(r)); if (dest != r) { + lua_assert(rset_test(as->freeset, r)); ra_modified(as, r); emit_movrr(as, ir, dest, r); } diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h index e865850d..f307d6b8 100644 --- a/src/lj_asm_arm.h +++ b/src/lj_asm_arm.h @@ -2102,9 +2102,12 @@ static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow) if (ra_hasspill(irp->s)) { rset_clear(allow, ra_dest(as, ir, allow)); } else { - lua_assert(ra_hasreg(irp->r)); - rset_clear(allow, irp->r); - ra_destreg(as, ir, irp->r); + Reg r = irp->r; + lua_assert(ra_hasreg(r)); + rset_clear(allow, r); + if (r != ir->r && !rset_test(as->freeset, r)) + ra_restore(as, regcost_ref(as->cost[r])); + ra_destreg(as, ir, r); } return allow; }