Merge pull request #64014 from xymus/access-level-import

[Sema] Diagnose exportability of decls limited by a non-public import

Author: xymus

include/swift/AST/DiagnosticsSema.def

@@ -2068,6 +2068,9 @@ ERROR(access_level_on_import_unsupported, none,
 ERROR(access_level_conflict_with_exported,none,
       "'%0' is incompatible with %1; it can only be applied to public imports",
       (DeclAttribute, DeclAttribute))
+NOTE(module_imported_here,none,
+     "module %0 imported as '%select{private|fileprivate|internal|package|%ERROR|%ERROR}1' here",
+     (Identifier, AccessLevel))
 
 // Opaque return types
 ERROR(opaque_type_invalid_constraint,none,

include/swift/AST/SourceFile.h

@@ -45,6 +45,9 @@ enum class RestrictedImportKind {
   None // No restriction, i.e. the module is imported publicly.
 };
 
+/// Import that limits the access level of imported entities.
+using ImportAccessLevel = Optional<AttributedImport<ImportedModule>>;
+
 /// A file containing Swift source code.
 ///
 /// This is a .swift or .sil file (or a virtual file, such as the contents of
@@ -382,6 +385,10 @@ class SourceFile final : public FileUnit {
   /// Get the most permissive restriction applied to the imports of \p module.
   RestrictedImportKind getRestrictedImportKind(const ModuleDecl *module) const;
 
+  /// Return the import of \p targetModule from this file with the most
+  /// permissive access level.
+  ImportAccessLevel getImportAccessLevel(const ModuleDecl *targetModule) const;
+
   /// Find all SPI names imported from \p importedModule by this file,
   /// collecting the identifiers in \p spiGroups.
   virtual void

lib/AST/Module.cpp

@@ -2944,6 +2944,29 @@ RestrictedImportKind SourceFile::getRestrictedImportKind(const ModuleDecl *modul
   return importKind;
 }
 
+ImportAccessLevel
+SourceFile::getImportAccessLevel(const ModuleDecl *targetModule) const {
+  assert(Imports.hasValue());
+
+  // Leave it to the caller to avoid calling this service for a self import.
+  // We want to return AccessLevel::Public, but there's no import site to return.
+  assert(targetModule != getParentModule() &&
+         "getImportAccessLevel doesn't support checking for a self-import");
+
+  auto &imports = getASTContext().getImportCache();
+  ImportAccessLevel restrictiveImport = None;
+
+  for (auto &import : *Imports) {
+    if ((!restrictiveImport.has_value() ||
+         import.accessLevel > restrictiveImport->accessLevel) &&
+        imports.isImportedBy(targetModule, import.module.importedModule)) {
+      restrictiveImport = import;
+    }
+  }
+
+  return restrictiveImport;
+}
+
 bool ModuleDecl::isImportedImplementationOnly(const ModuleDecl *module) const {
   if (module == this) return false;
 

lib/Sema/TypeAccessScopeChecker.h

@@ -31,6 +31,7 @@ class TypeAccessScopeChecker {
   bool TreatUsableFromInlineAsPublic;
 
   Optional<AccessScope> Scope = AccessScope::getPublic();
+  ImportAccessLevel ImportRestriction = None;
 
   TypeAccessScopeChecker(const DeclContext *useDC,
                          bool treatUsableFromInlineAsPublic)
@@ -43,21 +44,41 @@ class TypeAccessScopeChecker {
 
     auto AS = VD->getFormalAccessScope(File, TreatUsableFromInlineAsPublic);
     Scope = Scope->intersectWith(AS);
+
+    auto targetModule = VD->getDeclContext()->getParentModule();
+    if (targetModule != File->getParentModule()) {
+      auto localImportRestriction = File->getImportAccessLevel(targetModule);
+
+      if (localImportRestriction.has_value() &&
+          (!ImportRestriction.has_value() ||
+           localImportRestriction.value().accessLevel <
+             ImportRestriction.value().accessLevel)) {
+        ImportRestriction = localImportRestriction;
+      }
+    }
+
     return Scope.has_value();
   }
 
 public:
-  static Optional<AccessScope>
+
+  struct Result {
+    Optional<AccessScope> Scope;
+    ImportAccessLevel Import;
+  };
+
+  static Result
   getAccessScope(TypeRepr *TR, const DeclContext *useDC,
                  bool treatUsableFromInlineAsPublic = false) {
     TypeAccessScopeChecker checker(useDC, treatUsableFromInlineAsPublic);
     TR->walk(TypeReprIdentFinder([&](const IdentTypeRepr *typeRepr) {
       return checker.visitDecl(typeRepr->getBoundDecl());
     }));
-    return checker.Scope;
+    return {checker.Scope,
+            checker.ImportRestriction};
   }
 
-  static Optional<AccessScope>
+  static Result
   getAccessScope(Type T, const DeclContext *useDC,
                  bool treatUsableFromInlineAsPublic = false) {
     TypeAccessScopeChecker checker(useDC, treatUsableFromInlineAsPublic);
@@ -66,7 +87,9 @@ class TypeAccessScopeChecker {
         return TypeWalker::Action::Continue;
       return TypeWalker::Action::Stop;
     }));
-    return checker.Scope;
+
+    return {checker.Scope,
+            checker.ImportRestriction};
   }
 };