Sema: Check worseThanBestSolution() in a better place

Author: slavapestov

lib/Sema/CSStep.cpp

@@ -319,7 +319,7 @@ StepResult ComponentStep::take(bool prevFailed) {
   // One of the previous components created by "split"
   // failed, it means that we can't solve this component.
   if ((prevFailed && DependsOnPartialSolutions.empty()) ||
-      CS.isTooComplex(Solutions))
+      CS.isTooComplex(Solutions) || CS.worseThanBestSolution())
     return done(/*isSuccess=*/false);
 
   // Setup active scope, only if previous component didn't fail.
@@ -924,6 +924,7 @@ StepResult ConjunctionStep::resume(bool prevFailed) {
 
   // Rewind back the constraint system information.
   ActiveChoice.reset();
+  //restoreBestScore();
 
   if (CS.isDebugMode())
     getDebugLogger() << ")\n";