Merge pull request #10354 from slavapestov/fix-inherited-protocol-compositions-4.0

AST: Fix ProtocolDecl::getInheritedProtocols() for protocols that inherit from compositions [4.0]

Author: tkremenek

lib/AST/Decl.cpp

@@ -2905,10 +2905,13 @@ ProtocolDecl::getInheritedProtocols() const {
         // Only protocols can appear in the inheritance clause
         // of a protocol -- anything else should get diagnosed
         // elsewhere.
-        if (auto *protoTy = type->getAs<ProtocolType>()) {
-          auto *protoDecl = protoTy->getDecl();
-          if (known.insert(protoDecl).second)
-            result.push_back(protoDecl);
+        if (type->isExistentialType()) {
+          auto layout = type->getExistentialLayout();
+          for (auto protoTy : layout.getProtocols()) {
+            auto *protoDecl = protoTy->getDecl();
+            if (known.insert(protoDecl).second)
+              result.push_back(protoDecl);
+          }
         }
       }
     }

test/NameBinding/Inputs/protocol-inheritance.swift

@@ -0,0 +1,18 @@
+public protocol Critter {
+  associatedtype Fur
+}
+public protocol Pet {}
+
+public typealias Cat = Critter & Pet
+
+public protocol Kitten : Cat {}
+
+extension Kitten {
+  public func pet() -> Fur {
+    while true {}
+  }
+}
+
+public final class Meow<Purrs> : Kitten {
+  public typealias Fur = Purrs
+}

test/NameBinding/protocol-inheritance.swift

@@ -0,0 +1,5 @@
+// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/protocol-inheritance.swift
+
+func kitty<Purrs>(cat: Meow<Purrs>) {
+  cat.pet()
+}