[CMake] Don't pass -sil-serialize-all under SWIFT_STDLIB_ENABLE_RESILIENCE.

Thanks, Slava!

Author: jrose-apple

CMakeLists.txt

@@ -202,6 +202,11 @@ option(SWIFT_STDLIB_ENABLE_RESILIENCE
     "Build the standard libraries and overlays with resilience enabled; see docs/LibraryEvolution.rst"
     FALSE)
 
+if(SWIFT_SERIALIZE_STDLIB_UNITTEST AND SWIFT_STDLIB_ENABLE_RESILIENCE)
+  message(WARNING "Ignoring SWIFT_SERIALIZE_STDLIB_UNITTEST because SWIFT_STDLIB_ENABLE_RESILIENCE is set")
+  set(SWIFT_SERIALIZE_STDLIB_UNITTEST FALSE)
+endif()
+
 option(SWIFT_XCODE_GENERATE_FOR_IDE_ONLY
     "Generate an Xcode project suitable for IDE use, but which cannot build"
     FALSE)

cmake/modules/AddSwift.cmake

@@ -333,8 +333,10 @@ function(_compile_swift_files dependency_target_out_var_name)
   # FIXME: Cleaner way to do this?
   if(SWIFTFILE_IS_STDLIB_CORE)
     list(APPEND swift_flags
-        "-nostdimport" "-parse-stdlib" "-module-name" "Swift"
-        "-Xfrontend" "-sil-serialize-all")
+        "-nostdimport" "-parse-stdlib" "-module-name" "Swift")
+    if (NOT SWIFT_STDLIB_ENABLE_RESILIENCE)
+      list(append swift_flags "-Xfrontend" "-sil-serialize-all")
+    endif()
   endif()
 
   if(SWIFTFILE_IS_SDK_OVERLAY)

stdlib/CMakeLists.txt

@@ -23,6 +23,12 @@ if(SWIFT_HOST_VARIANT STREQUAL "linux")
   find_package(BSD REQUIRED)
 endif()
 
+if(SWIFT_STDLIB_ENABLE_RESILIENCE)
+  set(STDLIB_SIL_SERIALIZE_ALL)
+else()
+  set(STDLIB_SIL_SERIALIZE_ALL "-Xfrontend" "-sil-serialize-all")
+endif()
+
 add_subdirectory(public)
 add_subdirectory(internal)
 add_subdirectory(private)

stdlib/internal/SwiftExperimental/CMakeLists.txt

@@ -3,6 +3,6 @@ add_swift_library(swiftSwiftExperimental SHARED IS_STDLIB
   # filename.
   SwiftExperimental.swift
 
-  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all -parse-stdlib
+  SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} -parse-stdlib
   INSTALL_IN_COMPONENT stdlib-experimental)
 

stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt

@@ -7,7 +7,7 @@ add_swift_library(swiftStdlibUnittestFoundationExtras SHARED IS_STDLIB
   # <rdar://problem/18917405> Compiling StdlibUnittest with -sil-serialize-all
   # crashes in SIL serializer
   #
-  # SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  # SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
 
   SWIFT_MODULE_DEPENDS Foundation
   INSTALL_IN_COMPONENT stdlib-experimental)

stdlib/private/SwiftPrivate/CMakeLists.txt

@@ -8,7 +8,7 @@ add_swift_library(swiftSwiftPrivate SHARED IS_STDLIB
   PRNG.swift
   ShardedAtomicCounter.swift
 
-  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
   PRIVATE_LINK_LIBRARIES ${swift_private_private_link_libraries}
   INSTALL_IN_COMPONENT stdlib-experimental)
 

stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt

@@ -16,5 +16,5 @@ add_swift_library(swiftSwiftPrivateDarwinExtras SHARED IS_STDLIB
   Subprocess.swift
 
   SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}
-  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
   INSTALL_IN_COMPONENT stdlib-experimental)

stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt

@@ -15,6 +15,6 @@ add_swift_library(swiftSwiftPrivatePthreadExtras SHARED IS_STDLIB
   PthreadBarriers.swift
 
   SWIFT_MODULE_DEPENDS ${swift_private_pthread_extras_module_depends}
-  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
   INSTALL_IN_COMPONENT stdlib-experimental)
 

stdlib/public/SDK/CoreGraphics/CMakeLists.txt

@@ -2,7 +2,7 @@ add_swift_library(swiftCoreGraphics IS_SDK_OVERLAY
   CoreGraphics.swift
   CGFloat.swift.gyb
   # rdar://problem/20891746
-  # SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  # SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
   SWIFT_MODULE_DEPENDS ObjectiveC Dispatch Darwin
   FRAMEWORK_DEPENDS CoreGraphics)
 

stdlib/public/SDK/simd/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_swift_library(swiftsimd IS_SDK_OVERLAY
   simd.swift.gyb
 
-  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all -Xfrontend -parse-stdlib
+  SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} -parse-stdlib
   SWIFT_MODULE_DEPENDS Darwin)