From f5983437a6b08c140bdeb2fc15fa30d7f3b0daad Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sun, 5 Jun 2016 13:07:43 +0200
Subject: [PATCH] x64/LJ_GC64: Fix code generation for IR_KNULL call argument.

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

diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index 35f48727..50784daa 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -599,7 +599,7 @@ static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
     if (r) {  /* Argument is in a register. */
       if (r < RID_MAX_GPR && ref < ASMREF_TMP1) {
 #if LJ_64
-	if (LJ_GC64 ? ir->o != IR_KINT : ir->o == IR_KINT64)
+	if (LJ_GC64 ? !(ir->o == IR_KINT || ir->o == IR_KNULL) : ir->o == IR_KINT64)
 	  emit_loadu64(as, r, ir_k64(ir)->u64);
 	else
 #endif