IDE: Stop calling getAllConformances() on protocols

Author: slavapestov

lib/IDE/CodeCompletionResultType.cpp

@@ -208,32 +208,45 @@ const USRBasedType *USRBasedType::fromType(Type Ty, USRBasedTypeArena &Arena) {
   }
 
   SmallVector<const USRBasedType *, 2> Supertypes;
+  ;
   if (auto Nominal = Ty->getAnyNominal()) {
-    auto Conformances = Nominal->getAllConformances();
-    Supertypes.reserve(Conformances.size());
-    for (auto Conformance : Conformances) {
-      if (Conformance->getDeclContext()->getParentModule() !=
-          Nominal->getModuleContext()) {
-        // Only include conformances that are declared within the module of the
-        // type to avoid caching retroactive conformances which might not
-        // exist when using the code completion cache from a different module.
-        continue;
-      }
-      if (Conformance->getProtocol()->isSpecificProtocol(KnownProtocolKind::Sendable)) {
-        // FIXME: Sendable conformances are lazily synthesized as they are
-        // needed by the compiler. Depending on whether we checked whether a
-        // type conforms to Sendable before constructing the USRBasedType, we
-        // get different results for its conformance. For now, always drop the
-        // Sendable conformance.
-        continue;
+    if (auto *Proto = dyn_cast<ProtocolDecl>(Nominal)) {
+      Proto->walkInheritedProtocols([&](ProtocolDecl *inherited) {
+        if (Proto != inherited &&
+            !inherited->isSpecificProtocol(KnownProtocolKind::Sendable)) {
+          Supertypes.push_back(USRBasedType::fromType(
+            inherited->getDeclaredInterfaceType(), Arena));
+        }
+
+        return TypeWalker::Action::Continue;
+      });
+    } else {
+      auto Conformances = Nominal->getAllConformances();
+      Supertypes.reserve(Conformances.size());
+      for (auto Conformance : Conformances) {
+        if (Conformance->getDeclContext()->getParentModule() !=
+            Nominal->getModuleContext()) {
+          // Only include conformances that are declared within the module of the
+          // type to avoid caching retroactive conformances which might not
+          // exist when using the code completion cache from a different module.
+          continue;
+        }
+        if (Conformance->getProtocol()->isSpecificProtocol(KnownProtocolKind::Sendable)) {
+          // FIXME: Sendable conformances are lazily synthesized as they are
+          // needed by the compiler. Depending on whether we checked whether a
+          // type conforms to Sendable before constructing the USRBasedType, we
+          // get different results for its conformance. For now, always drop the
+          // Sendable conformance.
+          continue;
+        }
+        Supertypes.push_back(USRBasedType::fromType(
+            Conformance->getProtocol()->getDeclaredInterfaceType(), Arena));
       }
-      Supertypes.push_back(USRBasedType::fromType(
-          Conformance->getProtocol()->getDeclaredInterfaceType(), Arena));
     }
   }
 
   // You would think that superclass + conformances form a DAG. You are wrong!
-  // We can achieve a circular supertype hierarcy with
+  // We can achieve a circular supertype hierarchy with
   //
   // protocol Proto : Class {}
   // class Class : Proto {}

lib/IDE/CompletionLookup.cpp

@@ -2483,7 +2483,7 @@ void CompletionLookup::addTypeRelationFromProtocol(
 
   // The literal can produce any type that conforms to its ExpressibleBy
   // protocol. Figure out as which type we want to show it in code completion.
-  auto *P = Ctx.getProtocol(protocolForLiteralKind(kind));
+  auto *PD = Ctx.getProtocol(protocolForLiteralKind(kind));
   for (auto T : expectedTypeContext.getPossibleTypes()) {
     if (!T)
       continue;
@@ -2497,9 +2497,8 @@ void CompletionLookup::addTypeRelationFromProtocol(
     }
 
     // Check for conformance to the literal protocol.
-    if (auto *NTD = T->getAnyNominal()) {
-      SmallVector<ProtocolConformance *, 2> conformances;
-      if (NTD->lookupConformance(P, conformances)) {
+    if (T->getAnyNominal()) {
+      if (CurrModule->lookupConformance(T, PD)) {
         literalType = T;
         break;
       }

lib/IDE/CompletionOverrideLookup.cpp

@@ -411,6 +411,9 @@ void CompletionOverrideLookup::addAssociatedTypes(NominalTypeDecl *NTD) {
        hasOverride || hasOverridabilityModifier || hasStaticOrClass))
     return;
 
+  if (isa<ProtocolDecl>(NTD))
+    return;
+
   for (auto Conformance : NTD->getAllConformances()) {
     auto Proto = Conformance->getProtocol();
     if (!Proto->isAccessibleFrom(CurrDeclContext))