[AST] Make sure that InheritedProtocols::evaluate is never called on a deserialized protocol

The result should always be pre-cached by the deserialization.

Author: xedin

lib/AST/NameLookup.cpp

@@ -3257,55 +3257,42 @@ InheritedProtocolsRequest::evaluate(Evaluator &evaluator,
 
   llvm::SmallSetVector<ProtocolDecl *, 2> inherited;
 
-  if (PD->wasDeserialized()) {
-    auto protoSelfTy = PD->getSelfInterfaceType();
-    for (auto req : PD->getRequirementSignature().getRequirements()) {
-      // Dig out a conformance requirement...
-      if (req.getKind() != RequirementKind::Conformance)
-        continue;
-
-      // constraining Self.
-      if (!req.getFirstType()->isEqual(protoSelfTy))
-        continue;
+  assert(!PD->wasDeserialized());
 
-      inherited.insert(req.getProtocolDecl());
-    }
-  } else {
-    InvertibleProtocolSet inverses;
-    bool anyObject = false;
-    for (const auto &found : getDirectlyInheritedNominalTypeDecls(
-              PD, inverses, anyObject)) {
-      auto proto = dyn_cast<ProtocolDecl>(found.Item);
-      if (proto && proto != PD)
-        inherited.insert(proto);
-    }
-
-    // Apply inverses.
-    if (ctx.LangOpts.hasFeature(Feature::NoncopyableGenerics)) {
-      bool skipInverses = false;
-
-      // ... except for these protocols, so that Copyable does not have to
-      // inherit ~Copyable, etc.
-      if (auto kp = PD->getKnownProtocolKind()) {
-        switch (*kp) {
-        case KnownProtocolKind::Sendable:
-        case KnownProtocolKind::Copyable:
-        case KnownProtocolKind::Escapable:
-          skipInverses = true;
-          break;
+  InvertibleProtocolSet inverses;
+  bool anyObject = false;
+  for (const auto &found :
+       getDirectlyInheritedNominalTypeDecls(PD, inverses, anyObject)) {
+    auto proto = dyn_cast<ProtocolDecl>(found.Item);
+    if (proto && proto != PD)
+      inherited.insert(proto);
+  }
+
+  // Apply inverses.
+  if (ctx.LangOpts.hasFeature(Feature::NoncopyableGenerics)) {
+    bool skipInverses = false;
+
+    // ... except for these protocols, so that Copyable does not have to
+    // inherit ~Copyable, etc.
+    if (auto kp = PD->getKnownProtocolKind()) {
+      switch (*kp) {
+      case KnownProtocolKind::Sendable:
+      case KnownProtocolKind::Copyable:
+      case KnownProtocolKind::Escapable:
+        skipInverses = true;
+        break;
 
-        default:
-          break;
-        }
+      default:
+        break;
       }
+    }
 
-      if (!skipInverses) {
-        for (auto ip : InvertibleProtocolSet::full()) {
-          // Unless the user wrote ~P in the syntactic inheritance clause, the
-          // semantic inherited list includes P.
-          if (!inverses.contains(ip))
-            inherited.insert(ctx.getProtocol(getKnownProtocolKind(ip)));
-        }
+    if (!skipInverses) {
+      for (auto ip : InvertibleProtocolSet::full()) {
+        // Unless the user wrote ~P in the syntactic inheritance clause, the
+        // semantic inherited list includes P.
+        if (!inverses.contains(ip))
+          inherited.insert(ctx.getProtocol(getKnownProtocolKind(ip)));
       }
     }
   }