Merge branch 'main' into cdecl-global-function-checking

Author: xymus

.github/CODEOWNERS

@@ -285,17 +285,20 @@
 
 # utils
 /utils/*windows*                                              @compnerd
+/utils/build_swift/                                           @etcwilde @justice-adams-apple @shahmishal
 /utils/generate-xcode                                         @hamishknight
 /utils/gyb_sourcekit_support/                                 @ahoppen @bnbarham @hamishknight @rintaro
 /utils/sourcekit_fuzzer/                                      @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift-xcodegen/                                        @hamishknight
+/utils/swift_build_support/                                   @etcwilde @justice-adams-apple @shahmishal
 /utils/swift_build_support/products/earlyswiftsyntax.py       @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/skstresstester.py         @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/sourcekitlsp.py           @ahoppen @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/swiftformat.py            @ahoppen @allevato @bnbarham @hamishknight @rintaro
 /utils/swift_build_support/products/swiftsyntax.py            @ahoppen @bnbarham @hamishknight @rintaro
-/utils/update-checkout*                                       @shahmishal
-/utils/update_checkout/                                       @shahmishal
+/utils/update-checkout*                                       @etcwilde @justice-adams-apple @shahmishal
+/utils/update_checkout/                                       @etcwilde @justice-adams-apple @shahmishal
+/utils/update_checkout/update-checkout-config.json            @shahmishal
 /utils/vim/                                                   @compnerd
 
 # validation-test

CHANGELOG.md

@@ -5,6 +5,61 @@
 
 ## Swift 6.2
 
+* The Swift compiler no longer diagnoses references to declarations that are
+  potentially unavailable because the platform version might not be new enough
+  when those references occur inside of contexts that are also unavailable to
+  that platform. This addresses a long-standing nuisance for multi-platform
+  code. However, there is also a chance that existing source code may become
+  ambiguous as a result:
+
+  ```swift
+  struct A {}
+  struct B {}
+
+  func potentiallyAmbiguous(_: A) {}
+
+  @available(macOS 99, *)
+  func potentiallyAmbiguous(_: B) {}
+
+  @available(macOS, unavailable)
+  func unavailableOnMacOS() {
+    potentiallyAmbiguous(.init()) // error: ambiguous use of 'init()'
+  }
+  ```
+
+  Code that is now ambiguous as a result should likely be restructured since
+  disambiguation based on platform introduction alone has never been a reliable
+  strategy, given that the code would eventually become ambiguous anyways when
+  the deployment target is raised.
+
+* [SE-0470][]:
+  A protocol conformance can be isolated to a specific global actor, meaning that the conformance can only be used by code running on that actor. Isolated conformances are expressed by specifying the global actor on the conformance itself:
+
+  ```swift
+  protocol P {
+    func f()
+  }
+
+  @MainActor
+  class MyType: @MainActor P {
+    /*@MainActor*/ func f() {
+      // must be called on the main actor
+    }
+  }
+  ```
+
+  Swift will produce diagnostics if the conformance is directly accessed in code that isn't guaranteed to execute in the same global actor. For example:
+
+  ```swift
+  func acceptP<T: P>(_ value: T) { }
+
+  /*nonisolated*/ func useIsolatedConformance(myType: MyType) {
+    acceptP(myType) // error: main actor-isolated conformance of 'MyType' to 'P' cannot be used in nonisolated context
+  }
+  ```
+
+  To address such issues, only use an isolated conformance from code that executes on the same global actor.
+
 * [SE-0419][]:
   Introduced the new `Runtime` module, which contains a public API that can
   generate backtraces, presently supported on macOS and Linux.  Capturing a
@@ -10732,6 +10787,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
 [SE-0442]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0442-allow-taskgroup-childtaskresult-type-to-be-inferred.md
 [SE-0444]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
 [SE-0458]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0458-strict-memory-safety.md
+[SE-0470]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0470-isolated-conformances.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>

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(swift_Concurrency
   EmbeddedSupport.cpp
   Error.cpp
   ExecutorBridge.cpp
+  ExecutorImpl.cpp
   ExecutorChecks.cpp
   GlobalExecutor.cpp
   Setup.cpp

Runtimes/Core/cmake/modules/AvailabilityMacros.cmake

@@ -1,4 +1,7 @@
-file(STRINGS "${SwiftCore_SWIFTC_SOURCE_DIR}/utils/availability-macros.def" availability_defs)
+configure_file("${SwiftCore_SWIFTC_SOURCE_DIR}/utils/availability-macros.def"
+               "${CMAKE_CURRENT_BINARY_DIR}/availability-macros.def"
+               COPYONLY)
+file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/availability-macros.def" availability_defs)
 list(FILTER availability_defs EXCLUDE REGEX "^\\s*(#.*)?$")
 foreach(def ${availability_defs})
   add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${def}\">")

Runtimes/Core/core/CMakeLists.txt

@@ -208,6 +208,13 @@ add_library(swiftCore
   UnsafeRawPointer.swift
   UTFEncoding.swift
   UTF8.swift
+  UTF8EncodingError.swift
+  UTF8Span.swift
+  UTF8SpanBits.swift
+  UTF8SpanComparisons.swift
+  UTF8SpanFundamentals.swift
+  UTF8SpanInternalHelpers.swift
+  UTF8SpanIterators.swift
   UTF16.swift
   UTF32.swift
   Unicode.swift # ORDER DEPENDENCY: must follow new unicode support

Runtimes/Overlay/Android/Android/CMakeLists.txt

@@ -0,0 +1,25 @@
+
+gyb_expand(tgmath.swift.gyb tgmath.swift)
+
+add_library(swiftAndroid
+  tgmath.swift
+  Android.swift
+  Platform.swift
+  POSIXError.swift
+  TiocConstants.swift)
+set_target_properties(swiftAndroid PROPERTIES
+  Swift_MODULE_NAME Android)
+target_compile_definitions(swiftAndroid PRIVATE
+  $<$<BOOL:${SwiftOverlay_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
+target_link_libraries(swiftAndroid PRIVATE
+  SwiftAndroid
+  swiftCore)
+
+install(TARGETS swiftAndroid
+  ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+emit_swift_interface(swiftAndroid)
+install_swift_interface(swiftAndroid)
+
+embed_manifest(swiftAndroid)

Runtimes/Overlay/Android/CMakeLists.txt

@@ -0,0 +1,4 @@
+
+add_subdirectory(clang)
+add_subdirectory(Android)
+add_subdirectory(Math)

Runtimes/Overlay/Android/Math/CMakeLists.txt

@@ -0,0 +1,17 @@
+
+add_library(swift_math
+  Math.swift)
+set_target_properties(swift_math PROPERTIES
+  Swift_MODULE_NAME math)
+target_link_libraries(swift_math PRIVATE
+  SwiftAndroid
+  swiftCore)
+
+install(TARGETS swift_math
+  ARCHIVE DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${SwiftOverlay_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+emit_swift_interface(swift_math)
+install_swift_interface(swift_math)
+
+embed_manifest(swift_math)

Runtimes/Overlay/Android/clang/CMakeLists.txt

@@ -0,0 +1,40 @@
+
+# FIXME: how do we determine the sysroot? `CMAKE_SYSROOT` does not contain the sysroot.
+file(CONFIGURE
+  OUTPUT android-ndk-overlay.yaml
+  CONTENT [[
+---
+version: 0
+case-sensitive: false
+use-external-names: false
+roots:
+  - name: "@CMAKE_ANDROID_NDK@/toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include"
+    type: directory
+    contents:
+      - name: module.modulemap
+        type: file
+        external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/android.modulemap"
+      - name: SwiftAndroidNDK.h
+        type: file
+        external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/SwiftAndroidNDK.h"
+      - name: SwiftBionic.h
+        type: file
+        external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/SwiftBionic.h"
+]]
+ESCAPE_QUOTES @ONLY NEWLINE_STYLE LF)
+
+add_library(SwiftAndroid INTERFACE)
+target_compile_options(SwiftAndroid INTERFACE
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc --sysroot=\"${CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED}/sysroot\">"
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-vfsoverlay ${CMAKE_CURRENT_BINARY_DIR}/android-ndk-overlay.yaml>")
+
+install(FILES
+  android.modulemap
+  SwiftAndroidNDK.h
+  SwiftBionic.h
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SwiftOverlay_PLATFORM_SUBDIR}/${SwiftOverlay_ARCH_SUBDIR})
+
+install(FILES
+  posix_filesystem.apinotes
+  spawn.apinotes
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/apinotes)

Runtimes/Overlay/CMakeLists.txt

@@ -50,6 +50,9 @@ add_compile_options(
   "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>")
 
 add_subdirectory(clang)
+if(ANDROID)
+  add_subdirectory(Android)
+endif()
 if(WIN32)
   add_subdirectory(Windows)
 endif()