Merge pull request #8799 from rudkx/propagate-constraints

Author: swift-ci

lib/Sema/CSPropagate.cpp

@@ -69,9 +69,8 @@ getBindOverloadDisjunction(ConstraintSystem &CS, Constraint *applicableFn) {
   return found;
 }
 
-bool ConstraintSystem::collectNeighboringBindOverloadDisjunctions(
+void ConstraintSystem::collectNeighboringBindOverloadDisjunctions(
     llvm::SetVector<Constraint *> &neighbors) {
-  bool failed = false;
 
   while (!ActiveConstraints.empty()) {
     auto *constraint = &ActiveConstraints.front();
@@ -87,32 +86,14 @@ bool ConstraintSystem::collectNeighboringBindOverloadDisjunctions(
     } else if (constraint->getKind() == ConstraintKind::ApplicableFunction) {
       if (auto *bindDisjunction =
               getBindOverloadDisjunction(*this, constraint)) {
-        // FIXME: should we bind this now so that we do something when
-        //        we test the applicable constraint?
         neighbors.insert(bindDisjunction);
       }
     }
 
-    // Simplify this constraint.
-    switch (simplifyConstraint(*constraint)) {
-    case SolutionKind::Error:
-      failed = true;
-      LLVM_FALLTHROUGH;
-
-    case SolutionKind::Solved:
-      solverState->retireConstraint(constraint);
-      CG.removeConstraint(constraint);
-      break;
-
-    case SolutionKind::Unsolved:
-      InactiveConstraints.push_back(constraint);
-      break;
-    }
-
+    solverState->retireConstraint(constraint);
+    CG.removeConstraint(constraint);
     constraint->setActive(false);
   }
-
-  return !failed;
 }
 
 // Simplify any active constraints, returning true on success, false
@@ -218,21 +199,7 @@ bool ConstraintSystem::isBindOverloadConsistent(
     solverState->retireConstraint(bindConstraint);
     solverState->addGeneratedConstraint(bindConstraint);
 
-    auto passed = collectNeighboringBindOverloadDisjunctions(otherDisjunctions);
-    if (!passed) {
-      if (TC.getLangOpts().DebugConstraintSolver) {
-        auto &log = getASTContext().TypeCheckerDebug->getStream();
-        log << "Disabling bind constraint: ";
-        bindConstraint->print(log, &TC.Context.SourceMgr);
-        log << "\n";
-      }
-
-      bindConstraint->setDisabled();
-      for (auto *disjunction : otherDisjunctions)
-        workList.insert(disjunction);
-
-      return false;
-    }
+    collectNeighboringBindOverloadDisjunctions(otherDisjunctions);
   }
 
   // Test the our primary constraint against all of the members of

lib/Sema/ConstraintSystem.h

@@ -2362,7 +2362,7 @@ class ConstraintSystem {
   void shrink(Expr *expr);
 
   bool simplifyForConstraintPropagation();
-  bool collectNeighboringBindOverloadDisjunctions(
+  void collectNeighboringBindOverloadDisjunctions(
       llvm::SetVector<Constraint *> &neighbors);
   bool isBindOverloadConsistent(Constraint *bindConstraint,
                                 llvm::SetVector<Constraint *> &workList);

test/Misc/expression_too_complex.swift

@@ -1,10 +1,10 @@
-// RUN: %target-typecheck-verify-swift -solver-memory-threshold 8000
+// RUN: %target-typecheck-verify-swift -solver-memory-threshold 10000 -propagate-constraints
 
-var x = [1, 2, 3, 4.5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ,19] // expected-error{{expression was too complex to be solved in reasonable time; consider breaking up the expression into distinct sub-expressions}}
+var z = 10 + 10 // expected-error{{expression was too complex to be solved in reasonable time; consider breaking up the expression into distinct sub-expressions}}
 
 // No errors should appear below as a result of the error above.
+var x = [1, 2, 3, 4.5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ,19]
 var y = 10
-var z = 10 + 10
 
 class C {}
 

test/Sema/complex_expressions.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -propagate-constraints
 
 // SR-139:
 // Infinite recursion parsing bitwise operators
@@ -93,6 +93,7 @@ func sr1794(pt: P, p0: P, p1: P) -> Bool {
 let v1 = (1 - 2 / 3 * 6) as UInt
 let v2 = (([1 + 2 * 3, 4, 5])) as [UInt]
 let v3 = ["hello": 1 + 2, "world": 3 + 4 + 5 * 3] as Dictionary<String, UInt>
+// expected-error@-1 {{ambiguous use of operator '+'}}
 let v4 = [1 + 2 + 3, 4] as [UInt32] + [2 * 3] as [UInt32]
 let v5 = ([1 + 2 + 3, 4] as [UInt32]) + ([2 * 3] as [UInt32])
 let v6 = [1 + 2 + 3, 4] as Set<UInt32>