Fix size of union CArray

Author: kornilova203

bindgen/visitor/TreeVisitor.cpp

@@ -108,7 +108,8 @@ void TreeVisitor::handleUnion(clang::RecordDecl *record, std::string name) {
     std::vector<Field> fields;
 
     for (const clang::FieldDecl *field : record->fields()) {
-        maxSize = std::max(maxSize, astContext->getTypeSize(field->getType()));
+        uint64_t sizeInBytes = astContext->getTypeSize(field->getType()) / 8;
+        maxSize = std::max(maxSize, sizeInBytes);
         std::string fname = field->getNameAsString();
         std::string ftype = handleReservedWords(
             typeTranslator.Translate(field->getType(), &name));

tests/samples/PrivateMembers.scala

@@ -16,7 +16,7 @@ object PrivateMembers {
   type struct_structWithPrivateStruct = native.CStruct1[native.Ptr[struct_structWithPrivateType]]
   type struct_normalStruct = native.CStruct1[native.CInt]
   type struct_privateStructWithTypedef = native.CStruct1[native.Ptr[__private_type]]
-  type union___unionWithPrivateName = native.CArray[Byte, native.Nat.Digit[native.Nat._3, native.Nat._2]]
+  type union___unionWithPrivateName = native.CArray[Byte, native.Nat._4]
   def getTypeThatUsesPrivateTypes(): pid_t = native.extern
   def getPrivateType(): native.Ptr[__private_type] = native.extern
   def usesPrivateUnion(anonymous0: union___unionWithPrivateName): Unit = native.extern

tests/samples/ReservedWords.scala

@@ -15,7 +15,7 @@ object ReservedWords {
   type `finally` = struct_finally
   type struct_object = native.CStruct2[`match`, native.CInt]
   type struct_finally = native.CStruct2[`def`, `lazy`]
-  type union_lazy = native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._2, native.Nat._8]]]
+  type union_lazy = native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]
   def `with`(`sealed`: `match`, `implicit`: native.Ptr[`match`], `forSome`: `lazy`): `type` = native.extern
   def `implicit`(`type`: native.Ptr[`finally`]): `match` = native.extern
   def _1(): Unit = native.extern

tests/samples/Union.scala

@@ -6,7 +6,7 @@ import scala.scalanative.native._
 @native.link("bindgentests")
 @native.extern
 object Union {
-  type union_values = native.CArray[Byte, native.Nat.Digit[native.Nat._6, native.Nat._4]]
+  type union_values = native.CArray[Byte, native.Nat._8]
   def getValues(): native.Ptr[union_values] = native.extern
 }