Cope with BoundNameAliasType in more places that handle NameAliasType.

Author: DougGregor

lib/AST/Type.cpp

@@ -3964,6 +3964,21 @@ bool Type::isPrivateStdlibType(bool treatNonBuiltinProtocolsAsPublic) const {
     return AliasDecl->isPrivateStdlibDecl(treatNonBuiltinProtocolsAsPublic);
   }
 
+  // A 'public' typealias can have an 'internal' type.
+  if (auto *BNAT = dyn_cast<BoundNameAliasType>(Ty.getPointer())) {
+    auto *AliasDecl = BNAT->getDecl();
+    if (auto parent = BNAT->getParent()) {
+      if (parent.isPrivateStdlibType(treatNonBuiltinProtocolsAsPublic))
+        return true;
+    }
+
+    if (AliasDecl->isPrivateStdlibDecl(treatNonBuiltinProtocolsAsPublic))
+      return true;
+
+    return Type(BNAT->getSinglyDesugaredType()).isPrivateStdlibType(
+                                            treatNonBuiltinProtocolsAsPublic);
+  }
+
   if (auto Paren = dyn_cast<ParenType>(Ty.getPointer())) {
     Type Underlying = Paren->getUnderlyingType();
     return Underlying.isPrivateStdlibType(treatNonBuiltinProtocolsAsPublic);

lib/IRGen/DebugTypeInfo.cpp

@@ -147,6 +147,8 @@ TypeDecl *DebugTypeInfo::getDecl() const {
     return N->getDecl();
   if (auto *TA = dyn_cast<NameAliasType>(Type))
     return TA->getDecl();
+  if (auto *BTA = dyn_cast<BoundNameAliasType>(Type))
+    return BTA->getDecl();
   if (auto *UBG = dyn_cast<UnboundGenericType>(Type))
     return UBG->getDecl();
   if (auto *BG = dyn_cast<BoundGenericType>(Type))

lib/Sema/MiscDiagnostics.cpp

@@ -3838,6 +3838,11 @@ static OmissionTypeName getTypeNameForOmission(Type type) {
       continue;
     }
 
+    if (auto boundAliasTy = dyn_cast<BoundNameAliasType>(type.getPointer())) {
+      type = boundAliasTy->getSinglyDesugaredType();
+      continue;
+    }
+
     // Strip off lvalue/inout types.
     Type newType = type->getWithoutSpecifierType();
     if (newType.getPointer() != type.getPointer()) {

lib/Sema/TypeCheckExpr.cpp

@@ -660,6 +660,9 @@ Type TypeChecker::getDefaultType(ProtocolDecl *protocol, DeclContext *dc) {
     if (type && *type) {
       if (auto typeAlias = dyn_cast<NameAliasType>(type->getPointer()))
         *type = typeAlias->getSinglyDesugaredType();
+      else if (auto boundTypeAlias =
+                 dyn_cast<BoundNameAliasType>(type->getPointer()))
+        *type = boundTypeAlias->getSinglyDesugaredType();
     }
   }
 

test/Sema/accessibility_typealias.swift

@@ -26,8 +26,6 @@ public final class ReplayableGenerator<S: Sequence> : IteratorProtocol {
     }
 }
 
-// FIXME: Dependent member lookup of typealiases is not subject
-// to accessibility checking.
 struct Generic<T> {
   fileprivate typealias Dependent = T
 }
@@ -42,8 +40,7 @@ private func privateFuncWithFileprivateAlias() -> Generic<Int>.Dependent {
   return 3
 }
 
-// FIXME: No error here
-var y = privateFuncWithFileprivateAlias()
+var y = privateFuncWithFileprivateAlias() // expected-error{{variable must be declared private or fileprivate because its type 'Generic<Int>.Dependent' (aka 'Int') uses a fileprivate type}}
 
 
 private typealias FnType = (_ x: Int) -> Void // expected-note * {{type declared here}}

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

@@ -457,6 +457,8 @@ static bool initDocEntityInfo(const TextEntity &Entity,
 static const TypeDecl *getTypeDeclFromType(Type Ty) {
   if (auto Alias = dyn_cast<NameAliasType>(Ty.getPointer()))
     return Alias->getDecl();
+  if (auto BoundAlias = dyn_cast<BoundNameAliasType>(Ty.getPointer()))
+    return BoundAlias->getDecl();
   return Ty->getAnyNominal();
 }
 

tools/swift-api-digester/swift-api-digester.cpp

@@ -1158,6 +1158,9 @@ static StringRef getTypeName(SDKContext &Ctx, Type Ty,
   if (auto *NAT = dyn_cast<NameAliasType>(Ty.getPointer())) {
     return NAT->getDecl()->getNameStr();
   }
+  if (auto *BNAT = dyn_cast<BoundNameAliasType>(Ty.getPointer())) {
+    return BNAT->getDecl()->getNameStr();
+  }
   if (Ty->getAnyNominal()) {
     if (IsImplicitlyUnwrappedOptional) {
       assert(Ty->getOptionalObjectType());
@@ -1360,6 +1363,11 @@ static SDKNode *constructTypeNode(SDKContext &Ctx, Type T,
     Root->addChild(constructTypeNode(Ctx, NAT->getCanonicalType()));
     return Root;
   }
+  if (auto BNAT = dyn_cast<BoundNameAliasType>(T.getPointer())) {
+    SDKNode* Root = SDKNodeInitInfo(Ctx, T).createSDKNode(SDKNodeKind::TypeNameAlias);
+    Root->addChild(constructTypeNode(Ctx, BNAT->getCanonicalType()));
+    return Root;
+  }
 
   if (auto Fun = T->getAs<AnyFunctionType>()) {
     SDKNode* Root = SDKNodeInitInfo(Ctx, T).createSDKNode(SDKNodeKind::TypeFunc);