Define high-level dependency sources

Plug high-level requests that define dependency sources into the evaluator's incremental infrastructure.

Author: CodaFi

include/swift/AST/IRGenRequests.h

@@ -18,6 +18,7 @@
 #define SWIFT_IRGen_REQUESTS_H
 
 #include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/EvaluatorDependencies.h"
 #include "swift/AST/SimpleRequest.h"
 #include "swift/Basic/PrimarySpecificPaths.h"
 #include "llvm/ADT/StringSet.h"
@@ -116,7 +117,7 @@ void reportEvaluatedRequest(UnifiedStatsReporter &stats,
 class IRGenSourceFileRequest
     : public SimpleRequest<IRGenSourceFileRequest,
                            std::unique_ptr<llvm::Module>(IRGenDescriptor),
-                           CacheKind::Uncached> {
+                           CacheKind::Uncached|CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -129,6 +130,10 @@ class IRGenSourceFileRequest
 
 public:
   bool isCached() const { return true; }
+
+public:
+  // Incremental dependencies.
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 class IRGenWholeModuleRequest

include/swift/AST/ParseRequests.h

@@ -17,6 +17,7 @@
 #define SWIFT_PARSE_REQUESTS_H
 
 #include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/EvaluatorDependencies.h"
 #include "swift/AST/SimpleRequest.h"
 
 namespace swift {
@@ -82,9 +83,9 @@ class ParseAbstractFunctionBodyRequest :
 
 /// Parse the top-level decls of a SourceFile.
 class ParseSourceFileRequest
-    : public SimpleRequest<ParseSourceFileRequest,
-                           ArrayRef<Decl *>(SourceFile *),
-                           CacheKind::SeparatelyCached> {
+    : public SimpleRequest<
+          ParseSourceFileRequest, ArrayRef<Decl *>(SourceFile *),
+          CacheKind::SeparatelyCached | CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -99,6 +100,9 @@ class ParseSourceFileRequest
   bool isCached() const { return true; }
   Optional<ArrayRef<Decl *>> getCachedResult() const;
   void cacheResult(ArrayRef<Decl *> decls) const;
+
+public:
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 void simple_display(llvm::raw_ostream &out,
@@ -107,7 +111,7 @@ void simple_display(llvm::raw_ostream &out,
 class CodeCompletionSecondPassRequest
     : public SimpleRequest<CodeCompletionSecondPassRequest,
                            bool(SourceFile *, CodeCompletionCallbacksFactory *),
-                           CacheKind::Uncached> {
+                           CacheKind::Uncached|CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -117,6 +121,9 @@ class CodeCompletionSecondPassRequest
   // Evaluation.
   bool evaluate(Evaluator &evaluator, SourceFile *SF,
                 CodeCompletionCallbacksFactory *Factory) const;
+
+public:
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 /// The zone number for the parser.

include/swift/AST/SILGenRequests.h

@@ -18,6 +18,7 @@
 #define SWIFT_SILGEN_REQUESTS_H
 
 #include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/EvaluatorDependencies.h"
 #include "swift/AST/SimpleRequest.h"
 
 namespace swift {
@@ -81,7 +82,7 @@ SourceLoc extractNearestSourceLoc(const SILGenDescriptor &desc);
 class SILGenSourceFileRequest :
     public SimpleRequest<SILGenSourceFileRequest,
                          std::unique_ptr<SILModule>(SILGenDescriptor),
-                         CacheKind::Uncached> {
+                         CacheKind::Uncached|CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -94,6 +95,10 @@ class SILGenSourceFileRequest :
 
 public:
   bool isCached() const { return true; }
+
+public:
+  // Incremental dependencies.
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 class SILGenWholeModuleRequest :

include/swift/AST/TypeCheckRequests.h

@@ -842,7 +842,7 @@ class LazyStoragePropertyRequest :
 class TypeCheckFunctionBodyUntilRequest :
     public SimpleRequest<TypeCheckFunctionBodyUntilRequest,
                          bool(AbstractFunctionDecl *, SourceLoc),
-                         CacheKind::Cached> {
+                         CacheKind::Cached|CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -856,6 +856,10 @@ class TypeCheckFunctionBodyUntilRequest :
 
 public:
   bool isCached() const { return true; }
+
+public:
+  // Incremental dependencies.
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 /// Request to obtain a list of stored properties in a nominal type.
@@ -1973,10 +1977,10 @@ class DynamicallyReplacedDeclRequest
   bool isCached() const { return true; }
 };
 
-class TypeCheckSourceFileRequest :
-    public SimpleRequest<TypeCheckSourceFileRequest,
-                         evaluator::SideEffect (SourceFile *),
-                         CacheKind::SeparatelyCached> {
+class TypeCheckSourceFileRequest
+    : public SimpleRequest<
+          TypeCheckSourceFileRequest, evaluator::SideEffect(SourceFile *),
+          CacheKind::SeparatelyCached | CacheKind::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -1992,6 +1996,10 @@ class TypeCheckSourceFileRequest :
   bool isCached() const { return true; }
   Optional<evaluator::SideEffect> getCachedResult() const;
   void cacheResult(evaluator::SideEffect) const;
+
+public:
+  // Incremental dependencies.
+  evaluator::DependencySource readDependencySource(Evaluator &) const;
 };
 
 /// Computes whether the specified type or a super-class/super-protocol has the

lib/AST/TypeCheckRequests.cpp

@@ -1283,6 +1283,11 @@ void CheckRedeclarationRequest::cacheResult(evaluator::SideEffect) const {
 // TypeCheckSourceFileRequest computation.
 //----------------------------------------------------------------------------//
 
+evaluator::DependencySource
+TypeCheckSourceFileRequest::readDependencySource(Evaluator &e) const {
+  return {std::get<0>(getStorage()), evaluator::DependencyScope::Cascading};
+}
+
 Optional<evaluator::SideEffect>
 TypeCheckSourceFileRequest::getCachedResult() const {
   auto *SF = std::get<0>(getStorage());
@@ -1324,3 +1329,17 @@ void TypeCheckSourceFileRequest::cacheResult(evaluator::SideEffect) const {
 #endif
   }
 }
+
+//----------------------------------------------------------------------------//
+// TypeCheckFunctionBodyUntilRequest computation.
+//----------------------------------------------------------------------------//
+
+evaluator::DependencySource
+TypeCheckFunctionBodyUntilRequest::readDependencySource(Evaluator &e) const {
+  // We're going under a function body scope, unconditionally flip the scope
+  // to private.
+  return {
+    std::get<0>(getStorage())->getParentSourceFile(),
+    evaluator::DependencyScope::Private
+  };
+}

lib/IRGen/IRGenRequests.cpp

@@ -48,6 +48,15 @@ SourceLoc swift::extractNearestSourceLoc(const IRGenDescriptor &desc) {
   return SourceLoc();
 }
 
+evaluator::DependencySource
+IRGenSourceFileRequest::readDependencySource(Evaluator &e) const {
+  auto &desc = std::get<0>(getStorage());
+  return {
+    desc.Ctx.dyn_cast<SourceFile *>(),
+    evaluator::DependencyScope::Cascading
+  };
+}
+
 // Define request evaluation functions for each of the IRGen requests.
 static AbstractRequestFunction *irGenRequestFunctions[] = {
 #define SWIFT_REQUEST(Zone, Name, Sig, Caching, LocOptions)                    \

lib/Parse/ParseRequests.cpp

@@ -167,6 +167,11 @@ ArrayRef<Decl *> ParseSourceFileRequest::evaluate(Evaluator &evaluator,
   return ctx.AllocateCopy(decls);
 }
 
+evaluator::DependencySource
+ParseSourceFileRequest::readDependencySource(Evaluator &e) const {
+  return {std::get<0>(getStorage()), evaluator::DependencyScope::Cascading};
+}
+
 Optional<ArrayRef<Decl *>> ParseSourceFileRequest::getCachedResult() const {
   auto *SF = std::get<0>(getStorage());
   return SF->getCachedTopLevelDecls();
@@ -189,6 +194,11 @@ void ParseSourceFileRequest::cacheResult(ArrayRef<Decl *> decls) const {
 void swift::simple_display(llvm::raw_ostream &out,
                            const CodeCompletionCallbacksFactory *factory) { }
 
+evaluator::DependencySource
+CodeCompletionSecondPassRequest::readDependencySource(Evaluator &e) const {
+  return {std::get<0>(getStorage()), e.getActiveSourceScope()};
+}
+
 // Define request evaluation functions for each of the type checker requests.
 static AbstractRequestFunction *parseRequestFunctions[] = {
 #define SWIFT_REQUEST(Zone, Name, Sig, Caching, LocOptions)                    \

lib/SILGen/SILGenRequests.cpp

@@ -46,6 +46,16 @@ SourceLoc swift::extractNearestSourceLoc(const SILGenDescriptor &desc) {
   return SourceLoc();
 }
 
+evaluator::DependencySource
+SILGenSourceFileRequest::readDependencySource(Evaluator &e) const {
+  auto &desc = std::get<0>(getStorage());
+  auto *unit = desc.context.get<FileUnit *>();
+  return {
+    dyn_cast_or_null<SourceFile>(unit),
+    evaluator::DependencyScope::Cascading
+  };
+}
+
 // Define request evaluation functions for each of the SILGen requests.
 static AbstractRequestFunction *silGenRequestFunctions[] = {
 #define SWIFT_REQUEST(Zone, Name, Sig, Caching, LocOptions)                    \