Merge branch 'main' into users/kovdan01/ast-bridges-for-autodiff-closure-spec

Author: kovdan01

.github/CODEOWNERS

@@ -79,7 +79,7 @@
 /include/swift/AST/*Requirement*                   @hborla @slavapestov
 /include/swift/AST/*Substitution*                  @slavapestov
 /include/swift/AST/DiagnosticGroup*                @DougGregor
-/include/swift/AST/DiagnosticsClangImporter.def    @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/include/swift/AST/DiagnosticsClangImporter.def    @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @susmonteiro
 /include/swift/AST/DiagnosticsDriver.def           @artemcm
 /include/swift/AST/DiagnosticsFrontend.def         @artemcm @tshortli
 /include/swift/AST/DiagnosticsIDE.def              @bnbarham @hamishknight @rintaro
@@ -91,7 +91,7 @@
 /include/swift/AST/Evaluator*                      @CodaFi @slavapestov
 /include/swift/Basic/                              @DougGregor
 /include/swift/Basic/Features.def                  @DougGregor @hborla
-/include/swift/ClangImporter                       @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/include/swift/ClangImporter                       @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @susmonteiro
 /include/swift/DependencyScan                      @artemcm @cachemeifyoucan
 /include/swift/Driver*/                            @artemcm
 /include/swift/Frontend*/                          @artemcm @tshortli
@@ -102,7 +102,7 @@
 /include/swift/Migrator/                           @nkcsgexi
 /include/swift/Option/*Options*                    @tshortli
 /include/swift/Parse/                              @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/include/swift/PrintAsClang                        @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/include/swift/PrintAsClang                        @egorzhdan @Xazax-hun @j-hui @susmonteiro
 /include/swift/Refactoring                         @bnbarham @hamishknight @rintaro
 /include/swift/Runtime/                            @rjmccall @compnerd
 /include/swift/SIL/                                @jckarter
@@ -137,7 +137,7 @@
 /lib/ASTGen/                                        @bnbarham @CodaFi @hamishknight @rintaro
 /lib/Basic/                                         @DougGregor
 /lib/Basic/Windows                                  @compnerd
-/lib/ClangImporter                                  @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/lib/ClangImporter                                  @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @susmonteiro
 /lib/ClangImporter/DWARFImporter*                   @adrian-prantl
 /lib/DependencyScan                                 @artemcm @cachemeifyoucan
 /lib/Driver*/                                       @artemcm
@@ -157,7 +157,7 @@
 /lib/Markup/                                        @nkcsgexi
 /lib/Migrator/                                      @nkcsgexi
 /lib/Parse/                                         @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/lib/PrintAsClang                                   @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/lib/PrintAsClang                                   @egorzhdan @Xazax-hun @j-hui @susmonteiro
 /lib/Refactoring/                                   @bnbarham @hamishknight @rintaro
 /lib/SIL/                                           @jckarter
 /lib/SIL/**/*DebugInfo*                             @adrian-prantl
@@ -203,7 +203,7 @@
 /stdlib/public/core/Swiftify*             @hnrklssn @Xazax-hun
 /stdlib/public/*Demangl*/                 @rjmccall
 /stdlib/public/Concurrency/               @ktoso
-/stdlib/public/Cxx/                       @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
+/stdlib/public/Cxx/                       @egorzhdan @Xazax-hun @j-hui @susmonteiro
 /stdlib/public/Differentiation/           @asl
 /stdlib/public/Distributed/               @ktoso
 /stdlib/public/Observation/               @phausler
@@ -232,7 +232,7 @@
 /test/IDE/                                          @bnbarham @hamishknight @rintaro
 /test/IRGen/                                        @AnthonyLatsis @rjmccall
 /test/Index/                                        @bnbarham @hamishknight @rintaro
-/test/Interop/                                      @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro @hnrklssn
+/test/Interop/                                      @egorzhdan @Xazax-hun @j-hui @susmonteiro @hnrklssn
 /test/Macros/SwiftifyImport                         @hnrklssn @Xazax-hun
 /test/Migrator/                                     @nkcsgexi
 /test/Parse/                                        @bnbarham @CodaFi @DougGregor @hamishknight @rintaro

CMakeLists.txt

@@ -271,6 +271,19 @@ option(SWIFT_BUILD_STDLIB_CXX_MODULE
   "If not building stdlib, controls whether to build the Cxx module"
   TRUE)
 
+# The swiftClientRetainRelease library is currently only available for Darwin
+# platforms.
+if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
+  # Off by default everywhere for now.
+  option(SWIFT_BUILD_CLIENT_RETAIN_RELEASE
+    "Build the swiftClientRetainRelease library"
+    FALSE)
+else()
+  option(SWIFT_BUILD_CLIENT_RETAIN_RELEASE
+    "Build the swiftClientRetainRelease library"
+    FALSE)
+endif()
+
 # In many cases, the CMake build system needs to determine whether to include
 # a directory, or perform other actions, based on whether the stdlib or SDK is
 # being built at all -- statically or dynamically. Please note that these
@@ -538,8 +551,8 @@ set(SWIFT_SDK_LINUX_ARCHITECTURES "" CACHE STRING
 # User-configurable Android specific options.
 #
 
-set(SWIFT_ANDROID_API_LEVEL "" CACHE STRING
-  "Version number for the Android API")
+set(SWIFT_ANDROID_API_LEVEL "28" CACHE STRING
+  "Version number for the Android API (default: 28)")
 
 set(SWIFT_ANDROID_NDK_PATH "" CACHE STRING
   "Path to the directory that contains the Android NDK tools that are executable on the build machine")
@@ -1673,7 +1686,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
           -DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
           -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
           -DSwiftCore_INSTALL_NESTED_SUBDIR=YES
-          -DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency})
+          -DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency}
+          -DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
       if(NOT ${CMAKE_CROSSCOMPILING})
         add_dependencies("${stdlib_target}-core" swift-frontend)
       endif()
@@ -1700,7 +1714,9 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
           -DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
           -DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
           -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-          -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
+          -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
+          -DSwiftOverlay_ENABLE_CXX_INTEROP=TRUE
+          -DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
 
       ExternalProject_Add("${stdlib_target}-Supplemental"
         SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental"
@@ -1711,7 +1727,7 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
         # To ensure incremental builds work as expected
         BUILD_ALWAYS 1
         CMAKE_ARGS
-          -DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation
+          -DSwift_ENABLE_RUNTIMES=StringProcessing|Synchronization|Distributed|Observation|Runtime
           -DBUILD_SHARED_LIBS=YES
           -DCMAKE_Swift_COMPILER_WORKS:BOOLEAN=YES
           -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -1722,9 +1738,11 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
           -DCMAKE_Swift_COMPILER_TARGET:STRING=${stdlib_target_triple}
           -DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple}
           -DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
+          -DCMAKE_ASM_COMPILER_TARGET:STRING=${stdlib_target_triple}
           -DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
           -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-          -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
+          -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
+          -DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
     endforeach()
   endforeach()
 endif()

Runtimes/Core/cmake/modules/CatalystSupport.cmake

@@ -5,15 +5,15 @@
 
 if(SwiftCore_COMPILER_VARIANT_TARGET)
   add_compile_options(
-    "$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
+    "$<$<COMPILE_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
     "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-target-variant ${SwiftCore_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 ${SwiftCore_COMPILER_VARIANT_TARGET}>")
 
   add_link_options(
-    "$<$<LINK_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
+    "$<$<LINK_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
     "$<$<LINK_LANGUAGE:Swift>:SHELL:-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
 
     # TODO: Remove me once we have a driver with

Runtimes/Core/cmake/modules/PlatformInfo.cmake

@@ -43,47 +43,49 @@ if(NOT SwiftCore_ARCH_SUBDIR)
   message(CONFIGURE_LOG "Swift Arch: ${arch}")
 endif()
 
-# Note: *moduleTriple* doesn't have an "x" on the end of "macos"; just to be
-# safe, we support both cases here.
-set(availability_platform_macos "macOS")
-set(availaiblity_platform_macosx "macOS")
-set(availability_platform_ios "iOS")
-set(availability_platform_watchos "watchOS")
-set(availability_platform_tvos "tvOS")
-set(availability_platform_xros "visionOS")
-set(availability_platform_bridgeos "bridgeOS")
+if(APPLE)
+  # Note: *moduleTriple* doesn't have an "x" on the end of "macos"; just to be
+  # safe, we support both cases here.
+  set(availability_platform_macos "macOS")
+  set(availaiblity_platform_macosx "macOS")
+  set(availability_platform_ios "iOS")
+  set(availability_platform_watchos "watchOS")
+  set(availability_platform_tvos "tvOS")
+  set(availability_platform_xros "visionOS")
+  set(availability_platform_bridgeos "bridgeOS")
 
-if(NOT SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
-  if(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)-simulator$")
-    set(platform "${CMAKE_MATCH_1}")
-  elseif(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)-msvc$")
-    set(platform "${CMAKE_MATCH_1}")
-  elseif(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
-    set(platform "${CMAKE_MATCH_1}")
-  else()
-    message(WARNING "Unable to extract platform name from triple ${SwiftCore_MODULE_TRIPLE}")
-  endif()
+  if(NOT SwiftCore_SWIFT_AVAILABILITY_PLATFORM)
+    if(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)-simulator$")
+      set(platform "${CMAKE_MATCH_1}")
+    elseif(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)-msvc$")
+      set(platform "${CMAKE_MATCH_1}")
+    elseif(SwiftCore_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
+      set(platform "${CMAKE_MATCH_1}")
+    else()
+      message(WARNING "Unable to extract platform name from triple ${SwiftCore_MODULE_TRIPLE}")
+    endif()
 
-  if(availability_platform_${platform})
-    set(SwiftCore_SWIFT_AVAILABILITY_PLATFORM "${availability_platform_${platform}}")
-  else()
-    set(SwiftCore_SWIFT_AVAILABILITY_PLATFORM "unknown")
-    message(WARNING "Unknown platform ${platform} for availability")
+    if(availability_platform_${platform})
+      set(SwiftCore_SWIFT_AVAILABILITY_PLATFORM "${availability_platform_${platform}}")
+    else()
+      set(SwiftCore_SWIFT_AVAILABILITY_PLATFORM "unknown")
+      message(WARNING "Unknown platform ${platform} for availability")
+    endif()
   endif()
-endif()
 
-set(SwiftCore_VARIANT_AVAILABILITY_PLATFORM "none")
-if(SwiftCore_VARIANT_MODULE_TRIPLE)
-  if(SwiftCore_VARIANT_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
-    set(platform "${CMAKE_MATCH_1}")
-  else()
-    message(FATAL_ERROR "Unable to extract platform name from triple ${SwiftCore_VARIANT_MODULE_TRIPLE}")
-  endif()
+  set(SwiftCore_VARIANT_AVAILABILITY_PLATFORM "none")
+  if(SwiftCore_VARIANT_MODULE_TRIPLE)
+    if(SwiftCore_VARIANT_MODULE_TRIPLE MATCHES ".*-([^-]+)$")
+      set(platform "${CMAKE_MATCH_1}")
+    else()
+      message(FATAL_ERROR "Unable to extract platform name from triple ${SwiftCore_VARIANT_MODULE_TRIPLE}")
+    endif()
 
-  if(availability_platform_${platform})
-    set(SwiftCore_VARIANT_AVAILABILITY_PLATFORM "${availability_platform_${platform}}")
-  else()
-    message(WARNING "Unknown platform ${platform} for variant availability")
+    if(availability_platform_${platform})
+      set(SwiftCore_VARIANT_AVAILABILITY_PLATFORM "${availability_platform_${platform}}")
+    else()
+      message(WARNING "Unknown platform ${platform} for variant availability")
+    endif()
   endif()
 endif()
 

Runtimes/Overlay/Android/Math/CMakeLists.txt

@@ -2,7 +2,7 @@
 add_library(swift_math
   Math.swift)
 set_target_properties(swift_math PROPERTIES
-  Swift_MODULE_NAME math)
+  Swift_MODULE_NAME _math)
 target_link_libraries(swift_math PRIVATE
   SwiftAndroid
   swiftCore)

Runtimes/Overlay/CMakeLists.txt

@@ -64,7 +64,6 @@ add_compile_definitions(
   $<$<BOOL:${SwiftOverlay_ENABLE_BACKDEPLOYMENT_SUPPORT}>:SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT>)
 
 add_compile_options(
-  $<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>
   $<$<COMPILE_LANGUAGE:Swift>:-nostdlibimport>
   $<$<COMPILE_LANGUAGE:Swift>:-strict-memory-safety>
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-lexical-lifetimes=false>"
@@ -90,12 +89,20 @@ add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
 
 include(ExperimentalFeatures)
 
+if(NOT LINUX)
+  # explicit module builds crash the Swift compiler when building the Glibc
+  # platform overlay https://github.com/swiftlang/swift/issues/84740
+  add_compile_options($<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>)
+endif()
+
 add_subdirectory(clang)
 if(ANDROID)
   add_subdirectory(Android)
-endif()
-if(WIN32)
+elseif(WIN32)
   add_subdirectory(Windows)
+elseif(LINUX)
+  defaulted_set(SwiftOverlay_LINUX_LIBC STRING "Select Linux libc flavor. Options are: glibc")
+  add_subdirectory("Linux/${SwiftOverlay_LINUX_LIBC}")
 endif()
 
 if(SwiftOverlay_ENABLE_CXX_INTEROP)

Runtimes/Overlay/Cxx/CMakeLists.txt

@@ -39,11 +39,29 @@ target_link_libraries(swiftCxx PRIVATE
   swiftCore)
 
 install(TARGETS swiftCxx
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 emit_swift_interface(swiftCxx)
 install_swift_interface(swiftCxx)
 
 embed_manifest(swiftCxx)
+
+export(EXPORT SwiftCxxOverlayTargets
+  FILE "cmake/SwiftCxxOverlay/SwiftCxxOverlayTargets.cmake")
+install(EXPORT SwiftCxxOverlayTargets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay"
+  FILE "SwiftCxxOverlayTargets.cmake"
+  COMPONENT SwiftOverlayCMake)
+include(CMakePackageConfigHelpers)
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/interface/SwiftCxxOverlayConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfig.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay")
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY ExactVersion)
+install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCxxOverlay/SwiftCxxOverlayConfigVersion.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCxxOverlay")

Runtimes/Overlay/Cxx/cmake/interface/SwiftCxxOverlayConfig.cmake.in

@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+include("${CMAKE_CURRENT_LIST_DIR}/SwiftCxxOverlayTargets.cmake")
+
+set(SwiftOverlay_ENABLE_REFLECTION  @SwiftOverlay_ENABLE_REFLECTION@)

Runtimes/Overlay/Cxx/cxxshim/CMakeLists.txt

@@ -6,7 +6,7 @@ target_include_directories(cxxshim INTERFACE
   $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>>)
 
 install(TARGETS cxxshim
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

Runtimes/Overlay/Cxx/libstdcxx/CMakeLists.txt

@@ -6,7 +6,7 @@ target_include_directories(libstdcxx INTERFACE
   $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>>)
 
 install(TARGETS libstdcxx
-  EXPORT SwiftOverlayTargets
+  EXPORT SwiftCxxOverlayTargets
   ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")