[ConstraintSystem] Refactor Score printing to use new method that also prints non-zero ScoreKind description.

Author: Amritpan Kaur

lib/Sema/CSRanking.cpp

@@ -55,7 +55,8 @@ void ConstraintSystem::increaseScore(ScoreKind kind, unsigned value) {
   if (isDebugMode() && value > 0) {
     if (solverState)
       llvm::errs().indent(solverState->depth * 2);
-    llvm::errs() << "(increasing score due to " << getScoreKindName(kind) << ")\n";
+    llvm::errs() << "(increasing score due to " << Score::getNameFor(kind)
+                 << ")\n";
   }
 
   unsigned index = static_cast<unsigned>(kind);

lib/Sema/CSStep.cpp

@@ -241,8 +241,12 @@ bool SplitterStep::mergePartialSolutions() const {
       // Finalize this solution.
       auto solution = CS.finalize();
       solutionMemory += solution.getTotalMemory();
-      if (CS.isDebugMode())
-        getDebugLogger() << "(composed solution " << CS.CurrentScore << ")\n";
+      if (CS.isDebugMode()) {
+        auto &log = getDebugLogger();
+        log << "(composed solution:";
+        CS.CurrentScore.print(log);
+        log << ")\n";
+      }
 
       // Save this solution.
       Solutions.push_back(std::move(solution));
@@ -429,8 +433,12 @@ StepResult ComponentStep::take(bool prevFailed) {
   }
 
   auto solution = CS.finalize();
-  if (CS.isDebugMode())
-    getDebugLogger() << "(found solution " << getCurrentScore() << ")\n";
+  if (CS.isDebugMode()) {
+    auto &log = getDebugLogger();
+    log << "(found solution:";
+    getCurrentScore().print(log);
+    log << ")\n";
+  }
 
   Solutions.push_back(std::move(solution));
   return finalize(/*isSuccess=*/true);

lib/Sema/TypeCheckConstraints.cpp

@@ -1275,7 +1275,8 @@ void Solution::dump(raw_ostream &out) const {
 
   SourceManager *sm = &getConstraintSystem().getASTContext().SourceMgr;
 
-  out << "Fixed score: " << FixedScore;
+  out << "Fixed score:";
+  FixedScore.print(out);
 
   out << "\nType variables:\n";
   std::vector<std::pair<TypeVariableType *, Type>> bindings(
@@ -1428,7 +1429,8 @@ void ConstraintSystem::print(raw_ostream &out) const {
   PrintOptions PO;
   PO.PrintTypesForDebugging = true;
 
-  out << "Score: " << CurrentScore;
+  out << "Score:";
+  CurrentScore.print(out);
 
   for (const auto &contextualTypeEntry : contextualTypes) {
     auto info = contextualTypeEntry.second.first;