Merge pull request swiftlang#34581 from CodaFi/defunctionalization

[NFC] Pull addAllDefinedDeclsOfAGivenType into its Base Class

Author: CodaFi

include/swift/AST/AbstractSourceFileDepGraphFactory.h

@@ -66,6 +66,19 @@ class AbstractSourceFileDepGraphFactory {
   virtual void addAllUsedDecls() = 0;
 
 protected:
+  /// Given an array of Decls or pairs of them in \p declsOrPairs
+  /// create node pairs for context and name
+  template <NodeKind kind, typename ContentsT>
+  void addAllDefinedDeclsOfAGivenType(std::vector<ContentsT> &contentsVec) {
+    for (const auto &declOrPair : contentsVec) {
+      Optional<std::string> fp =
+          AbstractSourceFileDepGraphFactory::getFingerprintIfAny(declOrPair);
+      addADefinedDecl(
+          DependencyKey::createForProvidedEntityInterface<kind>(declOrPair),
+          fp ? StringRef(fp.getValue()) : Optional<StringRef>());
+    }
+  }
+
   /// Add an pair of interface, implementation nodes to the graph, which
   /// represent some \c Decl defined in this source file. \param key the
   /// interface key of the pair

lib/AST/FrontendSourceFileDepGraphFactory.cpp

@@ -408,20 +408,6 @@ void FrontendSourceFileDepGraphFactory::addAllDefinedDecls() {
       declFinder.classMembers);
 }
 
-/// Given an array of Decls or pairs of them in \p declsOrPairs
-/// create node pairs for context and name
-template <NodeKind kind, typename ContentsT>
-void FrontendSourceFileDepGraphFactory::addAllDefinedDeclsOfAGivenType(
-    std::vector<ContentsT> &contentsVec) {
-  for (const auto &declOrPair : contentsVec) {
-    Optional<std::string> fp =
-        AbstractSourceFileDepGraphFactory::getFingerprintIfAny(declOrPair);
-    addADefinedDecl(
-        DependencyKey::createForProvidedEntityInterface<kind>(declOrPair),
-        fp ? StringRef(fp.getValue()) : Optional<StringRef>());
-  }
-}
-
 //==============================================================================
 // MARK: FrontendSourceFileDepGraphFactory - adding collections of used Decls
 //==============================================================================
@@ -565,17 +551,3 @@ void ModuleDepGraphFactory::addAllDefinedDecls() {
   addAllDefinedDeclsOfAGivenType<NodeKind::dynamicLookup>(
       declFinder.classMembers);
 }
-
-/// Given an array of Decls or pairs of them in \p declsOrPairs
-/// create node pairs for context and name
-template <NodeKind kind, typename ContentsT>
-void ModuleDepGraphFactory::addAllDefinedDeclsOfAGivenType(
-    std::vector<ContentsT> &contentsVec) {
-  for (const auto &declOrPair : contentsVec) {
-    Optional<std::string> fp =
-        AbstractSourceFileDepGraphFactory::getFingerprintIfAny(declOrPair);
-    addADefinedDecl(
-        DependencyKey::createForProvidedEntityInterface<kind>(declOrPair),
-        fp ? StringRef(fp.getValue()) : Optional<StringRef>());
-  }
-}

lib/AST/FrontendSourceFileDepGraphFactory.h

@@ -39,11 +39,6 @@ class FrontendSourceFileDepGraphFactory
 
   void addAllDefinedDecls() override;
   void addAllUsedDecls() override;
-
-  /// Given an array of Decls or pairs of them in \p declsOrPairs
-  /// create node pairs for context and name
-  template <NodeKind kind, typename ContentsT>
-  void addAllDefinedDeclsOfAGivenType(std::vector<ContentsT> &contentsVec);
 };
 
 class ModuleDepGraphFactory : public AbstractSourceFileDepGraphFactory {
@@ -57,11 +52,6 @@ class ModuleDepGraphFactory : public AbstractSourceFileDepGraphFactory {
 private:
   void addAllDefinedDecls() override;
   void addAllUsedDecls() override {}
-
-  /// Given an array of Decls or pairs of them in \p declsOrPairs
-  /// create node pairs for context and name
-  template <NodeKind kind, typename ContentsT>
-  void addAllDefinedDeclsOfAGivenType(std::vector<ContentsT> &contentsVec);
 };
 
 } // namespace fine_grained_dependencies