1 files changed, 3 insertions, 1 deletions

diff --git a/src/lj_cparse.c b/src/lj_cparse.c
index ab5903fa..6642e8d8 100644
--- a/src/lj_cparse.c
+++ b/src/lj_cparse.c
@@ -918,7 +918,9 @@ static CTypeID cp_decl_intern(CPState *cp, CPDecl *decl)
             size = (CTSize)xsz;
           }
         }
-        info |= (cinfo & (CTF_QUAL|CTF_ALIGN));  /* Inherit qual and align. */
+        if ((cinfo & CTF_ALIGN) > (info & CTF_ALIGN))  /* Find max. align. */
+          info = (info & ~CTF_ALIGN) | (cinfo & CTF_ALIGN);
+        info |= (cinfo & CTF_QUAL);  /* Inherit qual. */
       } else {
         lua_assert(ctype_isvoid(info));
       }