Merge pull request #76486 from slavapestov/fix-issue-76479

IRGen: Workaround for type substitution limitation

Author: slavapestov

lib/IRGen/GenProto.cpp

@@ -111,10 +111,24 @@ class PolymorphicConvention {
   FulfillmentMap Fulfillments;
 
   GenericSignature::RequiredProtocols getRequiredProtocols(Type t) {
+    // FIXME: We need to rework this to use archetypes instead of interface
+    // types, or fix the bad interaction between interface type substitution
+    // and concretized conformance requirements. Then we can remove the hack
+    // from getReducedType() to handle this case, and also stop calling
+    // getReducedType() here.
+    t = Generics.getReducedType(t);
+    if (!t->isTypeParameter())
+      return {};
+
     return Generics->getRequiredProtocols(t);
   }
 
   CanType getSuperclassBound(Type t) {
+    // See above.
+    t = Generics.getReducedType(t);
+    if (!t->isTypeParameter())
+      return CanType();
+
     if (auto superclassTy = Generics->getSuperclassBound(t))
       return superclassTy->getCanonicalType();
     return CanType();
@@ -143,8 +157,6 @@ class PolymorphicConvention {
   }
 
 private:
-  void initGenerics();
-
   template <typename ...Args>
   void considerNewTypeSource(IsExact_t isExact, MetadataSource::Kind kind,
                              CanType type, Args... args);
@@ -199,9 +211,8 @@ class PolymorphicConvention {
 PolymorphicConvention::PolymorphicConvention(IRGenModule &IGM,
                                              CanSILFunctionType fnType,
                                              bool considerParameterSources = true)
-  : IGM(IGM), M(*IGM.getSwiftModule()), FnType(fnType){
-  initGenerics();
-
+  : IGM(IGM), M(*IGM.getSwiftModule()), FnType(fnType),
+    Generics(fnType->getInvocationGenericSignature()) {
   auto rep = fnType->getRepresentation();
 
   if (fnType->isPseudogeneric()) {
@@ -249,11 +260,8 @@ PolymorphicConvention::PolymorphicConvention(IRGenModule &IGM,
 
 void PolymorphicConvention::addPseudogenericFulfillments() {
   enumerateRequirements([&](GenericRequirement reqt) {
-    auto archetype = Generics.getGenericEnvironment()
-                        ->mapTypeIntoContext(reqt.getTypeParameter())
-                        ->getAs<ArchetypeType>();
-    assert(archetype && "did not get an archetype by mapping param?");
-    auto erasedTypeParam = archetype->getExistentialType()->getCanonicalType();
+    auto erasedTypeParam = Generics->getExistentialType(reqt.getTypeParameter())
+                              ->getCanonicalType();
     Sources.emplace_back(MetadataSource::Kind::ErasedTypeMetadata,
                          reqt.getTypeParameter(), erasedTypeParam);
 
@@ -319,10 +327,6 @@ enumerateUnfulfilledRequirements(const RequirementCallback &callback) {
   });
 }
 
-void PolymorphicConvention::initGenerics() {
-  Generics = FnType->getInvocationGenericSignature();
-}
-
 template <typename ...Args>
 void PolymorphicConvention::considerNewTypeSource(IsExact_t isExact,
                                                   MetadataSource::Kind kind,

test/IRGen/conditional_conformance_concretized_conformance_requirement.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend -emit-ir %s
+
+// https://github.com/swiftlang/swift/issues/76479
+
+public struct G<T> where T: P1, T.A: P1, T.A.A: P1 {}
+
+public protocol P1 {
+  associatedtype A
+}
+
+extension Int: P1 {
+  public typealias A = Int
+}
+
+public protocol P2 {
+  func f()
+}
+
+extension G: P2 where T.A == Int {
+  public func f() {}
+}