Migrate loadFingerprint onto ModuleDecl and Friends

Author: CodaFi

include/swift/AST/FileUnit.h

@@ -110,6 +110,9 @@ class FileUnit : public DeclContext {
                             const ModuleDecl *importedModule,
                             SmallSetVector<Identifier, 4> &spiGroups) const {};
 
+  virtual Optional<Fingerprint>
+  loadFingerprint(const IterableDeclContext *IDC) const { return None; }
+
 protected:
   /// Look up an operator declaration. Do not call directly, use
   /// \c DirectOperatorLookupRequest instead.

include/swift/AST/LazyResolver.h

@@ -84,11 +84,6 @@ class alignas(void*) LazyMemberLoader {
   loadNamedMembers(const IterableDeclContext *IDC, DeclBaseName N,
                    uint64_t contextData) = 0;
 
-  /// Returns the fingerprint associated with the given iterable decl context,
-  /// or \c None if no such fingerprint is available.
-  virtual Optional<Fingerprint>
-  loadFingerprint(const IterableDeclContext *IDC) = 0;
-
   /// Populates the given vector with all conformances for \p D.
   ///
   /// The implementation should \em not call setConformances on \p D.

include/swift/AST/Module.h

@@ -572,6 +572,9 @@ class ModuleDecl : public DeclContext, public TypeDecl {
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results) const;
 
+  Optional<Fingerprint>
+  loadFingerprint(const IterableDeclContext *IDC) const;
+
   /// Find all SPI names imported from \p importedModule by this module,
   /// collecting the identifiers in \p spiGroups.
   void lookupImportedSPIGroups(

include/swift/Serialization/SerializedModuleLoader.h

@@ -373,6 +373,9 @@ class SerializedASTFile final : public LoadedFile {
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results) const override;
 
+  Optional<Fingerprint>
+  loadFingerprint(const IterableDeclContext *IDC) const override;
+
   virtual void
   lookupImportedSPIGroups(
                 const ModuleDecl *importedModule,

lib/AST/DeclContext.cpp

@@ -1013,13 +1013,6 @@ IterableDeclContext::castDeclToIterableDeclContext(const Decl *D) {
 
 Optional<Fingerprint> IterableDeclContext::getBodyFingerprint() const {
   auto &ctx = getASTContext();
-  // If this decl comes from a serialized module, grab its fingerprint from
-  // the file.
-  if (!getAsGenericContext()->getParentSourceFile()) {
-    auto ci = ctx.getOrCreateLazyIterableContextData(this,
-                                                     /*lazyLoader=*/nullptr);
-    return ci->loader->loadFingerprint(this);
-  }
   auto mutableThis = const_cast<IterableDeclContext *>(this);
   return evaluateOrDefault(ctx.evaluator, ParseMembersRequest{mutableThis},
                            FingerprintAndMembers())

lib/AST/FrontendSourceFileDepGraphFactory.cpp

@@ -507,7 +507,7 @@ ModuleDepGraphFactory::ModuleDepGraphFactory(const ModuleDecl *Mod,
                                              bool emitDot)
     : AbstractSourceFileDepGraphFactory(Mod->getASTContext().hadError(),
                                         Mod->getNameStr(),
-                                        Fingerprint(std::string{Fingerprint::DIGEST_LENGTH, '0'}),
+                                        Fingerprint("00000000000000000000000000000000"),
                                         emitDot,
                                         Mod->getASTContext().Diags),
       Mod(Mod) {}

lib/AST/Module.cpp

@@ -680,6 +680,15 @@ void ModuleDecl::lookupObjCMethods(
   FORWARD(lookupObjCMethods, (selector, results));
 }
 
+Optional<Fingerprint>
+ModuleDecl::loadFingerprint(const IterableDeclContext *IDC) const {
+  for (auto file : getFiles()) {
+    if (auto FP = file->loadFingerprint(IDC))
+      return FP;
+  }
+  return None;
+}
+
 void ModuleDecl::lookupImportedSPIGroups(
                         const ModuleDecl *importedModule,
                         llvm::SmallSetVector<Identifier, 4> &spiGroups) const {

lib/ClangImporter/ClangImporter.cpp

@@ -3831,12 +3831,6 @@ void ClangImporter::Implementation::lookupAllObjCMembers(
   }
 }
 
-Optional<Fingerprint>
-ClangImporter::Implementation::loadFingerprint(const IterableDeclContext *) {
-  // Clang decls are not fingerprinted in Swift.
-  return None;
-}
-
 TinyPtrVector<ValueDecl *>
 ClangImporter::Implementation::loadNamedMembers(
     const IterableDeclContext *IDC, DeclBaseName N, uint64_t contextData) {

lib/ClangImporter/ImporterImpl.h

@@ -1247,9 +1247,6 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
   loadNamedMembers(const IterableDeclContext *IDC, DeclBaseName N,
                    uint64_t contextData) override;
 
-  virtual Optional<Fingerprint>
-  loadFingerprint(const IterableDeclContext *IDC) override;
-
 private:
   void
   loadAllMembersOfObjcContainer(Decl *D,

lib/Parse/ParseRequests.cpp

@@ -62,7 +62,11 @@ ParseMembersRequest::evaluate(Evaluator &evaluator,
       }
     }
 
-    return FingerprintAndMembers{None, ctx.AllocateCopy(members)};
+    Optional<Fingerprint> fp = None;
+    if (!idc->getDecl()->isImplicit()) {
+      fp = idc->getDecl()->getModuleContext()->loadFingerprint(idc);
+    }
+    return FingerprintAndMembers{fp, ctx.AllocateCopy(members)};
   }
 
   unsigned bufferID = *sf->getBufferID();