Enable the serialization of sil_vtables by default and completely remove the -sil-serialize-vtables option

Only sil_vtables of public classes with fixed layout are serialized.

Author: swiftix

cmake/modules/SwiftSource.cmake

@@ -254,11 +254,6 @@ function(_compile_swift_files
         "-nostdimport" "-parse-stdlib" "-module-name" "Swift")
     list(APPEND swift_flags "-Xfrontend" "-group-info-path"
                             "-Xfrontend" "${GROUP_INFO_JSON_FILE}")
-    if (NOT SWIFT_STDLIB_ENABLE_RESILIENCE)
-      if (SWIFT_STDLIB_SIL_SERIALIZE_ALL)
-        list(APPEND swift_flags "-Xfrontend" "-sil-serialize-vtables")
-      endif()
-    endif()
   endif()
 
   # Force swift 3 compatibility mode for Standard Library and overlay.

include/swift/AST/SILOptions.h

@@ -150,12 +150,6 @@ class SILOptions {
   /// \brief Enable large loadable types IRGen pass.
   bool EnableLargeLoadableTypes = true;
 
-  /// If set, SIL vtables will be serialized.
-  ///
-  /// It is supposed to be used only for compiling overlays.
-  /// User code should never be compiled with this flag set.
-  bool SILSerializeVTables = false;
-
   SILOptions() {}
 
   /// Return a hash code of any components from these options that should

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_vtables : Flag<["-"], "sil-serialize-vtables">,
-  HelpText<"Serialize eligible SIL vtables">;
-
 def sil_verify_all : Flag<["-"], "sil-verify-all">,
   HelpText<"Verify SIL after each transform">;
 

lib/Frontend/CompilerInvocation.cpp

@@ -1208,9 +1208,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_sil_merge_partial_modules))
     Opts.MergePartialModules = true;
 
-  Opts.SILSerializeVTables |=
-    Args.hasArg(OPT_sil_serialize_vtables);
-
   // Parse the optimization level.
   // Default to Onone settings if no option is passed.
   IRGenOpts.Optimize = false;

stdlib/CMakeLists.txt

@@ -93,15 +93,11 @@ add_custom_target(swift-test-stdlib ALL
 
 if(SWIFT_STDLIB_ENABLE_RESILIENCE)
   set(STDLIB_SIL_SERIALIZE_ALL)
-  set(STDLIB_SIL_SERIALIZE_VTABLES)
 else()
   if(SWIFT_STDLIB_SIL_SERIALIZE_ALL)
     set(STDLIB_SIL_SERIALIZE_ALL)
-    set(STDLIB_SIL_SERIALIZE_VTABLES "-Xfrontend" "-sil-serialize-vtables")
-    list(APPEND STDLIB_SIL_SERIALIZE_ALL ${STDLIB_SIL_SERIALIZE_VTABLES})
   else()
     set(STDLIB_SIL_SERIALIZE_ALL)
-    set(STDLIB_SIL_SERIALIZE_VTABLES)
   endif()
 endif()
 

stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

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

stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

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

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -4,9 +4,6 @@ set(swift_stdlib_unittest_compile_flags
 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-vtables")
-endif()
 
 is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" IS_BUILD_TYPE_OPTIMIZED)
 if (NOT IS_BUILD_TYPE_OPTIMIZED)

stdlib/public/SDK/CMakeLists.txt

@@ -8,8 +8,6 @@ if(SWIFT_BUILD_STATIC_SDK_OVERLAY)
   list(APPEND SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES STATIC)
 endif()
 
-list(APPEND SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "${STDLIB_SIL_SERIALIZE_VTABLES}")
-
 set(all_overlays "Accelerate;AppKit;ARKit;AssetsLibrary;AVFoundation;CallKit;CloudKit;Contacts;CoreAudio;CoreData;CoreFoundation;CoreGraphics;CoreImage;CoreLocation;CoreMedia;CryptoTokenKit;Dispatch;Foundation;GameplayKit;GLKit;HomeKit;IOKit;Intents;MapKit;MediaPlayer;Metal;MetalKit;ModelIO;ObjectiveC;OpenCL;os;Photos;QuartzCore;SafariServices;SceneKit;simd;SpriteKit;UIKit;Vision;WatchKit;XCTest;XPC")
 
 if(DEFINED SWIFT_OVERLAY_TARGETS)