RELEASE LuaJIT-2.0.0-beta2v2.0.0-beta2

1 files changed, 7 insertions, 4 deletions

diff --git a/src/lj_asm.c b/src/lj_asm.c
index b89b8543..a4d0c606 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -738,11 +738,14 @@ static Reg ra_allocref(ASMState *as, IRRef ref, RegSet allow)
       }
       RA_DBGX((as, "hintmiss  $f $r", ref, r));
     }
-    /* Invariants should preferably get unused registers. */
-    if (ref < as->loopref && !irt_isphi(ir->t))
-      r = rset_pickbot(pick);
-    else
+    /* Invariants should preferably get unmodified registers. */
+    if (ref < as->loopref && !irt_isphi(ir->t)) {
+      if ((pick & ~as->modset))
+        pick &= ~as->modset;
+      r = rset_pickbot(pick);  /* Reduce conflicts with inverse allocation. */
+    } else {
       r = rset_picktop(pick);
+    }
   } else {
     r = ra_evict(as, allow);
   }