SIL: move the FunctionBuilderTy template argument from TypeSubstCloner to remapParentFunction

Author: eeckstein

include/swift/SIL/TypeSubstCloner.h

@@ -36,7 +36,7 @@ namespace swift {
 /// subclasses. Used to break a circular dependency from SIL <=>
 /// SILOptimizer that would be caused by us needing to use
 /// SILOptFunctionBuilder here.
-template<typename ImplClass, typename FunctionBuilderTy>
+template<typename ImplClass>
 class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
   friend class SILInstructionVisitor<ImplClass>;
   friend class SILCloner<ImplClass>;
@@ -386,6 +386,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
   /// necessary when inlining said function into a new generic context.
   /// \param SubsMap - the substitutions of the inlining/specialization process.
   /// \param RemappedSig - the generic signature.
+  template<typename FunctionBuilderTy>
   static SILFunction *remapParentFunction(FunctionBuilderTy &FuncBuilder,
                                           SILModule &M,
                                           SILFunction *ParentFunction,

include/swift/SILOptimizer/Differentiation/Common.h

@@ -286,7 +286,7 @@ inline void createEntryArguments(SILFunction *f) {
 
 /// Cloner that remaps types using the target function's generic environment.
 class BasicTypeSubstCloner final
-    : public TypeSubstCloner<BasicTypeSubstCloner, SILOptFunctionBuilder> {
+    : public TypeSubstCloner<BasicTypeSubstCloner> {
 
   static SubstitutionMap getSubstitutionMap(SILFunction *target) {
     if (auto *targetGenEnv = target->getGenericEnvironment())

include/swift/SILOptimizer/Utils/GenericCloner.h

@@ -30,8 +30,8 @@
 namespace swift {
 
 class GenericCloner
-  : public TypeSubstCloner<GenericCloner, SILOptFunctionBuilder> {
-  using SuperTy = TypeSubstCloner<GenericCloner, SILOptFunctionBuilder>;
+  : public TypeSubstCloner<GenericCloner> {
+  using SuperTy = TypeSubstCloner<GenericCloner>;
 
   SILOptFunctionBuilder &FuncBuilder;
   SerializedKind_t Serialized;

lib/SILOptimizer/Differentiation/JVPCloner.cpp

@@ -42,7 +42,7 @@ namespace swift {
 namespace autodiff {
 
 class JVPCloner::Implementation final
-    : public TypeSubstCloner<JVPCloner::Implementation, SILOptFunctionBuilder> {
+    : public TypeSubstCloner<JVPCloner::Implementation> {
 private:
   /// The global context.
   ADContext &context;

lib/SILOptimizer/Differentiation/VJPCloner.cpp

@@ -41,7 +41,7 @@ namespace swift {
 namespace autodiff {
 
 class VJPCloner::Implementation final
-    : public TypeSubstCloner<VJPCloner::Implementation, SILOptFunctionBuilder> {
+    : public TypeSubstCloner<VJPCloner::Implementation> {
   friend class VJPCloner;
   friend class PullbackCloner;
 

lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp

@@ -43,10 +43,8 @@ using llvm::SmallVectorImpl;
 /// Create a SILCloner for Existential Specilizer.
 namespace {
 class ExistentialSpecializerCloner
-    : public TypeSubstCloner<ExistentialSpecializerCloner,
-                             SILOptFunctionBuilder> {
-  using SuperTy =
-      TypeSubstCloner<ExistentialSpecializerCloner, SILOptFunctionBuilder>;
+    : public TypeSubstCloner<ExistentialSpecializerCloner> {
+  using SuperTy = TypeSubstCloner<ExistentialSpecializerCloner>;
   friend class SILInstructionVisitor<ExistentialSpecializerCloner>;
   friend class SILCloner<ExistentialSpecializerCloner>;
 

lib/SILOptimizer/IPO/CapturePropagation.cpp

@@ -113,9 +113,8 @@ namespace {
 /// caller, so the cloned function will have a mix of locations from different
 /// functions.
 class CapturePropagationCloner
-  : public TypeSubstCloner<CapturePropagationCloner, SILOptFunctionBuilder> {
-  using SuperTy =
-    TypeSubstCloner<CapturePropagationCloner, SILOptFunctionBuilder>;
+  : public TypeSubstCloner<CapturePropagationCloner> {
+  using SuperTy = TypeSubstCloner<CapturePropagationCloner>;
   friend class SILInstructionVisitor<CapturePropagationCloner>;
   friend class SILCloner<CapturePropagationCloner>;
 

lib/SILOptimizer/Utils/SILInliner.cpp

@@ -307,10 +307,10 @@ class BeginApplySite {
 
 namespace swift {
 class SILInlineCloner
-    : public TypeSubstCloner<SILInlineCloner, SILOptFunctionBuilder> {
+    : public TypeSubstCloner<SILInlineCloner> {
   friend class SILInstructionVisitor<SILInlineCloner>;
   friend class SILCloner<SILInlineCloner>;
-  using SuperTy = TypeSubstCloner<SILInlineCloner, SILOptFunctionBuilder>;
+  using SuperTy = TypeSubstCloner<SILInlineCloner>;
   using InlineKind = SILInliner::InlineKind;
 
   SILOptFunctionBuilder &FuncBuilder;