fix structure size calculation when other structures are inlined

MoarVM · Feb 15, 2016 · f2ae11b · f2ae11b
1 parent 38d9a8b
commit f2ae11b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/6model/reprs/CPPStruct.c b/src/6model/reprs/CPPStruct.c
@@ -263,8 +263,8 @@ static void compute_allocation_strategy(MVMThreadContext *tc, MVMObject *repr_in
             repr_data->struct_offsets[i] = cur_size;
             cur_size += bits / 8;
 
-            if (bits / 8 > multiple_of)
-                multiple_of = bits / 8;
+            if (align > multiple_of)
+                multiple_of = align;
         }
 
         /* Finally, put computed allocation size in place; it's body size plus

diff --git a/src/6model/reprs/CStruct.c b/src/6model/reprs/CStruct.c
@@ -263,8 +263,8 @@ static void compute_allocation_strategy(MVMThreadContext *tc, MVMObject *repr_in
             repr_data->struct_offsets[i] = cur_size;
             cur_size += bits / 8;
 
-            if (bits / 8 > multiple_of)
-                multiple_of = bits / 8;
+            if (align > multiple_of)
+                multiple_of = align;
         }
 
         /* Finally, put computed allocation size in place; it's body size plus