[NFC] Pull the Computation of Fingerprints Into the Common Base Class

Author: CodaFi

include/swift/AST/AbstractSourceFileDepGraphFactory.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_AST_SOURCE_FILE_DEP_GRAPH_CONSTRUCTOR_H
 #define SWIFT_AST_SOURCE_FILE_DEP_GRAPH_CONSTRUCTOR_H
 
+#include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
 #include "swift/AST/FineGrainedDependencies.h"
 
@@ -72,6 +73,21 @@ class AbstractSourceFileDepGraphFactory {
                        Optional<StringRef> fingerprint);
 
   void addAUsedDecl(const DependencyKey &def, const DependencyKey &use);
+
+  static Optional<std::string> getFingerprintIfAny(
+      std::pair<const NominalTypeDecl *, const ValueDecl *>) {
+    return None;
+  }
+
+  static Optional<std::string> getFingerprintIfAny(const Decl *d) {
+    if (const auto *idc = dyn_cast<IterableDeclContext>(d)) {
+      auto result = idc->getBodyFingerprint();
+      assert((!result || !result->empty()) &&
+             "Fingerprint should never be empty");
+      return result;
+    }
+    return None;
+  }
 };
 
 } // namespace fine_grained_dependencies

lib/AST/FrontendSourceFileDepGraphFactory.cpp

@@ -229,6 +229,13 @@ std::string FrontendSourceFileDepGraphFactory::getFingerprint(SourceFile *SF) {
   return getInterfaceHash(SF);
 }
 
+std::string
+FrontendSourceFileDepGraphFactory::getInterfaceHash(SourceFile *SF) {
+  llvm::SmallString<32> interfaceHash;
+  SF->getInterfaceHash(interfaceHash);
+  return interfaceHash.str().str();
+}
+
 //==============================================================================
 // MARK: FrontendSourceFileDepGraphFactory - adding collections of defined Decls
 //==============================================================================
@@ -407,7 +414,8 @@ template <NodeKind kind, typename ContentsT>
 void FrontendSourceFileDepGraphFactory::addAllDefinedDeclsOfAGivenType(
     std::vector<ContentsT> &contentsVec) {
   for (const auto &declOrPair : contentsVec) {
-    Optional<std::string> fp = getFingerprintIfAny(declOrPair);
+    Optional<std::string> fp =
+        AbstractSourceFileDepGraphFactory::getFingerprintIfAny(declOrPair);
     addADefinedDecl(
         DependencyKey::createForProvidedEntityInterface<kind>(declOrPair),
         fp ? StringRef(fp.getValue()) : Optional<StringRef>());
@@ -519,33 +527,6 @@ void FrontendSourceFileDepGraphFactory::addAllUsedDecls() {
     .enumerateAllUses();
 }
 
-//==============================================================================
-// MARK: FrontendSourceFileDepGraphFactory - adding individual defined Decls
-//==============================================================================
-
-std::string
-FrontendSourceFileDepGraphFactory::getInterfaceHash(SourceFile *SF) {
-  llvm::SmallString<32> interfaceHash;
-  SF->getInterfaceHash(interfaceHash);
-  return interfaceHash.str().str();
-}
-
-/// At present, only \c NominalTypeDecls have (body) fingerprints
-Optional<std::string> FrontendSourceFileDepGraphFactory::getFingerprintIfAny(
-    std::pair<const NominalTypeDecl *, const ValueDecl *>) {
-  return None;
-}
-Optional<std::string>
-FrontendSourceFileDepGraphFactory::getFingerprintIfAny(const Decl *d) {
-  if (const auto *idc = dyn_cast<IterableDeclContext>(d)) {
-    auto result = idc->getBodyFingerprint();
-    assert((!result || !result->empty()) &&
-           "Fingerprint should never be empty");
-    return result;
-  }
-  return None;
-}
-
 //==============================================================================
 // MARK: ModuleDepGraphFactory
 //==============================================================================
@@ -591,29 +572,10 @@ template <NodeKind kind, typename ContentsT>
 void ModuleDepGraphFactory::addAllDefinedDeclsOfAGivenType(
     std::vector<ContentsT> &contentsVec) {
   for (const auto &declOrPair : contentsVec) {
-    Optional<std::string> fp = getFingerprintIfAny(declOrPair);
+    Optional<std::string> fp =
+        AbstractSourceFileDepGraphFactory::getFingerprintIfAny(declOrPair);
     addADefinedDecl(
         DependencyKey::createForProvidedEntityInterface<kind>(declOrPair),
         fp ? StringRef(fp.getValue()) : Optional<StringRef>());
   }
 }
-
-//==============================================================================
-// MARK: ModuleDepGraphFactory - adding individual defined Decls
-//==============================================================================
-
-/// At present, only \c NominalTypeDecls have (body) fingerprints
-Optional<std::string> ModuleDepGraphFactory::getFingerprintIfAny(
-    std::pair<const NominalTypeDecl *, const ValueDecl *>) {
-  return None;
-}
-Optional<std::string>
-ModuleDepGraphFactory::getFingerprintIfAny(const Decl *d) {
-  if (const auto *idc = dyn_cast<IterableDeclContext>(d)) {
-    auto result = idc->getBodyFingerprint();
-    assert((!result || !result->empty()) &&
-           "Fingerprint should never be empty");
-    return result;
-  }
-  return None;
-}

lib/AST/FrontendSourceFileDepGraphFactory.h

@@ -44,12 +44,6 @@ class FrontendSourceFileDepGraphFactory
   /// create node pairs for context and name
   template <NodeKind kind, typename ContentsT>
   void addAllDefinedDeclsOfAGivenType(std::vector<ContentsT> &contentsVec);
-
-  /// At present, only nominals, protocols, and extensions have (body)
-  /// fingerprints
-  static Optional<std::string>
-  getFingerprintIfAny(std::pair<const NominalTypeDecl *, const ValueDecl *>);
-  static Optional<std::string> getFingerprintIfAny(const Decl *d);
 };
 
 class ModuleDepGraphFactory : public AbstractSourceFileDepGraphFactory {
@@ -68,12 +62,6 @@ class ModuleDepGraphFactory : public AbstractSourceFileDepGraphFactory {
   /// create node pairs for context and name
   template <NodeKind kind, typename ContentsT>
   void addAllDefinedDeclsOfAGivenType(std::vector<ContentsT> &contentsVec);
-
-  /// At present, only nominals, protocols, and extensions have (body)
-  /// fingerprints
-  static Optional<std::string> getFingerprintIfAny(
-      std::pair<const NominalTypeDecl *, const ValueDecl *>);
-  static Optional<std::string> getFingerprintIfAny(const Decl *d);
 };
 
 } // namespace fine_grained_dependencies