gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2014-09-08 23:39:02 +02:00
commit 72c661e2b8
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lj_cconv.c
View File

@ -702,6 +702,7 @@ static void cconv_substruct_init(CTState *cts, CType *d, uint8_t *dp,
} else if (ctype_isxattrib(df->info, CTA_SUBTYPE)) { } else if (ctype_isxattrib(df->info, CTA_SUBTYPE)) {
cconv_substruct_init(cts, ctype_rawchild(cts, df), cconv_substruct_init(cts, ctype_rawchild(cts, df),
dp+df->size, o, len, ip); dp+df->size, o, len, ip);
if ((d->info & CTF_UNION)) break;
} /* Ignore all other entries in the chain. */ } /* Ignore all other entries in the chain. */
} }
} }

1
src/lj_crecord.c
View File

@ -1466,6 +1466,7 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
} }
} else if (!tref_isnum(tr)) { } else if (!tref_isnum(tr)) {
tr = 0; tr = 0;
ct = ctype_get(cts, CTID_P_VOID);
} }
ok: ok:
s[i] = ct; s[i] = ct;