Merge pull request swiftlang#12493 from swiftix/sil-serialization-before-optimizations5

Enable serialization of witness tables by default

Author: swiftix

cmake/modules/SwiftSource.cmake

@@ -256,8 +256,7 @@ function(_compile_swift_files
                             "-Xfrontend" "${GROUP_INFO_JSON_FILE}")
     if (NOT SWIFT_STDLIB_ENABLE_RESILIENCE)
       if (SWIFT_STDLIB_SIL_SERIALIZE_ALL)
-        list(APPEND swift_flags "-Xfrontend" "-sil-serialize-witness-tables"
-                                "-Xfrontend" "-sil-serialize-vtables")
+        list(APPEND swift_flags "-Xfrontend" "-sil-serialize-vtables")
       endif()
     endif()
   endif()

include/swift/AST/SILOptions.h

@@ -150,12 +150,6 @@ class SILOptions {
   /// \brief Enable large loadable types IRGen pass.
   bool EnableLargeLoadableTypes = true;
 
-  /// If set, SIL witness tables will be serialized.
-  ///
-  /// It is supposed to be used only for compiling overlays.
-  /// User code should never be compiled with this flag set.
-  bool SILSerializeWitnessTables = false;
-
   /// If set, SIL vtables 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_witness_tables : Flag<["-"], "sil-serialize-witness-tables">,
-  HelpText<"Serialize eligible SIL witness tables">;
-
 def sil_serialize_vtables : Flag<["-"], "sil-serialize-vtables">,
   HelpText<"Serialize eligible SIL vtables">;
 

include/swift/SIL/SILWitnessTable.h

@@ -273,8 +273,7 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
 
   // Whether a conformance should be serialized.
   static bool conformanceIsSerialized(ProtocolConformance *conformance,
-                                      ResilienceStrategy strategy,
-                                      bool silSerializeWitnessTables);
+                                      ResilienceStrategy strategy);
 
   /// Print the witness table.
   void print(llvm::raw_ostream &OS, bool Verbose = false) const;

include/swift/TBDGen/TBDGen.h

@@ -24,14 +24,12 @@ class FileUnit;
 class ModuleDecl;
 
 void enumeratePublicSymbols(FileUnit *module, llvm::StringSet<> &symbols,
-                            bool hasMultipleIRGenThreads,
-                            bool silSerializeWitnessTables);
+                            bool hasMultipleIRGenThreads);
 void enumeratePublicSymbols(ModuleDecl *module, llvm::StringSet<> &symbols,
-                            bool hasMultipleIRGenThreads,
-                            bool silSerializeWitnessTables);
+                            bool hasMultipleIRGenThreads);
 
 void writeTBDFile(ModuleDecl *M, llvm::raw_ostream &os,
-                  bool hasMultipleIRGenThreads, bool silSerializeWitnessTables,
+                  bool hasMultipleIRGenThreads,
                   llvm::StringRef installName);
 
 } // end namespace swift

lib/Frontend/CompilerInvocation.cpp

@@ -1208,8 +1208,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_sil_merge_partial_modules))
     Opts.MergePartialModules = true;
 
-  Opts.SILSerializeWitnessTables |=
-    Args.hasArg(OPT_sil_serialize_witness_tables);
   Opts.SILSerializeVTables |=
     Args.hasArg(OPT_sil_serialize_vtables);
 

lib/FrontendTool/FrontendTool.cpp

@@ -756,7 +756,7 @@ static bool performCompile(CompilerInstance &Instance,
                            : opts.TBDInstallName;
 
     if (writeTBD(Instance.getMainModule(), hasMultipleIRGenThreads,
-                 silOpts.SILSerializeWitnessTables, opts.TBDPath, installName))
+                 opts.TBDPath, installName))
       return true;
   }
 
@@ -1064,11 +1064,11 @@ static bool performCompile(CompilerInstance &Instance,
     bool error;
     if (PrimarySourceFile)
       error = validateTBD(PrimarySourceFile, *IRModule, hasMultipleIRGenThreads,
-                          silOpts.SILSerializeWitnessTables, allSymbols);
+                          allSymbols);
     else
       error = validateTBD(Instance.getMainModule(), *IRModule,
                           hasMultipleIRGenThreads,
-                          silOpts.SILSerializeWitnessTables, allSymbols);
+                          allSymbols);
     if (error)
       return true;
 

lib/FrontendTool/TBD.cpp

@@ -39,7 +39,7 @@ static std::vector<StringRef> sortSymbols(llvm::StringSet<> &symbols) {
 }
 
 bool swift::writeTBD(ModuleDecl *M, bool hasMultipleIRGenThreads,
-                     bool silSerializeWitnessTables, StringRef OutputFilename,
+                     StringRef OutputFilename,
                      StringRef installName) {
   std::error_code EC;
   llvm::raw_fd_ostream OS(OutputFilename, EC, llvm::sys::fs::F_None);
@@ -49,8 +49,7 @@ bool swift::writeTBD(ModuleDecl *M, bool hasMultipleIRGenThreads,
     return true;
   }
 
-  writeTBDFile(M, OS, hasMultipleIRGenThreads, silSerializeWitnessTables,
-               installName);
+  writeTBDFile(M, OS, hasMultipleIRGenThreads, installName);
 
   return false;
 }
@@ -120,23 +119,19 @@ static bool validateSymbolSet(DiagnosticEngine &diags,
 
 bool swift::validateTBD(ModuleDecl *M, llvm::Module &IRModule,
                         bool hasMultipleIRGenThreads,
-                        bool silSerializeWitnessTables,
                         bool diagnoseExtraSymbolsInTBD) {
   llvm::StringSet<> symbols;
-  enumeratePublicSymbols(M, symbols, hasMultipleIRGenThreads,
-                         silSerializeWitnessTables);
+  enumeratePublicSymbols(M, symbols, hasMultipleIRGenThreads);
 
   return validateSymbolSet(M->getASTContext().Diags, symbols, IRModule,
                            diagnoseExtraSymbolsInTBD);
 }
 
 bool swift::validateTBD(FileUnit *file, llvm::Module &IRModule,
                         bool hasMultipleIRGenThreads,
-                        bool silSerializeWitnessTables,
                         bool diagnoseExtraSymbolsInTBD) {
   llvm::StringSet<> symbols;
-  enumeratePublicSymbols(file, symbols, hasMultipleIRGenThreads,
-                         silSerializeWitnessTables);
+  enumeratePublicSymbols(file, symbols, hasMultipleIRGenThreads);
 
   return validateSymbolSet(file->getParentModule()->getASTContext().Diags,
                            symbols, IRModule, diagnoseExtraSymbolsInTBD);

lib/FrontendTool/TBD.h

@@ -25,14 +25,14 @@ class FileUnit;
 class FrontendOptions;
 
 bool writeTBD(ModuleDecl *M, bool hasMultipleIRGenThreads,
-              bool silSerializeWitnessTables, llvm::StringRef OutputFilename,
+              llvm::StringRef OutputFilename,
               llvm::StringRef installName);
 bool inputFileKindCanHaveTBDValidated(InputFileKind kind);
 bool validateTBD(ModuleDecl *M, llvm::Module &IRModule,
-                 bool hasMultipleIRGenThreads, bool silSerializeWitnessTables,
+                 bool hasMultipleIRGenThreads,
                  bool diagnoseExtraSymbolsInTBD);
 bool validateTBD(FileUnit *M, llvm::Module &IRModule,
-                 bool hasMultipleIRGenThreads, bool silSerializeWitnessTables,
+                 bool hasMultipleIRGenThreads,
                  bool diagnoseExtraSymbolsInTBD);
 }
 

lib/SIL/SILWitnessTable.cpp

@@ -159,8 +159,7 @@ Identifier SILWitnessTable::getIdentifier() const {
 }
 
 bool SILWitnessTable::conformanceIsSerialized(ProtocolConformance *conformance,
-                                              ResilienceStrategy strategy,
-                                              bool silSerializeWitnessTables) {
+                                              ResilienceStrategy strategy) {
   // Serialize witness tables for conformances synthesized by
   // the ClangImporter.
   if (isa<ClangModuleUnit>(conformance->getDeclContext()->getModuleScopeContext()))
@@ -174,6 +173,5 @@ bool SILWitnessTable::conformanceIsSerialized(ProtocolConformance *conformance,
   auto protocolIsPublic =
       conformance->getProtocol()->getEffectiveAccess() >= AccessLevel::Public;
   auto typeIsPublic = nominal->getEffectiveAccess() >= AccessLevel::Public;
-  return (moduleIsResilient || silSerializeWitnessTables) &&
-         nominal->hasFixedLayout() && protocolIsPublic && typeIsPublic;
+  return nominal->hasFixedLayout() && protocolIsPublic && typeIsPublic;
 }