incorporate disambiguation fix

Signed-off-by: Ahmad Rezaii <[email protected]>
chapel-lang · Sep 20, 2024 · ef3fc7f · ef3fc7f
1 parent dc6b9aa
commit ef3fc7f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/frontend/lib/resolution/disambiguation.cpp b/frontend/lib/resolution/disambiguation.cpp
@@ -1535,6 +1535,17 @@ static int testArgMapping(const DisambiguationContext& dctx,
   //   class GenericChild : Parent { type t; }
   // Here a GenericChild argument should be preferred to a Parent one
   if (f1Type == f2Type) {
+
+    if (f1Param && !f2Param) {
+      reason = "param vs not";
+      return 1;
+    }
+
+    if (!f1Param && f2Param) {
+      reason = "param vs not";
+      return 2;
+    }
+
     if (!f1Instantiated && f2Instantiated) {
       reason = "concrete vs generic";
       return 1;