Merge pull request #40946 from slavapestov/forwarding-substitutions-with-concrete-conformance

AST: Handle concrete superclass conformance when forming forwarding substitutions

Author: slavapestov

lib/AST/Type.cpp

@@ -3976,10 +3976,13 @@ operator()(CanType dependentType, Type conformingReplacementType,
           || conformingReplacementType->is<DependentMemberType>()
           || conformingReplacementType->is<TypeVariableType>())
          && "replacement requires looking up a concrete conformance");
-  // Lookup conformances for opened existential.
-  if (conformingReplacementType->isOpenedExistential()) {
-    return conformedProtocol->getModuleContext()->lookupConformance(
-        conformingReplacementType, conformedProtocol);
+  // A class-constrained archetype might conform to the protocol
+  // concretely.
+  if (auto *archetypeType = conformingReplacementType->getAs<ArchetypeType>()) {
+    if (auto superclassType = archetypeType->getSuperclass()) {
+      return conformedProtocol->getModuleContext()->lookupConformance(
+          archetypeType, conformedProtocol);
+    }
   }
   return ProtocolConformanceRef(conformedProtocol);
 }

test/SILGen/protocol_superclass_cycle.swift

@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend -emit-silgen %s
+
+// When a protocol has a superclass requirement on 'Self' and the class
+// itself conforms concretely, the forwarding substitution map will have
+// a concrete conformance in it. Make sure this is handled correctly
+// without tripping the SIL verifier.
+
+class C: P {}
+
+protocol P: C {}
+
+func f<T : P>(_ t: T) {
+  // The weak reference causes us to form a SILBoxType, which is where
+  // the problematic conformance popped up.
+  _ = { [weak t] in _ = t }
+}