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

Author: Amritpan Kaur

lib/Sema/CSApply.cpp

@@ -8991,6 +8991,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();
+
+    // If any of them failed to type check, bail.
+    if (hadError)
+      return None;
 
     if (cs.isDebugMode()) {
       auto &log = llvm::errs();
@@ -9047,15 +9056,6 @@ Optional<SolutionApplicationTarget> ConstraintSystem::applySolution(
   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.
-  bool hadError = walker.processDelayed();
-
-  // If any of them failed to type check, bail.
-  if (hadError)
-    return None;
-
   rewriter.finalize();
 
   return resultTarget;