conv:abi: Include abi alignment when reconstructing aggregates.

MATRIXKOO · Nov 20, 2023 · 408c661 · 408c661
1 parent 277105d
commit 408c661
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/include/vast/Conversion/ABI/AggregateTypes.hpp b/include/vast/Conversion/ABI/AggregateTypes.hpp
@@ -44,6 +44,13 @@ namespace vast::conv::abi
                 ++arg_idx;
                 offset = 0;
             }
+
+            void adjust_by_align(mlir_type type)
+            {
+                auto align = parent.dl.getTypeABIAlignment(type) * 8;
+                if (offset % align != 0)
+                    offset += align - (offset % align);
+            }
         };
 
         // TODO(conv:abi): Issue #423 - figure out how to make this not adhoc.
@@ -113,6 +120,8 @@ namespace vast::conv::abi
                 if (needs_nesting(field_type))
                     return self_t(state, mod).run_on(field_type, rewriter);
 
+                state.adjust_by_align(field_type);
+
                 if (!state.fits(field_type))
                     state.advance();
                 return state.allocate(field_type, rewriter);