Merge branch 'main' of https://github.com/swiftlang/swift into maxd/install-wasmkit

Author: MaxDesiatov

.github/CODEOWNERS

@@ -8,27 +8,28 @@
 
 # TODO: /.clang-format
 
-/.clang-tidy   @egorzhdan
+/.clang-tidy      @egorzhdan
 
-# TODO: /.dir-locals.el
+/.dir-locals.el   @al45tair
+/.editorconfig    @hamishknight
 # TODO: /.flake8
-# TODO: /.gitattributes
+/.gitattributes   @shahmishal
 
 # .github
 /.github/                                 @shahmishal
 /.github/CODEOWNERS                       @AnthonyLatsis @shahmishal
-/.github/ISSUE_TEMPLATE/                  @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
-/.github/PULL_REQUEST_TEMPLATE.md         @AnthonyLatsis @hborla @LucianoPAlmeida @shahmishal @xedin
+/.github/ISSUE_TEMPLATE/                  @AnthonyLatsis @hborla @shahmishal @xedin
+/.github/PULL_REQUEST_TEMPLATE.md         @AnthonyLatsis @hborla @shahmishal @xedin
 
-# TODO: /.gitignore
+/.gitignore           @shahmishal
 # TODO: /.mailmap
 # TODO: /Brewfile
-# TODO: /CHANGELOG.md
+/CHANGELOG.md         @hborla
 # TODO: /CMakeLists.txt
-# TODO: /CODE_OF_CONDUCT.md
-# TODO: /CODE_OWNERS.TXT
-# TODO: /CONTRIBUTING.md
-# TODO: /LICENSE.txt
+/CODE_OF_CONDUCT.md   @swiftlang/core-team
+/CODE_OWNERS.TXT      @swiftlang/core-team
+/CONTRIBUTING.md      @AnthonyLatsis @xedin
+/LICENSE.txt          @swiftlang/core-team
 # TODO: /README.md
 
 # Runtimes
@@ -60,7 +61,7 @@
 /docs/ABI/RegisterUsage.md                @al45tair
 /docs/CrossCompilationModel.md            @MaxDesiatov
 /docs/Generics                            @slavapestov
-/docs/HowToGuides/                        @AnthonyLatsis @LucianoPAlmeida @xedin
+/docs/HowToGuides/                        @AnthonyLatsis @xedin
 /docs/Optimizer*                          @eeckstein
 /docs/SIL*                                @jckarter
 /docs/Windows*                            @compnerd
@@ -223,7 +224,7 @@
 /test/Generics/                                     @hborla @slavapestov
 /test/Generics/inverse*                             @kavon
 /test/IDE/                                          @ahoppen @bnbarham @hamishknight @rintaro
-/test/IRGen/                                        @rjmccall
+/test/IRGen/                                        @AnthonyLatsis @rjmccall
 /test/Index/                                        @ahoppen @bnbarham @hamishknight @rintaro
 /test/Interop/                                      @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro @hnrklssn
 /test/Macros/SwiftifyImport                         @hnrklssn @Xazax-hun

CMakeLists.txt

@@ -1665,13 +1665,14 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
 
       ExternalProject_Get_Property("${stdlib_target}-core" INSTALL_DIR)
 
-      ExternalProject_Add("${stdlib_target}-StringProcessing"
-        SOURCE_DIR
-          "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental/StringProcessing"
+      ExternalProject_Add("${stdlib_target}-Supplemental"
+        SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental"
         DEPENDS "${stdlib_target}-core"
         INSTALL_DIR "${INSTALL_DIR}"
-        INSTALL_COMMAND "" # No install story set up yet
+        INSTALL_COMMAND ""
+        LIST_SEPARATOR "|"
         CMAKE_ARGS
+          -DSwift_ENABLE_RUNTIMES=StringProcessing
           -DBUILD_SHARED_LIBS=YES
           -DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}

README.md

@@ -8,7 +8,7 @@
 
 | | **Architecture** | **Build** |
 |---|:---:|:---:|
-| **macOS**        | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
+| **macOS**        | Universal |[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
 | **Ubuntu 20.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|
 | **Ubuntu 20.04** | AArch64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04-aarch64)|
 | **Ubuntu 22.04** | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-22_04)|

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -81,6 +81,7 @@ add_library(swift_Concurrency
   PartialAsyncTask.swift
   PlatformExecutorDarwin.swift
   PlatformExecutorLinux.swift
+  PlatformExecutorFreeBSD.swift
   PlatformExecutorOpenBSD.swift
   PlatformExecutorWindows.swift
   PriorityQueue.swift

Runtimes/Core/core/CMakeLists.txt

@@ -188,7 +188,6 @@ add_library(swiftCore
   StringWordBreaking.swift
   Substring.swift
   SwiftNativeNSArray.swift
-  SwiftSettings.swift
   TemporaryAllocation.swift
   ThreadLocalStorage.swift
   UIntBuffer.swift

Runtimes/Supplemental/CMakeLists.txt

@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.29)
+
+project(SwiftRuntime LANGUAGES Swift C CXX)
+
+include(ExternalProject)
+include(GNUInstallDirs)
+
+set(SwiftRuntime_SWIFTC_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../")
+
+foreach(lib ${Swift_ENABLE_RUNTIMES})
+  string(TOLOWER ${lib} name)
+  set(SwiftRuntime_ENABLE_${name} YES)
+endforeach()
+
+if(SwiftCore_DIR)
+  set(SwiftCore_DIR_FLAG "-DSwiftCore_DIR=${SwiftCore_DIR}")
+endif()
+
+if(CMAKE_MAKE_PROGRAM)
+  set(MAKE_PROGRAM_FLAG "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+endif()
+
+set(COMMON_OPTIONS
+  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+  -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
+  -DCMAKE_INSTALL_NAME_DIR=${CMAKE_INSTALL_NAME_DIR}
+  -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=${CMAKE_BUILD_WITH_INSTALL_NAME_DIR}
+  -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+  -DCMAKE_COLOR_DIAGNOSTICS=${CMAKE_COLOR_DIAGNOSTICS}
+  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+  -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER}
+  -DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}
+  -DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}
+  -DCMAKE_Swift_COMPILER_TARGET=${CMAKE_Swift_COMPILER_TARGET}
+  ${SwiftCore_DIR_FLAG}
+  ${MAKE_PROGRAM_FLAG})
+
+# StringProcessing
+if(SwiftRuntime_ENABLE_stringprocessing)
+  ExternalProject_Add(StringProcessing
+    PREFIX "StringProcessing"
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/StringProcessing"
+    INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
+    INSTALL_COMMAND ""
+    CMAKE_ARGS
+      ${COMMON_OPTIONS})
+endif()

Runtimes/Supplemental/Readme.md

@@ -0,0 +1,52 @@
+# Swift Supplemental Libraries
+
+The supplemental libraries are all libraries that are not one of the Core or
+overlay libraries. Each supplemental library builds as an independent project.
+
+The supplemental libraries are:
+ - CxxInterop
+ - Differentiation
+ - Distributed
+ - Observation
+ - StringProcessing
+ - Runtime
+ - Synchronization
+
+The top-level Supplemental CMakeLists supplies a super-build pattern for
+configuring and compiling each of the supplemental library projects through a
+single CMake invocation. The `Swift_ENABLE_RUNTIMES` CMake option enables the
+specified supplemental libraries. All libraries configured this way are built
+with the same compilers, against the same sysroot, with the same target triple
+and installed into the same location.
+
+## Super-Build
+
+Configuring each project independently is tedious. The Supplemental directory
+contains a Super-Build CMakeLists that invokes the build of each of the
+supplemental libraries in the appropriate order, simplifying the process of
+building each library.
+
+Important configuration variables:
+ - `Swift_ENABLE_RUNTIMES`: Used to configure which runtime libraries are built.
+
+The super-build forwards the following variables to each sub-project
+unconditionally:
+ - `BUILD_SHARED_LIBS`
+ - `CMAKE_BUILD_TYPE`
+ - `CMAKE_INSTALL_PREFIX`
+ - `CMAKE_COLOR_DIAGNOSTICS`
+ - `CMAKE_C_COMPILER`
+ - `CMAKE_C_COMPILER_TARGET`
+ - `CMAKE_CXX_COMPILER`
+ - `CMAKE_CXX_COMPILER_TARGET`
+ - `CMAKE_Swift_COMPILER`
+ - `CMAKE_Swift_COMPILER_TARGET`
+
+If set, the super-build forwards the following values to each sub-project:
+
+ - `SwiftCore_DIR`: Path to the SwiftCore build directory
+ - `CMAKE_MAKE_PROGRAM`: Path to `ninja`
+
+The super-build is for convenience. If more fine-grained control is desired for
+configuring a specific runtime library, you may configure that library
+independently.

Runtimes/Supplemental/cmake/modules/CatalystSupport.cmake

@@ -0,0 +1,38 @@
+# Add flags for generating the zippered target variant in the build
+
+# Initialize `${PROJECT_NAME}_VARIANT_MODULE_TRIPLE` if the driver is able to emit
+# modules for the target variant.
+
+if(${PROJECT_NAME}_COMPILER_VARIANT_TARGET)
+  add_compile_options(
+    "$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
+    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
+
+    # TODO: Remove me once we have a driver with
+    #   https://github.com/swiftlang/swift-driver/pull/1803
+    "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xclang-linker -darwin-target-variant -Xclang-linker ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>")
+
+  add_link_options(
+    "$<$<LINK_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
+    "$<$<LINK_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
+
+    # TODO: Remove me once we have a driver with
+    #   https://github.com/swiftlang/swift-driver/pull/1803
+    "$<$<LINK_LANGUAGE:Swift>:SHELL:-Xclang-linker -darwin-target-variant -Xclang-linker ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>")
+
+  # TODO: Once we are guaranteed to have a driver with the variant module path
+  #       support everywhere, we should integrate this into PlatformInfo.cmake
+  check_compiler_flag(Swift "-emit-variant-module-path ${CMAKE_CURRENT_BINARY_DIR}/CompilerID/variant.swiftmodule" HAVE_Swift_VARIANT_MODULE_PATH_FLAG)
+  if(HAVE_Swift_VARIANT_MODULE_PATH_FLAG)
+    # Get variant module triple
+    set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info -target ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET})
+    execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
+    message(CONFIGURE_LOG "Swift target variant info: ${target_info_json}")
+
+
+    string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
+    set(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE "${module_triple}" CACHE STRING "Triple used for installed swift{module,interface} files for the target variant")
+    mark_as_advanced(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
+    message(CONFIGURE_LOG "Swift target variant module triple: ${module_triple}")
+  endif()
+endif()

Runtimes/Supplemental/cmake/modules/EmitSwiftInterface.cmake

@@ -0,0 +1,73 @@
+# Generate and install swift interface files
+
+# TODO: CMake should learn how to model library evolution and generate this
+#       stuff automatically.
+
+
+# Generate a swift interface file for the target if library evolution is enabled
+function(emit_swift_interface target)
+  # Generate the target-variant binary swift module when performing zippered
+  # build
+  if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
+    set(variant_module_tmp_dir "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}")
+    file(MAKE_DIRECTORY "${variant_module_tmp_dir}")
+    target_compile_options(${target} PRIVATE
+      "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${variant_module_tmp_dir}/${target}.swiftmodule>")
+  endif()
+
+  # Generate textual swift interfaces is library-evolution is enabled
+  if(${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION)
+    target_compile_options(${target} PRIVATE
+      $<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface>
+      $<$<COMPILE_LANGUAGE:Swift>:-emit-private-module-interface-path$<SEMICOLON>${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface>
+      $<$<COMPILE_LANGUAGE:Swift>:-library-level$<SEMICOLON>api>
+      $<$<COMPILE_LANGUAGE:Swift>:-Xfrontend$<SEMICOLON>-require-explicit-availability=ignore>)
+
+      # Emit catalyst swiftmodules and interfaces
+      if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
+        target_compile_options(${target} PRIVATE
+          "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-interface-path ${variant_module_tmp_dir}/${target}.swiftinterface>"
+          "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-private-module-interface-path ${variant_module_tmp_dir}/${target}.private.swiftinterface>")
+      endif()
+  endif()
+endfunction()
+
+# Install the generated swift interface file for the target if library evolution
+# is enabled.
+function(install_swift_interface target)
+  # Install binary swift modules
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+    RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.swiftmodule"
+    DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+    COMPONENT ${PROJECT_NAME}_development)
+  if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
+      RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftmodule"
+      DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT ${PROJECT_NAME}_development)
+  endif()
+
+  # Install Swift interfaces if library-evolution is enabled
+  if(${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
+      RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.swiftinterface"
+      DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT ${PROJECT_NAME}_development)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
+      RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.private.swiftinterface"
+      DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT ${PROJECT_NAME}_development)
+
+    # Install catalyst interface files
+    if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
+        RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftinterface"
+        DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+        COMPONENT ${PROJECT_NAME}_development)
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
+        RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
+        DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+        COMPONENT ${PROJECT_NAME}_development)
+    endif()
+  endif()
+endfunction()

Runtimes/Supplemental/cmake/modules/PlatformInfo.cmake

@@ -0,0 +1,38 @@
+if(NOT ${PROJECT_NAME}_SIZEOF_POINTER)
+  set(${PROJECT_NAME}_SIZEOF_POINTER "${CMAKE_SIZEOF_VOID_P}" CACHE STRING "Size of a pointer in bytes")
+  message(CONFIGURE_LOG "Stdlib Pointer size: ${CMAKE_SIZEOF_VOID_P}")
+  mark_as_advanced(${PROJECT_NAME}_SIZEOF_POINTER)
+endif()
+
+# TODO: This logic should migrate to CMake once CMake supports installing swiftmodules
+set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
+if(CMAKE_Swift_COMPILER_TARGET)
+  list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
+endif()
+execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
+message(CONFIGURE_LOG "Swift target info: ${module_triple_command}\n"
+"${target_info_json}")
+
+if(NOT ${PROJECT_NAME}_MODULE_TRIPLE)
+  string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
+  set(${PROJECT_NAME}_MODULE_TRIPLE "${module_triple}" CACHE STRING "Triple used for installed swift{doc,module,interface} files")
+  mark_as_advanced(${PROJECT_NAME}_MODULE_TRIPLE)
+
+  message(CONFIGURE_LOG "Swift module triple: ${module_triple}")
+endif()
+
+if(NOT ${PROJECT_NAME}_PLATFORM_SUBDIR)
+  string(JSON platform GET "${target_info_json}" "target" "platform")
+  set(${PROJECT_NAME}_PLATFORM_SUBDIR "${platform}" CACHE STRING "Platform name used for installed swift{doc,module,interface} files")
+  mark_as_advanced(${PROJECT_NAME}_PLATFORM_SUBDIR)
+
+  message(CONFIGURE_LOG "Swift platform: ${platform}")
+endif()
+
+if(NOT ${PROJECT_NAME}_ARCH_SUBDIR)
+  string(JSON arch GET "${target_info_json}" "target" "arch")
+  set(${PROJECT_NAME}_ARCH_SUBDIR "${arch}" CACHE STRING "Architecture used for setting the architecture subdirectory")
+  mark_as_advanced(${PROJECT_NAME}_ARCH_SUBDIR)
+
+  message(CONFIGURE_LOG "Swift Arch: ${arch}")
+endif()