[ConstraintSystem] Only attempt generic overload pruning heuristics for

operators for now.

Author: hborla

lib/Sema/CSSolver.cpp

@@ -2178,17 +2178,14 @@ void ConstraintSystem::partitionDisjunction(
   SmallVector<unsigned, 4> genericOverloads;
 
   forEachChoice(Choices, [&](unsigned index, Constraint *constraint) -> bool {
-    if (!isForCodeCompletion()) {
+    if (!isForCodeCompletion() && isOperatorBindOverload(constraint)) {
       // Collect generic overload choices separately, and sort these choices
       // by specificity in order to try the most specific choice first.
-      if (constraint->getKind() == ConstraintKind::BindOverload) {
-        if (auto *decl = constraint->getOverloadChoice().getDeclOrNull()) {
-          auto *fnDecl = dyn_cast<AbstractFunctionDecl>(decl);
-          if (fnDecl && fnDecl->isGeneric()) {
-            genericOverloads.push_back(index);
-            return true;
-          }
-        }
+      auto *decl = constraint->getOverloadChoice().getDecl();
+      auto *fnDecl = dyn_cast<AbstractFunctionDecl>(decl);
+      if (fnDecl && fnDecl->isGeneric()) {
+        genericOverloads.push_back(index);
+        return true;
       }
     }
 

lib/Sema/CSStep.cpp

@@ -580,18 +580,6 @@ static bool isDeclSubstitutable(ValueDecl *declA, ValueDecl *declB) {
                            false);
 }
 
-static bool isGenericDisjunctionChoice(Constraint *constraint) {
-  if (constraint->getKind() != ConstraintKind::BindOverload)
-    return false;
-
-  auto choice = constraint->getOverloadChoice();
-  if (!choice.isDecl())
-    return false;
-
-  auto *funcDecl = dyn_cast<AbstractFunctionDecl>(choice.getDecl());
-  return funcDecl && funcDecl->isGeneric();
-}
-
 bool DisjunctionStep::shouldSkip(const DisjunctionChoice &choice) const {
   auto &ctx = CS.getASTContext();
 
@@ -624,7 +612,7 @@ bool DisjunctionStep::shouldSkip(const DisjunctionChoice &choice) const {
   // can be unconditionally substituted by the current choice, skip the current
   // choice.
   if (LastSolvedChoice && LastSolvedChoice->second == getCurrentScore() &&
-      isGenericDisjunctionChoice(choice)) {
+      choice.isGenericOperator()) {
     auto *declA = LastSolvedChoice->first->getOverloadChoice().getDecl();
     auto *declB = static_cast<Constraint *>(choice)->getOverloadChoice().getDecl();