Merge pull request swiftlang#37824 from apple/xcode-13-beta-5.5

[5.5] Support Xcode 13 beta

Author: shahmishal

cmake/modules/AddSwiftUnittests.cmake

@@ -42,7 +42,7 @@ function(add_swift_unittest test_dirname)
   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     # Add an @rpath to the swift library directory.
     set_target_properties(${test_dirname} PROPERTIES
-      BUILD_RPATH ${SWIFT_LIBRARY_OUTPUT_INTDIR}/swift/macosx)
+      BUILD_RPATH "${SWIFT_LIBRARY_OUTPUT_INTDIR}/swift/macosx;${SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR}")
     # Force all the swift libraries to be found via rpath.
     add_custom_command(TARGET "${test_dirname}" POST_BUILD
       COMMAND "${SWIFT_SOURCE_DIR}/utils/swift-rpathize.py"

include/swift/AST/DiagnosticsSema.def

@@ -4362,7 +4362,10 @@ ERROR(async_objc_dynamic_self,none,
 ERROR(actor_inheritance,none,
       "actor types do not support inheritance", ())
 
-ERROR(unowned_executor_outside_actor,none,
+// FIXME: This diagnostic was temporarily downgraded from an error because
+// it spuriously triggers when building the Foundation module from its textual
+// swiftinterface. (rdar://78932296)
+WARNING(unowned_executor_outside_actor,none,
       "'unownedExecutor' can only be implemented within the main "
       "definition of an actor", ())
 ERROR(override_implicit_unowned_executor,none,

lib/AST/Availability.cpp

@@ -413,7 +413,20 @@ AvailabilityContext ASTContext::getSwift54Availability() {
 }
 
 AvailabilityContext ASTContext::getSwift55Availability() {
-  return getSwiftFutureAvailability();
+  auto target = LangOpts.Target;
+
+  if (target.isMacOSX() ) {
+    return AvailabilityContext(
+        VersionRange::allGTE(llvm::VersionTuple(12, 0, 0)));
+  } else if (target.isiOS()) {
+    return AvailabilityContext(
+        VersionRange::allGTE(llvm::VersionTuple(15, 0, 0)));
+  } else if (target.isWatchOS()) {
+    return AvailabilityContext(
+        VersionRange::allGTE(llvm::VersionTuple(8, 0, 0)));
+  } else {
+    return AvailabilityContext::alwaysAvailable();
+  }
 }
 
 

lib/Sema/TypeCheckProtocol.cpp

@@ -4578,7 +4578,10 @@ void ConformanceChecker::resolveValueWitnesses() {
           Adoptee->getClassOrBoundGenericClass() &&
           Adoptee->getClassOrBoundGenericClass()->isActor()) {
         witness->diagnose(diag::unowned_executor_outside_actor);
-        return;
+        // FIXME: This diagnostic was temporarily downgraded from an error to a
+        // warning because it spuriously triggers when building the Foundation
+        // module from its textual swiftinterface. (rdar://78932296)
+        //return;
       }
 
       // Objective-C checking for @objc requirements.

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -965,11 +965,6 @@ function(_add_swift_target_library_single target name)
       endif()
     endif()
 
-    # Always use @rpath for XCTest
-    if(module_name STREQUAL "XCTest")
-      set(install_name_dir "@rpath")
-    endif()
-
     if(SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR)
       set(install_name_dir "${SWIFTLIB_SINGLE_DARWIN_INSTALL_NAME_DIR}")
     endif()
@@ -1914,9 +1909,7 @@ function(add_swift_target_library name)
       # These paths must come before their normal counterparts so that when compiling
       # macCatalyst-only or unzippered-twin overlays the macCatalyst version
       # of a framework is found and not the Mac version.
-      if(maccatalyst_build_flavor STREQUAL "ios-like"
-          OR (name STREQUAL "swiftXCTest"
-            AND maccatalyst_build_flavor STREQUAL "zippered"))
+      if(maccatalyst_build_flavor STREQUAL "ios-like")
 
         # The path to find iOS-only frameworks (such as UIKit) under macCatalyst.
         set(ios_support_frameworks_path "${SWIFT_SDK_${sdk}_PATH}/System/iOSSupport/System/Library/Frameworks/")

stdlib/private/OSLog/CMakeLists.txt

@@ -14,10 +14,10 @@ add_swift_target_library(swiftOSLogTestHelper
   OSLogPrivacy.swift
   OSLogFloatFormatting.swift
 
-  SWIFT_MODULE_DEPENDS_IOS Darwin ObjectiveC
-  SWIFT_MODULE_DEPENDS_OSX Darwin ObjectiveC
-  SWIFT_MODULE_DEPENDS_TVOS Darwin ObjectiveC
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin ObjectiveC
+  SWIFT_MODULE_DEPENDS_IOS Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_OSX Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_TVOS Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_WATCHOS Darwin _Concurrency
   TARGET_SDKS ALL_APPLE_PLATFORMS
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   INSTALL_IN_COMPONENT never_install

stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift

@@ -982,7 +982,7 @@ self.test("\(testNamePrefix).partition/DispatchesThroughDirectStorageAccessors")
     withUnsafeMutableBufferPointerIsSupported ? 1 : 0,
     actualWUMBPIFNonNil + actualWCMSIAIFNonNil)
 
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
     // `partition(by:)` is expected to dispatch to the public API in releases
     // that contain https://github.com/apple/swift/pull/36003.
     expectEqual(0, actualWUMBPIF)

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -37,17 +37,17 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
   TypeIndexed.swift
 
   SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivateThreadExtras SwiftPrivateLibcExtras
-  SWIFT_MODULE_DEPENDS_IOS Darwin Foundation
-  SWIFT_MODULE_DEPENDS_OSX Darwin Foundation
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Foundation
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Foundation
-  SWIFT_MODULE_DEPENDS_FREESTANDING Darwin
-  SWIFT_MODULE_DEPENDS_LINUX Glibc
-  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
-  SWIFT_MODULE_DEPENDS_OPENBSD Glibc
-  SWIFT_MODULE_DEPENDS_CYGWIN Glibc
-  SWIFT_MODULE_DEPENDS_HAIKU Glibc
-  SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
+  SWIFT_MODULE_DEPENDS_IOS Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_OSX Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_TVOS Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_WATCHOS Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_FREESTANDING Darwin _Concurrency
+  SWIFT_MODULE_DEPENDS_LINUX Glibc _Concurrency
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc _Concurrency
+  SWIFT_MODULE_DEPENDS_OPENBSD Glibc _Concurrency
+  SWIFT_MODULE_DEPENDS_CYGWIN Glibc _Concurrency
+  SWIFT_MODULE_DEPENDS_HAIKU Glibc _Concurrency
+  SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK _Concurrency
   SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   INSTALL_IN_COMPONENT stdlib-experimental
   DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}"

stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt

@@ -4,7 +4,7 @@ add_swift_target_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBR
   StdlibUnittestFoundationExtras.swift
   UnavailableFoundationMethodThunks.mm
 
-  SWIFT_MODULE_DEPENDS Foundation StdlibUnittest
+  SWIFT_MODULE_DEPENDS StdlibUnittest
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   INSTALL_IN_COMPONENT stdlib-experimental
   DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")

stdlib/public/CMakeLists.txt

@@ -109,10 +109,8 @@ if(SWIFT_BUILD_SDK_OVERLAY OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
 endif()
 
 if(SWIFT_BUILD_SDK_OVERLAY)
-  list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}" building_darwin_sdks)
-  if(building_darwin_sdks)
-    add_subdirectory(Darwin)
-  endif()
+  # On Apple platforms, we aren't building any overlays (other than Darwin in
+  # Platform above). Instead, we're picking them up from the SDK.
 
   if(WINDOWS IN_LIST SWIFT_SDKS)
     add_subdirectory(Windows)