Merge branch 'master' into v2.1

1 files changed, 4 insertions, 0 deletions

diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index b98bdbc6..55d76ca0 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -454,6 +454,10 @@ static TRef crec_ct_ct(jit_State *J, CType *d, CType *s, TRef dp, TRef sp,
     sinfo = CTINFO(CT_NUM, CTF_UNSIGNED);
     ssize = CTSIZE_PTR;
     st = IRT_UINTP;
+    if (((dsize ^ ssize) & 8) == 0) {  /* Must insert no-op type conversion. */
+      sp = emitconv(sp, dsize < 4 ? IRT_INT : dt, IRT_PTR, 0);
+      goto xstore;
+    }
     goto conv_I_I;
 
   /* Destination is a floating-point number. */