Frontend: Remove unused ModuleInterfaceOptionIgnorablePrivate.

Author: tshortli

include/swift/Frontend/ModuleInterfaceSupport.h

@@ -21,7 +21,6 @@
 #define SWIFT_COMPILER_VERSION_KEY "swift-compiler-version"
 #define SWIFT_MODULE_FLAGS_KEY "swift-module-flags"
 #define SWIFT_MODULE_FLAGS_IGNORABLE_KEY "swift-module-flags-ignorable"
-#define SWIFT_MODULE_FLAGS_IGNORABLE_PRIVATE_KEY "swift-module-flags-ignorable-private"
 
 namespace swift {
 
@@ -56,10 +55,6 @@ struct ModuleInterfaceOptions {
   /// ignored by the earlier version of the compiler.
   std::string IgnorableFlags;
 
-  /// Ignorable flags that should only be printed in .private.swiftinterface file;
-  /// e.g. -package-name PACKAGE_ID
-  std::string IgnorablePrivateFlags;
-
   /// Print imports with both @_implementationOnly and @_spi, only applies
   /// when PrintSPIs is true.
   bool ExperimentalSPIImports = false;

include/swift/Option/Options.h

@@ -41,9 +41,8 @@ namespace options {
     SwiftAPIDigesterOption = (1 << 16),
     NewDriverOnlyOption = (1 << 17),
     ModuleInterfaceOptionIgnorable = (1 << 18),
-    ModuleInterfaceOptionIgnorablePrivate = (1 << 19),
-    ArgumentIsFileList = (1 << 20),
-    CacheInvariant = (1 << 21),
+    ArgumentIsFileList = (1 << 19),
+    CacheInvariant = (1 << 20),
   };
 
   enum ID {

include/swift/Option/Options.td

@@ -56,12 +56,6 @@ def ModuleInterfaceOption : OptionFlag;
 // The option can be safely ignored by the older compiler.
 def ModuleInterfaceOptionIgnorable : OptionFlag;
 
-// The option should be written into a .private.swiftinterface or
-// .package.swiftinterface module interface file, and read/parsed from
-// there when reconstituting a .swiftmodule from it.
-// The option can be safely ignored by the older compiler.
-def ModuleInterfaceOptionIgnorablePrivate : OptionFlag;
-
 // The option causes the output of a supplementary output, or is the path option
 // for a supplementary output. E.g., `-emit-module` and `-emit-module-path`.
 def SupplementaryOutput : OptionFlag;

lib/Frontend/CompilerInvocation.cpp

@@ -499,18 +499,16 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
                                     ArgList &Args, DiagnosticEngine &Diags) {
   if (!FOpts.InputsAndOutputs.hasModuleInterfaceOutputPath())
     return;
+  
   ArgStringList RenderedArgs;
   ArgStringList RenderedArgsForPackageOnly;
   ArgStringList RenderedArgsIgnorable;
-  ArgStringList RenderedArgsIgnorablePrivate;
 
   for (auto A : Args) {
     if (!ShouldIncludeModuleInterfaceArg(A))
       continue;
 
-    if (A->getOption().hasFlag(options::ModuleInterfaceOptionIgnorablePrivate)) {
-      A->render(Args, RenderedArgsIgnorablePrivate);
-    } else if (A->getOption().hasFlag(options::ModuleInterfaceOptionIgnorable)) {
+    if (A->getOption().hasFlag(options::ModuleInterfaceOptionIgnorable)) {
       A->render(Args, RenderedArgsIgnorable);
     } else if (A->getOption().hasFlag(options::ModuleInterfaceOption)) {
       if (ShouldIncludeArgInPackageInterfaceOnly(A, Args))
@@ -532,12 +530,6 @@ static void SaveModuleInterfaceArgs(ModuleInterfaceOptions &Opts,
         [&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },
         [&] { OS << " "; });
   }
-  {
-    llvm::raw_string_ostream OS(Opts.IgnorablePrivateFlags);
-    interleave(RenderedArgsIgnorablePrivate,
-               [&](const char *Argument) { PrintArg(OS, Argument, StringRef()); },
-               [&] { OS << " "; });
-  }
   {
     llvm::raw_string_ostream OS(Opts.IgnorableFlags);
     interleave(RenderedArgsIgnorable,

lib/Frontend/ModuleInterfaceSupport.cpp

@@ -108,12 +108,6 @@ static void printToolVersionAndFlagsComment(raw_ostream &out,
     out << "// " SWIFT_MODULE_FLAGS_IGNORABLE_KEY ": "
         << Opts.IgnorableFlags << "\n";
   }
-
-  auto hasPrivateIgnorableFlags = !Opts.printPublicInterface() && !Opts.IgnorablePrivateFlags.empty();
-  if (hasPrivateIgnorableFlags) {
-    out << "// " SWIFT_MODULE_FLAGS_IGNORABLE_PRIVATE_KEY ": "
-        << Opts.IgnorablePrivateFlags << "\n";
-  }
 }
 
 std::string