Merge pull request #83865 from tshortli/simplify-require-access-level-tracking

Author: tshortli

lib/Sema/ResilienceDiagnostics.cpp

@@ -76,15 +76,7 @@ bool TypeChecker::diagnoseInlinableDeclRefAccess(SourceLoc loc,
   }
 
   // Remember that the module defining the decl must be imported publicly.
-  recordRequiredImportAccessLevelForDecl(
-      D, DC, AccessLevel::Public,
-      [&](AttributedImport<ImportedModule> attributedImport) {
-        ModuleDecl *importedVia = attributedImport.module.importedModule,
-                   *sourceModule = D->getModuleContext();
-        Context.Diags.diagnose(loc, diag::module_api_import, D, importedVia,
-                               sourceModule, importedVia == sourceModule,
-                               /*isImplicit*/ false);
-      });
+  recordRequiredImportAccessLevelForDecl(D, DC, AccessLevel::Public, loc);
 
   // General check on access-level of the decl.
   auto declAccessScope =

lib/Sema/TypeCheckAccess.cpp

@@ -212,19 +212,9 @@ void AccessControlCheckerBase::checkTypeAccessImpl(
   // Report where it was imported from.
   if (contextAccessScope.isPublicOrPackage()) {
     auto report = [&](const DeclRefTypeRepr *typeRepr, const ValueDecl *VD) {
-      // Remember that the module defining the decl must be imported publicly.
+      SourceLoc diagLoc = typeRepr ? typeRepr->getLoc() : SourceLoc();
       recordRequiredImportAccessLevelForDecl(
-          VD, useDC, contextAccessScope.accessLevelForDiagnostics(),
-          [&](AttributedImport<ImportedModule> attributedImport) {
-            SourceLoc diagLoc =
-                typeRepr ? typeRepr->getLoc() : extractNearestSourceLoc(useDC);
-            ModuleDecl *importedVia = attributedImport.module.importedModule,
-                       *sourceModule = VD->getModuleContext();
-            Context.Diags.diagnose(diagLoc, diag::module_api_import, VD,
-                                   importedVia, sourceModule,
-                                   importedVia == sourceModule,
-                                   /*isImplicit*/ !typeRepr);
-          });
+          VD, useDC, contextAccessScope.accessLevelForDiagnostics(), diagLoc);
     };
 
     if (typeRepr) {
@@ -2445,15 +2435,8 @@ class DeclAvailabilityChecker : public DeclVisitor<DeclAvailabilityChecker> {
 
       // Remember that the module defining the extended type must be imported
       // publicly.
-      recordRequiredImportAccessLevelForDecl(
-          extendedType, DC, AccessLevel::Public,
-          [&](AttributedImport<ImportedModule> attributedImport) {
-            ModuleDecl *importedVia = attributedImport.module.importedModule,
-                       *sourceModule = ED->getModuleContext();
-            ED->diagnose(diag::module_api_import, ED, importedVia, sourceModule,
-                         importedVia == sourceModule,
-                         /*isImplicit*/ false);
-          });
+      recordRequiredImportAccessLevelForDecl(extendedType, DC,
+                                             AccessLevel::Public, ED->getLoc());
     }
   }
 
@@ -2579,6 +2562,23 @@ void swift::recordRequiredImportAccessLevelForDecl(
   }
 }
 
+void swift::recordRequiredImportAccessLevelForDecl(const ValueDecl *decl,
+                                                   const DeclContext *dc,
+                                                   AccessLevel accessLevel,
+                                                   SourceLoc loc) {
+  recordRequiredImportAccessLevelForDecl(
+      decl, dc, accessLevel,
+      [&](AttributedImport<ImportedModule> attributedImport) {
+        SourceLoc diagLoc =
+            loc.isValid() ? loc : extractNearestSourceLoc(dc);
+        ModuleDecl *importedVia = attributedImport.module.importedModule,
+                   *sourceModule = decl->getModuleContext();
+        dc->getASTContext().Diags.diagnose(
+            diagLoc, diag::module_api_import, decl, importedVia, sourceModule,
+            importedVia == sourceModule, loc.isInvalid());
+      });
+}
+
 void swift::diagnoseUnnecessaryPublicImports(SourceFile &SF) {
   ASTContext &ctx = SF.getASTContext();
   if (ctx.TypeCheckerOpts.SkipFunctionBodies != FunctionBodySkipping::None)
@@ -2649,15 +2649,8 @@ void registerPackageAccessForPackageExtendedType(ExtensionDecl *ED) {
 
   // Remember that the module defining the decl must be imported with at least
   // package visibility.
-  recordRequiredImportAccessLevelForDecl(
-      extendedType, DC, AccessLevel::Package,
-      [&](AttributedImport<ImportedModule> attributedImport) {
-        ModuleDecl *importedVia = attributedImport.module.importedModule,
-                   *sourceModule = ED->getModuleContext();
-        ED->diagnose(diag::module_api_import, ED, importedVia, sourceModule,
-                     importedVia == sourceModule,
-                     /*isImplicit*/ false);
-      });
+  recordRequiredImportAccessLevelForDecl(extendedType, DC, AccessLevel::Package,
+                                         ED->getLoc());
 }
 
 void swift::checkAccessControl(Decl *D) {

lib/Sema/TypeCheckDistributed.cpp

@@ -711,15 +711,8 @@ void TypeChecker::checkDistributedActor(SourceFile *SF, NominalTypeDecl *nominal
 
   auto &C = nominal->getASTContext();
   auto loc = nominal->getLoc();
-  recordRequiredImportAccessLevelForDecl(
-    C.getDistributedActorDecl(), nominal, nominal->getEffectiveAccess(),
-    [&](AttributedImport<ImportedModule> attributedImport) {
-  ModuleDecl *importedVia = attributedImport.module.importedModule,
-             *sourceModule = nominal->getModuleContext();
-  C.Diags.diagnose(loc, diag::module_api_import, nominal, importedVia,
-                         sourceModule, importedVia == sourceModule,
-                         /*isImplicit*/ false);
-});
+  recordRequiredImportAccessLevelForDecl(C.getDistributedActorDecl(), nominal,
+                                         nominal->getEffectiveAccess(), loc);
 
   // ==== Constructors
   // --- Get the default initializer

lib/Sema/TypeChecker.h

@@ -1509,12 +1509,20 @@ using RequiredImportAccessLevelCallback =
     std::function<void(AttributedImport<ImportedModule>)>;
 
 /// Make a note that uses of \p decl in \p dc require that the decl's defining
-/// module be imported with an access level that is at least as permissive as \p
-/// accessLevel.
+/// module be imported with an access level that is at least as permissive as
+/// \p accessLevel.
 void recordRequiredImportAccessLevelForDecl(
     const Decl *decl, const DeclContext *dc, AccessLevel accessLevel,
     RequiredImportAccessLevelCallback remark);
 
+/// Make a note that uses of \p decl in \p dc require that the decl's defining
+/// module be imported with an access level that is at least as permissive as
+/// \p accessLevel. If `-Rmodule-api-import` is specified, a remark is emitted.
+void recordRequiredImportAccessLevelForDecl(const ValueDecl *decl,
+                                            const DeclContext *dc,
+                                            AccessLevel accessLevel,
+                                            SourceLoc loc);
+
 /// Report imports that are marked public but are not used in API.
 void diagnoseUnnecessaryPublicImports(SourceFile &SF);