Merge remote-tracking branch 'apple/release/5.6' into swiftwasm-release/5.6

Author: kateinoigakukun

CHANGELOG.md

@@ -6,6 +6,109 @@ _**Note:** This is in reverse chronological order, so newer entries are added to
 Swift 5.6
 ---------
 
+* Actor isolation checking now understands that `defer` bodies share the isolation of their enclosing function.
+
+  ```swift
+  // Works on global actors
+  @MainActor
+  func runAnimation(controller: MyViewController) async {
+    controller.hasActiveAnimation = true
+    defer { controller.hasActiveAnimation = false }
+
+    // do the animation here...
+  }
+
+  // Works on actor instances
+  actor OperationCounter {
+    var activeOperationCount = 0
+
+    func operate() async {
+      activeOperationCount += 1
+      defer { activeOperationCount -= 1 }
+
+      // do work here...
+    }
+  }
+  ```
+
+* [SE-0335][]:
+
+  Swift now allows existential types to be explicitly written with the `any`
+  keyword, creating a syntactic distinction between existential types and
+  protocol conformance constraints. For example:
+
+  ```swift
+  protocol P {}
+
+  func generic<T>(value: T) where T: P {
+    ...
+  }
+
+  func existential(value: any P) {
+     ...
+  }
+  ```
+
+* [SE-0337][]:
+
+  Swift now provides an incremental migration path to data race safety, allowing
+  APIs to adopt concurrency without breaking their clients that themselves have
+  not adopted concurrency. An existing declaration can introduce
+  concurrency-related annotations (such as making its closure parameters
+  `@Sendable`) and use the `@preconcurrency` attribute to maintain its behavior
+  for clients who have not themselves adopted concurrency:
+
+  ```swift
+  // module A
+  @preconcurrency func runOnSeparateTask(_ workItem: @Sendable () -> Void)
+
+  // module B
+  import A
+
+  class MyCounter {
+    var value = 0
+  }
+
+  func doesNotUseConcurrency(counter: MyCounter) {
+    runOnSeparateTask {
+      counter.value += 1 // no warning, because this code hasn't adopted concurrency
+    }
+  }
+
+  func usesConcurrency(counter: MyCounter) async {
+    runOnSeparateTask {
+      counter.value += 1 // warning: capture of non-Sendable type 'MyCounter'
+    }
+  }
+  ```
+
+  One can enable warnings about data race safety within a module with the
+  `-warn-concurrency` compiler option. When using a module that does not yet
+  provide `Sendable` annotations, one can suppress warnings for types from that
+  module by marking the import with `@preconcurrency`:
+
+  ```swift
+  /// module C
+  public struct Point {
+    public var x, y: Double
+  }
+
+  // module D
+  @preconcurrency import C
+
+  func centerView(at location: Point) {
+    Task {
+      await mainView.center(at: location) // no warning about non-Sendable 'Point' because the @preconcurrency import suppresses it
+    }
+  }
+  ```
+
+* [SE-0331][]:
+
+  The conformance of the unsafe pointer types (e.g., `UnsafePointer`,
+  `UnsafeMutableBufferPointer`) to the `Sendable` protocols has been removed,
+  because pointers cannot safely be transferred across task or actor boundaries.
+
 * References to `Self` or so-called "`Self` requirements" in the type signatures
   of protocol members are now correctly detected in the parent of a nested type.
   As a result, protocol members that fall under this overlooked case are no longer
@@ -26,7 +129,7 @@ Swift 5.6
     // protocol type (use a generic constraint instead).
     _ = p.method
   }
-  ``` 
+  ```
 
 * [SE-0324][]:
 
@@ -53,6 +156,13 @@ Swift 5.6
   }
   ```
 
+* [SE-0322][]:
+
+  The standard library now provides a new operation
+  `withUnsafeTemporaryAllocation` which provides an efficient temporarily
+  allocation within a limited scope, which will be optimized to use stack
+  allocation when possible.
+
 * [SE-0315][]:
 
   Type expressions and annotations can now include "type placeholders" which
@@ -8753,14 +8863,19 @@ Swift 1.0
 [SE-0298]: <https://github.com/apple/swift-evolution/blob/main/proposals/0298-asyncsequence.md>
 [SE-0299]: <https://github.com/apple/swift-evolution/blob/main/proposals/0299-extend-generic-static-member-lookup.md>
 [SE-0300]: <https://github.com/apple/swift-evolution/blob/main/proposals/0300-continuation.md>
+[SE-0302]: <https://github.com/apple/swift-evolution/blob/main/proposals/0302-concurrent-value-and-concurrent-closures.md>
 [SE-0306]: <https://github.com/apple/swift-evolution/blob/main/proposals/0306-actors.md>
 [SE-0310]: <https://github.com/apple/swift-evolution/blob/main/proposals/0310-effectful-readonly-properties.md>
 [SE-0311]: <https://github.com/apple/swift-evolution/blob/main/proposals/0311-task-locals.md>
 [SE-0313]: <https://github.com/apple/swift-evolution/blob/main/proposals/0313-actor-isolation-control.md>
 [SE-0315]: <https://github.com/apple/swift-evolution/blob/main/proposals/0315-placeholder-types.md>
 [SE-0316]: <https://github.com/apple/swift-evolution/blob/main/proposals/0316-global-actors.md>
+[SE-0322]: <https://github.com/apple/swift-evolution/blob/main/proposals/0322-temporary-buffers.md>
 [SE-0324]: <https://github.com/apple/swift-evolution/blob/main/proposals/0324-c-lang-pointer-arg-conversion.md>
 [SE-0323]: <https://github.com/apple/swift-evolution/blob/main/proposals/0323-async-main-semantics.md>
+[SE-0331]: <https://github.com/apple/swift-evolution/blob/main/proposals/0331-remove-sendable-from-unsafepointer.md>
+[SE-0337]: <https://github.com/apple/swift-evolution/blob/main/proposals/0337-support-incremental-migration-to-concurrency-checking.md>
+[SE-0335]: <https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md>
 
 [SR-75]: <https://bugs.swift.org/browse/SR-75>
 [SR-106]: <https://bugs.swift.org/browse/SR-106>

CMakeLists.txt

@@ -304,23 +304,6 @@ set(SWIFT_ANDROID_NDK_CLANG_VERSION "12.0.8" CACHE STRING
 set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
   "Path on an Android device where build products will be pushed. These are used when running the test suite against the device")
 
-#
-# User-configurable ICU specific options for Android, FreeBSD, Linux, Haiku, and WASI.
-#
-
-foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU;WASI)
-  foreach(arch aarch64;armv6;armv7;i686;powerpc64;powerpc64le;s390x;wasm32;x86_64)
-    set(SWIFT_${sdk}_${arch}_ICU_UC "" CACHE STRING
-        "Path to a directory containing the icuuc library for ${sdk}")
-    set(SWIFT_${sdk}_${arch}_ICU_UC_INCLUDE "" CACHE STRING
-        "Path to a directory containing headers for icuuc for ${sdk}")
-    set(SWIFT_${sdk}_${arch}_ICU_I18N "" CACHE STRING
-        "Path to a directory containing the icui18n library for ${sdk}")
-    set(SWIFT_${sdk}_${arch}_ICU_I18N_INCLUDE "" CACHE STRING
-        "Path to a directory containing headers icui18n for ${sdk}")
-  endforeach()
-endforeach()
-
 #
 # User-configurable Darwin-specific options.
 #

CODEOWNERS

@@ -0,0 +1 @@
+* @apple/swift5-branch-managers

cmake/modules/StandaloneOverlay.cmake

@@ -1,3 +1,10 @@
+# In some configurations (e.g. back deploy concurrency) we
+# configure the build from the root of the Swift repo but we skip
+# stdlib/CMakeLists.txt, with the risk of missing important parameters.
+# To account for this scenario, we include the stdlib options
+# before the guard
+include(${CMAKE_CURRENT_LIST_DIR}/../../stdlib/cmake/modules/StdlibOptions.cmake)
+
 # CMAKE_SOURCE_DIR is the directory that cmake got initially invoked on.
 # CMAKE_CURRENT_SOURCE_DIR is the current directory. If these are equal, it's
 # a top-level build of the CMAKE_SOURCE_DIR. Otherwise, define a guard variable
@@ -85,10 +92,6 @@ set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
 targets on Darwin platforms. These targets are in addition to the full \
 library targets.")
 
-option(SWIFT_STDLIB_SHORT_MANGLING_LOOKUPS
-       "Build stdlib with fast-path context descriptor lookups based on well-known short manglings."
-       TRUE)
-
 # -----------------------------------------------------------------------------
 # Constants
 

cmake/modules/SwiftConfigureSDK.cmake

@@ -63,7 +63,6 @@ function(_report_sdk prefix)
   if(NOT prefix IN_LIST SWIFT_DARWIN_PLATFORMS)
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       message(STATUS "  ${arch} libc header path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY}")
-      message(STATUS "  ${arch} libc architecture specific header path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY}")
     endforeach()
   endif()
 
@@ -288,7 +287,6 @@ macro(configure_sdk_unix name architectures)
       swift_android_sysroot(android_sysroot)
       set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${android_sysroot}")
       set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "${android_sysroot}/usr/include" CACHE STRING "Path to C library headers")
-      set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${android_sysroot}/usr/include" CACHE STRING "Path to C library architecture headers")
 
       if("${arch}" STREQUAL "armv7")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "arm-linux-androideabi")
@@ -320,10 +318,8 @@ macro(configure_sdk_unix name architectures)
 
       if("${prefix}" STREQUAL "HAIKU")
         set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "/system/develop/headers/posix" CACHE STRING "Path to C library headers")
-        set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "/system/develop/headers" CACHE STRING "Path to C library architecture headers")
       else()
         set(SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "/usr/include" CACHE STRING "Path to C library headers")
-        set(SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_SDK_${prefix}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY}/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "Path to C library architecture headers")
       endif()
 
       if("${prefix}" STREQUAL "LINUX")
@@ -373,7 +369,6 @@ macro(configure_sdk_unix name architectures)
         set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")
         set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
         set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
-        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SYSROOT_PATH}/include")
       else()
         message(FATAL_ERROR "unknown Unix OS: ${prefix}")
       endif()

docs/ABI/Mangling.rst

@@ -619,7 +619,7 @@ Types
   type-list ::= empty-list
 
                                                   // FIXME: Consider replacing 'h' with a two-char code
-  list-type ::= type identifier? 'Yk'? 'z'? 'h'? 'n'? 'Yi'? 'd'?  // type with optional label, '@noDerivative', inout convention, shared convention, owned convention, actor 'isolated', and variadic specifier
+  list-type ::= type identifier? 'Yk'? 'z'? 'h'? 'n'? 'Yi'? 'd'? 'Yt'?  // type with optional label, '@noDerivative', inout convention, shared convention, owned convention, actor 'isolated', variadic specifier, and compile-time constant
 
   METATYPE-REPR ::= 't'                      // Thin metatype representation
   METATYPE-REPR ::= 'T'                      // Thick metatype representation

docs/Android.md

@@ -43,51 +43,22 @@ To follow along with this guide, you'll need:
 
 ## "Hello, world" on Android
 
-### 1. Downloading (or building) the Swift Android stdlib dependencies
+### 1. Building the Swift stdlib for Android
 
-You may have noticed that, in order to build the Swift stdlib for Linux, you
-needed to `apt-get install libicu-dev icu-devtools`. Similarly, building
-the Swift stdlib for Android requires the libiconv and libicu libraries.
-However, you'll need versions of these libraries that work on Android devices.
-
-The steps are as follows:
-
-1. Ensure you have `curl`, `autoconf`, `automake`, `libtool`, and
-   `git` installed.
-2. Clone the [SwiftAndroid/libiconv-libicu-android](https://github.com/SwiftAndroid/libiconv-libicu-android)
-   project. From the command-line, run the following command:
-   `git clone https://github.com/SwiftAndroid/libiconv-libicu-android.git`.
-3. From the command-line, run `which ndk-build`. Confirm that the path to
-   the `ndk-build` executable in the Android NDK you downloaded is displayed.
-   If not, you may need to add the Android NDK directory to your `PATH`.
-4. Change directories into `libiconv-libicu-android`: `cd libiconv-libicu-android`
-5. Run the Swift build script: `./build-swift.sh`
-6. Confirm that the various `libicuXYZswift.so` libraries are located in the
-   `armeabi-v7a` directory.
-
-### 2. Building the Swift stdlib for Android
-
-Enter your Swift directory, then run the build script, passing paths to the
-Android NDK, as well as the directories that contain the `libicuucswift.so` and
-`libicui18nswift.so` you downloaded or built in step one:
+Enter your Swift directory, then run the build script, passing the path to the
+Android NDK:
 
 ```
-$ ARM_DIR=path/to/libiconv-libicu-android/armeabi-v7a
 $ NDK_PATH=path/to/android-ndk-r23b
 $ utils/build-script \
     -R \                                       # Build in ReleaseAssert mode.
     --android \                                # Build for Android.
     --android-ndk $NDK_PATH \                  # Path to an Android NDK.
     --android-arch armv7 \                     # Optionally specify Android architecture, alternately aarch64 or x86_64
-    --android-api-level 21 \                   # The Android API level to target. Swift only supports 21 or greater.
-    --android-icu-uc ${ARM_DIR}/libicuucswift.so \
-    --android-icu-uc-include ${ARM_DIR}/icu/source/common \
-    --android-icu-i18n ${ARM_DIR}/libicui18nswift.so \
-    --android-icu-i18n-include ${ARM_DIR}/icu/source/i18n \
-    --android-icu-data ${ARM_DIR}/libicudataswift.so
+    --android-api-level 21                     # The Android API level to target. Swift only supports 21 or greater.
 ```
 
-### 3. Compiling `hello.swift` to run on an Android device
+### 2. Compiling `hello.swift` to run on an Android device
 
 Create a simple Swift file named `hello.swift`:
 
@@ -121,7 +92,7 @@ This is exactly the error we want: the executable is built to run on an
 Android device--it does not run on Linux. Next, let's deploy it to an Android
 device in order to execute it.
 
-### 4. Deploying the build products to the device
+### 3. Deploying the build products to the device
 
 You can use the `adb push` command to copy build products from your Linux
 environment to your Android device. If you haven't already installed `adb`,
@@ -142,14 +113,6 @@ $ adb push build/Ninja-ReleaseAssert/swift-linux-x86_64/lib/swift/android/libswi
 $ adb push build/Ninja-ReleaseAssert/swift-linux-x86_64/lib/swift/android/libswiftRemoteMirror.so /data/local/tmp
 ```
 
-You will also need to push the icu libraries:
-
-```
-adb push /path/to/libicu-android/armeabi-v7a/libicudataswift.so /data/local/tmp
-adb push /path/to/libicu-android/armeabi-v7a/libicui18nswift.so /data/local/tmp
-adb push /path/to/libicu-android/armeabi-v7a/libicuucswift.so /data/local/tmp
-```
-
 In addition, you'll also need to copy the Android NDK's libc++:
 
 ```
@@ -162,7 +125,7 @@ previous step:
 $ adb push hello /data/local/tmp
 ```
 
-### 5. Running "Hello, world" on your Android device
+### 4. Running "Hello, world" on your Android device
 
 You can use the `adb shell` command to execute the `hello` executable on
 the Android device:
@@ -182,7 +145,7 @@ Congratulations! You've just run your first Swift program on Android.
 ## Running the Swift test suite hosted on an Android device
 
 When running the test suite, build products are automatically pushed to your
-device. As in part four, you'll need to connect your Android device via USB:
+device. As in part three, you'll need to connect your Android device via USB:
 
 1. Connect your Android device to your computer via USB. Ensure that remote
    debugging is enabled for that device by following the official instructions:
@@ -198,10 +161,5 @@ $ utils/build-script \
   --android \                        # Build for Android.
   --android-ndk ~/android-ndk-r23b \  # Path to an Android NDK.
   --android-arch armv7 \             # Optionally specify Android architecture, alternately aarch64
-  --android-ndk-version 21 \
-  --android-icu-uc ~/libicu-android/armeabi-v7a/libicuuc.so \
-  --android-icu-uc-include ~/libicu-android/armeabi-v7a/icu/source/common \
-  --android-icu-i18n ~/libicu-android/armeabi-v7a/libicui18n.so \
-  --android-icu-i18n-include ~/libicu-android/armeabi-v7a/icu/source/i18n/ \
-  --android-icu-data ~/libicu-android/armeabi-v7a/libicudata.so
+  --android-ndk-version 21
 ```

docs/AndroidBuild.md

@@ -74,10 +74,6 @@ cmake -C S:\swift-build\cmake\caches\android-armv7.cmake
   -DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr       ^
   -DLLVM_DIR=S:/b/a/llvm/lib/cmake/llvm                                                                               ^
   -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin ^
-  -DSWIFT_ANDROID_armv7_ICU_UC_INCLUDE=S:/b/a/Library/icu-64/usr/include/unicode                                      ^
-  -DSWIFT_ANDROID_armv7_ICU_UC=S:/b/a/Library/icu-64/usr/lib/libicuuc64.so                                            ^
-  -DSWIFT_ANDROID_armv7_ICU_I18N_INCLUDE=S:/b/a/Library/icu-64/usr/include                                            ^
-  -DSWIFT_ANDROID_armv7_ICU_I18N=S:/b/a/Library/icu-64/usr/lib/libicuin64.so                                          ^
   S:/swift
 ninja
 ninja install

docs/WindowsBuild.md

@@ -92,7 +92,7 @@ structure should resemble:
       ┕ usr/...
 ```
 
-Note that only ICU is required for building the toolchain, and SQLite is only
+Note that ICU is only required for building Foundation, and SQLite is only
 needed for building llbuild and onwards.  The ICU project provides binaries,
 alternatively, see the ICU project for details on building ICU from source.
 
@@ -134,10 +134,6 @@ cmake -B "S:\b\1" ^
   -D LLVM_EXTERNAL_CMARK_SOURCE_DIR=S:\cmark ^
   -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=S:\swift ^
   -D SWIFT_PATH_TO_LIBDISPATCH_SOURCE=S:\swift-corelibs-libdispatch ^
-  -D SWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE=S:\Library\icu-67\usr\include ^
-  -D SWIFT_WINDOWS_x86_64_ICU_I18N=S:\Library\icu-67\usr\lib\icuin67.lib ^
-  -D SWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE=S:\Library\icu-67\usr\include ^
-  -D SWIFT_WINDOWS_x86_64_ICU_UC=S:\Library\icu-67\usr\lib\icuuc67.lib ^
   -G Ninja ^
   -S S:\llvm-project\llvm