Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2024-11-28 16:28:51 +01:00
commit 4788e6f92a

View File

@ -949,11 +949,11 @@ static int asm_sunk_store(ASMState *as, IRIns *ira, IRIns *irs)
static void asm_snap_alloc1(ASMState *as, IRRef ref) static void asm_snap_alloc1(ASMState *as, IRRef ref)
{ {
IRIns *ir = IR(ref); IRIns *ir = IR(ref);
if (!irref_isk(ref) && ir->r != RID_SUNK) { if (!irref_isk(ref)) {
bloomset(as->snapfilt1, ref); bloomset(as->snapfilt1, ref);
bloomset(as->snapfilt2, hashrot(ref, ref + HASH_BIAS)); bloomset(as->snapfilt2, hashrot(ref, ref + HASH_BIAS));
if (ra_used(ir)) return; if (ra_used(ir)) return;
if (ir->r == RID_SINK) { if (ir->r == RID_SINK || ir->r == RID_SUNK) {
ir->r = RID_SUNK; ir->r = RID_SUNK;
#if LJ_HASFFI #if LJ_HASFFI
if (ir->o == IR_CNEWI) { /* Allocate CNEWI value. */ if (ir->o == IR_CNEWI) { /* Allocate CNEWI value. */