Fixed type-checked subexpression output bug for multi-statement closures.

Author: Amritpan Kaur

lib/Sema/CSApply.cpp

@@ -8992,14 +8992,15 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
     solution.setExprTypes(resultExpr);
     result.setExpr(resultExpr);
 
-    // 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.
-    bool hadError = processDelayed();
+    // Visit closures that have non-single expression bodies which
+    // could only be processed after contextual expression.
+    if (!ClosuresToTypeCheck.empty()) {
+      bool hadError = processDelayed();
 
-    // If any of them failed to type check, bail.
-    if (hadError)
-      return None;
+      // If any of them failed to type check, bail.
+      if (hadError)
+        return None;
+    }
 
     if (cs.isDebugMode()) {
       auto &log = llvm::errs();
@@ -9055,6 +9056,14 @@ Optional<SolutionApplicationTarget> ConstraintSystem::applySolution(
   auto resultTarget = walker.rewriteTarget(target);
   if (!resultTarget)
     return None;
+  
+  // Visit tap expressions, and possibly other types of AST nodes which
+  // be processed after contextual expression.
+  bool hadError = walker.processDelayed();
+
+  // If any of them failed to type check, bail.
+  if (hadError)
+    return None;
 
   rewriter.finalize();