Fix max alignment for unions in typebuilder

Since PR #1292 is merged, idlc calculates the alignment for a type using the alignof function. This commit removes a workaround in the typebuilder code for a bug in the old idlc alignment calculation. Signed-off-by: Dennis Potman <[email protected]>
eclipse-cyclonedds · Oct 10, 2022 · 8b7cb30 · 8b7cb30
1 parent d2b0bc6
commit 8b7cb30
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/core/ddsi/src/ddsi_typebuilder.c b/src/core/ddsi/src/ddsi_typebuilder.c
@@ -785,15 +785,14 @@ static dds_return_t typebuilder_add_union (struct typebuilder_data *tbd, struct
       member_sz = sz;
   }
 
-  tb_aggrtype->align = member_align; // FIXME: wrong alignment in idlc, should be: max(member_align, disc_align)
-
   // union size (size of c struct that has discriminator and c union)
   tb_aggrtype->size = disc_sz;
   align_to (&tb_aggrtype->size, member_align);
   tb_aggrtype->size += member_sz;
 
   // padding at end of union
   uint32_t max_align = member_align > disc_align ? member_align : disc_align;
+  tb_aggrtype->align = max_align;
   align_to (&tb_aggrtype->size, max_align);
 
   // offset for union members