Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2021-06-01 00:28:00 +02:00
commit b5dafe5891

View File

@ -568,7 +568,9 @@ void lj_cconv_ct_tv(CTState *cts, CType *d,
}
s = ctype_raw(cts, sid);
if (ctype_isfunc(s->info)) {
CTypeID did = ctype_typeid(cts, d);
sid = lj_ctype_intern(cts, CTINFO(CT_PTR, CTALIGN_PTR|sid), CTSIZE_PTR);
d = ctype_get(cts, did); /* cts->tab may have been reallocated. */
} else {
if (ctype_isenum(s->info)) s = ctype_child(cts, s);
goto doconv;