Merge pull request swiftlang#6034 from slavapestov/small-cleanups

Small cleanups

Author: slavapestov

include/swift/AST/Decl.h

@@ -2434,10 +2434,6 @@ class GenericTypeParamDecl : public AbstractTypeParamDecl {
   SourceLoc getStartLoc() const { return getNameLoc(); }
   SourceRange getSourceRange() const;
 
-  /// Determine whether this is the implicit 'Self' type parameter of
-  /// a protocol.
-  bool isProtocolSelf() const;
-
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::GenericTypeParam;
   }

include/swift/AST/DeclContext.h

@@ -265,12 +265,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   /// If this DeclContext is a protocol extension, return the extended protocol.
   ProtocolDecl *getAsProtocolExtensionContext() const;
 
-  /// \brief Retrieve the generic parameter 'Self' from a protocol or
-  /// protocol extension.
-  ///
-  /// Only valid if \c getAsProtocolOrProtocolExtensionContext().
-  GenericTypeParamDecl *getProtocolSelf() const;
-
   /// \brief Retrieve the generic parameter 'Self' from a protocol or
   /// protocol extension.
   ///

lib/AST/ASTPrinter.cpp

@@ -533,9 +533,8 @@ void ASTPrinter::printTextImpl(StringRef Text) {
 
 void ASTPrinter::printTypeRef(Type T, const TypeDecl *RefTo, Identifier Name) {
   PrintNameContext Context = PrintNameContext::Normal;
-  if (auto GP = dyn_cast<GenericTypeParamDecl>(RefTo)) {
-    if (GP->isProtocolSelf())
-      Context = PrintNameContext::GenericParameter;
+  if (isa<GenericTypeParamDecl>(RefTo)) {
+    Context = PrintNameContext::GenericParameter;
   } else if (T && T->is<DynamicSelfType>()) {
     assert(T->castTo<DynamicSelfType>()->getSelfType()->getAnyNominal() &&
            "protocol Self handled as GenericTypeParamDecl");
@@ -3951,7 +3950,8 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     if (Name.empty())
       Printer << "<anonymous>";
     else {
-      if (T->getDecl() && T->getDecl()->isProtocolSelf()) {
+      if (T->getDecl() &&
+          T->getDecl()->getDeclContext()->getAsProtocolOrProtocolExtensionContext()) {
         Printer.printTypeRef(T, T->getDecl(), Name);
         return;
       }

lib/AST/Decl.cpp

@@ -2218,14 +2218,6 @@ SourceRange GenericTypeParamDecl::getSourceRange() const {
   return SourceRange(getNameLoc(), endLoc);
 }
 
-bool GenericTypeParamDecl::isProtocolSelf() const {
-  if (!isImplicit()) return false;
-  auto dc = getDeclContext();
-  if (!dc->getAsProtocolOrProtocolExtensionContext()) return false;
-  return dc->getProtocolSelf() == this;
-}
-
-
 AssociatedTypeDecl::AssociatedTypeDecl(DeclContext *dc, SourceLoc keywordLoc,
                                        Identifier name, SourceLoc nameLoc,
                                        TypeLoc defaultDefinition)

lib/AST/DeclContext.cpp

@@ -106,7 +106,7 @@ ProtocolDecl *DeclContext::getAsProtocolExtensionContext() const {
            getAsGenericTypeOrGenericTypeExtensionContext());
 }
 
-GenericTypeParamDecl *DeclContext::getProtocolSelf() const {
+GenericTypeParamType *DeclContext::getProtocolSelfType() const {
   auto *proto = getAsProtocolOrProtocolExtensionContext();
   assert(proto && "not a protocol");
 
@@ -118,14 +118,8 @@ GenericTypeParamDecl *DeclContext::getProtocolSelf() const {
   if (!isInnermostContextGeneric())
     return nullptr;
 
-  return getGenericParamsOfContext()->getParams().front();
-}
-
-GenericTypeParamType *DeclContext::getProtocolSelfType() const {
-  auto *param = getProtocolSelf();
-  if (!param)
-    return nullptr;
-  return param->getDeclaredInterfaceType()
+  return getGenericParamsOfContext()->getParams().front()
+      ->getDeclaredInterfaceType()
       ->castTo<GenericTypeParamType>();
 }
 

lib/Sema/TypeCheckDecl.cpp

@@ -273,18 +273,13 @@ void TypeChecker::checkInheritanceClause(Decl *decl,
   } else if (auto ext = dyn_cast<ExtensionDecl>(decl)) {
     DC = ext;
     options |= TR_GenericSignature | TR_InheritanceClause;
-  } else if (auto GP = dyn_cast<GenericTypeParamDecl>(decl)) {
+  } else if (isa<GenericTypeParamDecl>(decl)) {
     // For generic parameters, we want name lookup to look at just the
     // signature of the enclosing entity.
     DC = decl->getDeclContext();
     if (auto nominal = dyn_cast<NominalTypeDecl>(DC)) {
       DC = nominal;
       options |= TR_GenericSignature;
-      // When looking up protocol 'Self' accessibility checks are disabled to
-      // head off spurious unavailable diagnostics.
-      if (isa<ProtocolDecl>(DC) && GP->isProtocolSelf()) {
-        options |= TR_AllowUnavailable;
-      }
     } else if (auto ext = dyn_cast<ExtensionDecl>(DC)) {
       DC = ext;
       options |= TR_GenericSignature;
@@ -1123,13 +1118,6 @@ void swift::configureImplicitSelf(TypeChecker &tc,
                                   AbstractFunctionDecl *func) {
   auto selfDecl = func->getImplicitSelfDecl();
 
-  // Validate the context.
-  if (auto nominal = dyn_cast<NominalTypeDecl>(func->getDeclContext())) {
-    tc.validateDecl(nominal);
-  } else {
-    tc.validateExtension(cast<ExtensionDecl>(func->getDeclContext()));
-  }
-
   // Compute the type of self.
   Type selfTy = func->computeSelfType();
   assert(selfDecl && selfTy && "Not a method");

lib/Sema/TypeCheckGeneric.cpp

@@ -488,7 +488,7 @@ static Type getResultType(TypeChecker &TC, FuncDecl *fn, Type resultType) {
 
 /// Determine whether the given type is \c Self, an associated type of \c Self,
 /// or a concrete type.
-static bool isSelfDerivedOrConcrete(Type type) {
+static bool isSelfDerivedOrConcrete(Type protoSelf, Type type) {
   // Check for a concrete type.
   if (!type->hasTypeParameter())
     return true;
@@ -498,8 +498,8 @@ static bool isSelfDerivedOrConcrete(Type type) {
     type = depMem->getBase();
   }
 
-  if (auto gp = type->getAs<GenericTypeParamType>())
-    return gp->getDepth() == 0 && gp->getIndex() == 0;
+  if (type->is<GenericTypeParamType>())
+    return type->isEqual(protoSelf);
 
   return false;
 }
@@ -544,11 +544,12 @@ TypeChecker::validateGenericFuncSignature(AbstractFunctionDecl *func) {
   if (!invalid && func->getGenericParams() &&
       isa<ProtocolDecl>(func->getDeclContext())) {
     auto proto = cast<ProtocolDecl>(func->getDeclContext());
+    auto protoSelf = proto->getSelfInterfaceType();
     for (auto req : sig->getRequirements()) {
       // If one of the types in the requirement is dependent on a non-Self
       // type parameter, this requirement is okay.
-      if (!isSelfDerivedOrConcrete(req.getFirstType()) ||
-          !isSelfDerivedOrConcrete(req.getSecondType()))
+      if (!isSelfDerivedOrConcrete(protoSelf, req.getFirstType()) ||
+          !isSelfDerivedOrConcrete(protoSelf, req.getSecondType()))
         continue;
 
       // The conformance of 'Self' to the protocol is okay.