CMake: option to disable swift in swift#79778
Merged
etcwilde merged 3 commits intoMar 7, 2025
Merged
Conversation
Member
Author
|
This will require the compiler and stdlib-side changes in #77815 |
compnerd
reviewed
Mar 5, 2025
e044d9b to
cc066eb
Compare
cc066eb to
318c963
Compare
Member
Author
|
This patch is enough to bring up a stage-0 compiler without macro support using the C++ Swift driver without Swift on the platform. Verified with on Ubuntu 24.04 without a pre-installed Swift: ./sources/swift/utils/build-script \
--skip-test-cmark \
--skip-test-lldb \
--skip-test-swift \
--skip-test-llbuild \
--skip-test-swiftpm \
--skip-test-swift-driver \
--skip-test-xctest \
--skip-test-foundation \
--skip-test-libdispatch \
--skip-test-playgroundsupport \
--skip-test-indexstore-db \
--skip-test-sourcekit-lsp \
--skip-test-swiftdocc \
--skip-test-wasm-stdlib \
--skip-test-swiftformat \
--swift-include-tests=0 \
--llvm-include-tests=0 \
--release \
--skip-early-swiftsyntax \
--skip-early-swift-driver \
--skip-build-benchmarks \
--build-runtime-with-host-compiler=0 \
--build-swift-libexec=0 \
--build-swift-remote-mirror=0 \
'--swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license' \
'--llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file' \
'--extra-cmake-options=-DLLVM_TARGETS_TO_BUILD=X86;AArch64' \
'--swift-cmake-options=-DSWIFT_ENABLE_SWIFT_IN_SWIFT:BOOL=NO -DSWIFT_INCLUDE_DOCS:BOOL=NO' \
--build-subdir=stage0 \
--install-destdir=/staging/stage0 \
--install-llvm \
--install-swiftThe resulting compiler is able to build the standard library and a simple "hello world" program. |
Member
Author
|
@swift-ci please test |
etcwilde
commented
Mar 6, 2025
318c963 to
4353c83
Compare
Member
Author
|
@swift-ci please test |
Member
|
FYI: when building Swift with a recent bootstrap compiler, I've noticed the following error: Bisecting leads to commit 008e10c and reverting this is a workaround for the problem. I haven't investigated or tested further than this, but a heads-up in case you run in to the same issue. |
Member
Author
|
yeah, I've seen that as well. Thanks for bisecting it. |
DougGregor
approved these changes
Mar 6, 2025
DougGregor
left a comment
Member
There was a problem hiding this comment.
Thank you for picking this up! Just the one question from me
Adding `SWIFT_ENABLE_SWIFT_IN_SWIFT` option to enable or disable the parts of Swift that require a Swift compiler to build. This is meant for bootstrapping compilers on new platforms and is not guaranteed to result in a compiler that will pass the test suite. This option is on by default so that folks won't forget. If the option is off, the resulting compiler does not include the Swift optimizer sources in SwiftCompilerSources nor does the resulting compiler have swift macro support.
Remove dependency on macros from compiler and stdlib build when bootstrapping the compiler without Swift available.
PR 79186 (swiftlang#79186) moved one of the mandatory passes from the C++ implementation to the Swift implementation resulting in a compiler that is unable to build the standard library. The pass used to ensure that inaccessible control-flow positions after an infinite loop was marked with `unreachable` in SIL. Since the pass is no longer running, any function that returns a value that also has an infinite loop internally must place a fatalError after the infinite loop or it will fail to compile as the compiler will determine that the function does not return from all control flow paths even though some of the paths are unreachable.
4353c83 to
ddaf003
Compare
Member
Author
|
@swift-ci please test |
Member
Author
|
@swift-ci please test Linux |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adding
SWIFT_ENABLE_SWIFT_IN_SWIFToption to enable or disable the parts of Swift that require a Swift compiler to build. This is meant for bootstrapping compilers on new platforms and is not guaranteed to result in a compiler that will pass the test suite.This option is on by default so that folks won't forget. If the option is off, the resulting compiler does not include the Swift optimizer sources in SwiftCompilerSources nor does the resulting compiler have swift macro support.