Skip to content

Commit c3bc08e

Browse files
committed
Remove any mention of sil-serialize-all related flags from CMake files and build-script-impl
These flags are not needed anymore.
1 parent 7491568 commit c3bc08e

File tree

11 files changed

+6
-44
lines changed

11 files changed

+6
-44
lines changed

CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ option(SWIFT_RUNTIME_CLOBBER_FREED_OBJECTS
251251
"Overwrite memory for deallocated Swift objects"
252252
"${SWIFT_RUNTIME_CLOBBER_FREED_OBJECTS_default}")
253253

254-
option(SWIFT_SERIALIZE_STDLIB_UNITTEST
255-
"Compile the StdlibUnittest module with -sil-serialize-all to increase the test coverage for the optimizer"
256-
FALSE)
257-
258254
option(SWIFT_STDLIB_SIL_DEBUGGING
259255
"Compile the Swift standard library with -gsil to enable debugging and profiling on SIL level"
260256
FALSE)
@@ -296,20 +292,6 @@ option(SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP
296292
"Build the standard libraries and overlays with sil ownership enabled."
297293
FALSE)
298294

299-
option(SWIFT_STDLIB_SIL_SERIALIZE_ALL
300-
"Build the standard libraries and overlays serializing all method bodies"
301-
TRUE)
302-
303-
if(SWIFT_SERIALIZE_STDLIB_UNITTEST AND SWIFT_STDLIB_ENABLE_RESILIENCE)
304-
message(WARNING "Ignoring SWIFT_SERIALIZE_STDLIB_UNITTEST because SWIFT_STDLIB_ENABLE_RESILIENCE is set")
305-
set(SWIFT_SERIALIZE_STDLIB_UNITTEST FALSE)
306-
endif()
307-
308-
if(SWIFT_STDLIB_SIL_SERIALIZE_ALL AND SWIFT_STDLIB_ENABLE_RESILIENCE)
309-
message(WARNING "Ignoring SWIFT_STDLIB_SIL_SERIALIZE_ALL because SWIFT_STDLIB_ENABLE_RESILIENCE is set")
310-
set(SWIFT_STDLIB_SIL_SERIALIZE_ALL FALSE)
311-
endif()
312-
313295
#
314296
# End of user-configurable options.
315297
#

stdlib/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ add_custom_target(swift-stdlib-sibgen
9191
add_custom_target(swift-test-stdlib ALL
9292
DEPENDS "swift-test-stdlib${SWIFT_PRIMARY_VARIANT_SUFFIX}")
9393

94-
if(SWIFT_STDLIB_ENABLE_RESILIENCE)
95-
set(STDLIB_SIL_SERIALIZE_ALL)
96-
else()
97-
if(SWIFT_STDLIB_SIL_SERIALIZE_ALL)
98-
set(STDLIB_SIL_SERIALIZE_ALL)
99-
else()
100-
set(STDLIB_SIL_SERIALIZE_ALL)
101-
endif()
102-
endif()
103-
10494
add_subdirectory(public)
10595
add_subdirectory(private)
10696

stdlib/private/SwiftPrivate/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ add_swift_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLI
66
PRNG.swift
77
ShardedAtomicCounter.swift
88

9-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
9+
SWIFT_COMPILE_FLAGS
1010
INSTALL_IN_COMPONENT stdlib-experimental)
1111

stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_swift_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
66
Subprocess.swift
77

88
SWIFT_MODULE_DEPENDS SwiftPrivate
9-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
9+
SWIFT_COMPILE_FLAGS
1010
SWIFT_MODULE_DEPENDS_OSX Darwin
1111
SWIFT_MODULE_DEPENDS_IOS Darwin
1212
SWIFT_MODULE_DEPENDS_TVOS Darwin

stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ add_swift_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TY
1212
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
1313
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
1414
SWIFT_MODULE_DEPENDS_HAIKU Glibc
15-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
15+
SWIFT_COMPILE_FLAGS
1616
TARGET_SDKS ALL_POSIX_PLATFORMS
1717
INSTALL_IN_COMPONENT stdlib-experimental)
1818

stdlib/public/SDK/Accelerate/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_library(swiftAccelerate ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
77
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
88
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
99
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
10-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} -parse-stdlib
10+
SWIFT_COMPILE_FLAGS -parse-stdlib
1111
SWIFT_MODULE_DEPENDS_OSX Darwin CoreFoundation CoreGraphics Dispatch Foundation IOKit Metal ObjectiveC XPC # auto-updated
1212
os
1313
SWIFT_MODULE_DEPENDS_IOS Darwin CoreFoundation CoreGraphics Dispatch Foundation Metal ObjectiveC os # auto-updated

stdlib/public/SDK/CoreGraphics/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ add_swift_library(swiftCoreGraphics ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_
66
CGFloat.swift.gyb
77
Private.swift
88

9-
# rdar://problem/20891746
10-
# SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
119
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
1210
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1311
SWIFT_MODULE_DEPENDS_OSX Darwin CoreFoundation Dispatch IOKit ObjectiveC # auto-updated

stdlib/public/SDK/simd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_library(swiftsimd ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVER
77

88
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
99
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
10-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} -parse-stdlib
10+
SWIFT_COMPILE_FLAGS -parse-stdlib
1111
SWIFT_MODULE_DEPENDS_OSX Darwin # auto-updated
1212
SWIFT_MODULE_DEPENDS_IOS Darwin # auto-updated
1313
SWIFT_MODULE_DEPENDS_TVOS Darwin # auto-updated

stdlib/public/SwiftOnoneSupport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ add_swift_library(swiftSwiftOnoneSupport ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftOnoneSupport.swift
5-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} "-parse-stdlib" "-Xllvm" "-sil-inline-generics=false" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
SWIFT_COMPILE_FLAGS "-parse-stdlib" "-Xllvm" "-sil-inline-generics=false" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
66
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
77
INSTALL_IN_COMPONENT stdlib)

utils/build-presets.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ dash-dash
134134

135135
swift-stdlib-build-type=RelWithDebInfo
136136
swift-stdlib-enable-assertions=false
137-
build-serialized-stdlib-unittest
138137

139138
[preset: mixin_buildbot_tools_R_stdlib_RD]
140139
mixin-preset=
@@ -149,7 +148,6 @@ dash-dash
149148

150149
swift-stdlib-build-type=RelWithDebInfo
151150
swift-stdlib-enable-assertions=false
152-
build-serialized-stdlib-unittest
153151

154152
[preset: mixin_buildbot_tools_RA_stdlib_DA]
155153
mixin-preset=
@@ -1463,7 +1461,6 @@ dash-dash
14631461

14641462
swift-stdlib-build-type=RelWithDebInfo
14651463
swift-stdlib-enable-assertions=false
1466-
build-serialized-stdlib-unittest
14671464

14681465
[preset: buildbot_incremental,tools=RA,stdlib=DA,test=macOS,type=device]
14691466
mixin-preset=
@@ -1569,7 +1566,6 @@ dash-dash
15691566

15701567
swift-stdlib-build-type=RelWithDebInfo
15711568
swift-stdlib-enable-assertions=true
1572-
build-serialized-stdlib-unittest
15731569

15741570
#===------------------------------------------------------------------------===#
15751571
# Swift Coverage Preset

0 commit comments

Comments
 (0)