Merge pull request #68644 from xymus/skip-superfluous-import-notes

Sema: Only complain about the import when it does restrict the access level

Author: xymus

lib/Sema/ResilienceDiagnostics.cpp

@@ -114,7 +114,7 @@ bool TypeChecker::diagnoseInlinableDeclRefAccess(SourceLoc loc,
 
   ImportAccessLevel problematicImport = D->getImportAccessFrom(DC);
   if (problematicImport.has_value() &&
-      diagAccessLevel == problematicImport->accessLevel) {
+      problematicImport->accessLevel < D->getFormalAccess()) {
     Context.Diags.diagnose(problematicImport->accessLevelLoc,
                            diag::decl_import_via_here, D,
                            problematicImport->accessLevel,

lib/Sema/TypeCheckAccess.cpp

@@ -268,6 +268,12 @@ void AccessControlCheckerBase::checkTypeAccessImpl(
       static_cast<const IdentTypeRepr*>(complainRepr)->getBoundDecl();
     assert(VD && "findTypeWithScope should return bound TypeReprs only");
     complainImport = VD->getImportAccessFrom(useDC);
+
+    // Don't complain about an import that doesn't restrict the access
+    // level of the decl. This can happen with imported `package` decls.
+    if (complainImport.has_value() &&
+        complainImport->accessLevel >= VD->getFormalAccess())
+      complainImport = llvm::None;
   }
 
   diagnose(problematicAccessScope, complainRepr, downgradeToWarning,

test/Sema/access-level-import-diag-priority.swift

@@ -4,8 +4,10 @@
 // RUN: split-file --leading-lines %s %t
 
 /// Build the libraries.
-// RUN: %target-swift-frontend -emit-module %t/PublicLib.swift -o %t
-// RUN: %target-swift-frontend -emit-module %t/PackageLib.swift -o %t
+// RUN: %target-swift-frontend -emit-module %t/PublicLib.swift -o %t \
+// RUN:   -package-name pkg
+// RUN: %target-swift-frontend -emit-module %t/PackageLib.swift -o %t \
+// RUN:   -package-name pkg
 // RUN: %target-swift-frontend -emit-module %t/InternalLib.swift -o %t
 // RUN: %target-swift-frontend -emit-module %t/FileprivateLib.swift -o %t
 // RUN: %target-swift-frontend -emit-module %t/PrivateLib.swift -o %t
@@ -14,15 +16,20 @@
 // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
 // RUN:   -enable-experimental-feature AccessLevelOnImport -verify \
 // RUN:   -package-name pkg
+// RUN: %target-swift-frontend -typecheck %t/PackageTypeImportedAsPackageClient.swift -I %t \
+// RUN:   -enable-experimental-feature AccessLevelOnImport -verify \
+// RUN:   -package-name pkg
 // RUN: %target-swift-frontend -typecheck %t/LocalVsImportClient.swift -I %t \
 // RUN:   -enable-experimental-feature AccessLevelOnImport -verify \
 // RUN:   -package-name pkg
 
 //--- PublicLib.swift
 public struct PublicImportType {}
+package struct PackageLevelPublicImportedType {}
 
 //--- PackageLib.swift
 public struct PackageImportType {}
+package struct PackageLevelPackageImportedType {}
 
 //--- InternalLib.swift
 public struct InternalImportType {}
@@ -62,6 +69,26 @@ public func publicFuncUsesPrivateScambled(_ a: PublicImportType, d: FileprivateI
     var _: PrivateImportType
 }
 
+//--- PackageTypeImportedAsPackageClient.swift
+/// Report errors about using package decls in public but don't note the import
+/// as it doesn't affect the access level of the decls.
+
+public import PublicLib
+package import PackageLib
+
+public func publicFuncUsesPackageLevelPublicImportedType(_ a: PackageLevelPublicImportedType) {} // expected-error {{function cannot be declared public because its parameter uses a package type}}
+public func publicFuncUsesPackageLevelPackageImportedType(_ a: PackageLevelPackageImportedType) {} // expected-error {{function cannot be declared public because its parameter uses a package type}}
+
+@inlinable public func funcInlinableReferenceToPublicImportedType() {
+  var _: PackageLevelPublicImportedType // expected-error {{struct 'PackageLevelPublicImportedType' is package and cannot be referenced from an '@inlinable' function}}
+  var _: Array<PackageLevelPublicImportedType> // expected-error {{struct 'PackageLevelPublicImportedType' is package and cannot be referenced from an '@inlinable' function}}
+}
+
+@inlinable public func funcInlinableReferenceToPackageImportedType() {
+  var _: PackageLevelPackageImportedType // expected-error {{struct 'PackageLevelPackageImportedType' is package and cannot be referenced from an '@inlinable' function}}
+  var _: Array<PackageLevelPackageImportedType> // expected-error {{struct 'PackageLevelPackageImportedType' is package and cannot be referenced from an '@inlinable' function}}
+}
+
 /// Local vs imports
 //--- LocalVsImportClient.swift
 public import PublicLib