Fixed the generated C# for a fixed array of pointers.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -98,12 +98,20 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
                         else
                         {
                             var arrayType = array.Type.Desugar();
+                            var finalArrayType = arrayType.GetPointee() ?? arrayType;
                             Class @class;
-                            if (arrayType.TryGetClass(out @class) && @class.IsRefType)
-                                supportBefore.WriteLineIndent(
-                                    "{0}[i] = {1}.{2}(*(({1}.{3}*)&({4}[i * sizeof({1}.{3})])));",
-                                    value, array.Type, Helpers.CreateInstanceIdentifier,
-                                    Helpers.InternalStruct, Context.ReturnVarName);
+                            if ((finalArrayType.TryGetClass(out @class)) && @class.IsRefType)
+                            {
+                                if (arrayType == finalArrayType)
+                                    supportBefore.WriteLineIndent(
+                                        "{0}[i] = {1}.{2}(*(({1}.{3}*)&({4}[i * sizeof({1}.{3})])));",
+                                        value, array.Type, Helpers.CreateInstanceIdentifier,
+                                        Helpers.InternalStruct, Context.ReturnVarName);
+                                else
+                                    supportBefore.WriteLineIndent(
+                                        $@"{value}[i] = {finalArrayType}.{Helpers.CreateInstanceIdentifier}(({
+                                            CSharpTypePrinter.IntPtrType}) {Context.ReturnVarName}[i]);");
+                            }
                             else
                             {
                                 if (arrayType.IsPrimitiveType(PrimitiveType.Char) &&
@@ -483,7 +491,6 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
             if (!VisitType(array, quals))
                 return false;
 
-            var arrayType = array.Type.Desugar();
             switch (array.SizeType)
             {
                 case ArrayType.ArraySize.Constant:
@@ -497,18 +504,25 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
                         supportBefore.WriteLine("if ({0} != null)", Context.ArgName);
                         supportBefore.WriteStartBraceIndent();
                         Class @class;
-                        if (arrayType.TryGetClass(out @class) && @class.IsRefType)
+                        var arrayType = array.Type.Desugar();
+                        var finalArrayType = arrayType.GetPointee() ?? arrayType;
+                        if (finalArrayType.TryGetClass(out @class) && @class.IsRefType)
                         {
                             supportBefore.WriteLine("if (value.Length != {0})", array.Size);
                             ThrowArgumentOutOfRangeException();
                         }
                         supportBefore.WriteLine("for (int i = 0; i < {0}; i++)", array.Size);
                         if (@class != null && @class.IsRefType)
                         {
-                            supportBefore.WriteLineIndent(
-                                "*({1}.{2}*) &{0}[i * sizeof({1}.{2})] = *({1}.{2}*){3}[i].{4};",
-                                Context.ReturnVarName, arrayType, Helpers.InternalStruct,
-                                Context.ArgName, Helpers.InstanceIdentifier);
+                            if (finalArrayType == arrayType)
+                                supportBefore.WriteLineIndent(
+                                    "*({1}.{2}*) &{0}[i * sizeof({1}.{2})] = *({1}.{2}*){3}[i].{4};",
+                                    Context.ReturnVarName, arrayType, Helpers.InternalStruct,
+                                    Context.ArgName, Helpers.InstanceIdentifier);
+                            else
+                                supportBefore.WriteLineIndent($@"{Context.ReturnVarName}[i] = ({
+                                    (Context.Context.TargetInfo.PointerWidth == 64 ? "long" : "int")}) {
+                                    Context.ArgName}[i].{Helpers.InstanceIdentifier};");
                         }
                         else
                         {

tests/CSharp/CSharp.Tests.cs

@@ -1108,6 +1108,21 @@ public void TestStringArrayParams()
         }
     }
 
+    [Test]
+    public void TestHasFixedArrayOfPointers()
+    {
+        using (var hasFixedArrayOfPointers = new HasFixedArrayOfPointers())
+        {
+            var foos = new Foo[] { new Foo() { A = 5 }, new Foo { A = 15 }, new Foo { A = 20 } };
+            hasFixedArrayOfPointers.FixedArrayOfPointers = foos;
+            for (int i = 0; i < hasFixedArrayOfPointers.FixedArrayOfPointers.Length; i++)
+                Assert.That(hasFixedArrayOfPointers.FixedArrayOfPointers[i].A,
+                    Is.EqualTo(foos[i].A));
+            foreach (var foo in foos)
+                foo.Dispose();
+        }
+    }
+
     private class OverrideVirtualTemplate : VirtualTemplate<int>
     {
         public override int Function

tests/CSharp/CSharp.cpp

@@ -1450,3 +1450,11 @@ int TestArrays::virtualTakeArrays(Foo *fixedArrayOfPointersToObjects[], int fixe
 {
     return takeArrays(fixedArrayOfPointersToObjects, fixedArrayOfPrimitives, fixedArrayOfPointersToPrimitives);
 }
+
+HasFixedArrayOfPointers::HasFixedArrayOfPointers()
+{
+}
+
+HasFixedArrayOfPointers::~HasFixedArrayOfPointers()
+{
+}

tests/CSharp/CSharp.h

@@ -1257,3 +1257,10 @@ class TestForwardedClassInAnotherUnit
 {
 };
 
+class DLL_API HasFixedArrayOfPointers
+{
+public:
+    HasFixedArrayOfPointers();
+    ~HasFixedArrayOfPointers();
+    Foo* fixedArrayOfPointers[3];
+};