Sema: Always compute captures when we type check a function body

Author: slavapestov

lib/Sema/MiscDiagnostics.cpp

@@ -2385,12 +2385,8 @@ class VarDeclUsageChecker : public ASTWalker {
         }
       }
 
-      if (afd->isBodyTypeChecked()) {
-        // FIXME: We don't actually need captures here anymore, but this happens
-        // to be the place where they get computed. Move this somewhere else.
-        TypeChecker::computeCaptures(afd);
+      if (afd->isBodyTypeChecked())
         return true;
-      }
 
       // Don't walk into a body that has not yet been type checked. This should
       // only occur for top-level code.

lib/Sema/TypeCheckStmt.cpp

@@ -1688,6 +1688,7 @@ static Type getFunctionBuilderType(FuncDecl *FD) {
 bool TypeChecker::typeCheckAbstractFunctionBody(AbstractFunctionDecl *AFD) {
   auto res = TypeChecker::typeCheckAbstractFunctionBodyUntil(AFD, SourceLoc());
   TypeChecker::checkFunctionErrorHandling(AFD);
+  TypeChecker::computeCaptures(AFD);
   return res;
 }
 

lib/Sema/TypeChecker.cpp

@@ -306,11 +306,6 @@ static void typeCheckDelayedFunctions(SourceFile &SF) {
   } while (currentFunctionIdx < SF.DelayedFunctions.size() ||
            currentSynthesizedDecl < SF.SynthesizedDecls.size());
 
-
-  for (AbstractFunctionDecl *FD : llvm::reverse(SF.DelayedFunctions)) {
-    TypeChecker::computeCaptures(FD);
-  }
-
   SF.DelayedFunctions.clear();
 }