[CSApply] Fix type-checked subexpression output bug for multi-statement closures.

Author: Amritpan Kaur

lib/Sema/CSApply.cpp

@@ -8991,6 +8991,16 @@ ExprWalker::rewriteTarget(SolutionApplicationTarget target) {
 
     solution.setExprTypes(resultExpr);
     result.setExpr(resultExpr);
+    
+    // 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 (cs.isDebugMode()) {
       auto &log = llvm::errs();
@@ -9046,10 +9056,9 @@ 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.
+  
+  // 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.