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

Author: kovdan01

.github/CODEOWNERS

@@ -230,7 +230,7 @@
 /test/Generics/                                     @hborla @slavapestov
 /test/Generics/inverse*                             @kavon
 /test/IDE/                                          @bnbarham @hamishknight @rintaro
-/test/IRGen/                                        @AnthonyLatsis @rjmccall
+/test/IRGen/                                        @rjmccall
 /test/Index/                                        @bnbarham @hamishknight @rintaro
 /test/Interop/                                      @egorzhdan @Xazax-hun @j-hui @susmonteiro @hnrklssn
 /test/Macros/SwiftifyImport                         @hnrklssn @Xazax-hun

CHANGELOG.md

@@ -5,6 +5,39 @@
 
 ## Swift (next)
 
+* [SE-0491][]:
+  You can now use a module selector to specify which module Swift should look inside to find a named declaration. A
+  module selector is written before the name it qualifies and consists of the module name and two colons (`::`):
+  
+  ```swift
+  // This type conforms to the `View` protocol from `SwiftUI`, even if other
+  // modules have also declared a type named `View`:
+  struct MyView: SwiftUI::View { ... }
+  ```
+  
+  A module selector can also be applied to the name of a member; this is helpful if extensions in other modules have
+  added an ambiguous overload:
+  
+  ```swift
+  // Calls the `data(using:)` method added by `Foundation`, even if other
+  // modules have added identical overloads of `data(using:)`.
+  let data = "a little bit of text".Foundation::data(using: .utf8)
+  ```
+  
+  When a module selector is used, Swift skips past any enclosing scopes and starts its search at the top level of the
+  module; this means that certain declarations, such as local variables and generic parameter types, cannot be found
+  with a module selector. Constraints in `where` clauses also cannot use a module selector to refer to an associated
+  type.
+  
+  Module selectors are primarily intended to be used when working around unavoidable conflicts, such as when two
+  modules you don't control both use the same name. API designs which force clients to use a module selector are not
+  recommended; it is usually better to rename a declaration instead. (19481048)
+
+* If you maintain a module built with Library Evolution, you can now configure Swift to use module selectors to improve
+  the robustness of its module interface file. This is especially helpful if your module declares a type with the same
+  name as the module itself. To opt in to this behavior, add the `-enable-module-selectors-in-module-interface` flag to
+  the `OTHER_SWIFT_FLAGS` build setting.
+
 * Concurrency-related APIs like `Task` and string-processing-related APIs like `Regex` can now be qualified by the name
   `Swift`, just like other standard library APIs:
 
@@ -10925,6 +10958,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
 [SE-0470]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0470-isolated-conformances.md
 [SE-0471]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0371-isolated-synchronous-deinit.md
 [SE-0472]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0472-task-start-synchronously-on-caller-context.md
+[SE-0491]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0491-module-selectors.md
 [#64927]: <https://github.com/apple/swift/issues/64927>
 [#42697]: <https://github.com/apple/swift/issues/42697>
 [#42728]: <https://github.com/apple/swift/issues/42728>

CMakeLists.txt

@@ -271,16 +271,16 @@ 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
+# The swiftSwiftDirectRuntime 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"
+  option(SWIFT_BUILD_SWIFT_DIRECT_RUNTIME
+    "Build the swiftSwiftDirectRuntime library"
     FALSE)
 else()
-  option(SWIFT_BUILD_CLIENT_RETAIN_RELEASE
-    "Build the swiftClientRetainRelease library"
+  option(SWIFT_BUILD_SWIFT_DIRECT_RUNTIME
+    "Build the swiftSwiftDirectRuntime library"
     FALSE)
 endif()
 
@@ -1550,6 +1550,10 @@ else()
   # Some of the things below depend on the threading library
   add_subdirectory(stdlib/public/Threading)
 
+  if(SWIFT_BUILD_SWIFT_DIRECT_RUNTIME)
+    add_subdirectory(stdlib/public/SwiftDirectRuntime)
+  endif()
+
   if(SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT)
     add_subdirectory(stdlib/toolchain)
 

Runtimes/Core/CMakeLists.txt

@@ -109,6 +109,7 @@ defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtim
 defaulted_option(SwiftCore_ENABLE_STDLIB_TRACING "Enable tracing in the runtime. Assumes the presence of os_log(3) and the os_signpost(3) API.")
 defaulted_option(SwiftCore_ENABLE_CONCURRENCY "Enable Concurrency runtime support")
 defaulted_option(SwiftCore_ENABLE_REMOTE_MIRROR "Enable RemoteMirror runtime support")
+defaulted_option(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE "Use direct retain release in the runtime/stdlib")
 defaulted_set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR STRING "Default Concurrency global executor implementation")
 option(SwiftCore_ENABLE_COMMANDLINE_SUPPORT "Enable command line argument support" ON)
 option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
@@ -196,6 +197,11 @@ add_compile_options(
   "$<$<AND:$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
   "$<$<AND:$<BOOL:${SwiftCore_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
 
+if(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE)
+  find_package(SwiftSwiftDirectRuntime REQUIRED)
+  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-direct-retain-release>")
+endif()
+
 include(ExperimentalFeatures)
 
 include_directories(include)
@@ -206,7 +212,7 @@ add_subdirectory(Demangling)
 add_subdirectory(Threading)
 add_subdirectory(runtime)
 add_subdirectory(stubs)
-add_subdirectory(core)
+add_subdirectory(Core)
 if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
   add_subdirectory(CommandLineSupport)
 endif()

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -139,6 +139,7 @@ target_link_libraries(swift_Concurrency PRIVATE
   $<$<PLATFORM_ID:Android>:log>
   $<$<PLATFORM_ID:Windows>:Synchronization>
   $<$<PLATFORM_ID:Windows>:mincore>
+  $<$<BOOL:${SwiftSwiftDirectRuntime_FOUND}>:swiftSwiftDirectRuntime>
   # Link to the runtime that we are just building.
   swiftCore)
 set_target_properties(swift_Concurrency PROPERTIES

Runtimes/Core/core/CMakeLists.txt renamed to Runtimes/Core/Core/CMakeLists.txt

@@ -337,6 +337,7 @@ target_link_libraries(swiftCore
     swiftStdlibStubs
     swiftThreading
     $<$<NOT:$<PLATFORM_ID:Darwin>>:swiftrt$<$<PLATFORM_ID:Windows>:T>>
+    $<$<BOOL:${SwiftSwiftDirectRuntime_FOUND}>:swiftSwiftDirectRuntime>
   PUBLIC
     swiftShims
   INTERFACE

Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt

@@ -29,7 +29,8 @@ target_compile_definitions(swiftSwiftOnoneSupport PRIVATE
 target_link_libraries(swiftSwiftOnoneSupport
   PRIVATE
     swiftShims
-    swiftCore)
+    swiftCore
+    $<$<BOOL:${SwiftSwiftDirectRuntime_FOUND}>:swiftSwiftDirectRuntime>)
 
 install(TARGETS swiftSwiftOnoneSupport
     EXPORT SwiftCoreTargets

Runtimes/Core/cmake/interface/SwiftCoreConfig.cmake.in

@@ -6,3 +6,5 @@ set(SwiftCore_ENABLE_LIBRARY_EVOLUTION @SwiftCore_ENABLE_LIBRARY_EVOLUTION@)
 set(SwiftCore_ENABLE_VECTOR_TYPES @SwiftCore_ENABLE_VECTOR_TYPES@)
 
 set(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT @SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT@)
+
+set(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE @SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE@)

Runtimes/Core/cmake/modules/DefaultSettings.cmake

@@ -46,12 +46,15 @@ if(APPLE)
   set(SwiftCore_THREADING_PACKAGE_default "DARWIN")
   set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
+  # TODO we are not ready to enable it here
+  set(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE_default OFF)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
   set(SwiftCore_OBJECT_FORMAT_default "elf")
   set(SwiftCore_THREADING_PACKAGE_default "NONE")
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
   set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "none")
+  set(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE_default OFF)
 elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_OBJECT_FORMAT_default "elf")
 
@@ -66,6 +69,7 @@ elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
   set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
+  set(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE_default OFF)
 elseif(WIN32)
   set(SwiftCore_OBJECT_FORMAT_default "coff")
 
@@ -80,6 +84,7 @@ elseif(WIN32)
   # errors
   set(SwiftCore_ENABLE_PRESPECIALIZATION_default OFF)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
+  set(SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE_default OFF)
 
   set(SwiftCore_ENABLE_VECTOR_TYPES_default ON)
   set(SwiftCore_ENABLE_FILESYSTEM_SUPPORT_default ON)

Runtimes/Overlay/CMakeLists.txt

@@ -59,6 +59,8 @@ option(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION "Generate ABI resilient runtime lib
   ${SwiftCore_ENABLE_LIBRARY_EVOLUTION})
 option(SwiftOverlay_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtime backdeployment"
   ${SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT})
+option(${PROJECT_NAME}_ENABLE_DIRECT_RETAIN_RELEASE "Use direct retain release in overlays"
+  ${SwiftCore_ENABLE_DIRECT_RETAIN_RELEASE})
 
 add_compile_definitions(
   $<$<BOOL:${SwiftOverlay_ENABLE_BACKDEPLOYMENT_SUPPORT}>:SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT>)
@@ -74,6 +76,11 @@ add_compile_options(
   "$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION}>,$<COMPILE_LANGUAGE:Swift>>:-enable-library-evolution>"
   "$<$<AND:$<BOOL:${${PROJECT_NAME}_ENABLE_PRESPECIALIZATION}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xfrontend -prespecialize-generic-metadata>")
 
+if(${PROJECT_NAME}_ENABLE_DIRECT_RETAIN_RELEASE)
+  find_package(SwiftSwiftDirectRuntime REQUIRED)
+  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -enable-direct-retain-release>")
+endif()
+
 include(ExperimentalFeatures)
 
 # LNK4049: symbol 'symbol' defined in 'filename.obj' is imported