[CSApply] changes.

Author: Amritpan Kaur

lib/Sema/CSApply.cpp

@@ -8995,14 +8995,31 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
     if (cs.isDebugMode()) {
       // If target is a multi-statement closure or
       // a tap expression, expression will not be fully
-      // type checked until these types are visited in
+      // type checked until these expressions are visited in
       // processDelayed().
+      bool isPartial = false;
+      resultExpr->forEachChildExpr([&](Expr *child) -> Expr * {
+        if (auto *closure = dyn_cast<ClosureExpr>(child)) {
+          if (!closure->hasSingleExpressionBody()) {
+            isPartial = true;
+            return nullptr;
+          }
+        }
+        if (isa<TapExpr>(child)) {
+          isPartial = true;
+          return nullptr;
+        }
+      return child;
+      });
+      
       auto &log = llvm::errs();
-      if (!ClosuresToTypeCheck.empty() || !TapsToTypeCheck.empty()) {
+      if (isPartial) {
         log << "---Partially type-checked expression---\n";
-        resultExpr->dump(log);
-        log << "\n";
+      } else {
+        log << "---Type-checked expression---\n";
       }
+      resultExpr->dump(log);
+      log << "\n";
     }
   }
 
@@ -9052,7 +9069,7 @@ Optional<SolutionApplicationTarget> ConstraintSystem::applySolution(
   auto resultTarget = walker.rewriteTarget(target);
   if (!resultTarget)
     return None;
-
+  
   // Visit closures that have non-single expression bodies, tap expressions,
   // and possibly other types of AST nodes which could only be processed
   // after contextual expression.
@@ -9061,16 +9078,38 @@ Optional<SolutionApplicationTarget> ConstraintSystem::applySolution(
   // If any of them failed to type check, bail.
   if (hadError)
     return None;
-
-  rewriter.finalize();
 
-  if (isDebugMode()) {
+  bool isPartial = false;
+  resultTarget->getAsExpr()->forEachChildExpr([&](Expr *child) -> Expr * {
+    if (auto *closure = dyn_cast<ClosureExpr>(child)) {
+      if (!closure->hasSingleExpressionBody()) {
+        isPartial = true;
+        return nullptr;
+      }
+    }
+    if (isa<TapExpr>(child)) {
+      isPartial = true;
+      return nullptr;
+    }
+  return child;
+  });
+  
+  if (isPartial) {
     auto &log = llvm::errs();
     log << "---Fully type-checked expression---\n";
     resultTarget->getAsExpr()->dump(log);
     log << "\n";
   }
 
+  rewriter.finalize();
+  
+//  if (isDebugMode()) {
+//    auto &log = llvm::errs();
+//    log << "---Fully type-checked expression---\n";
+//    resultTarget->getAsExpr()->dump(log);
+//    log << "\n";
+//}
+
   return resultTarget;
 }