Merge pull request #71532 from slavapestov/assoc-type-regression-fixes

Fixes for a few regressions with associated type inference

Author: slavapestov

include/swift/AST/Module.h

@@ -862,11 +862,8 @@ class ModuleDecl
 
   /// Collect the conformances of \c fromType to each of the protocols of an
   /// existential type's layout.
-  ///
-  /// See `TypeChecker::containsProtocol` for details on the boolean arguments.
   ArrayRef<ProtocolConformanceRef>
   collectExistentialConformances(CanType fromType, CanType existential,
-                                 bool skipConditionalRequirements = true,
                                  bool allowMissing = false);
 
   /// Find a member named \p name in \p container that was declared in this

include/swift/AST/TypeCheckRequests.h

@@ -323,30 +323,6 @@ class ExistentialConformsToSelfRequest :
   void cacheResult(bool value) const;
 };
 
-class CollectExistentialConformancesRequest
-    : public SimpleRequest<CollectExistentialConformancesRequest,
-                           ArrayRef<ProtocolConformanceRef>(ModuleDecl*,
-                                                            CanType,
-                                                            CanType,
-                                                            bool,
-                                                            bool),
-                           RequestFlags::Uncached> { // TODO: maybe cache this?
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  ArrayRef<ProtocolConformanceRef>
-      evaluate(Evaluator &evaluator,
-               ModuleDecl *module,
-               CanType fromType,
-               CanType existential,
-               bool skipConditionalRequirements,
-               bool allowMissing) const;
-};
-
 /// Determine whether an existential type conforming to this protocol
 /// requires the \c any syntax.
 class HasSelfOrAssociatedTypeRequirementsRequest :

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -101,13 +101,6 @@ SWIFT_REQUEST(TypeChecker, EnumRawTypeRequest,
               Type(EnumDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ExistentialConformsToSelfRequest,
               bool(ProtocolDecl *), SeparatelyCached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, CollectExistentialConformancesRequest,
-            ArrayRef<ProtocolConformanceRef>(ModuleDecl*,
-                                             CanType,
-                                             CanType,
-                                             bool,
-                                             bool),
-            Uncached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, HasSelfOrAssociatedTypeRequirementsRequest,
               bool(ProtocolDecl *), SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ExtendedTypeRequest, Type(ExtensionDecl *), Cached,

lib/AST/ConformanceLookup.cpp

@@ -47,14 +47,20 @@ using namespace swift;
 ArrayRef<ProtocolConformanceRef>
 ModuleDecl::collectExistentialConformances(CanType fromType,
                                            CanType existential,
-                                           bool skipConditionalRequirements,
                                            bool allowMissing) {
-  CollectExistentialConformancesRequest request{this,
-                                                fromType,
-                                                existential,
-                                                skipConditionalRequirements,
-                                                allowMissing};
-  return evaluateOrDefault(getASTContext().evaluator, request, /*default=*/{});
+  assert(existential.isAnyExistentialType());
+
+  auto layout = existential.getExistentialLayout();
+  auto protocols = layout.getProtocols();
+
+  SmallVector<ProtocolConformanceRef, 4> conformances;
+  for (auto *proto : protocols) {
+    auto conformance = lookupConformance(fromType, proto, allowMissing);
+    assert(conformance);
+    conformances.push_back(conformance);
+  }
+
+  return getASTContext().AllocateCopy(conformances);
 }
 
 ProtocolConformanceRef

lib/SILGen/SILGenPoly.cpp

@@ -279,7 +279,6 @@ static ManagedValue emitTransformExistential(SILGenFunction &SGF,
       SGF.SGM.M.getSwiftModule()->collectExistentialConformances(
                                      fromInstanceType,
                                      toInstanceType,
-                                     /*skipConditionalRequirements=*/true,
                                      /*allowMissing=*/true);
 
   // Build result existential