Fixes package import stmt missing from .package.swiftinterface.

Resolves rdar://124309585

Author: elsh

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -286,6 +286,14 @@ static void printImports(raw_ostream &out,
     allImportFilter |= ModuleDecl::ImportFilterKind::SPIOnly;
   }
 
+  llvm::SmallSet<ImportedModule, 8, ImportedModule::Order> packageOnlyImportSet;
+  if (!Opts.printPublicInterface() &&  Opts.printPackageInterface()) {
+    SmallVector<ImportedModule, 8> packageOnlyImports;
+    M->getImportedModules(packageOnlyImports, ModuleDecl::ImportFilterKind::PackageOnly);
+    packageOnlyImportSet.insert(packageOnlyImports.begin(), packageOnlyImports.end());
+    allImportFilter |= ModuleDecl::ImportFilterKind::PackageOnly;
+  }
+
   SmallVector<ImportedModule, 8> allImports;
   M->getImportedModules(allImports, allImportFilter);
 
@@ -351,7 +359,11 @@ static void printImports(raw_ostream &out,
         out << "@_spi(" << spiName << ") ";
     }
 
-    if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
+    if (!Opts.printPublicInterface() &&
+        Opts.printPackageInterface() &&
+        packageOnlyImportSet.count(import))
+      out << "package ";
+    else if (ctx.LangOpts.hasFeature(Feature::InternalImportsByDefault)) {
       out << "public ";
     }
 

test/ModuleInterface/access-level-import-swiftinterfaces.swift

@@ -22,57 +22,73 @@
 // RUN:   -package-name TestPackage \
 // RUN:   -enable-library-evolution -swift-version 5 \
 // RUN:   -emit-module-interface-path %t/Client.swiftinterface \
-// RUN:   -emit-private-module-interface-path %t/Client.private.swiftinterface
+// RUN:   -emit-private-module-interface-path %t/Client.private.swiftinterface \
+// RUN:   -emit-package-module-interface-path %t/Client.package.swiftinterface
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client.private.swiftinterface) -I %t \
 // RUN:   -module-name Client
+// RUN: %target-swift-typecheck-module-from-interface(%t/Client.package.swiftinterface) -I %t \
+// RUN:   -module-name Client
 
 // RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/Client.swiftinterface
 // RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/Client.private.swiftinterface
+// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5,CHECK-5-PKG %s < %t/Client.package.swiftinterface
 
 /// Build a client composed of many files.
 // RUN: %target-swift-frontend -typecheck %t/MultiFiles?.swift -I %t \
 // RUN:   -package-name TestPackage \
 // RUN:   -enable-library-evolution -swift-version 5 \
 // RUN:   -emit-module-interface-path %t/MultiFiles.swiftinterface \
-// RUN:   -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface
+// RUN:   -emit-private-module-interface-path %t/MultiFiles.private.swiftinterface \
+// RUN:   -emit-package-module-interface-path %t/MultiFiles.package.swiftinterface
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.swiftinterface) -I %t
 // RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.private.swiftinterface) -I %t \
 // RUN:   -module-name MultiFiles
+// RUN: %target-swift-typecheck-module-from-interface(%t/MultiFiles.package.swiftinterface) -I %t \
+// RUN:   -module-name MultiFiles
 
 // RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/MultiFiles.swiftinterface
 // RUN: %FileCheck --check-prefixes=CHECK,CHECK-5 %s < %t/MultiFiles.private.swiftinterface
+// RUN: %FileCheck --check-prefixes=CHECK,CHECK-5-PKG %s < %t/MultiFiles.package.swiftinterface
 
 /// Swift 6 mode.
 // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
 // RUN:   -package-name TestPackage -module-name Client_Swift6 \
 // RUN:   -enable-library-evolution -swift-version 6 \
 // RUN:   -emit-module-interface-path %t/Client_Swift6.swiftinterface \
-// RUN:   -emit-private-module-interface-path %t/Client_Swift6.private.swiftinterface
+// RUN:   -emit-private-module-interface-path %t/Client_Swift6.private.swiftinterface \
+// RUN:   -emit-package-module-interface-path %t/Client_Swift6.package.swiftinterface
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client_Swift6.swiftinterface) -I %t
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client_Swift6.private.swiftinterface) -I %t \
 // RUN:   -module-name Client_Swift6
+// RUN: %target-swift-typecheck-module-from-interface(%t/Client_Swift6.package.swiftinterface) -I %t \
+// RUN:   -module-name Client_Swift6
 
 // RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6 < %t/Client_Swift6.swiftinterface
 // RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6 < %t/Client_Swift6.private.swiftinterface
+// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-6-PKG < %t/Client_Swift6.package.swiftinterface
 
 /// Feature flag.
 // RUN: %target-swift-frontend -typecheck %t/Client.swift -I %t \
 // RUN:   -package-name TestPackage -module-name Client_FeatureFlag \
 // RUN:   -enable-library-evolution -swift-version 5 \
 // RUN:   -emit-module-interface-path %t/Client_FeatureFlag.swiftinterface \
 // RUN:   -emit-private-module-interface-path %t/Client_FeatureFlag.private.swiftinterface \
+// RUN:   -emit-package-module-interface-path %t/Client_FeatureFlag.package.swiftinterface \
 // RUN:   -enable-upcoming-feature InternalImportsByDefault
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client_FeatureFlag.swiftinterface) -I %t
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client_FeatureFlag.private.swiftinterface) -I %t \
 // RUN:   -module-name Client_FeatureFlag
+// RUN: %target-swift-typecheck-module-from-interface(%t/Client_FeatureFlag.package.swiftinterface) -I %t \
+// RUN:   -module-name Client_FeatureFlag
 
 // RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-FLAG < %t/Client_FeatureFlag.swiftinterface
 // RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-FLAG < %t/Client_FeatureFlag.private.swiftinterface
+// RUN: %FileCheck %s --check-prefixes=CHECK,CHECK-6,CHECK-6-PKG,CHECK-FLAG < %t/Client_FeatureFlag.package.swiftinterface
 
 //--- PublicLib.swift
 //--- PackageLib.swift
@@ -82,8 +98,10 @@
 
 //--- Client.swift
 // CHECK-5-NOT: public
+// CHECK-5-PKG: package import PackageLib
 // CHECK-FLAG: -enable-upcoming-feature InternalImportsByDefault
 // CHECK-6: public
+// CHECK-6-PKG: package import PackageLib
 
 public import PublicLib
 // CHECK: PublicLib
@@ -102,8 +120,10 @@ private import PrivateLib
 
 //--- MultiFilesA.swift
 public import PublicLib
+package import PackageLib
 private import InternalLib
 
 //--- MultiFilesB.swift
 internal import PublicLib
+internal import PackageLib
 internal import InternalLib