Checked the desugared type when visiting pointer types.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
mono · Aug 13, 2013 · ef1828d · ef1828d
1 parent 90db6eb
commit ef1828d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -275,8 +275,9 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
 
             var pointee = pointer.Pointee;
 
-            if (pointee.IsPrimitiveType(PrimitiveType.Char) ||
-                pointee.IsPrimitiveType(PrimitiveType.WideChar))
+            Type type = pointee.Desugar();
+            if (type.IsPrimitiveType(PrimitiveType.Char) ||
+                type.IsPrimitiveType(PrimitiveType.WideChar))
             {
                 Context.Return.Write("Marshal.StringToHGlobalAnsi({0})",
                     Context.Parameter.Name);
@@ -292,7 +293,7 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
             }
 
             Class @class;
-            if (pointee.Desugar().IsTagDecl(out @class) && @class.IsValueType)
+            if (type.IsTagDecl(out @class) && @class.IsValueType)
             {
                 if (Context.Parameter.Usage == ParameterUsage.Out)
                 {
@@ -312,7 +313,7 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
             }
 
             PrimitiveType primitive;
-            if (pointee.IsPrimitiveType(out primitive))
+            if (type.IsPrimitiveType(out primitive))
             {
                 Context.Return.Write(Context.Parameter.Name);
                 return true;