[CSApply] Set types for for all delayed closures

Author: xedin

lib/Sema/CSApply.cpp

@@ -6113,9 +6113,9 @@ static bool applyTypeToClosureExpr(ConstraintSystem &cs,
   if (auto CE = dyn_cast<ClosureExpr>(expr)) {
     cs.setType(CE, toType);
 
-    // If this closure isn't type-checked in its enclosing expression, write
-    // the type into the ClosureExpr directly here, since the visitor won't.
-    if (!shouldTypeCheckInEnclosingExpression(CE))
+    // If solution application for this closure is delayed, let's write the
+    // type into the ClosureExpr directly here, since the visitor won't.
+    if (!CE->hasSingleExpressionBody())
       CE->setType(toType);
 
     return true;