Force enabling SwiftCompilerSources in the build

This means that `bootstrapping=off` cannot be used anymore.
Also, make `hosttools` the default bootstrapping mode on Darwin
This change also enables SwiftCompilerSources in lldb on Windows.

#73322

Author: eeckstein

CMakeLists.txt

@@ -343,7 +343,6 @@ option(SWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS
 
 option(BOOTSTRAPPING_MODE [=[
 How to build the swift compiler modules. Possible values are
-    OFF:           build without swift modules
     HOSTTOOLS:     build with a pre-installed toolchain
     BOOTSTRAPPING: build with a 2-stage bootstrapping process
     BOOTSTRAPPING-WITH-HOSTLIBS:   build with a 2-stage bootstrapping process,
@@ -352,7 +351,7 @@ How to build the swift compiler modules. Possible values are
                    `SWIFT_NATIVE_SWIFT_TOOLS_PATH` (non-Darwin only)
     CROSSCOMPILE-WITH-HOSTLIBS:    build with a bootstrapping-with-hostlibs compiled
                                    compiler, provided in `SWIFT_NATIVE_SWIFT_TOOLS_PATH`
-]=] OFF)
+]=] HOSTTOOLS)
 
 option(BRIDGING_MODE [=[
 How swift-C++ bridging code is compiled:
@@ -736,18 +735,6 @@ option(SWIFT_ENABLE_BACKTRACING
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST "14.5" CACHE STRING
   "Minimum deployment target version for macCatalyst")
 
-# A tempoarary hack: force enabling HOSTTOOLS mode on Windows.
-# Right now, SwiftCompilerSources cannot be enabled for lldb because on Windows
-# swift and lldb are built in a unified build and there is a missing dependency
-# on swiftrt.
-# Swift and lldb are configured with the same cmake invocation and therefore
-# enabling bootstrapping for swift and disabling it for lldb only works by
-# hardcoding the bootstrapping mode in the cmake file.
-# https://github.com/apple/swift/issues/73322
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(BOOTSTRAPPING_MODE "HOSTTOOLS")
-endif()
-
 #
 # End of user-configurable options.
 #
@@ -910,6 +897,10 @@ set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include")
 set(SWIFT_SHIMS_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/stdlib/public/SwiftShims")
 set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 
+if (NOT BOOTSTRAPPING_MODE)
+  message(FATAL_ERROR "turning off bootstrapping is not supported anymore")
+endif()
+
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
 if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")

test/lit.cfg

@@ -896,6 +896,10 @@ if 'swift_evolve' in lit_config.params:
 if not 'swift_driver' in lit_config.params:
     config.available_features.add("cplusplus_driver")
 
+# SwiftCompilerSources are now always enabled:
+# TODO: remove all the `REQUIRES: swift_in_compiler` in tests
+config.available_features.add('swift_in_compiler')
+
 # Check if we need to run lit tests using the legacy driver or the new driver
 # The default for existing test runs is to use the legacy driver.
 # The new driver is tested separately.

test/lit.site.cfg.in

@@ -166,16 +166,6 @@ config.swift_stdlib_enable_objc_interop = "@SWIFT_STDLIB_ENABLE_OBJC_INTEROP@" =
 # Configured in DarwinSDKs.cmake
 config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
 
-if "@BOOTSTRAPPING_MODE@" != "OFF":
-  config.available_features.add('swift_in_compiler')
-
-if "@BOOTSTRAPPING_MODE@" == 'HOSTTOOLS':
-  config.available_features.add('hosttools_mode')
-elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING':
-  config.available_features.add('bootstrapping_mode')
-elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING-WITH-HOSTLIBS':
-  config.available_features.add('bootstrapping_with_hostlibs_mode')
-
 if '@SWIFT_BUILD_SWIFT_SYNTAX@' == 'TRUE':
   config.available_features.add('swift_swift_parser')
 

utils/build-presets.ini

@@ -952,15 +952,6 @@ mixin-preset=
     buildbot_linux
     mixin_buildbot_linux,no_test
 
-[preset: buildbot_linux,no_test,bootstrapping_off]
-mixin-preset=
-    buildbot_linux,no_test
-
-skip-early-swift-driver
-skip-early-swiftsyntax
-
-bootstrapping=off
-
 [preset: buildbot_linux,no_assertions,no_test]
 mixin-preset=
     buildbot_linux,no_assertions

utils/build-script-impl

@@ -381,15 +381,8 @@ function true_false() {
 
 function to_bootstrapping_mode() {
     case "$1" in
-        false | FALSE | 0)
-            echo "OFF"
-            ;;
-        true | TRUE | 1 | "")
-            if [[ "$(uname -s)" == "Darwin" ]] ; then
-              echo "BOOTSTRAPPING-WITH-HOSTLIBS"
-            else
-              echo "BOOTSTRAPPING"
-            fi
+        false | FALSE | 0 | "")
+            echo "HOSTTOOLS"
             ;;
         *)
             echo `toupper $1`

utils/build.ps1

@@ -1056,6 +1056,7 @@ function Build-BuildTools($Arch) {
       SWIFT_INCLUDE_APINOTES = "NO";
       SWIFT_INCLUDE_DOCS = "NO";
       SWIFT_INCLUDE_TESTS = "NO";
+      BOOTSTRAPPING_MODE = "HOSTTOOLS";
       "cmark-gfm_DIR" = "$($Arch.ToolchainInstallRoot)\usr\lib\cmake";
     }
 }
@@ -1148,6 +1149,7 @@ function Build-Compilers() {
         SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
         SWIFT_PATH_TO_SWIFT_SDK = (Get-PinnedToolchainSDK);
         "cmark-gfm_DIR" = "$($Arch.ToolchainInstallRoot)\usr\lib\cmake";
+        BOOTSTRAPPING_MODE = "HOSTTOOLS";
       })
   }
 }
@@ -1383,6 +1385,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
         SWIFT_PATH_TO_LIBDISPATCH_SOURCE = "$SourceCache\swift-corelibs-libdispatch";
         SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
         CMAKE_SHARED_LINKER_FLAGS = @("/INCREMENTAL:NO", "/OPT:REF", "/OPT:ICF");
+        BOOTSTRAPPING_MODE = "HOSTTOOLS";
       }
   }
 

validation-test/lit.site.cfg.in

@@ -145,9 +145,6 @@ config.swift_stdlib_enable_objc_interop = "@SWIFT_STDLIB_ENABLE_OBJC_INTEROP@" =
 # Configured in DarwinSDKs.cmake
 config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
 
-if "@BOOTSTRAPPING_MODE@" != "OFF":
-  config.available_features.add('swift_in_compiler')
-
 # Let the main config do the real work.
 config.test_exec_root = os.path.dirname(os.path.realpath(__file__))
 lit_config.load_config(config, "@SWIFT_SOURCE_DIR@/validation-test/lit.cfg")