swiftlang · slavapestov · Jul 7, 2018 · Jul 7, 2018
diff --git a/include/swift/AST/LazyResolver.h b/include/swift/AST/LazyResolver.h
@@ -53,11 +53,6 @@ class LazyResolver {
   virtual void resolveWitness(const NormalProtocolConformance *conformance,
                               ValueDecl *requirement) = 0;
 
-  /// Resolve the access of a value.
-  ///
-  /// It does no type-checking.
-  virtual void resolveAccessControl(ValueDecl *VD) = 0;
-
   /// Resolve the type and declaration attributes of a value.
   ///
   /// This can be called when the type or signature of a value is needed.

diff --git a/include/swift/AST/NameLookup.h b/include/swift/AST/NameLookup.h
@@ -267,12 +267,11 @@ class NamedDeclConsumer : public VisibleDeclConsumer {
 class AccessFilteringDeclConsumer final : public VisibleDeclConsumer {
   const DeclContext *DC;
   VisibleDeclConsumer &ChainedConsumer;
-  LazyResolver *TypeResolver;
+
 public:
   AccessFilteringDeclConsumer(const DeclContext *DC,
-                              VisibleDeclConsumer &consumer,
-                              LazyResolver *typeResolver)
-    : DC(DC), ChainedConsumer(consumer), TypeResolver(typeResolver) {}
+                              VisibleDeclConsumer &consumer)
+    : DC(DC), ChainedConsumer(consumer) {}
 
   void foundDecl(ValueDecl *D, DeclVisibilityKind reason) override;
 };

diff --git a/lib/AST/LookupVisibleDecls.cpp b/lib/AST/LookupVisibleDecls.cpp
@@ -130,7 +130,6 @@ static bool isDeclVisibleInLookupMode(ValueDecl *Member, LookupState LS,
 
   if (TypeResolver) {
     TypeResolver->resolveDeclSignature(Member);
-    TypeResolver->resolveAccessControl(Member);
   }
 
   // Check access when relevant.
@@ -615,8 +614,7 @@ static void lookupVisibleMemberDeclsImpl(
   // Lookup module references, as on some_module.some_member.  These are
   // special and can't have extensions.
   if (ModuleType *MT = BaseTy->getAs<ModuleType>()) {
-    AccessFilteringDeclConsumer FilteringConsumer(CurrDC, Consumer,
-                                                  TypeResolver);
+    AccessFilteringDeclConsumer FilteringConsumer(CurrDC, Consumer);
     MT->getModule()->lookupVisibleDecls(ModuleDecl::AccessPathTy(),
                                         FilteringConsumer,
                                         NLKind::QualifiedLookup);
@@ -816,7 +814,6 @@ class OverrideFilteringConsumer : public VisibleDeclConsumer {
 
     if (TypeResolver) {
       TypeResolver->resolveDeclSignature(VD);
-      TypeResolver->resolveAccessControl(VD);
     }
 
     if (VD->isInvalid()) {

diff --git a/lib/AST/ModuleNameLookup.cpp b/lib/AST/ModuleNameLookup.cpp
@@ -171,11 +171,6 @@ static void lookupInModule(ModuleDecl *module, ModuleDecl::AccessPathTy accessPa
   if (respectAccessControl) {
     auto newEndIter = std::remove_if(localDecls.begin(), localDecls.end(),
                                     [=](ValueDecl *VD) {
-      if (typeResolver) {
-        typeResolver->resolveAccessControl(VD);
-      }
-      if (!VD->hasAccess())
-        return false;
       return !VD->isAccessibleFrom(moduleScopeContext);
     });
     localDecls.erase(newEndIter, localDecls.end());

diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -60,9 +60,7 @@ void DebuggerClient::anchor() {}
 void AccessFilteringDeclConsumer::foundDecl(ValueDecl *D,
                                             DeclVisibilityKind reason) {
   if (D->getASTContext().LangOpts.EnableAccessControl) {
-    if (TypeResolver)
-      TypeResolver->resolveAccessControl(D);
-    if (D->isInvalid() && !D->hasAccess())
+    if (D->isInvalid())
       return;
     if (!D->isAccessibleFrom(DC))
       return;
@@ -1779,9 +1777,6 @@ bool DeclContext::lookupQualified(Type type,
 
     // Check access.
     if (!(options & NL_IgnoreAccessControl)) {
-      if (typeResolver)
-        typeResolver->resolveAccessControl(decl);
-
       return decl->isAccessibleFrom(this);
     }
 

diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -4143,8 +4143,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
                      : LookupKind::ValueInDeclContext;
     NeedLeadingDot = false;
     ModuleDecl *M = CurrDeclContext->getParentModule();
-    AccessFilteringDeclConsumer FilteringConsumer(CurrDeclContext, *this,
-                                                  TypeResolver.get());
+    AccessFilteringDeclConsumer FilteringConsumer(CurrDeclContext, *this);
     M->lookupVisibleDecls({}, FilteringConsumer, NLKind::UnqualifiedLookup);
   }
 
@@ -4159,8 +4158,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       LookupAccessPath.push_back(
           std::make_pair(Ctx.getIdentifier(Piece), SourceLoc()));
     }
-    AccessFilteringDeclConsumer FilteringConsumer(CurrDeclContext, *this,
-                                                  TypeResolver.get());
+    AccessFilteringDeclConsumer FilteringConsumer(CurrDeclContext, *this);
     TheModule->lookupVisibleDecls(LookupAccessPath, FilteringConsumer,
                                   NLKind::UnqualifiedLookup);
   }

diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
@@ -3689,7 +3689,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
   if (hasEnabledForbiddenTypecheckPrefix())
     checkForForbiddenPrefix(D);
 
-  validateAccessControl(D);
+  (void) D->getFormalAccess();
 
   // Validate the context.
   auto dc = D->getDeclContext();
@@ -3850,7 +3850,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
           aliasDecl->getUnderlyingTypeLoc().setType(Type());
           aliasDecl->setInterfaceType(Type());
 
-          validateAccessControl(aliasDecl);
+          (void) aliasDecl->getFormalAccess();
 
           // Check generic parameters, if needed.
           bool validated = aliasDecl->hasValidationStarted();
@@ -4596,8 +4596,6 @@ void TypeChecker::validateDecl(ValueDecl *D) {
     auto *EED = cast<EnumElementDecl>(D);
 
     checkDeclAttributesEarly(EED);
-    validateAccessControl(EED);
-
     validateAttributes(*this, EED);
 
     EED->setIsBeingValidated(true);
@@ -4684,7 +4682,7 @@ void TypeChecker::validateDeclForNameLookup(ValueDecl *D) {
     for (auto paramDecl : *gp)
       paramDecl->setDepth(depth);
 
-    validateAccessControl(proto);
+    (void) proto->getFormalAccess();
 
     // Record inherited protocols.
     resolveInheritedProtocols(proto);
@@ -4712,7 +4710,7 @@ void TypeChecker::validateDeclForNameLookup(ValueDecl *D) {
     if (assocType->hasInterfaceType())
       return;
     assocType->computeType();
-    validateAccessControl(assocType);
+    (void) assocType->getFormalAccess();
     break;
   }
   case DeclKind::TypeAlias: {
@@ -4728,7 +4726,7 @@ void TypeChecker::validateDeclForNameLookup(ValueDecl *D) {
         typealias->setIsBeingValidated();
         SWIFT_DEFER { typealias->setIsBeingValidated(false); };
 
-        validateAccessControl(typealias);
+        (void) typealias->getFormalAccess();
 
         ProtocolRequirementTypeResolver resolver;
         TypeResolutionOptions options =
@@ -4899,10 +4897,6 @@ void TypeChecker::finalizeDecl(ValueDecl *decl) {
   }
 }
 
-void TypeChecker::validateAccessControl(ValueDecl *D) {
-  (void) D->getFormalAccess();
-}
-
 bool swift::isPassThroughTypealias(TypeAliasDecl *typealias) {
   // Pass-through only makes sense when the typealias refers to a nominal
   // type.

diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
@@ -1004,9 +1004,6 @@ class TypeChecker final : public LazyResolver {
   /// Perform just enough validation for looking up names using the Decl.
   void validateDeclForNameLookup(ValueDecl *D);
 
-  /// Resolves the access control of the given declaration.
-  void validateAccessControl(ValueDecl *D);
-
   /// Validate the given extension declaration, ensuring that it
   /// properly extends the nominal type it names.
   void validateExtension(ExtensionDecl *ext);
@@ -1238,10 +1235,6 @@ class TypeChecker final : public LazyResolver {
   /// Check the default arguments that occur within this value decl.
   void checkDefaultArguments(ArrayRef<ParameterList *> params, ValueDecl *VD);
 
-  virtual void resolveAccessControl(ValueDecl *VD) override {
-    validateAccessControl(VD);
-  }
-
   virtual void resolveDeclSignature(ValueDecl *VD) override {
     validateDeclForNameLookup(VD);
   }

diff --git a/test/decl/class/circular_inheritance.swift b/test/decl/class/circular_inheritance.swift
@@ -51,13 +51,10 @@ class Outer3
 // CHECK-NEXT:      `--{{.*}}InheritedTypeRequest(circular_inheritance.(file).Left@
 // CHECK-NEXT:          `--{{.*}}AccessLevelRequest
 // CHECK-NEXT:          `--{{.*}}AccessLevelRequest
-// CHECK-NEXT:          `--{{.*}}AccessLevelRequest
 // CHECK-NEXT:          `--{{.*}}SuperclassTypeRequest
 // CHECK-NEXT:              `--{{.*}}InheritedTypeRequest(circular_inheritance.(file).Right@
 // CHECK-NEXT:                  `--{{.*}}AccessLevelRequest{{.*}}
 // CHECK-NEXT:                  `--{{.*}}AccessLevelRequest{{.*}}
-// CHECK-NEXT:                  `--{{.*}}AccessLevelRequest{{.*}}
-// CHECK-NEXT:                  `--{{.*}}AccessLevelRequest{{.*}}
 // CHECK-NEXT:                  `--{{.*}}SuperclassTypeRequest{{.*(cyclic dependency)}}
 
 // CHECK-DOT: digraph Dependencies