From f640ec713a57cfb7d16c8cf81d0af487dd9038c2 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 20 Feb 2017 02:42:54 +0100
Subject: [PATCH] x64/LJ_GC64: Fix (currently unused) integer stores in
 asm_tvptr().

---
 src/lj_asm_x86.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index b6754cfa..fceb1877 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -1065,7 +1065,8 @@ static void asm_tvptr(ASMState *as, Reg dest, IRRef ref)
 	emit_u32(as, irt_toitype(ir->t) << 15);
 	emit_rmro(as, XO_ARITHi, XOg_OR, dest, 4);
       } else {
-	emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15) | 0x7fff);
+	/* Currently, no caller passes integers that might end up here. */
+	emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15));
       }
       emit_movtomro(as, REX_64IR(ir, src), dest, 0);
     }