Merge pull request #2885 from gregomni/more-typealias

[Sema] Make typealiases in protocols available for nested type lookup.

Author: slavapestov

include/swift/AST/DiagnosticsSema.def

@@ -1347,6 +1347,9 @@ NOTE(optional_req_near_match_accessibility,none,
 // Protocols and existentials
 ERROR(assoc_type_outside_of_protocol,none,
       "cannot use associated type %0 outside of its protocol", (Identifier))
+ERROR(typealias_to_assoc_type_outside_of_protocol,none,
+      "cannot use typealias %0 of associated type %1 outside of its protocol",
+      (Identifier, TypeLoc))
 
 ERROR(circular_protocol_def,none,
       "circular protocol inheritance %0", (StringRef))

lib/Sema/TypeCheckNameLookup.cpp

@@ -362,17 +362,22 @@ LookupTypeResult TypeChecker::lookupMemberType(DeclContext *dc,
       }
     }
 
-    // Ignore typealiases found in protocol members.
-    if (auto alias = dyn_cast<TypeAliasDecl>(typeDecl)) {
-      auto aliasParent = alias->getParent();
-      if (aliasParent != dc && isa<ProtocolDecl>(aliasParent))
-        continue;
-    }
-
     // Substitute the base into the member's type.
     if (Type memberType = substMemberTypeWithBase(dc->getParentModule(),
                                                   typeDecl, type,
                                                   /*isTypeReference=*/true)) {
+
+      // Similar to the associated type case, ignore typealiases containing
+      // associated types when looking into a non-protocol.
+      if (auto alias = dyn_cast<TypeAliasDecl>(typeDecl)) {
+        auto parentProtocol = alias->getDeclContext()->
+          getAsProtocolOrProtocolExtensionContext();
+        if (parentProtocol && memberType->hasTypeParameter() &&
+            !type->is<ArchetypeType>() && !type->isExistentialType()) {
+          continue;
+        }
+      }
+
       // If we haven't seen this type result yet, add it to the result set.
       if (types.insert(memberType->getCanonicalType()).second)
         result.Results.push_back({typeDecl, memberType});

lib/Sema/TypeCheckType.cpp

@@ -1154,13 +1154,22 @@ static Type resolveNestedIdentTypeComponent(
     member = memberTypes.back().first;
   }
 
-  if (parentTy->isExistentialType()) {
+  if (parentTy->isExistentialType() && isa<AssociatedTypeDecl>(member)) {
     if (diagnoseErrors)
       TC.diagnose(comp->getIdLoc(), diag::assoc_type_outside_of_protocol,
                   comp->getIdentifier());
 
     return ErrorType::get(TC.Context);
   }
+  if (auto alias = dyn_cast<TypeAliasDecl>(member)) {
+    if (parentTy->isExistentialType() && memberType->hasTypeParameter()) {
+      if (diagnoseErrors)
+        TC.diagnose(comp->getIdLoc(), diag::typealias_to_assoc_type_outside_of_protocol,
+                    comp->getIdentifier(), alias->getUnderlyingTypeLoc());
+
+      return ErrorType::get(TC.Context);
+    }
+  }
 
   // If there are generic arguments, apply them now.
   if (auto genComp = dyn_cast<GenericIdentTypeRepr>(comp))
@@ -3243,10 +3252,18 @@ class UnsupportedProtocolVisitor
   }
 
   bool walkToTypeReprPre(TypeRepr *T) {
+    if (T->isInvalid())
+      return false;
+    if (auto compound = dyn_cast<CompoundIdentTypeRepr>(T)) {
+      // Only visit the last component to check, because nested typealiases in
+      // existentials are okay.
+      visit(compound->getComponentRange().back());
+      return false;
+    }
     visit(T);
     return true;
   }
-    
+
   std::pair<bool, Stmt*> walkToStmtPre(Stmt *S) {
     if (recurseIntoSubstatements) {
       return { true, S };

test/decl/typealias/typealias.swift

@@ -248,4 +248,17 @@ protocol P4 {
   func getSelf() -> X
 }
 
+// Availability of typealiases in protocols for nested type lookup
+protocol P5 {
+  associatedtype A
+  typealias T1 = Int
+  typealias T2 = A
+  var a: T2 { get }
+}
+
+struct T5 : P5 {
+  var a: P5.T1 // OK
+  var v2: P5.T2 // expected-error {{cannot use typealias 'T2' of associated type 'A' outside of its protocol}}
+}
+