From 27a6fee82e91319bbed8c3aa443aa2b0f1b0a470 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 13 Jul 2022 00:30:23 +0200
Subject: FFI: Allow ffi.metatype() for typedefs with attributes.

Reported by Eric Gouyer.
---
 src/lib_ffi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib_ffi.c b/src/lib_ffi.c
index cc8d419d..6eaec71c 100644
--- a/src/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -743,7 +743,7 @@ LJLIB_CF(ffi_metatype)
   CTypeID id = ffi_checkctype(L, cts, NULL);
   GCtab *mt = lj_lib_checktab(L, 2);
   GCtab *t = cts->miscmap;
-  CType *ct = ctype_get(cts, id);  /* Only allow raw types. */
+  CType *ct = ctype_raw(cts, id);
   TValue *tv;
   GCcdata *cd;
   if (!(ctype_isstruct(ct->info) || ctype_iscomplex(ct->info) ||
-- 
cgit v1.2.1


From 36b2962d400db3981a7d7322f85c469240eb6f3b Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 13 Jul 2022 00:32:04 +0200
Subject: FFI: Fix ffi.alignof() for reference types.

Reported by Eric Gouyer.
---
 src/lib_ffi.c  | 2 +-
 src/lj_ctype.c | 8 ++++++++
 src/lj_ctype.h | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib_ffi.c b/src/lib_ffi.c
index 6eaec71c..654e71a2 100644
--- a/src/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -615,7 +615,7 @@ LJLIB_CF(ffi_alignof)	LJLIB_REC(ffi_xof FF_ffi_alignof)
   CTState *cts = ctype_cts(L);
   CTypeID id = ffi_checkctype(L, cts, NULL);
   CTSize sz = 0;
-  CTInfo info = lj_ctype_info(cts, id, &sz);
+  CTInfo info = lj_ctype_info_raw(cts, id, &sz);
   setintV(L->top-1, 1 << ctype_align(info));
   return 1;
 }
diff --git a/src/lj_ctype.c b/src/lj_ctype.c
index 68edb287..7ef00521 100644
--- a/src/lj_ctype.c
+++ b/src/lj_ctype.c
@@ -328,6 +328,14 @@ CTInfo lj_ctype_info(CTState *cts, CTypeID id, CTSize *szp)
   return qual;
 }
 
+/* Ditto, but follow a reference. */
+CTInfo lj_ctype_info_raw(CTState *cts, CTypeID id, CTSize *szp)
+{
+  CType *ct = ctype_get(cts, id);
+  if (ctype_isref(ct->info)) id = ctype_cid(ct->info);
+  return lj_ctype_info(cts, id, szp);
+}
+
 /* Get ctype metamethod. */
 cTValue *lj_ctype_meta(CTState *cts, CTypeID id, MMS mm)
 {
diff --git a/src/lj_ctype.h b/src/lj_ctype.h
index 77551e76..4979a7ac 100644
--- a/src/lj_ctype.h
+++ b/src/lj_ctype.h
@@ -449,6 +449,7 @@ LJ_FUNC CType *lj_ctype_rawref(CTState *cts, CTypeID id);
 LJ_FUNC CTSize lj_ctype_size(CTState *cts, CTypeID id);
 LJ_FUNC CTSize lj_ctype_vlsize(CTState *cts, CType *ct, CTSize nelem);
 LJ_FUNC CTInfo lj_ctype_info(CTState *cts, CTypeID id, CTSize *szp);
+LJ_FUNC CTInfo lj_ctype_info_raw(CTState *cts, CTypeID id, CTSize *szp);
 LJ_FUNC cTValue *lj_ctype_meta(CTState *cts, CTypeID id, MMS mm);
 LJ_FUNC GCstr *lj_ctype_repr(lua_State *L, CTypeID id, GCstr *name);
 LJ_FUNC GCstr *lj_ctype_repr_int64(lua_State *L, uint64_t n, int isunsigned);
-- 
cgit v1.2.1


From 899093a9e0fa5b16f27016381ef4b15529dadff2 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 13 Jul 2022 00:32:31 +0200
Subject: FFI: Fix sizeof expression in C parser for reference types.

---
 src/lj_cparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lj_cparse.c b/src/lj_cparse.c
index 9cd26d67..df85d23b 100644
--- a/src/lj_cparse.c
+++ b/src/lj_cparse.c
@@ -457,7 +457,7 @@ static void cp_expr_sizeof(CPState *cp, CPValue *k, int wantsz)
   } else {
     cp_expr_unary(cp, k);
   }
-  info = lj_ctype_info(cp->cts, k->id, &sz);
+  info = lj_ctype_info_raw(cp->cts, k->id, &sz);
   if (wantsz) {
     if (sz != CTSIZE_INVALID)
       k->u32 = sz;
-- 
cgit v1.2.1