Extra work in picking disjunction not necessary.

Author: gregomni

lib/Sema/CSSolver.cpp

@@ -2292,25 +2292,8 @@ Constraint *ConstraintSystem::selectDisjunction() {
   auto minDisjunction =
       std::min_element(disjunctions.begin(), disjunctions.end(),
                        [&](Constraint *first, Constraint *second) -> bool {
-                         unsigned firstFavored = first->countFavoredNestedConstraints();
-                         unsigned secondFavored = second->countFavoredNestedConstraints();
-
-                         if (firstFavored == secondFavored) {
-                           // Look for additional choices to favor
-                           SmallVector<Constraint *, 4> firstExisting;
-                           SmallVector<Constraint *, 4> secondExisting;
-
-                           existingOperatorBindingsForDisjunction(*cs, first->getNestedConstraints(), firstExisting);
-                           firstFavored = firstExisting.size() ?: first->countActiveNestedConstraints();
-                           existingOperatorBindingsForDisjunction(*cs, second->getNestedConstraints(), secondExisting);
-                           secondFavored = secondExisting.size() ?: second->countActiveNestedConstraints();
-
-                           return firstFavored < secondFavored;
-                         } else {
-                           firstFavored = firstFavored ?: first->countActiveNestedConstraints();
-                           secondFavored = secondFavored ?: second->countActiveNestedConstraints();
-                           return firstFavored < secondFavored;
-                         }
+                         return first->countActiveNestedConstraints() <
+                                second->countActiveNestedConstraints();
                        });
 
   if (minDisjunction != disjunctions.end())

lib/Sema/Constraint.h

@@ -597,15 +597,6 @@ class Constraint final : public llvm::ilist_node<Constraint>,
     return Nested;
   }
 
-  unsigned countFavoredNestedConstraints() const {
-    unsigned count = 0;
-    for (auto *constraint : Nested)
-      if (constraint->isFavored() && !constraint->isDisabled())
-        count++;
-
-    return count;
-  }
-
   unsigned countActiveNestedConstraints() const {
     unsigned count = 0;
     for (auto *constraint : Nested)