Remove the -sil-serialize-all option

Author: swiftix

docs/Lexicon.rst

@@ -344,12 +344,6 @@ source code, tests, and commit messages. See also the `LLVM lexicon`_.
     "Swift Intermediate Language". A high-level IR used by the Swift compiler
     for flow-sensitive diagnostics, optimization, and LLVM IR generation.
 
-  -sil-serialize-all
-    A mode where all functions in a library are made available for inlining by
-    any client, regardless of access control. Also called "magic performance
-    mode" as a reminder of how this drastically changes compilation. Not
-    guaranteed to work on arbitrary code.
-
   SR
     An issue reported on `bugs.swift.org <https://bugs.swift.org>`_. A
     backronym for "Swift Report"; really the name is derived from LLVM's

include/swift/AST/SILOptions.h

@@ -150,11 +150,6 @@ class SILOptions {
   /// \brief Enable large loadable types IRGen pass.
   bool EnableLargeLoadableTypes = true;
 
-  /// Enables the "fully fragile" resilience strategy.
-  ///
-  /// \see ResilienceStrategy::Fragile
-  bool SILSerializeAll = false;
-
   /// If set, SIL witness tables will be serialized.
   ///
   /// It is supposed to be used only for compiling overlays.

include/swift/Option/FrontendOptions.td

@@ -372,9 +372,6 @@ def sil_merge_partial_modules : Flag<["-"], "sil-merge-partial-modules">,
 def sil_link_all : Flag<["-"], "sil-link-all">,
   HelpText<"Link all SIL functions">;
 
-def sil_serialize_all : Flag<["-"], "sil-serialize-all">,
-  HelpText<"Serialize all generated SIL">;
-
 def sil_serialize_witness_tables : Flag<["-"], "sil-serialize-witness-tables">,
   HelpText<"Serialize eligible SIL witness tables">;
 

include/swift/SIL/SILModule.h

@@ -323,7 +323,7 @@ class SILModule {
   }
 
   /// Returns true if everything in this SILModule is being serialized.
-  bool isWholeModuleSerialized() const { return Options.SILSerializeAll; }
+  bool isWholeModuleSerialized() const { return false; }
 
   /// Returns true if it is the OnoneSupport module.
   bool isOnoneSupportModule() const;

lib/Frontend/CompilerInvocation.cpp

@@ -1373,7 +1373,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_sil_merge_partial_modules))
     Opts.MergePartialModules = true;
 
-  Opts.SILSerializeAll |= Args.hasArg(OPT_sil_serialize_all);
   Opts.SILSerializeWitnessTables |=
     Args.hasArg(OPT_sil_serialize_witness_tables);
   Opts.SILSerializeVTables |=

lib/Frontend/Frontend.cpp

@@ -258,8 +258,6 @@ ModuleDecl *CompilerInstance::getMainModule() {
 
     if (Invocation.getFrontendOptions().EnableResilience)
       MainModule->setResilienceStrategy(ResilienceStrategy::Resilient);
-    else if (Invocation.getSILOptions().SILSerializeAll)
-      MainModule->setResilienceStrategy(ResilienceStrategy::Fragile);
   }
   return MainModule;
 }

lib/FrontendTool/FrontendTool.cpp

@@ -925,8 +925,6 @@ static bool performCompile(CompilerInstance &Instance,
       serializationOpts.OutputPath = opts.ModuleOutputPath.c_str();
       serializationOpts.DocOutputPath = opts.ModuleDocOutputPath.c_str();
       serializationOpts.GroupInfoPath = opts.GroupInfoPath.c_str();
-      serializationOpts.SerializeAllSIL =
-          Invocation.getSILOptions().SILSerializeAll;
       if (opts.SerializeBridgingHeader)
         serializationOpts.ImportedHeader = opts.ImplicitObjCHeaderPath;
       serializationOpts.ModuleLinkName = opts.ModuleLinkName;

lib/SILGen/SILGen.h

@@ -126,7 +126,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
 
   /// If true, all functions and globals are made fragile. Currently only used
   /// for compiling the stdlib.
-  bool isMakeModuleFragile() const { return M.getOptions().SILSerializeAll; }
+  bool isMakeModuleFragile() const { return false; }
 
   Optional<SILDeclRef> StringToNSStringFn;
   Optional<SILDeclRef> NSStringToStringFn;

lib/SILGen/SILGenType.cpp

@@ -376,7 +376,8 @@ class SILGenConformance : public SILGenWitnessTable<SILGenConformance> {
 
     // Serialize the witness table if we're serializing everything with
     // -sil-serialize-all....
-    if (SGM.isMakeModuleFragile())
+    if (SGM.isMakeModuleFragile() ||
+        SGM.M.getOptions().SILSerializeWitnessTables)
       Serialized = IsSerialized;
 
     // ... or if the conformance itself thinks it should be.

lib/Serialization/SerializeSIL.cpp

@@ -2283,7 +2283,8 @@ void SILSerializer::writeSILBlock(const SILModule *SILMod) {
 
   // Write out fragile WitnessTables.
   for (const SILWitnessTable &wt : SILMod->getWitnessTables()) {
-    if ((ShouldSerializeAll || wt.isSerialized()) &&
+    if ((ShouldSerializeAll || SILMod->getOptions().SILSerializeWitnessTables ||
+         wt.isSerialized()) &&
         wt.getConformance()->getDeclContext()->isChildContextOf(assocDC))
       writeSILWitnessTable(wt);
   }

stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(swift_stdlib_unittest_compile_flags)
 if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
-  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
+  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-witness-tables" "-Xfrontend" "-sil-serialize-vtables")
 endif()
 
 # TODO: support this on non-POSIX platforms.  It cannot be currently as it

stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(swift_stdlib_unittest_compile_flags)
 if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
-  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
+  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-witness-tables" "-Xfrontend" "-sil-serialize-vtables")
 endif()
 
 # TODO: support this on non-POSIX platforms.  It cannot be currently as it

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -5,7 +5,7 @@ if (SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
   list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER")
 endif()
 if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
-  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
+  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-witness-tables" "-Xfrontend" "-sil-serialize-vtables")
 endif()
 
 is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" IS_BUILD_TYPE_OPTIMIZED)