[AST] Intro and use isSPI and getSPIGroups

Author: xymus

include/swift/AST/Decl.h

@@ -927,6 +927,16 @@ class alignas(1 << DeclAlignInBits) Decl {
   /// @_originalDefinedIn attribute, this function returns this module name.
   StringRef getAlternateModuleName() const;
 
+  // Is this Decl an SPI? It can be directly marked with @_spi or is defined in
+  // an @_spi context.
+  bool isSPI() const;
+
+  // List the SPI groups declared with @_spi or inherited by this decl.
+  //
+  // SPI groups are inherited from the parent contexts only if the local decl
+  // doesn't declare any @_spi.
+  ArrayRef<Identifier> getSPIGroups() const;
+
   /// Emit a diagnostic tied to this declaration.
   template<typename ...ArgTypes>
   InFlightDiagnostic diagnose(

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -105,9 +105,6 @@ SWIFT_REQUEST(TypeChecker, IsDynamicRequest, bool(ValueDecl *),
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, IsFinalRequest, bool(ValueDecl *), SeparatelyCached,
               NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, SPIGroupsRequest,
-              llvm::ArrayRef<Identifier>(Decl *),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, IsGetterMutatingRequest, bool(AbstractStorageDecl *),
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, IsImplicitlyUnwrappedOptionalRequest,
@@ -210,6 +207,9 @@ SWIFT_REQUEST(TypeChecker, PreCheckFunctionBuilderRequest,
 SWIFT_REQUEST(TypeChecker, ResolveImplicitMemberRequest,
               bool(NominalTypeDecl *, ImplicitMemberAction), Uncached,
               NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, SPIGroupsRequest,
+              llvm::ArrayRef<Identifier>(Decl *),
+              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, SynthesizeMemberwiseInitRequest,
               ConstructorDecl *(NominalTypeDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, HasDefaultInitRequest,

lib/AST/ASTPrinter.cpp

@@ -156,8 +156,7 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(bool preferTypeRepr,
               return true;
 
           // Always print SPI decls if `PrintSPIs`.
-          if (options.PrintSPIs &&
-              VD->getAttrs().hasAttribute<SPIAccessControlAttr>())
+          if (options.PrintSPIs && VD->isSPI())
             return true;
 
           return false;

lib/AST/Decl.cpp

@@ -3209,8 +3209,7 @@ static AccessLevel getAdjustedFormalAccess(const ValueDecl *VD,
     if (!useSF) return access;
     if (useSF->hasTestableOrPrivateImport(access, VD))
       return getMaximallyOpenAccessFor(VD);
-  } else if (!treatSPIAsPublic &&
-             VD->getAttrs().hasAttribute<SPIAccessControlAttr>()) {
+  } else if (!treatSPIAsPublic && VD->isSPI()) {
     // Restrict access to SPI decls.
     return AccessLevel::Internal;
   }
@@ -3368,9 +3367,7 @@ getAccessScopeForFormalAccess(const ValueDecl *VD,
   case AccessLevel::Open: {
     if (useDC) {
       auto *useSF = dyn_cast<SourceFile>(useDC->getModuleScopeContext());
-      if (useSF &&
-          VD->getAttrs().hasAttribute<SPIAccessControlAttr>() &&
-          !useSF->isImportedAsSPI(VD))
+      if (useSF && VD->isSPI() && !useSF->isImportedAsSPI(VD))
         return AccessScope(VD->getModuleContext(), /*private*/false);
     }
     return AccessScope::getPublic();
@@ -3482,9 +3479,7 @@ static bool checkAccess(const DeclContext *useDC, const ValueDecl *VD,
   case AccessLevel::Open: {
     if (useDC) {
       auto *useSF = dyn_cast<SourceFile>(useDC->getModuleScopeContext());
-      if (useSF &&
-          VD->getAttrs().hasAttribute<SPIAccessControlAttr>() &&
-          !useSF->isImportedAsSPI(VD))
+      if (useSF && VD->isSPI() && !useSF->isImportedAsSPI(VD))
         return false;
     }
     return true;

lib/AST/Module.cpp

@@ -1825,10 +1825,7 @@ bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const {
   lookupImportedSPIGroups(targetModule, importedSPIGroups);
   if (importedSPIGroups.empty()) return false;
 
-  auto declSPIGroups = evaluateOrDefault(
-                        targetDecl->getASTContext().evaluator,
-                        SPIGroupsRequest{ targetDecl },
-                        ArrayRef<Identifier>());
+  auto declSPIGroups = targetDecl->getSPIGroups();
 
   // Note: If we reach a point where there are many SPI imports or SPI groups
   // on decls we could optimize this further by using a set.
@@ -1840,15 +1837,30 @@ bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const {
   return false;
 }
 
-llvm::Expected<llvm::ArrayRef<Identifier>>
-SPIGroupsRequest::evaluate(Evaluator &evaluator, const Decl *decl) const {
-  // Applies only to public ValueDecls and ExtensionDecls.
-  if (auto vd = dyn_cast<ValueDecl>(decl)) {
+bool Decl::isSPI() const {
+  return !getSPIGroups().empty();
+}
+
+ArrayRef<Identifier> Decl::getSPIGroups() const {
+  if (auto vd = dyn_cast<ValueDecl>(this)) {
     if (vd->getFormalAccess() < AccessLevel::Public)
       return ArrayRef<Identifier>();
-  } else if (!isa<ExtensionDecl>(decl))
+  } else if (!isa<ExtensionDecl>(this))
     return ArrayRef<Identifier>();
 
+  return evaluateOrDefault(getASTContext().evaluator,
+                           SPIGroupsRequest{ this },
+                           ArrayRef<Identifier>());
+}
+
+llvm::Expected<llvm::ArrayRef<Identifier>>
+SPIGroupsRequest::evaluate(Evaluator &evaluator, const Decl *decl) const {
+  // Applies only to public ValueDecls and ExtensionDecls.
+  if (auto vd = dyn_cast<ValueDecl>(decl))
+    assert(vd->getFormalAccess() >= AccessLevel::Public);
+  else
+    assert(isa<ExtensionDecl>(decl));
+
   // First, look for local attributes.
   llvm::SetVector<Identifier> spiGroups;
   for (auto attr : decl->getAttrs().getAttributes<SPIAccessControlAttr>())
@@ -1861,19 +1873,15 @@ SPIGroupsRequest::evaluate(Evaluator &evaluator, const Decl *decl) const {
     // Then in the extended nominal type.
     if (auto extension = dyn_cast<ExtensionDecl>(decl)) {
       auto extended = extension->getExtendedNominal();
-      auto extSPIs = evaluateOrDefault(ctx.evaluator,
-                                       SPIGroupsRequest{ extended },
-                                       ArrayRef<Identifier>());
+      auto extSPIs = extended->getSPIGroups();
       if (!extSPIs.empty()) return extSPIs;
     }
 
     // And finally in the parent context.
     auto parent = decl->getDeclContext();
     if (auto parentD = parent->getAsDecl()) {
       if (!isa<ModuleDecl>(parentD)) {
-        return evaluateOrDefault(ctx.evaluator,
-                                 SPIGroupsRequest{ parentD },
-                                 ArrayRef<Identifier>());
+        return parentD->getSPIGroups();
       }
     }
   }

lib/Sema/TypeCheckAccess.cpp

@@ -288,8 +288,7 @@ void AccessControlCheckerBase::checkTypeAccessImpl(
     // If in SPI mode, don't report SPI use from within the same module.
     if (auto CITR = dyn_cast<ComponentIdentTypeRepr>(complainRepr)) {
       const ValueDecl *VD = CITR->getBoundDecl();
-      if (useDC->getParentModule() == VD->getModuleContext() &&
-          VD->getAttrs().hasAttribute<SPIAccessControlAttr>())
+      if (useDC->getParentModule() == VD->getModuleContext() && VD->isSPI())
         return;
     }
   }
@@ -319,8 +318,7 @@ void AccessControlCheckerBase::checkTypeAccess(
     context->getFormalAccessScope(
       context->getDeclContext(), checkUsableFromInline);
 
-  auto fromSPI = static_cast<FromSPI>(
-      context->getAttrs().hasAttribute<SPIAccessControlAttr>());
+  auto fromSPI = static_cast<FromSPI>(context->isSPI());
   checkTypeAccessImpl(type, typeRepr, contextAccessScope, DC, mayBeInferred,
                       fromSPI, diagnose);
 }
@@ -381,8 +379,10 @@ void AccessControlCheckerBase::checkGenericParamAccess(
   };
 
   auto *DC = ownerDecl->getDeclContext();
-  auto fromSPI = static_cast<FromSPI>(
-     ownerDecl->getAttrs().hasAttribute<SPIAccessControlAttr>());
+  auto fromSPI = FromSPI::No;
+  if (auto ownerValueDecl = dyn_cast<ValueDecl>(ownerDecl)) {
+    fromSPI = static_cast<FromSPI>(ownerValueDecl->isSPI());
+  }
 
   for (auto param : *params) {
     if (param->getInherited().empty())