Merge branch 'master' into v2.1

2014-09-08 23:39:02 +02:00
parent e107525f20 41156fe1cd
commit 72c661e2b8
2 changed files with 2 additions and 0 deletions
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1466,6 +1466,7 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
      }
    } else if (!tref_isnum(tr)) {
      tr = 0;
+      ct = ctype_get(cts, CTID_P_VOID);
    }
  ok:
    s[i] = ct;