Merge branch 'master' into v2.1

Mike Pall · Mike Pall · commit a90e7795ca7f · 2018-04-22T13:30:02.000+02:00
diff --git 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;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1879,6 +1879,8 @@ void LJ_FASTCALL lj_crecord_tonumber(jit_State J, RecordFFData rd)`
`1879`	`1879`	`d = ctype_get(cts, CTID_DOUBLE);`
`1880`	`1880`	`J->base[0] = crec_ct_tv(J, d, 0, J->base[0], &rd->argv[0]);`
`1881`	`1881`	`} else {`
	`1882`	`+ /* Specialize to the ctype that couldn't be converted. */`
	`1883`	`+ argv2cdata(J, J->base[0], &rd->argv[0]);`
`1882`	`1884`	`J->base[0] = TREF_NIL;`
`1883`	`1885`	`}`
`1884`	`1886`	`}`