Merge pull request #28236 from CodaFi/parametric-monomorphism

Author: swift-ci

include/swift/Subsystems.h

@@ -228,8 +228,7 @@ namespace swift {
                               bool ProduceDiagnostics = true);
 
   /// Expose TypeChecker's handling of GenericParamList to SIL parsing.
-  GenericEnvironment *handleSILGenericParams(ASTContext &Ctx,
-                                             GenericParamList *genericParams,
+  GenericEnvironment *handleSILGenericParams(GenericParamList *genericParams,
                                              DeclContext *DC);
 
   /// Turn the given module into SIL IR.

lib/ParseSIL/ParseSIL.cpp

@@ -1281,34 +1281,29 @@ bool SILParser::parseSILType(SILType &Result,
 
   // Resolve the generic environments for parsed generic function and box types.
   class HandleSILGenericParamsWalker : public ASTWalker {
-    ASTContext &C;
     SourceFile *SF;
   public:
-    HandleSILGenericParamsWalker(ASTContext &C,
-                                 SourceFile *SF)
-      : C(C), SF(SF)
-    {}
-    
+    HandleSILGenericParamsWalker(SourceFile *SF) : SF(SF) {}
+
     bool walkToTypeReprPre(TypeRepr *T) override {
       if (auto fnType = dyn_cast<FunctionTypeRepr>(T)) {
         if (auto generics = fnType->getGenericParams()) {
-          auto env = handleSILGenericParams(C, generics, SF);
+          auto env = handleSILGenericParams(generics, SF);
           fnType->setGenericEnvironment(env);
         }
       }
       if (auto boxType = dyn_cast<SILBoxTypeRepr>(T)) {
         if (auto generics = boxType->getGenericParams()) {
-          auto env = handleSILGenericParams(C, generics, SF);
+          auto env = handleSILGenericParams(generics, SF);
           boxType->setGenericEnvironment(env);
         }
       }
       return true;
     }
   };
 
-  TyR.get()
-    ->walk(HandleSILGenericParamsWalker(P.Context, &P.SF));
-  
+  TyR.get()->walk(HandleSILGenericParamsWalker(&P.SF));
+
   // Save the top-level function generic environment if there was one.
   if (auto fnType = dyn_cast<FunctionTypeRepr>(TyR.get()))
     if (auto env = fnType->getGenericEnvironment())
@@ -2039,7 +2034,7 @@ bool SILParser::parseSILDeclRef(SILDeclRef &Member, bool FnTypeRequired) {
       if (auto generics = fnType->getGenericParams()) {
         assert(!Ty.wasValidated() && Ty.getType().isNull());
 
-        genericEnv = handleSILGenericParams(P.Context, generics, &P.SF);
+        genericEnv = handleSILGenericParams(generics, &P.SF);
         fnType->setGenericEnvironment(genericEnv);
       }
     }
@@ -3108,8 +3103,8 @@ bool SILParser::parseSILInstruction(SILBuilder &B) {
     {
       Scope genericsScope(&P, ScopeKind::Generics);
       generics = P.maybeParseGenericParams().getPtrOrNull();
-      patternEnv = handleSILGenericParams(P.Context, generics, &P.SF);
-      
+      patternEnv = handleSILGenericParams(generics, &P.SF);
+
       if (P.parseToken(tok::l_paren, diag::expected_tok_in_sil_instr, "("))
         return true;
 
@@ -5717,8 +5712,8 @@ bool SILParserTUState::parseSILProperty(Parser &P) {
   Scope toplevelScope(&P, ScopeKind::TopLevel);
   Scope genericsScope(&P, ScopeKind::Generics);
   generics = P.maybeParseGenericParams().getPtrOrNull();
-  patternEnv = handleSILGenericParams(P.Context, generics, &P.SF);
-  
+  patternEnv = handleSILGenericParams(generics, &P.SF);
+
   if (patternEnv) {
     if (patternEnv->getGenericSignature()->getCanonicalSignature()
            != VD->getInnermostDeclContext()->getGenericSignatureOfContext()
@@ -6028,7 +6023,7 @@ ProtocolConformanceRef SILParser::parseProtocolConformance(
 
   auto *genericParams = P.maybeParseGenericParams().getPtrOrNull();
   if (genericParams) {
-    genericEnv = handleSILGenericParams(P.Context, genericParams, &P.SF);
+    genericEnv = handleSILGenericParams(genericParams, &P.SF);
   }
 
   auto retVal = parseProtocolConformanceHelper(proto, genericEnv, context,

lib/Sema/TypeCheckDecl.cpp

@@ -634,32 +634,6 @@ HasCircularRawValueRequest::evaluate(Evaluator &evaluator,
   return result;
 }
 
-/// Expose TypeChecker's handling of GenericParamList to SIL parsing.
-GenericEnvironment *
-TypeChecker::handleSILGenericParams(GenericParamList *genericParams,
-                                    DeclContext *DC) {
-  if (genericParams == nullptr)
-    return nullptr;
-
-  SmallVector<GenericParamList *, 2> nestedList;
-  for (; genericParams; genericParams = genericParams->getOuterParameters()) {
-    nestedList.push_back(genericParams);
-  }
-
-  std::reverse(nestedList.begin(), nestedList.end());
-
-  for (unsigned i = 0, e = nestedList.size(); i < e; ++i) {
-    auto genericParams = nestedList[i];
-    genericParams->setDepth(i);
-  }
-
-  auto sig = TypeChecker::checkGenericSignature(
-             nestedList.back(), DC,
-             /*parentSig=*/nullptr,
-             /*allowConcreteGenericParams=*/true);
-  return (sig ? sig->getGenericEnvironment() : nullptr);
-}
-
 /// Check whether \c current is a redeclaration.
 static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
   // If we've already checked this declaration, don't do it again.

lib/Sema/TypeChecker.cpp

@@ -554,9 +554,28 @@ bool swift::performTypeLocChecking(ASTContext &Ctx, TypeLoc &T,
 
 /// Expose TypeChecker's handling of GenericParamList to SIL parsing.
 GenericEnvironment *
-swift::handleSILGenericParams(ASTContext &Ctx, GenericParamList *genericParams,
+swift::handleSILGenericParams(GenericParamList *genericParams,
                               DeclContext *DC) {
-  return TypeChecker::handleSILGenericParams(genericParams, DC);
+  if (genericParams == nullptr)
+    return nullptr;
+
+  SmallVector<GenericParamList *, 2> nestedList;
+  for (; genericParams; genericParams = genericParams->getOuterParameters()) {
+    nestedList.push_back(genericParams);
+  }
+
+  std::reverse(nestedList.begin(), nestedList.end());
+
+  for (unsigned i = 0, e = nestedList.size(); i < e; ++i) {
+    auto genericParams = nestedList[i];
+    genericParams->setDepth(i);
+  }
+
+  auto sig =
+      TypeChecker::checkGenericSignature(nestedList.back(), DC,
+                                         /*parentSig=*/nullptr,
+                                         /*allowConcreteGenericParams=*/true);
+  return (sig ? sig->getGenericEnvironment() : nullptr);
 }
 
 void swift::typeCheckPatternBinding(PatternBindingDecl *PBD,

lib/Sema/TypeChecker.h

@@ -613,10 +613,6 @@ class TypeChecker final {
   static void checkUnsupportedProtocolType(ASTContext &ctx,
                                            GenericParamList *genericParams);
 
-  /// Expose TypeChecker's handling of GenericParamList to SIL parsing.
-  static GenericEnvironment *
-  handleSILGenericParams(GenericParamList *genericParams, DeclContext *DC);
-
   /// Resolve a reference to the given type declaration within a particular
   /// context.
   ///