[AST] NFC: introduce ASTContext::isAccessControlDisabled

Author: xedin

include/swift/AST/ASTContext.h

@@ -936,6 +936,12 @@ class ASTContext final {
     return LangOpts.isSwiftVersionAtLeast(major, minor);
   }
 
+  /// Check whether it's important to respect access control restrictions
+  /// in current context.
+  bool isAccessControlDisabled() const {
+    return !LangOpts.EnableAccessControl;
+  }
+
 private:
   friend Decl;
   Optional<RawComment> getRawComment(const Decl *D);

lib/AST/Decl.cpp

@@ -2750,12 +2750,6 @@ ValueDecl::getFormalAccessScope(const DeclContext *useDC,
                                        treatUsableFromInlineAsPublic);
 }
 
-/// Check whether it's important to respect access control restrictions
-/// in current context.
-static bool isAccessControlDisabled(const ASTContext &ctx) {
-  return !ctx.LangOpts.EnableAccessControl;
-}
-
 /// Checks if \p VD may be used from \p useDC, taking \@testable imports into
 /// account.
 ///
@@ -2766,7 +2760,7 @@ static bool isAccessControlDisabled(const ASTContext &ctx) {
 static bool checkAccessUsingAccessScopes(const DeclContext *useDC,
                                          const ValueDecl *VD,
                                          AccessLevel access) {
-  if (isAccessControlDisabled(VD->getASTContext()))
+  if (VD->getASTContext().isAccessControlDisabled())
     return true;
 
   AccessScope accessScope =
@@ -2788,7 +2782,7 @@ static bool checkAccessUsingAccessScopes(const DeclContext *useDC,
 /// See ValueDecl::isAccessibleFrom for a description of \p forConformance.
 static bool checkAccess(const DeclContext *useDC, const ValueDecl *VD,
                         AccessLevel access, bool forConformance) {
-  if (isAccessControlDisabled(VD->getASTContext()))
+  if (VD->getASTContext().isAccessControlDisabled())
     return true;
 
   auto *sourceDC = VD->getDeclContext();

lib/AST/ModuleNameLookup.cpp

@@ -258,8 +258,8 @@ void namelookup::lookupInModule(ModuleDecl *startModule,
                                 ArrayRef<ModuleDecl::ImportedModule> extraImports) {
   assert(moduleScopeContext && moduleScopeContext->isModuleScopeContext());
   ModuleLookupCache cache;
-  bool respectAccessControl = startModule->getASTContext().LangOpts
-                                .EnableAccessControl;
+  bool respectAccessControl =
+      !startModule->getASTContext().isAccessControlDisabled();
   ::lookupInModule<CanTypeSet>(startModule, topAccessPath, decls,
                                resolutionKind, /*canReturnEarly=*/true,
                                typeResolver, cache, moduleScopeContext,
@@ -282,7 +282,7 @@ void namelookup::lookupVisibleDeclsInModule(
     ArrayRef<ModuleDecl::ImportedModule> extraImports) {
   assert(moduleScopeContext && moduleScopeContext->isModuleScopeContext());
   ModuleLookupCache cache;
-  bool respectAccessControl = M->getASTContext().LangOpts.EnableAccessControl;
+  bool respectAccessControl = !M->getASTContext().isAccessControlDisabled();
   ::lookupInModule<NamedCanTypeSet>(M, accessPath, decls,
                                     resolutionKind, /*canReturnEarly=*/false,
                                     typeResolver, cache, moduleScopeContext,

lib/AST/NameLookup.cpp

@@ -65,12 +65,11 @@ void DebuggerClient::anchor() {}
 
 void AccessFilteringDeclConsumer::foundDecl(ValueDecl *D,
                                             DeclVisibilityKind reason) {
-  if (D->getASTContext().LangOpts.EnableAccessControl) {
-    if (D->isInvalid())
-      return;
-    if (!D->isAccessibleFrom(DC))
-      return;
-  }
+  if (D->isInvalid())
+    return;
+  if (!D->isAccessibleFrom(DC))
+    return;
+
   ChainedConsumer.foundDecl(D, reason);
 }
 
@@ -1843,7 +1842,7 @@ static void configureLookup(const DeclContext *dc,
                             ReferencedNameTracker *&tracker,
                             bool &isLookupCascading) {
   auto &ctx = dc->getASTContext();
-  if (!ctx.LangOpts.EnableAccessControl)
+  if (ctx.isAccessControlDisabled())
     options |= NL_IgnoreAccessControl;
 
   // Find the dependency tracker we'll need for this lookup.

lib/PrintAsObjC/PrintAsObjC.cpp

@@ -1122,7 +1122,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
 
     ASTContext &ctx = M.getASTContext();
     bool isSettable = VD->isSettable(nullptr);
-    if (isSettable && ctx.LangOpts.EnableAccessControl)
+    if (isSettable && !ctx.isAccessControlDisabled())
       isSettable = (VD->getSetterFormalAccess() >= minRequiredAccess);
     if (!isSettable)
       os << ", readonly";

lib/Sema/TypeCheckAccess.cpp

@@ -160,7 +160,7 @@ void AccessControlCheckerBase::checkTypeAccessImpl(
     Type type, TypeRepr *typeRepr, AccessScope contextAccessScope,
     const DeclContext *useDC, bool mayBeInferred,
     llvm::function_ref<CheckTypeAccessCallback> diagnose) {
-  if (!TC.getLangOpts().EnableAccessControl)
+  if (TC.Context.isAccessControlDisabled())
     return;
   if (!type)
     return;

lib/Sema/TypeCheckDecl.cpp

@@ -2775,7 +2775,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         }
       }
 
-      if (TC.getLangOpts().EnableAccessControl) {
+      if (!TC.Context.isAccessControlDisabled()) {
         // Require the superclass to be open if this is outside its
         // defining module.  But don't emit another diagnostic if we
         // already complained about the class being inherently

lib/Sema/TypeCheckDeclOverride.cpp

@@ -761,7 +761,7 @@ SmallVector<OverrideMatch, 2> OverrideMatcher::match(
 
 static void checkOverrideAccessControl(ValueDecl *baseDecl, ValueDecl *decl,
                                        ASTContext &ctx) {
-  if (!ctx.LangOpts.EnableAccessControl)
+  if (ctx.isAccessControlDisabled())
     return;
 
   auto &diags = ctx.Diags;
@@ -1479,7 +1479,7 @@ static bool checkSingleOverride(ValueDecl *override, ValueDecl *base) {
     // read-only.  Observing properties look at change, read-only properties
     // have nothing to observe!
     bool baseIsSettable = baseASD->isSettable(baseASD->getDeclContext());
-    if (baseIsSettable && ctx.LangOpts.EnableAccessControl) {
+    if (baseIsSettable) {
       baseIsSettable =
          baseASD->isSetterAccessibleFrom(overrideASD->getDeclContext());
     }

lib/Sema/TypeCheckNameLookup.cpp

@@ -90,7 +90,7 @@ namespace {
                         bool isMemberLookup)
       : Result(result), DC(dc), Options(options),
         IsMemberLookup(isMemberLookup) {
-      if (!dc->getASTContext().LangOpts.EnableAccessControl)
+      if (dc->getASTContext().isAccessControlDisabled())
         Options |= NameLookupFlags::IgnoreAccessControl;
     }
 

lib/Sema/TypeCheckProtocol.cpp

@@ -1274,7 +1274,7 @@ bool WitnessChecker::checkWitnessAccess(ValueDecl *requirement,
                                         ValueDecl *witness,
                                         bool *isSetter) {
   *isSetter = false;
-  if (!TC.getLangOpts().EnableAccessControl)
+  if (TC.Context.isAccessControlDisabled())
     return false;
 
   AccessScope actualScopeToCheck = getRequiredAccessScope();

lib/Sema/TypeCheckProtocol.h

@@ -497,7 +497,7 @@ class WitnessChecker {
   AccessScope getRequiredAccessScope();
 
   bool isUsableFromInlineRequired() {
-    if (!TC.getLangOpts().EnableAccessControl)
+    if (TC.Context.isAccessControlDisabled())
       return false;
 
     assert(RequiredAccessScopeAndUsableFromInline.hasValue() &&