Merge commit 'b4ed321' into pull-luajit-jan2018

snabbco · Jan 17, 2018 · 0dbdc24 · 0dbdc24
2 parents 98027c8 + b4ed321
commit 0dbdc24
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/lj_asm.c b/src/lj_asm.c
@@ -895,7 +895,7 @@ static uint32_t ir_khash(IRIns *ir)
   } else {
     lua_assert(irt_isgcv(ir->t));
     lo = u32ptr(ir_kgc(ir));
-    hi = lo + HASH_BIAS;
+    hi = (uint32_t)(u64ptr(ir_kgc(ir)) >> 32) | (irt_toitype(ir->t) << 15);
   }
   return hashrot(lo, hi);
 }