Add tests for types that use native.CArray

Author: kornilova203

bindgen/ir/IR.cpp

@@ -141,7 +141,9 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
         s << "object " << ir.libName << "Helpers {\n";
 
         for (const auto &st : ir.structs) {
-            s << "\n" << st->generateHelperClass();
+            if (st->hasHelperMethods()) {
+                s << "\n" << st->generateHelperClass();
+            }
         }
 
         for (const auto &u : ir.unions) {

bindgen/ir/Struct.cpp

@@ -37,10 +37,8 @@ std::shared_ptr<TypeDef> Struct::generateTypeDef() {
 }
 
 std::string Struct::generateHelperClass() const {
-    if (!hasHelperMethods()) {
-        /* struct is empty or represented as an array */
-        return "";
-    }
+    assert(hasHelperMethods());
+    /* struct is not empty and not represented as an array */
     std::stringstream s;
     std::string type = getAliasType();
     s << "  implicit class " << type << "_ops(val p: native.Ptr[" << type

tests/samples/Struct.c

@@ -7,3 +7,5 @@ point_s getPoint() {
     point->y = 20;
     return point;
 }
+
+int getBigStructSize() { return sizeof(struct bigStruct); }

tests/samples/Struct.h

@@ -6,3 +6,31 @@ struct point {
 typedef struct point *point_s;
 
 point_s getPoint();
+
+struct bigStruct {
+    long one;
+    char two;
+    int three;
+    float four;
+    double five;
+    point_s six;
+    int seven;
+    int eight;
+    int nine;
+    int ten;
+    int eleven;
+    int twelve;
+    int thirteen;
+    int fourteen;
+    int fifteen;
+    int sixteen;
+    int seventeen;
+    int eighteen;
+    int nineteen;
+    int twenty;
+    int twentyOne;
+    int twentyTwo;
+    int twentyThree;
+};
+
+int getBigStructSize();

tests/samples/Struct.scala

@@ -8,7 +8,9 @@ import scala.scalanative.native._
 object Struct {
   type struct_point = native.CStruct2[native.CInt, native.CInt]
   type point_s = native.Ptr[struct_point]
+  type struct_bigStruct = native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._1, native.Nat._2]]]
   def getPoint(): native.Ptr[struct_point] = native.extern
+  def getBigStructSize(): native.CInt = native.extern
 }
 
 import Struct._

tests/samples/Union.c

@@ -4,3 +4,5 @@
 void setIntValue(union values *v) { v->i = 10; }
 
 void setLongValue(union values *v) { v->l = 10000000000; }
+
+int getUnionSize() { return sizeof(union values); }

tests/samples/Union.h

@@ -7,3 +7,5 @@ union values {
 void setIntValue(union values *v);
 
 void setLongValue(union values *v);
+
+int getUnionSize();

tests/samples/Union.scala

@@ -9,6 +9,7 @@ object Union {
   type union_values = native.CArray[Byte, native.Nat._8]
   def setIntValue(v: native.Ptr[union_values]): Unit = native.extern
   def setLongValue(v: native.Ptr[union_values]): Unit = native.extern
+  def getUnionSize(): native.CInt = native.extern
 }
 
 import Union._

tests/samples/src/test/scala/org/scalanative/bindgen/samples/StructTests.scala

@@ -1,6 +1,7 @@
 package org.scalanative.bindgen.samples
 
 import utest._
+import scala.scalanative.native.sizeof
 import org.scalanative.bindgen.samples.StructHelpers._
 
 object StructTests extends TestSuite {
@@ -10,5 +11,9 @@ object StructTests extends TestSuite {
       assert(point.x == 10)
       assert(point.y == 20)
     }
+
+    'bigStructSize - {
+      assert(Struct.getBigStructSize() == sizeof[Struct.struct_bigStruct])
+    }
   }
 }

tests/samples/src/test/scala/org/scalanative/bindgen/samples/UnionTests.scala

@@ -13,6 +13,8 @@ object UnionTests extends TestSuite {
         assert(!structPtr.i == 10)
         Union.setLongValue(structPtr)
         assert(!structPtr.l == 10000000000L)
+
+        assert(Union.getUnionSize() == sizeof[Union.union_values])
       }
     }
   }