[CSClosure] Move participatesInInference check to Constraint Generator

Author: angela-laar

lib/AST/Module.cpp

@@ -3497,7 +3497,8 @@ ArrayRef<OpaqueTypeDecl *> SourceFile::getOpaqueReturnTypeDecls() {
   for (auto *vd : UnvalidatedDeclsWithOpaqueReturnTypes.takeVector()) {
     if (auto opaqueDecl = vd->getOpaqueResultTypeDecl()) {
       auto inserted = ValidatedOpaqueReturnTypes.insert(
-          {opaqueDecl->getOpaqueReturnTypeIdentifier().str(), opaqueDecl});
+                {opaqueDecl->getOpaqueReturnTypeIdentifier().str(),
+                 opaqueDecl});
       if (inserted.second) {
         OpaqueReturnTypes.push_back(opaqueDecl);
       }

lib/Parse/ParseDecl.cpp

@@ -7234,13 +7234,13 @@ Parser::parseDeclVar(ParseDeclOptions Flags,
 
       pattern = patternRes.get();
     }
-
+    
     bool hasOpaqueReturnTy = false;
     if (auto typedPattern = dyn_cast<TypedPattern>(pattern)) {
       hasOpaqueReturnTy = typedPattern->getTypeRepr()->hasOpaque();
     }
     auto sf = CurDeclContext->getParentSourceFile();
-
+    
     // Configure all vars with attributes, 'static' and parent pattern.
     pattern->forEachVariable([&](VarDecl *VD) {
       VD->setStatic(StaticLoc.isValid());
@@ -7543,12 +7543,13 @@ ParserResult<FuncDecl> Parser::parseDeclFunc(SourceLoc StaticLoc,
                               CurDeclContext);
 
   // Let the source file track the opaque return type mapping, if any.
-  if (FuncRetTy && FuncRetTy->hasOpaque() && !InInactiveClauseEnvironment) {
+  if (FuncRetTy && FuncRetTy->hasOpaque() &&
+      !InInactiveClauseEnvironment) {
     if (auto sf = CurDeclContext->getParentSourceFile()) {
       sf->addUnvalidatedDeclWithOpaqueResultType(FD);
     }
   }
-
+  
   // Parse a 'where' clause if present.
   if (Tok.is(tok::kw_where)) {
     ContextChange CC(*this, FD);
@@ -8511,7 +8512,7 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
       Context, name, StaticLoc, StaticSpelling, SubscriptLoc, Indices.get(),
       ArrowLoc, ElementTy.get(), CurDeclContext, GenericParams);
   Subscript->getAttrs() = Attributes;
-
+  
   // Let the source file track the opaque return type mapping, if any.
   if (ElementTy.get() && ElementTy.get()->hasOpaque() &&
       !InInactiveClauseEnvironment) {

lib/Sema/CSSyntacticElement.cpp

@@ -907,8 +907,7 @@ class SyntacticElementConstraintGenerator
   void visitBraceStmt(BraceStmt *braceStmt) {
     auto &ctx = cs.getASTContext();
 
-    if (auto closure = cast<ClosureExpr>(context.getAbstractClosureExpr());
-        context.getBody() == braceStmt) {
+    if (auto closure = cast<ClosureExpr>(context.getAsAbstractClosureExpr().getPtrOrNull()); context.getBody() == braceStmt) {
       // If this closure has an empty body and no explicit result type
       // let's bind result type to `Void` since that's the only type empty body
       // can produce. Otherwise, if (multi-statement) closure doesn't have
@@ -924,6 +923,8 @@ class SyntacticElementConstraintGenerator
             ctx.TheEmptyTupleType,
             cs.getConstraintLocator(closure, ConstraintLocator::ClosureResult));
       }
+      if (!cs.participatesInInference(closure))
+        return;
     }
 
     if (context.isSingleExpressionClosure(cs)) {
@@ -1147,20 +1148,7 @@ bool ConstraintSystem::generateConstraints(AnyFunctionRef fn, BraceStmt *body) {
   if (auto *func = fn.getAbstractFunctionDecl()) {
     locator = getConstraintLocator(func);
   } else {
-    auto closure = cast<ClosureExpr>(fn.getAbstractClosureExpr());
-    locator = getConstraintLocator(closure);
-
-    if (participatesInInference(closure)) {
-      SyntacticElementConstraintGenerator generator(
-          *this, closure, getConstraintLocator(closure));
-
-      generator.visit(closure->getBody());
-
-      if (closure->hasSingleExpressionBody())
-        return generator.hadError;
-    }
-
-    return false;
+    locator = getConstraintLocator(fn.getAbstractClosureExpr());
   }
 
   SyntacticElementConstraintGenerator generator(