Generate valid C# for static object-typed fields

Signed-off-by: Dimitar Dobrev <[email protected]>
mono · Oct 29, 2021 · c8c415b · c8c415b
1 parent 12f456e
commit c8c415b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -286,6 +286,7 @@ public override bool VisitClassDecl(Class @class)
             {
                 if (Context.MarshalKind == MarshalKind.NativeField ||
                     Context.MarshalKind == MarshalKind.Variable ||
+                    Context.MarshalKind == MarshalKind.ReturnVariableArray ||
                     !originalClass.HasNonTrivialDestructor)
                 {
                     Context.Return.Write($"{qualifiedClass}.{Helpers.CreateInstanceIdentifier}({Context.ReturnVarName})");

diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -1294,9 +1294,12 @@ private bool GenerateVariableGetter(Variable var)
             ctx.PushMarshalKind(MarshalKind.ReturnVariableArray);
 
             var arrayType = var.Type.Desugar() as ArrayType;
-            var isRefTypeArray = arrayType != null && var.Namespace is Class @class && @class.IsRefType;
+            var isRefTypeArray = arrayType != null && var.Namespace is Class context && context.IsRefType;
             var elementType = arrayType?.Type.Desugar();
-            if (!isRefTypeArray && elementType == null)
+            Type type = (var.QualifiedType.Type.GetFinalPointee() ?? var.QualifiedType.Type).Desugar();
+            if (type.TryGetClass(out Class @class) && @class.IsRefType)
+                ctx.ReturnVarName = $"new {TypePrinter.IntPtrType}({ptr})";
+            else if (!isRefTypeArray && elementType == null)
                 ctx.ReturnVarName = $"*{ptr}";
             else if (elementType == null || elementType.IsPrimitiveType() ||
                 arrayType.SizeType == ArrayType.ArraySize.Constant)

diff --git a/tests/Common/Common.Tests.cs b/tests/Common/Common.Tests.cs
@@ -914,6 +914,8 @@ public void TestStaticFields()
         Assert.That(Foo.ReadWrite, Is.EqualTo(15));
         Foo.ReadWrite = 25;
         Assert.That(Foo.ReadWrite, Is.EqualTo(25));
+        Foo.StaticField.A = 20;
+        Assert.That(Foo.StaticField.A, Is.EqualTo(20));
     }
 
     [Test]

diff --git a/tests/Common/Common.cpp b/tests/Common/Common.cpp
@@ -60,6 +60,8 @@ char16_t Foo::returnChar16()
     return 'a';
 }
 
+Foo Foo::staticField;
+
 Foo2::Foo2() {}
 
 Foo2::Foo2(const Foo2& other) : Foo(other), C(other.C), valueTypeField(other.valueTypeField) {}

diff --git a/tests/Common/Common.h b/tests/Common/Common.h
@@ -105,6 +105,8 @@ class DLL_API Foo
 
     int fooPtr();
     char16_t returnChar16();
+
+    static Foo staticField;
 };
 
 struct DLL_API Bar