Skip to content

Commit 2e2b9dd

Browse files
committed
Nuke --build-serialized-stdlib-unittest build-script flag
1 parent c272d41 commit 2e2b9dd

File tree

6 files changed

+0
-24
lines changed

6 files changed

+0
-24
lines changed

CMakeLists.txt

Lines changed: 0 additions & 9 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)
@@ -300,11 +296,6 @@ option(SWIFT_STDLIB_SIL_SERIALIZE_ALL
300296
"Build the standard libraries and overlays serializing all method bodies"
301297
TRUE)
302298

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-
308299
if(SWIFT_STDLIB_SIL_SERIALIZE_ALL AND SWIFT_STDLIB_ENABLE_RESILIENCE)
309300
message(WARNING "Ignoring SWIFT_STDLIB_SIL_SERIALIZE_ALL because SWIFT_STDLIB_ENABLE_RESILIENCE is set")
310301
set(SWIFT_STDLIB_SIL_SERIALIZE_ALL FALSE)

stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
set(swift_stdlib_unittest_compile_flags)
2-
if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
3-
list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
4-
endif()
52

63
# TODO: support this on non-POSIX platforms. It cannot be currently as it
74
# depends on pthreads.

stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
set(swift_stdlib_unittest_compile_flags)
2-
if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
3-
list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
4-
endif()
52

63
# TODO: support this on non-POSIX platforms. It cannot be currently as it
74
# depends on pthreads.

stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ set(swift_stdlib_unittest_compile_flags
44
if (SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
55
list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER")
66
endif()
7-
if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
8-
list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
9-
endif()
107

118
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" IS_BUILD_TYPE_OPTIMIZED)
129
if (NOT IS_BUILD_TYPE_OPTIMIZED)

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=
@@ -1471,7 +1469,6 @@ dash-dash
14711469

14721470
swift-stdlib-build-type=RelWithDebInfo
14731471
swift-stdlib-enable-assertions=false
1474-
build-serialized-stdlib-unittest
14751472

14761473
[preset: buildbot_incremental,tools=RA,stdlib=DA,test=macOS,type=device]
14771474
mixin-preset=
@@ -1577,7 +1574,6 @@ dash-dash
15771574

15781575
swift-stdlib-build-type=RelWithDebInfo
15791576
swift-stdlib-enable-assertions=true
1580-
build-serialized-stdlib-unittest
15811577

15821578
#===------------------------------------------------------------------------===#
15831579
# Swift Coverage Preset

utils/build-script-impl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ KNOWN_SETTINGS=(
172172
build-swift-static-sdk-overlay "" "set to 1 to build static variants of the Swift SDK overlay"
173173
build-swift-examples "1" "set to 1 to build examples"
174174
build-swift-remote-mirror "1" "set to 1 to build the Swift Remote Mirror library"
175-
build-serialized-stdlib-unittest "0" "set to 1 to build the StdlibUnittest module with -sil-serialize-all"
176175
build-sil-debugging-stdlib "0" "set to 1 to build the Swift standard library with -gsil to enable debugging and profiling on SIL level"
177176
check-incremental-compilation "0" "set to 1 to compile swift libraries multiple times to check if incremental compilation works"
178177
report-statistics "0" "set to 1 to generate compilation statistics files for swift libraries"
@@ -2173,7 +2172,6 @@ for host in "${ALL_HOSTS[@]}"; do
21732172
-DSWIFT_NATIVE_SWIFT_TOOLS_PATH:STRING="${native_swift_tools_path}"
21742173
-DSWIFT_INCLUDE_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
21752174
-DSWIFT_BUILD_REMOTE_MIRROR:BOOL=$(true_false "${BUILD_SWIFT_REMOTE_MIRROR}")
2176-
-DSWIFT_SERIALIZE_STDLIB_UNITTEST:BOOL=$(true_false "${BUILD_SERIALIZED_STDLIB_UNITTEST}")
21772175
-DSWIFT_STDLIB_SIL_DEBUGGING:BOOL=$(true_false "${BUILD_SIL_DEBUGGING_STDLIB}")
21782176
-DSWIFT_CHECK_INCREMENTAL_COMPILATION:BOOL=$(true_false "${CHECK_INCREMENTAL_COMPILATION}")
21792177
-DSWIFT_REPORT_STATISTICS:BOOL=$(true_false "${REPORT_STATISTICS}")

0 commit comments

Comments
 (0)