Add SILGenSourceFileRequest

Replace SILGenModule::emitSourceFile with SILGenSourceFileRequest so we
have an explicit source file to associate any lookups with.

Author: CodaFi

include/swift/AST/SILGenRequests.h

@@ -31,6 +31,7 @@ class SourceFile;
 
 namespace Lowering {
   class TypeConverter;
+  class SILGenModule;
 }
 
 /// Report that a request of the given kind is being evaluated, so it
@@ -96,6 +97,30 @@ void simple_display(llvm::raw_ostream &out, const SILGenDescriptor &d);
 
 SourceLoc extractNearestSourceLoc(const SILGenDescriptor &desc);
 
+class SILGenSourceFileRequest :
+    public SimpleRequest<SILGenSourceFileRequest,
+                         bool(Lowering::SILGenModule *, SourceFile *),
+                         CacheKind::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<bool>
+  evaluate(Evaluator &evaluator,
+           Lowering::SILGenModule *SGM, SourceFile *SF) const;
+
+public:
+  bool isCached() const { return true; }
+};
+
+inline void
+simple_display(llvm::raw_ostream &out, const Lowering::SILGenModule *SGM) {
+  // No-op
+}
+
 /// The zone number for SILGen.
 #define SWIFT_TYPEID_ZONE SILGen
 #define SWIFT_TYPEID_HEADER "swift/AST/SILGenTypeIDZone.def"

include/swift/AST/SILGenTypeIDZone.def

@@ -17,3 +17,6 @@
 SWIFT_REQUEST(SILGen, GenerateSILRequest,
               std::unique_ptr<SILModule>(SILGenDescriptor),
               Uncached, NoLocationInfo)
+SWIFT_REQUEST(SILGen, SILGenSourceFileRequest,
+              bool(Lowering::SILGenModule *, SourceFile *),
+              Uncached, NoLocationInfo)

lib/SILGen/SILGen.cpp

@@ -1669,22 +1669,24 @@ class SourceFileScope {
 
 } // end anonymous namespace
 
-void SILGenModule::emitSourceFile(SourceFile *sf) {
-  SourceFileScope scope(*this, sf);
-  FrontendStatsTracer StatsTracer(getASTContext().Stats, "SILgen-file", sf);
+llvm::Expected<bool>
+SILGenSourceFileRequest::evaluate(Evaluator &evaluator,
+                                  SILGenModule *SGM, SourceFile *sf) const {
+  SourceFileScope scope(*SGM, sf);
   for (Decl *D : sf->getTopLevelDecls()) {
-    FrontendStatsTracer StatsTracer(getASTContext().Stats, "SILgen-decl", D);
-    visit(D);
+    FrontendStatsTracer StatsTracer(SGM->getASTContext().Stats, "SILgen-decl", D);
+    SGM->visit(D);
   }
 
   for (TypeDecl *TD : sf->LocalTypeDecls) {
-    FrontendStatsTracer StatsTracer(getASTContext().Stats, "SILgen-tydecl", TD);
+    FrontendStatsTracer StatsTracer(SGM->getASTContext().Stats, "SILgen-tydecl", TD);
     // FIXME: Delayed parsing would prevent these types from being added to the
     //        module in the first place.
     if (TD->getDeclContext()->getInnermostSkippedFunctionContext())
       continue;
-    visit(TD);
+    SGM->visit(TD);
   }
+  return true;
 }
 
 //===----------------------------------------------------------------------===//
@@ -1708,7 +1710,8 @@ SILModule::constructSIL(ModuleDecl *mod, TypeConverter &tc,
 
   if (SF) {
     if (auto *file = dyn_cast<SourceFile>(SF)) {
-      SGM.emitSourceFile(file);
+      (void)evaluateOrDefault(file->getASTContext().evaluator,
+                              SILGenSourceFileRequest{&SGM, file}, false);
     } else if (auto *file = dyn_cast<SerializedASTFile>(SF)) {
       if (file->isSIB())
         M->getSILLoader()->getAllForModule(mod->getName(), file);
@@ -1718,7 +1721,8 @@ SILModule::constructSIL(ModuleDecl *mod, TypeConverter &tc,
       auto nextSF = dyn_cast<SourceFile>(file);
       if (!nextSF || nextSF->ASTStage != SourceFile::TypeChecked)
         continue;
-      SGM.emitSourceFile(nextSF);
+      (void)evaluateOrDefault(nextSF->getASTContext().evaluator,
+                              SILGenSourceFileRequest{&SGM, nextSF}, false);
     }
 
     // Also make sure to process any intermediate files that may contain SIL

lib/SILGen/SILGen.h

@@ -208,9 +208,6 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
 
   void emitAbstractFuncDecl(AbstractFunctionDecl *AFD);
 
-  /// Generate code for a source file of the module.
-  void emitSourceFile(SourceFile *sf);
-  
   /// Generates code for the given FuncDecl and adds the
   /// SILFunction to the current SILModule under the name SILDeclRef(decl). For
   /// curried functions, curried entry point Functions are also generated and