RequirementMachine: Use ProtocolDecl::getAllInheritedProtocols()

Author: slavapestov

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -1072,7 +1072,7 @@ TypeAliasRequirementsRequest::evaluate(Evaluator &evaluator,
 
   // Collect all typealiases from inherited protocols recursively.
   llvm::MapVector<Identifier, TinyPtrVector<TypeDecl *>> inheritedTypeDecls;
-  for (auto *inheritedProto : ctx.getRewriteContext().getInheritedProtocols(proto)) {
+  for (auto *inheritedProto : proto->getAllInheritedProtocols()) {
     for (auto req : inheritedProto->getMembers()) {
       if (auto *typeReq = dyn_cast<TypeDecl>(req)) {
         if (!isSuitableType(typeReq))

lib/AST/RequirementMachine/RewriteContext.cpp

@@ -250,41 +250,10 @@ void RewriteContext::endTimer(StringRef name) {
 
 }
 
-const llvm::TinyPtrVector<const ProtocolDecl *> &
-RewriteContext::getInheritedProtocols(const ProtocolDecl *proto) {
-  auto found = AllInherited.find(proto);
-  if (found != AllInherited.end())
-    return found->second;
-
-  AllInherited.insert(std::make_pair(proto, TinyPtrVector<const ProtocolDecl *>()));
-
-  llvm::SmallDenseSet<const ProtocolDecl *, 4> visited;
-  llvm::TinyPtrVector<const ProtocolDecl *> protos;
-
-  for (auto *inheritedProto : proto->getInheritedProtocols()) {
-    if (!visited.insert(inheritedProto).second)
-      continue;
-
-    protos.push_back(inheritedProto);
-    const auto &allInherited = getInheritedProtocols(inheritedProto);
-
-    for (auto *otherProto : allInherited) {
-      if (!visited.insert(otherProto).second)
-        continue;
-
-      protos.push_back(otherProto);
-    }
-  }
-
-  auto &result = AllInherited[proto];
-  std::swap(protos, result);
-  return result;
-}
-
 int RewriteContext::compareProtocols(const ProtocolDecl *lhs,
                                      const ProtocolDecl *rhs) {
-  unsigned lhsSupport = getInheritedProtocols(lhs).size();
-  unsigned rhsSupport = getInheritedProtocols(rhs).size();
+  unsigned lhsSupport = lhs->getAllInheritedProtocols().size();
+  unsigned rhsSupport = rhs->getAllInheritedProtocols().size();
 
   if (lhsSupport != rhsSupport)
     return rhsSupport - lhsSupport;

lib/AST/RequirementMachine/RewriteContext.h

@@ -51,10 +51,6 @@ class RewriteContext final {
   /// Folding set for uniquing terms.
   llvm::FoldingSet<Term::Storage> Terms;
 
-  /// Cache for transitive closure of inherited protocols.
-  llvm::DenseMap<const ProtocolDecl *,
-                 llvm::TinyPtrVector<const ProtocolDecl *>> AllInherited;
-
   /// Requirement machines built from generic signatures.
   llvm::DenseMap<GenericSignature, RequirementMachine *> Machines;
 
@@ -163,9 +159,6 @@ class RewriteContext final {
   ///
   //////////////////////////////////////////////////////////////////////////////
 
-  const llvm::TinyPtrVector<const ProtocolDecl *> &
-  getInheritedProtocols(const ProtocolDecl *proto);
-
   int compareProtocols(const ProtocolDecl *lhs,
                        const ProtocolDecl *rhs);
 

lib/AST/RequirementMachine/Rule.cpp

@@ -113,9 +113,7 @@ bool Rule::isProtocolRefinementRule(RewriteContext &ctx) const {
     auto *proto = LHS[0].getProtocol();
     auto *otherProto = LHS[1].getProtocol();
 
-    auto inherited = ctx.getInheritedProtocols(proto);
-    return (std::find(inherited.begin(), inherited.end(), otherProto)
-            != inherited.end());
+    return proto->inheritsFrom(otherProto);
   }
 
   return false;

lib/AST/RequirementMachine/RuleBuilder.cpp

@@ -112,7 +112,7 @@ void RuleBuilder::initWithProtocolSignatureRequirements(
     // between getTypeForTerm() and isValidTypeParameter(), we need to add rules
     // for inherited protocols.
     if (reqs.getErrors().contains(GenericSignatureErrorFlags::CompletionFailed)) {
-      for (auto *inheritedProto : Context.getInheritedProtocols(proto)) {
+      for (auto *inheritedProto : proto->getAllInheritedProtocols()) {
         Requirement req(RequirementKind::Conformance,
                         proto->getSelfInterfaceType(),
                         inheritedProto->getDeclaredInterfaceType());
@@ -238,7 +238,7 @@ void RuleBuilder::addPermanentProtocolRules(const ProtocolDecl *proto) {
   for (auto *assocType : proto->getAssociatedTypeMembers())
     addAssociatedType(assocType, proto);
 
-  for (auto *inheritedProto : Context.getInheritedProtocols(proto)) {
+  for (auto *inheritedProto : proto->getAllInheritedProtocols()) {
     for (auto *assocType : inheritedProto->getAssociatedTypeMembers())
       addAssociatedType(assocType, proto);
   }
@@ -553,7 +553,7 @@ void RuleBuilder::collectPackShapeRules(ArrayRef<GenericTypeParamType *> generic
       addMemberShapeRule(proto, assocType);
     }
 
-    for (auto *inheritedProto : Context.getInheritedProtocols(proto)) {
+    for (auto *inheritedProto : proto->getAllInheritedProtocols()) {
       for (auto *assocType : inheritedProto->getAssociatedTypeMembers()) {
         addMemberShapeRule(proto, assocType);
       }

test/Generics/protocol_requirement_signatures.swift

@@ -1,3 +1,4 @@
+// RUN: %target-typecheck-verify-swift
 // RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1
 // RUN: %FileCheck %s < %t.dump
 
@@ -17,7 +18,7 @@ protocol P3 {}
 // CHECK-LABEL: .Q1@
 // CHECK-NEXT: Requirement signature: <Self where Self.[Q1]X : P1>
 protocol Q1 {
-    associatedtype X: P1 // expected-note 3{{declared here}}
+    associatedtype X: P1 // expected-note {{declared here}}
 }
 
 // inheritance
@@ -36,7 +37,7 @@ protocol Q3: Q1 {
 // CHECK-LABEL: .Q4@
 // CHECK-NEXT: Requirement signature: <Self where Self : Q1, Self.[Q1]X : P2>
 protocol Q4: Q1 {
-    associatedtype X: P2 // expected-warning{{redeclaration of associated type 'X'}}
+    associatedtype X: P2 // expected-warning{{redeclaration of associated type 'X'}} // expected-note 2{{declared here}}
 }
 
 // multiple inheritance
@@ -50,7 +51,7 @@ protocol Q5: Q2, Q3, Q4 {}
 protocol Q6: Q2,
              Q3, Q4 {
     associatedtype X: P1
-                   // expected-warning@-1{{redeclaration of associated type 'X' from protocol 'Q1' is}}
+                   // expected-warning@-1{{redeclaration of associated type 'X' from protocol 'Q4' is}}
 }
 
 // multiple inheritance with a new conformance