AST: Re-implement ProtocolType::canonicalizeProtocols() to use getAllInheritedProtocols()

Author: slavapestov

lib/AST/Type.cpp

@@ -1533,22 +1533,18 @@ static void canonicalizeProtocols(SmallVectorImpl<ProtocolDecl *> &protocols,
       continue;
 
     // Add the protocols we inherited.
-    proto->walkInheritedProtocols([&](ProtocolDecl *inherited) {
-      if (inherited == proto)
-        return TypeWalker::Action::Continue;
-
+    auto allInherited = proto->getAllInheritedProtocols();
+    for (auto *inherited : allInherited) {
       auto found = known.find(inherited);
       if (found != known.end()) {
         // Don't zap protocols associated with parameterized types.
         if (parameterized && parameterized->count(inherited))
-          return TypeWalker::Action::Continue;
+          return;
 
         protocols[found->second] = nullptr;
         zappedAny = true;
       }
-
-      return TypeWalker::Action::Continue;
-    });
+    }
   }
 
   if (zappedAny) {