aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2024-11-28 16:28:51 +0100
committerMike Pall <mike>2024-11-28 16:28:51 +0100
commit4788e6f92a21cfae7e29f0900c55fc584d88bf12 (patch)
treecea0c1653736f31d80e4274b3d6213d2515486b7
parentfe71d0fb54ceadfb5b5f3b6baf29e486d97f6059 (diff)
parent811e448daa0f8f06e946fb607a98ace85c43b574 (diff)
downloadluajit-4788e6f92a21cfae7e29f0900c55fc584d88bf12.tar.gz
luajit-4788e6f92a21cfae7e29f0900c55fc584d88bf12.tar.bz2
luajit-4788e6f92a21cfae7e29f0900c55fc584d88bf12.zip
Merge branch 'master' into v2.1
-rw-r--r--src/lj_asm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c
index 844910ad..c31dd1de 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -949,11 +949,11 @@ static int asm_sunk_store(ASMState *as, IRIns *ira, IRIns *irs)
949static void asm_snap_alloc1(ASMState *as, IRRef ref) 949static void asm_snap_alloc1(ASMState *as, IRRef ref)
950{ 950{
951 IRIns *ir = IR(ref); 951 IRIns *ir = IR(ref);
952 if (!irref_isk(ref) && ir->r != RID_SUNK) { 952 if (!irref_isk(ref)) {
953 bloomset(as->snapfilt1, ref); 953 bloomset(as->snapfilt1, ref);
954 bloomset(as->snapfilt2, hashrot(ref, ref + HASH_BIAS)); 954 bloomset(as->snapfilt2, hashrot(ref, ref + HASH_BIAS));
955 if (ra_used(ir)) return; 955 if (ra_used(ir)) return;
956 if (ir->r == RID_SINK) { 956 if (ir->r == RID_SINK || ir->r == RID_SUNK) {
957 ir->r = RID_SUNK; 957 ir->r = RID_SUNK;
958#if LJ_HASFFI 958#if LJ_HASFFI
959 if (ir->o == IR_CNEWI) { /* Allocate CNEWI value. */ 959 if (ir->o == IR_CNEWI) { /* Allocate CNEWI value. */