Prefer non-mapped types when resolving ambiguous overloads

This fixes a missing specialized method when it has a parameter with type a mapped template which is ignored when dependent.

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

Author: ddobrev

src/Generator/Passes/CheckAmbiguousFunctions.cs

@@ -75,6 +75,9 @@ private bool CheckDefaultParametersForAmbiguity(Function function, Function over
 
             var commonParameters = Math.Min(functionParams.Count, overloadParams.Count);
 
+            int functionMappedParams = 0;
+            int overloadMappedParams = 0;
+
             var i = 0;
             for (; i < commonParameters; ++i)
             {
@@ -83,6 +86,11 @@ private bool CheckDefaultParametersForAmbiguity(Function function, Function over
                 AST.Type overloadType = overloadParams[i].Type.GetMappedType(
                     TypeMaps, Options.GeneratorKind);
 
+                if (!funcType.Equals(functionParams[i].Type.Desugar()))
+                    functionMappedParams++;
+                if (!overloadType.Equals(overloadParams[i].Type.Desugar()))
+                    overloadMappedParams++;
+
                 AST.Type funcPointee = funcType.GetFinalPointee() ?? funcType;
                 AST.Type overloadPointee = overloadType.GetFinalPointee() ?? overloadType;
 
@@ -106,7 +114,8 @@ private bool CheckDefaultParametersForAmbiguity(Function function, Function over
                     return false;
             }
 
-            if (functionParams.Count > overloadParams.Count)
+            if (functionParams.Count > overloadParams.Count ||
+                functionMappedParams < overloadMappedParams)
                 overload.ExplicitlyIgnore();
             else
                 function.ExplicitlyIgnore();

tests/CSharp/CSharp.cs

@@ -149,6 +149,8 @@ public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
             }
         }
 
+        public override bool IsIgnored => Type.IsDependent;
+
         private static Type GetEnumType(Type mappedType)
         {
             var type = mappedType.Desugar();

tests/CSharp/CSharpTemplates.h

@@ -706,17 +706,17 @@ template <typename T>
 class HasCtorWithMappedToEnum
 {
 public:
-    HasCtorWithMappedToEnum(QFlags<T> t);
     HasCtorWithMappedToEnum(T t);
+    HasCtorWithMappedToEnum(QFlags<T> t);
 };
 
 template <typename T>
-HasCtorWithMappedToEnum<T>::HasCtorWithMappedToEnum(QFlags<T> t)
+HasCtorWithMappedToEnum<T>::HasCtorWithMappedToEnum(T t)
 {
 }
 
 template <typename T>
-HasCtorWithMappedToEnum<T>::HasCtorWithMappedToEnum(T t)
+HasCtorWithMappedToEnum<T>::HasCtorWithMappedToEnum(QFlags<T> t)
 {
 }