Merge branch 'master' into v2.1

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index fd59e281..d425686d 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1879,6 +1879,8 @@ void LJ_FASTCALL lj_crecord_tonumber(jit_State *J, RecordFFData *rd)
       d = ctype_get(cts, CTID_DOUBLE);
     J->base[0] = crec_ct_tv(J, d, 0, J->base[0], &rd->argv[0]);
   } else {
+    /* Specialize to the ctype that couldn't be converted. */
+    argv2cdata(J, J->base[0], &rd->argv[0]);
     J->base[0] = TREF_NIL;
   }
 }