Test: Moved tests for typealias access through metatypes into protocols tests

Author: sl

test/Constraints/protocols.swift

@@ -107,6 +107,9 @@ protocol P : Initable {
   func bar(_ x: Int)
   mutating func mut(_ x: Int)
   static func tum()
+  
+  typealias E = Int
+  typealias F = Self.E
 }
 
 protocol ClassP : class {
@@ -216,6 +219,13 @@ func staticExistential(_ p: P.Type, pp: P.Protocol) {
   // Static member of metatype -- not allowed
   _ = pp.tum // expected-error{{static member 'tum' cannot be used on protocol metatype 'P.Protocol'}}
   _ = P.tum // expected-error{{static member 'tum' cannot be used on protocol metatype 'P.Protocol'}}
+
+  // Access typealias through protocol and existential metatypes
+  _ = pp.E.self
+  _ = p.E.self
+
+  _ = pp.F.self
+  _ = p.F.self
 }
 
 protocol StaticP {

test/type/metatype/metatypes.swift

@@ -18,23 +18,3 @@ var test1 = Test1a.self
 test1 = Test1b.self
 var x = Test1b()
 test1 = type(of: x)
-
-// test associated type access through metatypes
-protocol P {
-  typealias E = Int
-}
-
-func foo(meta1: P.Protocol, meta2: P.Type) {
-  print(meta1.E.self)
-  print(meta2.E.self)
-}
-
-protocol P2 {
-  typealias E = Self
-  typealias F = Int
-}
-
-func foo(meta1: P.Protocol, meta2: P.Type) {
-  print(meta1.E.F.self)
-  print(meta2.E.F.self)
-}