Fix the regressed C# marshalling of char*

Fixes #1258.

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

Author: ddobrev

Diff for: src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -566,24 +566,25 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
                     return true;
                 }
 
+                bool isConst = quals.IsConst || pointer.QualifiedPointee.Qualifiers.IsConst ||
+                     pointer.GetFinalQualifiedPointee().Qualifiers.IsConst;
+
                 if (Context.Context.Options.MarshalCharAsManagedChar &&
                     primitive == PrimitiveType.Char)
                 {
-                    Context.Return.Write($"({typePrinter.PrintNative(pointer)}) &{param.Name}");
+                    Context.Return.Write($"({typePrinter.PrintNative(pointer)})");
+                    if (isConst)
+                        Context.Return.Write("&");
+                    Context.Return.Write(param.Name);
                     return true;
                 }
 
                 pointer.QualifiedPointee.Visit(this);
 
                 if (Context.Parameter.IsIndirect)
                     Context.ArgumentPrefix.Write("&");
-
-                bool isVoid = primitive == PrimitiveType.Void &&
-                    pointee.IsAddress() && pointer.IsReference() &&
-                    (quals.IsConst || pointer.QualifiedPointee.Qualifiers.IsConst ||
-                     pointer.GetFinalQualifiedPointee().Qualifiers.IsConst);
-                if (pointer.Pointee.Desugar(false) is TemplateParameterSubstitutionType ||
-                    isVoid)
+                bool isVoid = primitive == PrimitiveType.Void && pointer.IsReference() && isConst;
+                if (pointer.Pointee.Desugar(false) is TemplateParameterSubstitutionType || isVoid)
                 {
                     var local = Generator.GeneratedIdentifier($@"{
                         param.Name}{Context.ParameterIndex}");

Diff for: tests/CSharp/CSharp.Tests.cs

@@ -110,6 +110,13 @@ public void TestReturnCharPointer()
         Assert.That(*CSharp.CSharp.TakeConstCharRef(z), Is.EqualTo(z));
     }
 
+    [Test]
+    public void TestTakeCharPointer()
+    {
+        char c = 'c';
+        Assert.That(*CSharp.CSharp.TakeCharPointer(&c), Is.EqualTo(c));
+    }
+
     [Test]
     public void TestIndexer()
     {

Diff for: tests/CSharp/CSharp.cpp

@@ -1645,6 +1645,11 @@ char* returnCharPointer()
     return 0;
 }
 
+char* takeCharPointer(char* c)
+{
+    return c;
+}
+
 char* takeConstCharRef(const char& c)
 {
     return const_cast<char*>(&c);

Diff for: tests/CSharp/CSharp.h

@@ -1362,6 +1362,7 @@ class DLL_API HasFunctionPtrField
 
 DLL_API void va_listFunction(va_list v);
 DLL_API char* returnCharPointer();
+DLL_API char* takeCharPointer(char* c);
 DLL_API char* takeConstCharRef(const char& c);
 DLL_API const char*& takeConstCharStarRef(const char*& c);
 DLL_API const void*& rValueReferenceToPointer(void*&& v);