DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FFI: Fix handling of qualified transparent structs/unions.

Browse Source
This commit is contained in:
Mike Pall
2013-02-03 11:51:19 +01:00
parent 4eb4b8ab84
commit fe9934feea
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lj_ctype.c
View File

@@ -234,7 +234,8 @@ CTypeID lj_ctype_getname(CTState *cts, CType **ctp, GCstr *name, uint32_t tmask)
}
/* Get a struct/union/enum/function field by name. */
CType *lj_ctype_getfield(CTState *cts, CType *ct, GCstr *name, CTSize *ofs)
CType *lj_ctype_getfieldq(CTState *cts, CType *ct, GCstr *name, CTSize *ofs,
CTInfo *qual)
{
while (ct->sib) {
ct = ctype_get(cts, ct->sib);
@@ -243,8 +244,15 @@ CType *lj_ctype_getfield(CTState *cts, CType *ct, GCstr *name, CTSize *ofs)
return ct;
}
if (ctype_isxattrib(ct->info, CTA_SUBTYPE)) {
CType *fct = lj_ctype_getfield(cts, ctype_child(cts, ct), name, ofs);
CType *fct, *cct = ctype_child(cts, ct);
CTInfo q = 0;
while (ctype_isattrib(cct->info)) {
if (ctype_attrib(cct->info) == CTA_QUAL) q |= cct->size;
cct = ctype_child(cts, cct);
}
fct = lj_ctype_getfieldq(cts, cct, name, ofs, qual);
if (fct) {
if (qual) *qual |= q;
*ofs += ct->size;
return fct;
}