Drop package-name if needed in SaveModuleInterfaceArgs

Author: elsh

include/swift/Frontend/ModuleInterfaceSupport.h

@@ -47,6 +47,11 @@ struct ModuleInterfaceOptions {
   /// back .swiftinterface and reconstructing .swiftmodule.
   std::string Flags;
 
+  /// Keep track of flags to be printed in package.swiftinterface only.
+  /// If -disable-print-package-name-for-non-package-interface is passed,
+  /// package-name flag should only be printed in package.swiftinterface.
+  std::string FlagsForPackageOnly;
+
   /// Flags that should be emitted to the .swiftinterface file but are OK to be
   /// ignored by the earlier version of the compiler.
   std::string IgnorableFlags;

lib/Frontend/CompilerInvocation.cpp

@@ -485,6 +485,13 @@ static bool ShouldIncludeModuleInterfaceArg(const Arg *A) {
   return true;
 }
 
+static bool ShouldIncludeArgInPackageInterfaceOnly(const Arg *A,
+                                                   ArgList &Args) {
+  return A->getOption().matches(options::OPT_package_name) &&
+         Args.hasArg(
+             options::OPT_disable_print_package_name_for_non_package_interface);
+}
+
 /// Save a copy of any flags marked as ModuleInterfaceOption, if running
 /// in a mode that is going to emit a .swiftinterface file.
 static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
@@ -493,8 +500,10 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
   if (!FOpts.InputsAndOutputs.hasModuleInterfaceOutputPath())
     return;
   ArgStringList RenderedArgs;
+  ArgStringList RenderedArgsForPackageOnly;
   ArgStringList RenderedArgsIgnorable;
   ArgStringList RenderedArgsIgnorablePrivate;
+
   for (auto A : Args) {
     if (!ShouldIncludeModuleInterfaceArg(A))
       continue;
@@ -504,7 +513,10 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
     } else if (A->getOption().hasFlag(options::ModuleInterfaceOptionIgnorable)) {
       A->render(Args, RenderedArgsIgnorable);
     } else if (A->getOption().hasFlag(options::ModuleInterfaceOption)) {
-      A->render(Args, RenderedArgs);
+      if (ShouldIncludeArgInPackageInterfaceOnly(A, Args))
+        A->render(Args, RenderedArgsForPackageOnly);
+      else
+        A->render(Args, RenderedArgs);
     }
   }
   {
@@ -513,6 +525,13 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
                [&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },
                [&] { OS << " "; });
   }
+  {
+    llvm::raw_string_ostream OS(Opts.FlagsForPackageOnly);
+    interleave(
+        RenderedArgsForPackageOnly,
+        [&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },
+        [&] { OS << " "; });
+  }
   {
     llvm::raw_string_ostream OS(Opts.IgnorablePrivateFlags);
     interleave(RenderedArgsIgnorablePrivate,

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -90,6 +90,13 @@ static void printToolVersionAndFlagsComment(raw_ostream &out,
   out << "// " SWIFT_MODULE_FLAGS_KEY ": "
       << flagsStr;
 
+  // Adding package-name can be disabled in non-package
+  // swiftinterfaces; add only to package.swiftinterface
+  // in such case.
+  if (Opts.printPackageInterface() &&
+      !Opts.FlagsForPackageOnly.empty())
+    out << " " << Opts.FlagsForPackageOnly;
+
   // Insert additional -module-alias flags
   if (Opts.AliasModuleNames) {
     StringRef moduleName = M->getNameStr();

test/ModuleInterface/package_interface_disable_package_name.swift

@@ -19,12 +19,12 @@
 // CHECK-PRIVATE-NOT: -package-name foopkg
 // CHECK-PRIVATE-NOT: -package-name barpkg
 // CHECK-PACKAGE-NOT: -package-name foopkg
-// CHECK-PACKAGE: -package-name barpkg
 
-// CHECK-PUBLIC: -module-name Bar
-// CHECK-PRIVATE: -module-name Bar
-// CHECK-PACKAGE: -module-name Bar
+// CHECK-PUBLIC:  -enable-library-evolution -swift-version 6 -disable-print-package-name-for-non-package-interface -module-name Bar
+// CHECK-PRIVATE:  -enable-library-evolution -swift-version 6 -disable-print-package-name-for-non-package-interface -module-name Bar
+// CHECK-PACKAGE:  -enable-library-evolution -swift-version 6 -disable-print-package-name-for-non-package-interface -module-name Bar -package-name barpkg
 
+/// Verify building modules from non-package interfaces succeeds without the package-name flag.
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.private.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
@@ -48,9 +48,9 @@
 // RUN: %FileCheck %s < %t/Bar.private.swiftinterface
 // RUN: %FileCheck %s < %t/Bar.package.swiftinterface
 
-// CHECK: -package-name barpkg
-// CHECK: -module-name Bar
+// CHECK: -enable-library-evolution -package-name barpkg -swift-version 6 -module-name Bar
 
+/// Building modules from non-package interfaces with package-name (default mode) should succeed.
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.swiftinterface -o %t/Bar.swiftmodule -module-name Bar
 // RUN: rm -rf %t/Bar.swiftmodule
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Bar.private.swiftinterface -o %t/Bar.swiftmodule -module-name Bar