FFI: Fix auto-deref of pointers to structs.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index 0d8c02a5..3ee39ece 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -363,9 +363,17 @@ void LJ_FASTCALL recff_cdata_index(jit_State *J, RecordFFData *rd)
     GCstr *name = strV(&rd->argv[1]);
     /* Always specialize to the field name. */
     emitir(IRTG(IR_EQ, IRT_STR), idx, lj_ir_kstr(J, name));
-    if (ctype_isstruct(ct->info)) {
+    if (ctype_isptr(ct->info)) {  /* Automatically perform '->'. */
+      CType *cct = ctype_rawchild(cts, ct);
+      if (ctype_isstruct(cct->info)) {
+        ct = cct;
+        goto index_struct;
+      }
+    } else if (ctype_isstruct(ct->info)) {
       CTSize fofs;
-      CType *fct = lj_ctype_getfield(cts, ct, name, &fofs);
+      CType *fct;
+index_struct:
+      fct = lj_ctype_getfield(cts, ct, name, &fofs);
       if (fct) {
         if (ctype_isconstval(fct->info)) {
           if (fct->size >= 0x80000000u &&