1 files changed, 6 insertions, 2 deletions

diff --git a/src/lj_ir.h b/src/lj_ir.h
index 4e9c85c7..e77f7b99 100644
--- a/src/lj_ir.h
+++ b/src/lj_ir.h
@@ -412,7 +412,7 @@ static LJ_AINLINE IRType itype2irt(const TValue *tv)
 
 static LJ_AINLINE uint32_t irt_toitype_(IRType t)
 {
-  lua_assert(!LJ_64 || t != IRT_LIGHTUD);
+  lua_assert(!LJ_64 || LJ_GC64 || t != IRT_LIGHTUD);
   if (LJ_DUALNUM && t > IRT_NUM) {
     return LJ_TISNUM;
   } else {
@@ -568,7 +568,11 @@ typedef union IRIns {
 #define ir_knum(ir)     check_exp((ir)->o == IR_KNUM, &(ir)[1].tv)
 #define ir_kint64(ir)   check_exp((ir)->o == IR_KINT64, &(ir)[1].tv)
 #define ir_k64(ir) \
-  check_exp((ir)->o == IR_KNUM || (ir)->o == IR_KINT64, &(ir)[1].tv)
+  check_exp((ir)->o == IR_KNUM || (ir)->o == IR_KINT64 || \
+            (LJ_GC64 && \
+             ((ir)->o == IR_KGC || \
+              (ir)->o == IR_KPTR || (ir)->o == IR_KKPTR)), \
+            &(ir)[1].tv)
 #define ir_kptr(ir) \
   check_exp((ir)->o == IR_KPTR || (ir)->o == IR_KKPTR, \
     mref((ir)[LJ_GC64].ptr, void))