Merge pull request swiftlang#81522 from slavapestov/fix-rdar151162470

AST: Fix two bugs with SelfProtocolConformance

Author: slavapestov

include/swift/AST/ProtocolConformance.h

@@ -918,9 +918,7 @@ class SelfProtocolConformance : public RootProtocolConformance {
   }
 
   ProtocolConformanceRef getAssociatedConformance(Type assocType,
-                                                  ProtocolDecl *protocol) const{
-    llvm_unreachable("self-conformances never have associated types");
-  }
+                                                  ProtocolDecl *protocol) const;
 
   bool hasWitness(ValueDecl *requirement) const {
     return true;

lib/AST/ProtocolConformance.cpp

@@ -739,6 +739,13 @@ NormalProtocolConformance::getWitnessUncached(ValueDecl *requirement) const {
   return entry->second;
 }
 
+ProtocolConformanceRef
+SelfProtocolConformance::getAssociatedConformance(Type assocType,
+                                                  ProtocolDecl *protocol) const {
+  ASSERT(assocType->isEqual(protocol->getSelfInterfaceType()));
+  return lookupConformance(getType(), protocol);
+}
+
 Witness SelfProtocolConformance::getWitness(ValueDecl *requirement) const {
   return Witness(requirement, SubstitutionMap(), nullptr, SubstitutionMap(),
                  GenericSignature(), std::nullopt);

lib/AST/SubstitutionMap.cpp

@@ -285,12 +285,12 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
     // anything but still end up with an ErrorType in the AST.
     if (conformance.isConcrete()) {
       auto concrete = conformance.getConcrete();
-      auto normal = concrete->getRootNormalConformance();
-
-      if (!normal->hasComputedAssociatedConformances()) {
-        if (proto->getASTContext().evaluator.hasActiveRequest(
-              ResolveTypeWitnessesRequest{normal})) {
-          return ProtocolConformanceRef::forInvalid();
+      if (auto normal = dyn_cast<NormalProtocolConformance>(concrete->getRootConformance())) {
+        if (!normal->hasComputedAssociatedConformances()) {
+          if (proto->getASTContext().evaluator.hasActiveRequest(
+                ResolveTypeWitnessesRequest{normal})) {
+            return ProtocolConformanceRef::forInvalid();
+          }
         }
       }
     }

test/SILOptimizer/specialize_self_conforming.swift

@@ -5,14 +5,26 @@
 
 import Foundation
 
-@objc protocol P {}
+@objc protocol P: Q {
+  func foo()
+}
+
+@objc protocol Q {
+  func bar()
+}
+
+@_optimize(none)
+func takesP<T : P>(_ t: T) {}
 
 @_optimize(none)
-func takesP<T : P>(_: T) {}
+func takesQ<T : Q>(_ t: T) {}
 
 @inline(__always)
 func callsTakesP<T : P>(_ t: T) {
   takesP(t)
+  takesQ(t)
+  t.foo()
+  t.bar()
 }
 
 // CHECK-LABEL: sil hidden @$s26specialize_self_conforming16callsTakesPWithPyyAA1P_pF : $@convention(thin) (@guaranteed any P) -> () {