diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c
index a960ea50..e7e1b124 100644
--- a/src/lj_ffrecord.c
+++ b/src/lj_ffrecord.c
@@ -118,11 +118,7 @@ static void recff_stitch(jit_State *J)
 
   /* Ditto for the IR. */
   memmove(&J->base[1], &J->base[-1], sizeof(TRef)*(J->maxslot+1));
-#if LJ_64
-  trcont = lj_ir_kptr(J, (void *)((int64_t)cont-(int64_t)lj_vm_asm_begin));
-#else
-  trcont = lj_ir_kptr(J, (void *)cont);
-#endif
+  trcont = lj_ir_kptr(J, mkcontptr(cont));
   J->base[0] = trcont | TREF_CONT;
   J->ktracep = lj_ir_k64_reserve(J);
   lua_assert(irt_toitype_(IRT_P64) == LJ_TTRACE);
diff --git a/src/lj_ir.c b/src/lj_ir.c
index 63c98254..b4087aa7 100644
--- a/src/lj_ir.c
+++ b/src/lj_ir.c
@@ -345,7 +345,7 @@ TRef lj_ir_kptr_(jit_State *J, IROp op, void *ptr)
 {
   IRIns *ir, *cir = J->cur.ir;
   IRRef ref;
-  lua_assert((void *)(intptr_t)i32ptr(ptr) == ptr);
+  lua_assert((void *)(uintptr_t)u32ptr(ptr) == ptr);
   for (ref = J->chain[op]; ref; ref = cir[ref].prev)
     if (mref(cir[ref].ptr, void) == ptr)
       goto found;
diff --git a/src/lj_obj.h b/src/lj_obj.h
index 059eb132..72611bd5 100644
--- a/src/lj_obj.h
+++ b/src/lj_obj.h
@@ -843,12 +843,16 @@ static LJ_AINLINE void setlightudV(TValue *o, void *p)
 #endif
 
 #if LJ_FR2
-#define setcont(o, f)		((o)->u64 = (uint64_t)(uintptr_t)(void *)(f))
+#define mkcontptr(f)		((void *)(f))
+#define setcont(o, f)		((o)->u64 = (uint64_t)(uintptr_t)mkcontptr(f))
 #elif LJ_64
+#define mkcontptr(f) \
+  ((void *)(uintptr_t)(uint32_t)((int64_t)(f) - (int64_t)lj_vm_asm_begin))
 #define setcont(o, f) \
   ((o)->u64 = (uint64_t)(void *)(f) - (uint64_t)lj_vm_asm_begin)
 #else
-#define setcont(o, f)		setlightudV((o), (void *)(f))
+#define mkcontptr(f)		((void *)(f))
+#define setcont(o, f)		setlightudV((o), mkcontptr(f))
 #endif
 
 #define tvchecklive(L, o) \
diff --git a/src/lj_record.c b/src/lj_record.c
index 306a85cb..7e8a9026 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -882,11 +882,7 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults)
 static BCReg rec_mm_prep(jit_State *J, ASMFunction cont)
 {
   BCReg s, top = cont == lj_cont_cat ? J->maxslot : curr_proto(J->L)->framesize;
-#if LJ_64
-  TRef trcont = lj_ir_kptr(J, (void *)((int64_t)cont-(int64_t)lj_vm_asm_begin));
-#else
-  TRef trcont = lj_ir_kptr(J, (void *)cont);
-#endif
+  TRef trcont = lj_ir_kptr(J, mkcontptr(cont));
   J->base[top] = trcont | TREF_CONT;
   J->framedepth++;
   for (s = J->maxslot; s < top; s++)