Merge pull request #23223 from xedin/followup-to-add-overload-set-cleanup

[ConstraintSystem] Prefer a single local choice over outer alternatives

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -1519,8 +1519,15 @@ void ConstraintSystem::addOverloadSet(Type boundType,
     recordChoice(overloads, choice);
   }
 
-  for (auto &choice : outerAlternatives)
-    recordChoice(overloads, choice);
+  if (!outerAlternatives.empty()) {
+    // If local scope has a single choice,
+    // it should always be preferred.
+    if (overloads.size() == 1)
+      overloads.front()->setFavored();
+
+    for (auto &choice : outerAlternatives)
+      recordChoice(overloads, choice);
+  }
 
   addDisjunctionConstraint(overloads, locator, ForgetChoice);
 }

test/Constraints/members.swift

@@ -565,3 +565,16 @@ func rdar_48114578() {
     return .valueOf((a, b)) // Ok
   }
 }
+
+struct S_Min {
+  var min: Int = 42
+}
+
+func min(_: Int, _: Float) -> Int { return 0 }
+func min(_: Float, _: Int) -> Int { return 0 }
+
+extension S_Min : CustomStringConvertible {
+  public var description: String {
+    return "\(min)" // Ok
+  }
+}