Sema: Reset best score after applying previous conjunction solution

Author: slavapestov

lib/Sema/CSStep.cpp

@@ -865,10 +865,6 @@ bool DisjunctionStep::attempt(const DisjunctionChoice &choice) {
 bool ConjunctionStep::attempt(const ConjunctionElement &element) {
   ++CS.solverState->NumConjunctionTerms;
 
-  // Outside or previous element score doesn't affect
-  // subsequent elements.
-  CS.solverState->BestScore.reset();
-
   // Apply solution inferred for all the previous elements
   // because this element could reference declarations
   // established in previous element(s).
@@ -880,6 +876,10 @@ bool ConjunctionStep::attempt(const ConjunctionElement &element) {
     CS.applySolution(Solutions.pop_back_val());
   }
 
+  // Outside or previous element score doesn't affect
+  // subsequent elements.
+  CS.solverState->BestScore.reset();
+
   // Make sure that element is solved in isolation
   // by dropping all scoring information.
   CS.CurrentScore = Score();