Runtime: Make SubstGenericParametersFromWrittenArgs and _gatherWrittenGenericArgs() completely private to MetadataLoookup.cpp

Author: slavapestov

stdlib/public/runtime/MetadataLookup.cpp

@@ -1181,8 +1181,47 @@ struct MetadataOrPack {
   }
 };
 
+/// Function object that produces substitutions for the generic parameters
+/// that occur within a mangled name, using the complete set of generic
+/// arguments "as written".
+///
+/// Use with \c _getTypeByMangledName to decode potentially-generic types.
+class SubstGenericParametersFromWrittenArgs {
+  /// The complete set of generic arguments.
+  const llvm::SmallVectorImpl<const Metadata *> &allGenericArgs;
+
+  /// The counts of generic parameters at each level.
+  const llvm::SmallVectorImpl<unsigned> &genericParamCounts;
+
+public:
+  /// Initialize a new function object to handle substitutions. Both
+  /// parameters are references to vectors that must live longer than
+  /// this function object.
+  ///
+  /// \param allGenericArgs The complete set of generic arguments, as written.
+  /// This could come directly from "source" (where all generic arguments are
+  /// encoded) or from metadata via gatherWrittenGenericArgs().
+  ///
+  /// \param genericParamCounts The count of generic parameters at each
+  /// generic level, typically gathered by _gatherGenericParameterCounts.
+  explicit SubstGenericParametersFromWrittenArgs(
+      const llvm::SmallVectorImpl<const Metadata *> &allGenericArgs,
+      const llvm::SmallVectorImpl<unsigned> &genericParamCounts)
+      : allGenericArgs(allGenericArgs),
+        genericParamCounts(genericParamCounts) {}
+
+  const Metadata *getMetadata(unsigned depth, unsigned index) const;
+  const WitnessTable *getWitnessTable(const Metadata *type,
+                                      unsigned index) const;
+};
+
 }  // end anonymous namespace
 
+static void _gatherWrittenGenericArgs(
+    const Metadata *metadata, const TypeContextDescriptor *description,
+    llvm::SmallVectorImpl<const Metadata *> &allGenericArgs,
+    Demangler &BorrowFrom);
+
 static llvm::Optional<TypeLookupError>
 _gatherGenericParameters(const ContextDescriptor *context,
                          llvm::ArrayRef<const Metadata *> genericArgs,
@@ -1262,8 +1301,8 @@ _gatherGenericParameters(const ContextDescriptor *context,
 
     // If we have a parent, gather it's generic arguments "as written".
     if (parent) {
-      gatherWrittenGenericArgs(parent, parent->getTypeContextDescriptor(),
-                               allGenericArgs, demangler);
+      _gatherWrittenGenericArgs(parent, parent->getTypeContextDescriptor(),
+                                allGenericArgs, demangler);
     }
 
     // Add the generic arguments we were given.
@@ -2883,7 +2922,7 @@ demangleToGenericParamRef(StringRef typeName) {
                                        node->getChild(1)->getIndex());
 }
 
-void swift::gatherWrittenGenericArgs(
+static void _gatherWrittenGenericArgs(
     const Metadata *metadata, const TypeContextDescriptor *description,
     llvm::SmallVectorImpl<const Metadata *> &allGenericArgs,
     Demangler &BorrowFrom) {

stdlib/public/runtime/Private.h

@@ -423,40 +423,6 @@ class TypeInfo {
                                SubstDependentWitnessTableFn substWitnessTable);
 #pragma clang diagnostic pop
 
-  /// Function object that produces substitutions for the generic parameters
-  /// that occur within a mangled name, using the complete set of generic
-  /// arguments "as written".
-  ///
-  /// Use with \c _getTypeByMangledName to decode potentially-generic types.
-  class SWIFT_RUNTIME_LIBRARY_VISIBILITY SubstGenericParametersFromWrittenArgs {
-    /// The complete set of generic arguments.
-    const llvm::SmallVectorImpl<const Metadata *> &allGenericArgs;
-
-    /// The counts of generic parameters at each level.
-    const llvm::SmallVectorImpl<unsigned> &genericParamCounts;
-
-  public:
-    /// Initialize a new function object to handle substitutions. Both
-    /// parameters are references to vectors that must live longer than
-    /// this function object.
-    ///
-    /// \param allGenericArgs The complete set of generic arguments, as written.
-    /// This could come directly from "source" (where all generic arguments are
-    /// encoded) or from metadata via gatherWrittenGenericArgs().
-    ///
-    /// \param genericParamCounts The count of generic parameters at each
-    /// generic level, typically gathered by _gatherGenericParameterCounts.
-    explicit SubstGenericParametersFromWrittenArgs(
-        const llvm::SmallVectorImpl<const Metadata *> &allGenericArgs,
-        const llvm::SmallVectorImpl<unsigned> &genericParamCounts)
-        : allGenericArgs(allGenericArgs),
-          genericParamCounts(genericParamCounts) {}
-
-    const Metadata *getMetadata(unsigned depth, unsigned index) const;
-    const WitnessTable *getWitnessTable(const Metadata *type,
-                                        unsigned index) const;
-  };
-
   /// Gather generic parameter counts from a context descriptor.
   ///
   /// \returns true if the innermost descriptor is generic.
@@ -534,23 +500,6 @@ class TypeInfo {
   SWIFT_RETURNS_NONNULL SWIFT_NODISCARD
   void *allocateMetadata(size_t size, size_t align);
 
-  /// Gather the set of generic arguments that would be written in the
-  /// source.
-  ///
-  /// This function computes generic arguments even when they are not
-  /// directly represented in the metadata, e.g., generic parameters that
-  /// are canonicalized away by same-type constraints and are therefore not
-  /// "key" parameters.
-  ///
-  /// \code
-  ///   extension Array where Element == String { }
-  ///   extension Dictionary where Key == Value { }
-  /// \endcode
-  void gatherWrittenGenericArgs(const Metadata *metadata,
-                                const TypeContextDescriptor *description,
-                                llvm::SmallVectorImpl<const Metadata *> &allGenericArgs,
-                                Demangler &BorrowFrom);
-
   Demangle::NodePointer
   _buildDemanglingForContext(const ContextDescriptor *context,
                              llvm::ArrayRef<NodePointer> demangledGenerics,