diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18cf581a64f03..c8f9999c2a173 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,6 +458,12 @@ if(SWIFT_PATH_TO_CMARK_BUILD)
 endif()
 message(STATUS "")
 
+if("${SWIFT_NATIVE_LLVM_TOOLS_PATH}" STREQUAL "")
+  set(SWIFT_CROSS_COMPILING FALSE)
+else()
+  set(SWIFT_CROSS_COMPILING TRUE)
+endif()
+
 include(SwiftSharedCMakeConfig)
 
 # NOTE: We include this before SwiftComponents as it relies on some LLVM CMake
@@ -487,16 +493,6 @@ if(NOT SWIFT_LIPO)
   find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
 endif()
 
-# Reset CMAKE_SYSTEM_PROCESSOR if not cross-compiling.
-# CMake refuses to use `uname -m` on OS X
-# http://public.kitware.com/Bug/view.php?id=10326
-if(NOT CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
-  execute_process(
-      COMMAND "uname" "-m"
-      OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
 get_filename_component(SWIFT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} REALPATH)
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(SWIFT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
diff --git a/README.md b/README.md
index c219cecac3ab6..8b090a70578d4 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 11.4](https://developer.apple.com/xcode/resources/).
+To build for macOS, you need [Xcode 12 beta](https://developer.apple.com/xcode/resources/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.
@@ -241,7 +241,7 @@ various products. These incremental builds are a big timesaver when developing
 and debugging.
 
     cd ${SWIFT_BUILD_DIR}
-    ninja swift
+    ninja swift-frontend
 
 This will build the Swift compiler, but will not rebuild the standard library or
 any other target. Building the `swift-stdlib` target as an additional layer of
@@ -258,7 +258,7 @@ To open the Swift project in Xcode, open `${SWIFT_BUILD_DIR}/Swift.xcodeproj`.
 It will auto-create a *lot* of schemes for all of the available targets. A
 common debug flow would involve:
 
- - Select the 'swift' scheme.
+ - Select the 'swift-frontend' scheme.
  - Pull up the scheme editor (⌘⇧<).
  - Select the 'Arguments' tab and click the '+'.
  - Add the command line options.
diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
index fb20e12689359..ea36002f8eabe 100644
--- a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
+++ b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -105,7 +105,7 @@ macro(configure_build)
 endmacro()
 
 macro(configure_sdks_darwin)
-  set(macosx_arch "x86_64")
+  set(macosx_arch "x86_64" "arm64")
   set(iphoneos_arch "arm64" "arm64e" "armv7")
   set(appletvos_arch "arm64")
   set(watchos_arch "armv7k")
@@ -609,11 +609,7 @@ function (swift_benchmark_compile_archopts)
 
   if(is_darwin)
     # If host == target.
-    if("${BENCH_COMPILE_ARCHOPTS_PLATFORM}" STREQUAL "macosx")
-      set(OUTPUT_EXEC "${benchmark-bin-dir}/Benchmark_${BENCH_COMPILE_ARCHOPTS_OPT}")
-    else()
-      set(OUTPUT_EXEC "${benchmark-bin-dir}/Benchmark_${BENCH_COMPILE_ARCHOPTS_OPT}-${target}")
-    endif()
+    set(OUTPUT_EXEC "${benchmark-bin-dir}/Benchmark_${BENCH_COMPILE_ARCHOPTS_OPT}-${target}")
   else()
     # If we are on Linux, we do not support cross compiling.
     set(OUTPUT_EXEC "${benchmark-bin-dir}/Benchmark_${BENCH_COMPILE_ARCHOPTS_OPT}")
@@ -660,8 +656,11 @@ function (swift_benchmark_compile_archopts)
           "-m${triple_platform}-version-min=${ver}"
           "-lobjc"
           "-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
+          "-L${sdk}/usr/lib/swift"
           "-Xlinker" "-rpath"
           "-Xlinker" "${SWIFT_LINK_RPATH}"
+          "-Xlinker" "-rpath"
+          "-Xlinker" "/usr/lib/swift"
           ${bench_library_objects}
           ${bench_driver_objects}
           ${ld64_add_ast_path_opts}
@@ -694,7 +693,7 @@ function(swift_benchmark_compile)
   cmake_parse_arguments(SWIFT_BENCHMARK_COMPILE "" "PLATFORM" "" ${ARGN})
 
   if(NOT SWIFT_BENCHMARK_BUILT_STANDALONE)
-    set(stdlib_dependencies "swift")
+    set(stdlib_dependencies "swift-frontend")
     foreach(stdlib_dependency ${UNIVERSAL_LIBRARY_NAMES_${SWIFT_BENCHMARK_COMPILE_PLATFORM}})
       string(FIND "${stdlib_dependency}" "Unittest" find_output)
       if("${find_output}" STREQUAL "-1")
diff --git a/benchmark/single-source/FloatingPointParsing.swift b/benchmark/single-source/FloatingPointParsing.swift
index 70aa335af544f..0b1f01186dd52 100644
--- a/benchmark/single-source/FloatingPointParsing.swift
+++ b/benchmark/single-source/FloatingPointParsing.swift
@@ -242,7 +242,7 @@ public func run_ParseDoubleExp(_ N: Int) {
 
 @inline(never)
 public func run_ParseFloat80Exp(_ N: Int) {
-  #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Linux)
+#if canImport(Darwin) || os(Linux)
 // On Darwin, long double is Float80 on x86, and Double otherwise.
 // On Linux, Float80 is at aleast available on x86.
 #if arch(x86_64) || arch(i386)
@@ -263,7 +263,7 @@ public func run_ParseDoubleUniform(_ N: Int) {
 
 @inline(never)
 public func run_ParseFloat80Uniform(_ N: Int) {
-  #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Linux)
+#if canImport(Darwin) || os(Linux)
 // On Darwin, long double is Float80 on x86, and Double otherwise.
 // On Linux, Float80 is at aleast available on x86.
 #if arch(x86_64) || arch(i386)
diff --git a/benchmark/single-source/FloatingPointPrinting.swift b/benchmark/single-source/FloatingPointPrinting.swift
index 06f6c494f8c27..08961077c9bf2 100644
--- a/benchmark/single-source/FloatingPointPrinting.swift
+++ b/benchmark/single-source/FloatingPointPrinting.swift
@@ -106,7 +106,7 @@ public func run_FloatingPointPrinting_Double_description_small(_ N: Int) {
 
 @inline(never)
 public func run_FloatingPointPrinting_Float80_description_small(_ N: Int) {
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Linux)
+#if canImport(Darwin) || os(Linux)
 // On Darwin, long double is Float80 on x86, and Double otherwise.
 // On Linux, Float80 is at aleast available on x86.
 #if arch(x86_64) || arch(i386)
@@ -152,7 +152,7 @@ public func run_FloatingPointPrinting_Double_description_uniform(_ N: Int) {
 
 @inline(never)
 public func run_FloatingPointPrinting_Float80_description_uniform(_ N: Int) {
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Linux)
+#if canImport(Darwin) || os(Linux)
 // On Darwin, long double is Float80 on x86, and Double otherwise.
 // On Linux, Float80 is at aleast available on x86.
 #if arch(x86_64) || arch(i386)
@@ -202,7 +202,7 @@ public func run_FloatingPointPrinting_Double_interpolated(_ N: Int) {
 
 @inline(never)
 public func run_FloatingPointPrinting_Float80_interpolated(_ N: Int) {
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Linux)
+#if canImport(Darwin) || os(Linux)
 // On Darwin, long double is Float80 on x86, and Double otherwise.
 // On Linux, Float80 is at aleast available on x86.
 #if arch(x86_64) || arch(i386)
diff --git a/benchmark/single-source/NSStringConversion.swift b/benchmark/single-source/NSStringConversion.swift
index 9b51720861c3e..d57415e3498c8 100644
--- a/benchmark/single-source/NSStringConversion.swift
+++ b/benchmark/single-source/NSStringConversion.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 // <rdar://problem/19003201>
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 
 import TestsUtils
 import Foundation
diff --git a/benchmark/single-source/Substring.swift b/benchmark/single-source/Substring.swift
index 7d4c7a7906459..e6ccccd667b54 100644
--- a/benchmark/single-source/Substring.swift
+++ b/benchmark/single-source/Substring.swift
@@ -17,6 +17,8 @@ public let SubstringTest = [
   BenchmarkInfo(name: "EqualSubstringString", runFunction: run_EqualSubstringString, tags: [.validation, .api, .String]),
   BenchmarkInfo(name: "EqualSubstringSubstring", runFunction: run_EqualSubstringSubstring, tags: [.validation, .api, .String]),
   BenchmarkInfo(name: "EqualSubstringSubstringGenericEquatable", runFunction: run_EqualSubstringSubstringGenericEquatable, tags: [.validation, .api, .String]),
+  BenchmarkInfo(name: "SubstringRemoveFirst1", runFunction: run_SubstringRemoveFirst1, tags: [.validation, .api, .String]),
+  BenchmarkInfo(name: "SubstringRemoveLast1", runFunction: run_SubstringRemoveLast1, tags: [.validation, .api, .String]),
   BenchmarkInfo(name: "LessSubstringSubstring", runFunction: run_LessSubstringSubstring, tags: [.validation, .api, .String]),
   BenchmarkInfo(name: "LessSubstringSubstringGenericComparable", runFunction: run_LessSubstringSubstringGenericComparable, tags: [.validation, .api, .String]),
   BenchmarkInfo(name: "StringFromLongWholeSubstring", runFunction: run_StringFromLongWholeSubstring, tags: [.validation, .api, .String]),
@@ -34,6 +36,8 @@ let longWide = "fὢasὢodὢijὢadὢolὢsjὢalὢsdὢjlὢasὢdfὢijὢ
 let (s1, ss1) = equivalentWithDistinctBuffers()
 let (s2, ss2) = equivalentWithDistinctBuffers()
 
+let quiteLong = String(repeating: "0", count: 10_000)[...]
+
 @inline(never)
 public func run_SubstringFromLongString(_ N: Int) {
   var s = longWide
@@ -126,6 +130,24 @@ public func run_EqualSubstringSubstringGenericEquatable(_ N: Int) {
   }
 }
 
+@inline(never)
+public func run_SubstringRemoveFirst1(_ N: Int) {
+  for _ in 1...N {
+    var s = quiteLong
+    s.removeFirst(1)
+    blackHole(s.first == "0")
+  }
+}
+
+@inline(never)
+public func run_SubstringRemoveLast1(_ N: Int) {
+  for _ in 1...N {
+    var s = quiteLong
+    s.removeLast(1)
+    blackHole(s.first == "0")
+  }
+}
+
 /*
 func checkEqual<T, U>(_ x: T, _ y: U)
 where T : StringProtocol, U : StringProtocol {
diff --git a/benchmark/utils/main.swift b/benchmark/utils/main.swift
index cbf8aaedaa25c..b4791ad6208e7 100644
--- a/benchmark/utils/main.swift
+++ b/benchmark/utils/main.swift
@@ -103,12 +103,12 @@ import NibbleSort
 import NIOChannelPipeline
 import NSDictionaryCastToSwift
 import NSError
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import NSStringConversion
 #endif
 import NopDeinit
 import ObjectAllocation
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import ObjectiveCBridging
 import ObjectiveCBridgingStubs
 #if !(SWIFT_PACKAGE || Xcode)
@@ -287,14 +287,14 @@ registerBenchmark(MonteCarloE)
 registerBenchmark(MonteCarloPi)
 registerBenchmark(NSDictionaryCastToSwift)
 registerBenchmark(NSErrorTest)
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 registerBenchmark(NSStringConversion)
 #endif
 registerBenchmark(NibbleSort)
 registerBenchmark(NIOChannelPipeline)
 registerBenchmark(NopDeinit)
 registerBenchmark(ObjectAllocation)
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 registerBenchmark(ObjectiveCBridging)
 registerBenchmark(ObjectiveCBridgingStubs)
 #if !(SWIFT_PACKAGE || Xcode)
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
index cbef2b8534d4f..1d97caa2e09bd 100644
--- a/cmake/modules/AddSwift.cmake
+++ b/cmake/modules/AddSwift.cmake
@@ -23,7 +23,7 @@ function(_swift_gyb_target_sources target scope)
 
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${generated}
       COMMAND
-        $<TARGET_FILE:Python2::Interpreter> ${SWIFT_SOURCE_DIR}/utils/gyb -D CMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P} ${SWIFT_GYB_FLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/${generated}.tmp ${absolute}
+        $<TARGET_FILE:Python3::Interpreter> ${SWIFT_SOURCE_DIR}/utils/gyb -D CMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P} ${SWIFT_GYB_FLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/${generated}.tmp ${absolute}
       COMMAND
         ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${generated}.tmp ${CMAKE_CURRENT_BINARY_DIR}/${generated}
       COMMAND
@@ -88,6 +88,7 @@ function(_add_host_variant_c_compile_link_flags name)
       MACCATALYST_BUILD_FLAVOR ""
       DEPLOYMENT_VERSION "${DEPLOYMENT_VERSION}")
     target_compile_options(${name} PRIVATE -target;${target})
+    target_link_options(${name} PRIVATE -target;${target})
   endif()
 
   set(_sysroot
@@ -120,6 +121,7 @@ function(_add_host_variant_c_compile_link_flags name)
   _compute_lto_flag("${SWIFT_TOOLS_ENABLE_LTO}" _lto_flag_out)
   if (_lto_flag_out)
     target_compile_options(${name} PRIVATE ${_lto_flag_out})
+    target_link_options(${name} PRIVATE ${_lto_flag_out})
   endif()
 endfunction()
 
@@ -470,6 +472,7 @@ function(add_swift_host_library name)
 
   _add_host_variant_c_compile_flags(${name})
   _add_host_variant_link_flags(${name})
+  _add_host_variant_c_compile_link_flags(${name})
   _set_target_prefix_and_suffix(${name} "${libkind}" "${SWIFT_HOST_VARIANT_SDK}")
 
   # Set compilation and link flags.
@@ -526,11 +529,6 @@ function(add_swift_host_library name)
       target_link_options(${name} PRIVATE
         "LINKER:-current_version,${SWIFT_COMPILER_VERSION}")
     endif()
-
-    get_target_triple(target target_variant "${SWIFT_HOST_VARIANT_SDK}" "${SWIFT_HOST_VARIANT_ARCH}"
-      MACCATALYST_BUILD_FLAVOR ""
-      DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
-    target_link_options(${name} PRIVATE -target;${target})
   endif()
 
   add_dependencies(dev ${name})
@@ -575,6 +573,7 @@ function(add_swift_host_tool executable)
   add_executable(${executable} ${ASHT_UNPARSED_ARGUMENTS})
   _add_host_variant_c_compile_flags(${executable})
   _add_host_variant_link_flags(${executable})
+  _add_host_variant_c_compile_link_flags(${executable})
   target_link_directories(${executable} PRIVATE
     ${SWIFTLIB_DIR}/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
   add_dependencies(${executable} ${LLVM_COMMON_DEPENDS})
diff --git a/cmake/modules/AddSwiftUnittests.cmake b/cmake/modules/AddSwiftUnittests.cmake
index 811b455bd3ed2..531916e071b79 100644
--- a/cmake/modules/AddSwiftUnittests.cmake
+++ b/cmake/modules/AddSwiftUnittests.cmake
@@ -57,9 +57,11 @@ function(add_swift_unittest test_dirname)
       _ENABLE_EXTENDED_ALIGNED_STORAGE)
   endif()
 
-  if(SWIFT_USE_LINKER)
-    set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
-      LINK_FLAGS " -fuse-ld=${SWIFT_USE_LINKER}")
+  if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
+    if(SWIFT_USE_LINKER)
+      target_link_options(${test_dirname} PRIVATE
+        -fuse-ld=${SWIFT_USE_LINKER}$<$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>:.exe>)
+    endif()
   endif()
 
   if(SWIFT_ANALYZE_CODE_COVERAGE)
diff --git a/cmake/modules/DarwinSDKs.cmake b/cmake/modules/DarwinSDKs.cmake
index 23fa42a9bd43e..5ad1e32d1d8a1 100644
--- a/cmake/modules/DarwinSDKs.cmake
+++ b/cmake/modules/DarwinSDKs.cmake
@@ -4,17 +4,34 @@ option(SWIFT_ENABLE_IOS32
 
 if(SWIFT_ENABLE_IOS32)
 set(SUPPORTED_IOS_ARCHS "armv7;armv7s;arm64;arm64e")
-set(SUPPORTED_IOS_SIMULATOR_ARCHS "i386;x86_64")
+set(SUPPORTED_IOS_SIMULATOR_ARCHS "i386;x86_64;arm64")
 else()
 set(SUPPORTED_IOS_ARCHS "arm64;arm64e")
-set(SUPPORTED_IOS_SIMULATOR_ARCHS "x86_64")
+set(SUPPORTED_IOS_SIMULATOR_ARCHS "x86_64;arm64")
 endif()
 
 set(SUPPORTED_TVOS_ARCHS "arm64")
-set(SUPPORTED_TVOS_SIMULATOR_ARCHS "x86_64")
+set(SUPPORTED_TVOS_SIMULATOR_ARCHS "x86_64;arm64")
 set(SUPPORTED_WATCHOS_ARCHS "armv7k")
-set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386")
-set(SUPPORTED_OSX_ARCHS "x86_64")
+set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386;arm64")
+set(SUPPORTED_OSX_ARCHS "x86_64;arm64;arm64e")
+
+# Get the SDK version from SDKSettings.
+execute_process(
+  COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "Version"
+    OUTPUT_VARIABLE SWIFT_OSX_SDK_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Remove the last component, if any. e.g. 10.15.26 -> 10.15
+string(REGEX REPLACE "\([0-9]*[.][0-9]*\)[.][0-9]*" "\\1"
+       SWIFT_OSX_SDK_VERSION "${SWIFT_OSX_SDK_VERSION}")
+
+if (${SWIFT_OSX_SDK_VERSION} STREQUAL "10.14" OR
+    ${SWIFT_OSX_SDK_VERSION} STREQUAL "10.15")
+  set(SUPPORTED_OSX_ARCHS "x86_64")
+else()
+  set(SUPPORTED_OSX_ARCHS "x86_64;arm64e")
+endif()
 
 is_sdk_requested(OSX swift_build_osx)
 if(swift_build_osx)
diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake
index 09d45cc3a34a3..52c08025e62a0 100644
--- a/cmake/modules/SwiftConfigureSDK.cmake
+++ b/cmake/modules/SwiftConfigureSDK.cmake
@@ -85,6 +85,38 @@ function(_report_sdk prefix)
   message(STATUS "")
 endfunction()
 
+# Remove architectures not supported by the SDK from the given list.
+function(remove_sdk_unsupported_archs name os sdk_path architectures_var)
+  execute_process(COMMAND
+      /usr/libexec/PlistBuddy -c "Print :SupportedTargets:${os}:Archs" ${sdk_path}/SDKSettings.plist
+    OUTPUT_VARIABLE sdk_supported_archs
+    RESULT_VARIABLE plist_error)
+
+  if (NOT plist_error EQUAL 0)
+    message(STATUS "${os} SDK at ${sdk_path} does not publish its supported architectures")
+    return()
+  endif()
+
+  set(architectures)
+  foreach(arch ${${architectures_var}})
+    if(sdk_supported_archs MATCHES "${arch}\n")
+      list(APPEND architectures ${arch})
+    elseif(arch MATCHES "^armv7(s)?$" AND os STREQUAL "iphoneos")
+      # 32-bit iOS is not listed explicitly in SDK settings.
+      message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
+      list(APPEND architectures ${arch})
+    elseif(arch STREQUAL "i386" AND os STREQUAL "iphonesimulator")
+      # 32-bit iOS simulatoris not listed explicitly in SDK settings.
+      message(STATUS "Assuming ${name} SDK at ${sdk_path} supports architecture ${arch}")
+      list(APPEND architectures ${arch})
+    else()
+      message(STATUS "${name} SDK at ${sdk_path} does not support architecture ${arch}")
+    endif()
+  endforeach()
+
+  set("${architectures_var}" ${architectures} PARENT_SCOPE)
+endfunction()
+
 # Configure an SDK
 #
 # Usage:
@@ -164,6 +196,9 @@ macro(configure_sdk_darwin
       SWIFT_SDK_${prefix}_ARCHITECTURES)  # result
   endif()
 
+  # Remove any architectures not supported by the SDK.
+  remove_sdk_unsupported_archs(${name} ${xcrun_name} ${SWIFT_SDK_${prefix}_PATH} SWIFT_SDK_${prefix}_ARCHITECTURES)
+
   list_intersect(
     "${SWIFT_DARWIN_MODULE_ARCHS}"            # lhs
     "${architectures}"                        # rhs
diff --git a/cmake/modules/SwiftHandleGybSources.cmake b/cmake/modules/SwiftHandleGybSources.cmake
index f8dc984ea0c68..e74489f56989f 100644
--- a/cmake/modules/SwiftHandleGybSources.cmake
+++ b/cmake/modules/SwiftHandleGybSources.cmake
@@ -1,8 +1,6 @@
 include(SwiftAddCustomCommandTarget)
 include(SwiftSetIfArchBitness)
 
-find_package(Python2 COMPONENTS Interpreter REQUIRED)
-
 # Create a target to process single gyb source with the 'gyb' tool.
 #
 # handle_gyb_source_single(
@@ -60,7 +58,7 @@ function(handle_gyb_source_single dependency_out_var_name)
       COMMAND
           "${CMAKE_COMMAND}" -E make_directory "${dir}"
       COMMAND
-          "$<TARGET_FILE:Python2::Interpreter>" "${gyb_tool}" ${SWIFT_GYB_FLAGS} ${GYB_SINGLE_FLAGS} -o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
+          "$<TARGET_FILE:Python3::Interpreter>" "${gyb_tool}" ${SWIFT_GYB_FLAGS} ${GYB_SINGLE_FLAGS} -o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
       COMMAND
           "${CMAKE_COMMAND}" -E copy_if_different "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_OUTPUT}"
       COMMAND
diff --git a/cmake/modules/SwiftSharedCMakeConfig.cmake b/cmake/modules/SwiftSharedCMakeConfig.cmake
index 5bddf37d86816..c4c15084fe902 100644
--- a/cmake/modules/SwiftSharedCMakeConfig.cmake
+++ b/cmake/modules/SwiftSharedCMakeConfig.cmake
@@ -58,7 +58,7 @@ macro(swift_common_standalone_build_config_llvm product)
     fix_imported_targets_for_xcode("${LLVM_EXPORTED_TARGETS}")
   endif()
 
-  if(NOT CMAKE_CROSSCOMPILING)
+  if(NOT CMAKE_CROSSCOMPILING AND NOT SWIFT_CROSS_COMPILING)
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
   endif()
 
diff --git a/docs/ABI/TypeMetadata.rst b/docs/ABI/TypeMetadata.rst
index a74ad24ec5899..533b387e51594 100644
--- a/docs/ABI/TypeMetadata.rst
+++ b/docs/ABI/TypeMetadata.rst
@@ -222,13 +222,18 @@ classes.
   record is stored at **offset 0**, in place of an integer kind discriminator.
 - The **super pointer** pointing to the metadata record for the superclass is
   stored at **offset 1**. If the class is a root class, it is null.
-- Two words are reserved for use by the Objective-C runtime at **offset 2**
-  and **offset 3**.
-- The **rodata pointer** is stored at **offset 4**; it points to an Objective-C
-  compatible rodata record for the class. This pointer value includes a tag.
+- On platforms which support Objective-C interoperability, two words are
+  reserved for use by the Objective-C runtime at **offset 2** and **offset
+  3**; on other platforms, nothing is reserved.
+- On platforms which support Objective-C interoperability, the **rodata 
+  pointer** is stored at **offset 4**; on other platforms, it is not present. 
+  The rodata pointer points to an Objective-C compatible rodata record for the 
+  class. This pointer value includes a tag.
   The **low bit is always set to 1** for Swift classes and always set to 0 for
   Objective-C classes.
-- The **class flags** are a 32-bit field at **offset 5**.
+- The **class flags** are a 32-bit field at **offset 5** on platforms which 
+  support Objective-C interoperability; on other platforms, the field is at 
+  **offset 2**.
 - The **instance address point** is a 32-bit field following the class flags.
   A pointer to an instance of this class points this number of bytes after the
   beginning of the instance.
@@ -246,8 +251,11 @@ classes.
   object size.  This is the number of bytes of storage in the class metadata
   object.
 - The `nominal type descriptor`_ for the most-derived class type is referenced
-  at an offset immediately following the class object address point. This is
-  **offset 8** on a 64-bit platform or **offset 11** on a 32-bit platform.
+  at an offset immediately following the class object address point. On 64-bit
+  and 32-bit platforms which support Objective-C interoperability, this is,
+  respectively, at **offset 8** and at **offset 11**; in platforms that do not
+  support Objective-C interoperability, this is, respectively, at **offset 5** 
+  and at **offset 8**.
 - For each Swift class in the class's inheritance hierarchy, in order starting
   from the root class and working down to the most derived class, the following
   fields are present:
diff --git a/docs/Android.md b/docs/Android.md
index d0bbd19180910..77d6b46479d2d 100644
--- a/docs/Android.md
+++ b/docs/Android.md
@@ -103,10 +103,9 @@ $ NDK_PATH="path/to/android-ndk21"
 $ build/Ninja-ReleaseAssert/swift-linux-x86_64/bin/swiftc \     # The Swift compiler built in the previous step.
                                                                 # The location of the tools used to build Android binaries
     -tools-directory ${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/ \
-    -target armv7a-none-linux-androideabi \                     # Targeting android-armv7.
-    -sdk ${NDK_PATH}/platforms/android-21/arch-arm \            # Use the same architecture and API version as you used to build the stdlib in the previous step.
-    -Xclang-linker -nostdlib++ \                                # Don't link libc++, and supply the path to libgcc.
+    -target armv7a-none-linux-androideabi \                     # Targeting android-armv7, and supply the path to libgcc.
     -L ${NDK_PATH}/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a \
+    -sdk ${NDK_PATH}/platforms/android-21/arch-arm \            # Use the same architecture and API version as you used to build the stdlib in the previous step.
     hello.swift
 ```
 
diff --git a/docs/DifferentiableProgramming.md b/docs/DifferentiableProgramming.md
index 0cec90aa47712..91b396adada17 100644
--- a/docs/DifferentiableProgramming.md
+++ b/docs/DifferentiableProgramming.md
@@ -1,7 +1,7 @@
 # Differentiable Programming Manifesto
 
 *   Authors: [Richard Wei], [Dan Zheng], [Marc Rasi], [Bart Chrzaszcz]
-*   Status: Partially implemented
+*   Status: Partially implemented on master, feature gated under `import _Differentiation`
 
 ## Table of contents
 
@@ -1949,7 +1949,7 @@ One concrete example is `sinf(_:)` from the C standard library. It can be made
 differentiable by defining a derivative retroactively.
 
 ```swift
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import func Darwin.sinf
 #else
 import func Glibc.sinf
diff --git a/docs/ExternalResources.md b/docs/ExternalResources.md
new file mode 100644
index 0000000000000..b8bf3849ee728
--- /dev/null
+++ b/docs/ExternalResources.md
@@ -0,0 +1,176 @@
+# External Resources
+
+The official [Swift blog](https://swift.org/blog/) has a lot of useful
+information, such as [how runtime reflection works][mirror-post] and how the
+compiler's [new diagnostic architecture][diagnostic-arch-post] is structured.
+
+[mirror-post]: https://swift.org/blog/how-mirror-works/
+[diagnostic-arch-post]: https://swift.org/blog/new-diagnostic-arch-overview/
+
+This page lists some external resources apart from the Swift blog which may be
+helpful for people interested in contributing to Swift. The resources are listed
+in reverse-chronological order and organized by topic.
+
+<!--
+Some resources don't fall cleanly into one topic bucket or another; in such a
+case we break the tie arbitrarily.
+-->
+
+<!--
+The textual descriptions should be written in a way that makes it clear
+which topics are discussed, and what a potential contributor to Swift
+will gain from it. This is usually different from the talk's abstract.
+-->
+
+## Contributing Guides and Tips
+
+- [Steps for first PR and asking questions][] by Varun Gandhi (Swift forum
+  comment, Dec 2019).
+- [Contributing to Swift for the First Time][] by Robert Pieta (talk, Jun 2019):
+  This talk describes Robert's experience contributing to
+  `swift-corelibs-foundation` and later `swift`, providing a step-by-step guide
+  for new contributors to get their feet wet.
+- [Contributing to Swift compiler][] by Yusuke Kita (lightning talk, Apr 2019).
+- Contributing to Swift ([Part 1][Contributing to Swift - Part 1],
+  [Part 2][Contributing to Swift - Part 2]) by Suyash Srijan (blog post series,
+  Dec 2018).
+- [Setting up a compile-edit-test cycle][] by Robert Widmann (Swift forum
+  comment, May 2018)
+- [Becoming an Effective Contributor to Swift][] by Harlan Haskins and Robert
+  Widmann (talk, Apr 2018): Covers the following topics:
+  - The organization of different projects part of the Swift monorepo.
+  - How to set up an environment for building Swift.
+  - Common utilities and compiler flags for debugging different stages.
+  - Common build configurations.
+  - Tips and tricks for testing: early exiting, filtering tests,
+    testing Swift and Objective-C together, using `PrettyStackTrace`.
+  - A live demo fixing a crash:
+    - Copying program arguments into Xcode for debugging.
+    - Using `dump()` for print debugging.
+- [Getting Started with Swift Compiler Development][] by Brian Gesiak (blog post
+  series, Aug 2017 - Jun 2018)
+- [Contributing to Open Source Swift][] by Jesse Squires (talk, Mar 2016):
+  Covers the following topics:
+  - The overall compiler pipeline.
+  - The organization of different projects part of the Swift monorepo,
+    including some "difficulty levels" for different projects.
+  - Tips for contributing effectively.
+
+[Steps for first PR and asking questions]:
+https://forums.swift.org/t/getting-started-with-swift-compiler-development/31502/2
+[Contributing to Swift for the First Time]: https://youtu.be/51j7TrFNKiA
+[Contributing to Swift compiler]: https://youtu.be/HAXJsgYniqE
+[Contributing to Swift - Part 1]: https://medium.com/kinandcartacreated/contributing-to-swift-part-1-ea19108a2a54
+[Contributing to Swift - Part 2]:
+https://medium.com/kinandcartacreated/contributing-to-swift-part-2-efebcf7b6c93
+[Setting up a compile-edit-test cycle]: https://forums.swift.org/t/need-a-workflow-advice/12536/14
+[Becoming an Effective Contributor to Swift]: https://youtu.be/oGJKsp-pZPk
+[Getting Started with Swift Compiler Development]: https://modocache.io/getting-started-with-swift-development
+[Contributing to Open Source Swift]: https://youtu.be/Ysa2n8ZX-YY
+
+## AST
+
+- [The secret life of types in Swift][] by Slava Pestov (blog post, Jul 2016):
+  This blog post describes the representation of Swift types inside the compiler.
+  It covers many important concepts: `TypeLoc` vs `TypeRepr` vs `Type`, the
+  representation of generic types, substitutions and more.
+  <!-- TODO: It would be great to integrate some of the descriptions
+       in this blog post into the compiler's own doc comments. -->
+
+[The secret life of types in Swift]: https://medium.com/@slavapestov/the-secret-life-of-types-in-swift-ff83c3c000a5
+
+### libSyntax and SwiftSyntax
+
+- [An overview of SwiftSyntax][] by Luciano Almeida (blog post, Apr 2019):
+  This post provides a quick tour of libSyntax and SwiftSyntax.
+- [Improving Swift Tools with libSyntax][] by Harlan Haskins (talk, Sep 2017):
+  This talk describes the design of libSyntax/SwiftSyntax and discusses some
+  useful APIs. It also describes how to write a simple Swift formatter using the
+  library.
+
+[An overview of SwiftSyntax]: https://medium.com/@lucianoalmeida1/an-overview-of-swiftsyntax-cf1ae6d53494
+[Improving Swift Tools with libSyntax]: https://youtu.be/5ivuYGxW_3M
+
+## Type checking and inference
+
+- [Implementing Swift Generics][] by Slava Pestov and John McCall (talk, Oct 2017):
+  This talk dives into how Swift's compilation scheme for generics balances
+  (a) modularity and separate compilation with (b) the ability to pass unboxed
+  values and (c) the flexibility to optionally generate fully specialized code.
+  It covers the following type-checking related topics: type-checking generic
+  contexts, requirement paths and canonicalized generic signatures.
+- [A Type System from Scratch][] by Robert Widmann (talk, Apr 2017):
+  This talk covers several topics related to type-checking and inference in Swift:
+  - Understanding sequent notation which can be used to represent typing judgments.
+  - An overview of how bidirectional type-checking works.
+  - Examples of checking and inferring types for some Swift expressions.
+  - Interaction complexity of different type system features with type inference.
+  - Type variables and constraint graphs.
+
+[Implementing Swift Generics]: https://youtu.be/ctS8FzqcRug
+[A Type System from Scratch]: https://youtu.be/IbjoA5xVUq0
+
+## SIL
+
+- [Ownership SSA][] by Michael Gottesman (talk, Oct 2019): This talk describes
+  efficiency and correctness challenges with automatic reference counting and
+  how including ownership semantics in the compiler's intermediate representation
+  helps tackles those challenges.
+- [How to talk to your kids about SIL type use][] by Slava Pestov (blog post,
+  Jul 2016): This blog post describes several important SIL concepts: object
+  vs address types, AST -> SIL type lowering, trivial vs loadable vs
+  address-only SIL types, abstraction patterns and more.
+- [Swift's High-Level IR][] by Joe Groff and Chris Lattner (talk, Oct 2015):
+  This talk describes the goals and design of SIL. It covers the following:
+  - Some commonly used SIL instructions and how they are motivated by language
+    features.
+  - Some early passes in SIL processing, such as mandatory inlining,
+    box-to-stack promotion and definite initialization.
+  - Why SIL is useful as an intermediate representation between the AST and
+    LLVM IR.
+
+[Ownership SSA]: https://youtu.be/qy3iZPHZ88o
+[How to talk to your kids about SIL type use]: https://medium.com/@slavapestov/how-to-talk-to-your-kids-about-sil-type-use-6b45f7595f43
+[Swift's High-Level IR]: https://youtu.be/Ntj8ab-5cvE
+
+## Code generation, runtime and ABI
+
+- [How Swift Achieved Dynamic Linking Where Rust Couldn't][] by Alexis
+  Beingessner (blog post, Nov 2019): This blog post describes Swift's approach
+  for compiling polymorphic functions, contrasting it with the strategy used by
+  Rust and C++ (monomorphization). It covers the following topics: ABI stability,
+  library evolution, resilient type layout, reabstraction, materialization,
+  ownership and calling conventions.
+- [arm64e: An ABI for Pointer Authentication][] by Ahmed Bougacha and John McCall
+  (talk, Oct 2019): This talk does not mention Swift specifically, but provides a
+  good background on the arm64e ABI and pointer authentication. The ABI affects
+  parts of IR generation, the Swift runtime, and small parts of the standard
+  library using unsafe code.
+- [Exploiting The Swift ABI][] by Robert Widmann (talk, July 2019):
+  This talk is a whirlwind tour of different aspects of the Swift ABI and runtime
+  touching the following topics: reflection, type layout, ABI entrypoints,
+  Swift's compilation model for generics and archetypes, witness tables,
+  relative references, context descriptors and more.
+- [Efficiently Implementing Runtime Metadata][] by Joe Groff and Doug Gregor
+  (talk, Oct 2018): This talk covers the use of relative references in Swift's
+  runtime metadata structures. After describing some important metrics impacted
+  by the use of dynamic libraries, it goes through the different kinds of
+  relative references used in the Swift runtime and the resulting tooling and
+  performance benefits.
+- [Coroutine Representations and ABIs in LLVM][] by John McCall (talk, Oct 2018):
+  This talk describes several points in the design space for coroutines, diving
+  into important implementation tradeoffs. It explains how different language
+  features can be built on top of coroutines and how they impose different
+  design requirements. It also contrasts C++20's coroutines feature with
+  Swift's accessors, describing the differences between the two as implemented
+  in LLVM.
+- [Implementing Swift Generics][]: This talk is mentioned in the type-checking
+  section. It also covers the following code generation and runtime topics:
+  value witness tables, type metadata, abstraction patterns, reabstraction,
+  reabstraction thunks and protocol witness tables.
+
+[How Swift Achieved Dynamic Linking Where Rust Couldn't]: https://gankra.github.io/blah/swift-abi/
+[arm64e: An ABI for Pointer Authentication]: https://youtu.be/C1nZvpEBfYA
+[Exploiting The Swift ABI]: https://youtu.be/0rHG_Pa86oA
+[Efficiently Implementing Runtime Metadata]: https://youtu.be/G3bpj-4tWVU
+[Coroutine Representations and ABIs in LLVM]: https://youtu.be/wyAbV8AM9PM
diff --git a/docs/README.md b/docs/README.md
index dceb55fa82bda..1492d1ef48430 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -252,12 +252,10 @@ They are preserved mostly for historical interest.
 
 ## External Resources
 
-The official [Swift blog](https://swift.org/blog/) contains a lot of useful
-information, such as how library evolution works and how the compiler's new
-diagnostic architecture is structured, helping us provide more precise
-diagnostics.
-
-TODO: Add a new document ExternalResources.md.
+External resources are listed in [docs/ExternalResources.md](ExternalResources.md).
+These cover a variety of topics,
+such as the design of different aspects of the Swift compiler and runtime
+and contributing to the project more effectively.
 
 ## Uncategorized
 
diff --git a/docs/SIL.rst b/docs/SIL.rst
index 947f166123d33..34143b4724f97 100644
--- a/docs/SIL.rst
+++ b/docs/SIL.rst
@@ -3573,6 +3573,20 @@ the encoding is ``objc_selector``, the string literal produces a
 reference to a UTF-8-encoded Objective-C selector in the Objective-C
 method name segment.
 
+base_addr_for_offset
+````````````````````
+::
+
+  sil-instruction ::= 'base_addr_for_offset' sil-type
+
+  %1 = base_addr_for_offset $*S
+  // %1 has type $*S
+
+Creates a base address for offset calculations. The result can be used by
+address projections, like ``struct_element_addr``, which themselves return the
+offset of the projected fields.
+IR generation simply creates a null pointer for ``base_addr_for_offset``.
+
 Dynamic Dispatch
 ~~~~~~~~~~~~~~~~
 
diff --git a/docs/StandardLibraryProgrammersManual.md b/docs/StandardLibraryProgrammersManual.md
index d3bf123d53d2c..67ded2ecb6613 100644
--- a/docs/StandardLibraryProgrammersManual.md
+++ b/docs/StandardLibraryProgrammersManual.md
@@ -98,7 +98,7 @@ On these platforms, the Swift Standard Library ships as an integrated part of th
 
 #### Unwrapping Optionals
 
-Optionals can be unwrapped with `!`, which triggers a trap on nil. Alternatively, they can be `.unsafelyUnwrapped()`, which will check and trap in debug builds of user code. Internal to the standard library is `._unsafelyUnwrappedUnchecked()` which will only check and trap in debug builds of the standard library itself. These correspond directly with `_precondition`, `_debugPrecondition`, and `_sanityCheck`. See [that section](#precondition) for details.
+Optionals can be unwrapped with `!`, which triggers a trap on nil. Alternatively, they can be `.unsafelyUnwrapped()`, which will check and trap in debug builds of user code. Internal to the standard library is `._unsafelyUnwrappedUnchecked()` which will only check and trap in debug builds of the standard library itself. These correspond directly with `_precondition`, `_debugPrecondition`, and `_internalInvariant`. See [that section](#precondition) for details.
 
 #### UnsafeBitCast and Casting References
 
diff --git a/docs/StdlibRationales.rst b/docs/StdlibRationales.rst
index 3b8503b5a92c8..1a13f5a8109c4 100644
--- a/docs/StdlibRationales.rst
+++ b/docs/StdlibRationales.rst
@@ -174,21 +174,6 @@ call an API with a different name, say ``lazyEnumerate()`` to opt into
 laziness.  The problem is that the eager API, which would have a shorter and
 less obscure name, would be less efficient for the common case.
 
-Use of ``BooleanType`` in library APIs
---------------------------------------
-
-Use ``Bool`` instead of a generic function over a ``BooleanType``, unless there
-are special circumstances (for example, ``func &&`` is designed to work on all
-boolean values so that ``&&`` feels like a part of the language).
-
-``BooleanType`` is a protocol to which only ``Bool`` and ``ObjCBool`` conform.
-Users don't usually interact ``ObjCBool`` instances, except when using certain
-specific APIs (for example, APIs that operate on pointers to ``BOOL``).  If
-someone already has an ``ObjCBool`` instance for whatever strange reason, they
-can just convert it to ``Bool``.  We think this is the right tradeoff:
-simplifying function signatures is more important than making a marginal
-usecase a bit more convenient.
-
 Possible future directions
 ==========================
 
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
index 4ff1060777427..44aff1b7cd009 100644
--- a/include/swift/AST/ASTContext.h
+++ b/include/swift/AST/ASTContext.h
@@ -254,11 +254,6 @@ class ASTContext final {
   /// The request-evaluator that is used to process various requests.
   Evaluator evaluator;
 
-  /// The set of top-level modules we have loaded.
-  /// This map is used for iteration, therefore it's a MapVector and not a
-  /// DenseMap.
-  llvm::MapVector<Identifier, ModuleDecl*> LoadedModules;
-
   /// The builtin module.
   ModuleDecl * const TheBuiltinModule;
 
@@ -654,6 +649,15 @@ class ASTContext final {
   /// metadata.
   AvailabilityContext getPrespecializedGenericMetadataAvailability();
 
+  /// Get the runtime availability of the swift_compareTypeContextDescriptors
+  /// for the target platform.
+  AvailabilityContext getCompareTypeContextDescriptorsAvailability();
+
+  /// Get the runtime availability of the
+  /// swift_compareProtocolConformanceDescriptors entry point for the target
+  /// platform.
+  AvailabilityContext getCompareProtocolConformanceDescriptorsAvailability();
+
   /// Get the runtime availability of features introduced in the Swift 5.2
   /// compiler for the target platform.
   AvailabilityContext getSwift52Availability();
@@ -712,8 +716,11 @@ class ASTContext final {
   ///                compiler.
   /// \param isDWARF \c true if this module loader can load Clang modules
   ///                from DWARF.
+  /// \param IsInterface \c true if this module loader can load Swift textual
+  ///                interface.
   void addModuleLoader(std::unique_ptr<ModuleLoader> loader,
-                       bool isClang = false, bool isDWARF = false);
+                       bool isClang = false, bool isDWARF = false,
+                       bool IsInterface = false);
 
   /// Retrieve the module dependencies for the module with the given name.
   ///
@@ -787,8 +794,26 @@ class ASTContext final {
   /// The loader is owned by the AST context.
   ClangModuleLoader *getDWARFModuleLoader() const;
 
+  /// Retrieve the module interface loader for this ASTContext.
+  ModuleLoader *getModuleInterfaceLoader() const;
+public:
   namelookup::ImportCache &getImportCache() const;
 
+  /// Returns an iterator over the modules that are known by this context
+  /// to be loaded.
+  ///
+  /// Iteration order is guaranteed to match the order in which
+  /// \c addLoadedModule was called to register the loaded module
+  /// with this context.
+  iterator_range<llvm::MapVector<Identifier, ModuleDecl *>::const_iterator>
+  getLoadedModules() const;
+
+  /// Returns the number of loaded modules known by this context to be loaded.
+  unsigned getNumLoadedModules() const {
+    auto eltRange = getLoadedModules();
+    return std::distance(eltRange.begin(), eltRange.end());
+  }
+
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.
@@ -828,6 +853,11 @@ class ASTContext final {
     return const_cast<ASTContext *>(this)->getStdlibModule(false);
   }
 
+  /// Insert an externally-sourced module into the set of known loaded modules
+  /// in this context.
+  void addLoadedModule(ModuleDecl *M);
+
+public:
   /// Retrieve the current generation number, which reflects the
   /// number of times a module import has caused mass invalidation of
   /// lookup tables.
diff --git a/include/swift/AST/ASTDemangler.h b/include/swift/AST/ASTDemangler.h
index 02d8a479337eb..f8582c5e8c41b 100644
--- a/include/swift/AST/ASTDemangler.h
+++ b/include/swift/AST/ASTDemangler.h
@@ -26,6 +26,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "swift/AST/Types.h"
 #include "swift/Demangling/Demangler.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/TypeDecoder.h"
 
 namespace swift {
@@ -33,6 +34,7 @@ namespace swift {
 class TypeDecl;
 
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 Type getTypeForMangling(ASTContext &ctx,
                         llvm::StringRef mangling);
@@ -178,6 +180,7 @@ class ASTBuilder {
                                               Demangle::Node::Kind kind);
 };
 
+SWIFT_END_INLINE_NAMESPACE
 }  // namespace Demangle
 
 }  // namespace swift
diff --git a/include/swift/AST/ASTMangler.h b/include/swift/AST/ASTMangler.h
index f6605561b4adb..d806bcc3fda0c 100644
--- a/include/swift/AST/ASTMangler.h
+++ b/include/swift/AST/ASTMangler.h
@@ -101,7 +101,8 @@ class ASTMangler : public Mangler {
                            SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleDestructorEntity(const DestructorDecl *decl,
-                                     bool isDeallocating, SymbolKind SKind);
+                                     bool isDeallocating,
+                                     SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleConstructorEntity(const ConstructorDecl *ctor,
                                       bool isAllocating,
@@ -120,11 +121,11 @@ class ASTMangler : public Mangler {
 
   std::string mangleDefaultArgumentEntity(const DeclContext *func,
                                           unsigned index,
-                                          SymbolKind SKind);
+                                          SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleInitializerEntity(const VarDecl *var, SymbolKind SKind);
   std::string mangleBackingInitializerEntity(const VarDecl *var,
-                                             SymbolKind SKind);
+                                             SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleNominalType(const NominalTypeDecl *decl);
 
diff --git a/include/swift/AST/ASTPrinter.h b/include/swift/AST/ASTPrinter.h
index 0e5a17c9dcef7..3c28d725ab6bb 100644
--- a/include/swift/AST/ASTPrinter.h
+++ b/include/swift/AST/ASTPrinter.h
@@ -204,7 +204,9 @@ class ASTPrinter {
     return *this << StringRef(&c, 1);
   }
 
-  void printKeyword(StringRef name, PrintOptions Opts, StringRef Suffix = "") {
+  void printKeyword(StringRef name,
+                    const PrintOptions &Opts,
+                    StringRef Suffix = "") {
     if (Opts.SkipUnderscoredKeywords && name.startswith("_"))
       return;
     assert(!name.empty() && "Tried to print empty keyword");
diff --git a/include/swift/AST/ASTTypeIDZone.def b/include/swift/AST/ASTTypeIDZone.def
index 5c1eaa91fe286..daf638f797480 100644
--- a/include/swift/AST/ASTTypeIDZone.def
+++ b/include/swift/AST/ASTTypeIDZone.def
@@ -27,6 +27,7 @@ SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID(Requirement)
 SWIFT_TYPEID(ResilienceExpansion)
 SWIFT_TYPEID(FragileFunctionKind)
+SWIFT_TYPEID(TangentPropertyInfo)
 SWIFT_TYPEID(Type)
 SWIFT_TYPEID(TypePair)
 SWIFT_TYPEID(TypeWitnessAndDecl)
diff --git a/include/swift/AST/ASTTypeIDs.h b/include/swift/AST/ASTTypeIDs.h
index 9359f95427d0e..b81fdc686b9ac 100644
--- a/include/swift/AST/ASTTypeIDs.h
+++ b/include/swift/AST/ASTTypeIDs.h
@@ -19,6 +19,7 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/TypeID.h"
+
 namespace swift {
 
 class AbstractFunctionDecl;
@@ -58,14 +59,14 @@ class Requirement;
 enum class ResilienceExpansion : unsigned;
 struct FragileFunctionKind;
 class SourceFile;
+struct TangentPropertyInfo;
 class Type;
-class ValueDecl;
-class VarDecl;
-class Witness;
 class TypeAliasDecl;
-class Type;
 struct TypePair;
 struct TypeWitnessAndDecl;
+class ValueDecl;
+class VarDecl;
+class Witness;
 enum class AncestryFlags : uint8_t;
 enum class ImplicitMemberAction : uint8_t;
 struct FingerprintAndMembers;
diff --git a/include/swift/AST/Attr.def b/include/swift/AST/Attr.def
index 95504c3477426..fb1085509c8f3 100644
--- a/include/swift/AST/Attr.def
+++ b/include/swift/AST/Attr.def
@@ -494,7 +494,7 @@ SIMPLE_DECL_ATTR(_disfavoredOverload, DisfavoredOverload,
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   87)
 SIMPLE_DECL_ATTR(_functionBuilder, FunctionBuilder,
-  OnNominalType |
+  OnNominalType | UserInaccessible |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   88)
 DECL_ATTR(_projectedValueProperty, ProjectedValueProperty,
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
index d6482297d272f..98eb453af7a36 100644
--- a/include/swift/AST/Attr.h
+++ b/include/swift/AST/Attr.h
@@ -35,6 +35,7 @@
 #include "swift/AST/Ownership.h"
 #include "swift/AST/PlatformKind.h"
 #include "swift/AST/Requirement.h"
+#include "swift/AST/StorageImpl.h"
 #include "swift/AST/TrailingCallArguments.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
@@ -1718,6 +1719,7 @@ class OriginallyDefinedInAttr: public DeclAttribute {
 struct DeclNameRefWithLoc {
   DeclNameRef Name;
   DeclNameLoc Loc;
+  Optional<AccessorKind> AccessorKind;
 };
 
 /// Attribute that marks a function as differentiable.
diff --git a/include/swift/AST/AutoDiff.h b/include/swift/AST/AutoDiff.h
index 5b447027b20c5..18524c9933e9e 100644
--- a/include/swift/AST/AutoDiff.h
+++ b/include/swift/AST/AutoDiff.h
@@ -35,6 +35,7 @@ class AnyFunctionType;
 class SourceFile;
 class SILFunctionType;
 class TupleType;
+class VarDecl;
 
 /// A function type differentiability kind.
 enum class DifferentiabilityKind : uint8_t {
@@ -459,6 +460,99 @@ class DerivativeFunctionTypeError
   }
 };
 
+/// Describes the "tangent stored property" corresponding to an original stored
+/// property in a `Differentiable`-conforming type.
+///
+/// The tangent stored property is the stored property in the `TangentVector`
+/// struct of the `Differentiable`-conforming type, with the same name as the
+/// original stored property and with the original stored property's
+/// `TangentVector` type.
+struct TangentPropertyInfo {
+  struct Error {
+    enum class Kind {
+      /// The original property is `@noDerivative`.
+      NoDerivativeOriginalProperty,
+      /// The nominal parent type does not conform to `Differentiable`.
+      NominalParentNotDifferentiable,
+      /// The original property's type does not conform to `Differentiable`.
+      OriginalPropertyNotDifferentiable,
+      /// The parent `TangentVector` type is not a struct.
+      ParentTangentVectorNotStruct,
+      /// The parent `TangentVector` struct does not declare a stored property
+      /// with the same name as the original property.
+      TangentPropertyNotFound,
+      /// The tangent property's type is not equal to the original property's
+      /// `TangentVector` type.
+      TangentPropertyWrongType,
+      /// The tangent property is not a stored property.
+      TangentPropertyNotStored
+    };
+
+    /// The error kind.
+    Kind kind;
+
+  private:
+    union Value {
+      Type type;
+      Value(Type type) : type(type) {}
+      Value() {}
+    } value;
+
+  public:
+    Error(Kind kind) : kind(kind), value() {
+      assert(kind == Kind::NoDerivativeOriginalProperty ||
+             kind == Kind::NominalParentNotDifferentiable ||
+             kind == Kind::OriginalPropertyNotDifferentiable ||
+             kind == Kind::ParentTangentVectorNotStruct ||
+             kind == Kind::TangentPropertyNotFound ||
+             kind == Kind::TangentPropertyNotStored);
+    };
+
+    Error(Kind kind, Type type) : kind(kind), value(type) {
+      assert(kind == Kind::TangentPropertyWrongType);
+    };
+
+    Type getType() const {
+      assert(kind == Kind::TangentPropertyWrongType);
+      return value.type;
+    }
+
+    friend bool operator==(const Error &lhs, const Error &rhs);
+  };
+
+  /// The tangent stored property.
+  VarDecl *tangentProperty = nullptr;
+
+  /// An optional error.
+  Optional<Error> error = None;
+
+private:
+  TangentPropertyInfo(VarDecl *tangentProperty, Optional<Error> error)
+      : tangentProperty(tangentProperty), error(error) {}
+
+public:
+  TangentPropertyInfo(VarDecl *tangentProperty)
+      : TangentPropertyInfo(tangentProperty, None) {}
+
+  TangentPropertyInfo(Error::Kind errorKind)
+      : TangentPropertyInfo(nullptr, Error(errorKind)) {}
+
+  TangentPropertyInfo(Error::Kind errorKind, Type errorType)
+      : TangentPropertyInfo(nullptr, Error(errorKind, errorType)) {}
+
+  /// Returns `true` iff this tangent property info is valid.
+  bool isValid() const { return tangentProperty && !error; }
+
+  explicit operator bool() const { return isValid(); }
+
+  friend bool operator==(const TangentPropertyInfo &lhs,
+                         const TangentPropertyInfo &rhs) {
+    return lhs.tangentProperty == rhs.tangentProperty && lhs.error == rhs.error;
+  }
+};
+
+void simple_display(llvm::raw_ostream &OS, TangentPropertyInfo info);
+
 /// The key type used for uniquing `SILDifferentiabilityWitness` in
 /// `SILModule`: original function name, parameter indices, result indices, and
 /// derivative generic signature.
diff --git a/include/swift/AST/AvailabilitySpec.h b/include/swift/AST/AvailabilitySpec.h
index 05c0752bffaab..86b0342419a1a 100644
--- a/include/swift/AST/AvailabilitySpec.h
+++ b/include/swift/AST/AvailabilitySpec.h
@@ -68,16 +68,33 @@ class PlatformVersionConstraintAvailabilitySpec : public AvailabilitySpec {
   SourceLoc PlatformLoc;
 
   llvm::VersionTuple Version;
+
+  // For macOS Big Sur, we canonicalize 10.16 to 11.0 for compile-time
+  // checking since clang canonicalizes availability markup. However, to
+  // support Beta versions of macOS Big Sur where the OS
+  // reports 10.16 at run time, we need to compare against 10.16,
+  //
+  // This means for:
+  //
+  // if #available(macOS 10.16, *) { ... }
+  //
+  // we need to keep around both a canonical version for use in compile-time
+  // checks and an uncanonicalized version for the version to actually codegen
+  // with.
+  llvm::VersionTuple RuntimeVersion;
+
   SourceRange VersionSrcRange;
 
 public:
   PlatformVersionConstraintAvailabilitySpec(PlatformKind Platform,
                                             SourceLoc PlatformLoc,
                                             llvm::VersionTuple Version,
+                                            llvm::VersionTuple RuntimeVersion,
                                             SourceRange VersionSrcRange)
     : AvailabilitySpec(AvailabilitySpecKind::PlatformVersionConstraint),
       Platform(Platform),
       PlatformLoc(PlatformLoc), Version(Version),
+      RuntimeVersion(RuntimeVersion),
       VersionSrcRange(VersionSrcRange) {}
 
   /// The required platform.
@@ -93,6 +110,11 @@ class PlatformVersionConstraintAvailabilitySpec : public AvailabilitySpec {
   llvm::VersionTuple getVersion() const { return Version; }
   SourceRange getVersionSrcRange() const { return VersionSrcRange; }
 
+  // The version to be used in codegen for version comparisons at run time.
+  // This is required to support beta versions of macOS Big Sur that
+  // report 10.16 at run time.
+  llvm::VersionTuple getRuntimeVersion() const { return RuntimeVersion; }
+
   SourceRange getSourceRange() const;
 
   void print(raw_ostream &OS, unsigned Indent) const;
diff --git a/include/swift/AST/CMakeLists.txt b/include/swift/AST/CMakeLists.txt
new file mode 100644
index 0000000000000..ebc60523cb0d8
--- /dev/null
+++ b/include/swift/AST/CMakeLists.txt
@@ -0,0 +1,3 @@
+swift_install_in_component(DIRECTORY diagnostics
+                           DESTINATION "share/swift/"
+                           COMPONENT compiler)
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
index 8b372835d08b1..8848b5c2360a1 100644
--- a/include/swift/AST/Decl.h
+++ b/include/swift/AST/Decl.h
@@ -535,7 +535,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     NumRequirementsInSignature : 16
   );
 
-  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+1+2+1+1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(ClassDecl, NominalTypeDecl, 1+1+2+1+1+1+1+1,
     /// Whether this class inherits its superclass's convenience initializers.
     InheritsSuperclassInits : 1,
     ComputedInheritsSuperclassInits : 1,
@@ -543,9 +543,6 @@ class alignas(1 << DeclAlignInBits) Decl {
     /// \see ClassDecl::ForeignKind
     RawForeignKind : 2,
 
-    /// \see ClassDecl::getEmittedMembers()
-    HasForcedEmittedMembers : 1,
-
     HasMissingDesignatedInitializers : 1,
     ComputedHasMissingDesignatedInitializers : 1,
 
@@ -3856,14 +3853,6 @@ class ClassDecl final : public NominalTypeDecl {
     llvm::PointerIntPair<Type, 1, bool> SuperclassType;
   } LazySemanticInfo;
 
-  bool hasForcedEmittedMembers() const {
-    return Bits.ClassDecl.HasForcedEmittedMembers;
-  }
-
-  void setHasForcedEmittedMembers() {
-    Bits.ClassDecl.HasForcedEmittedMembers = true;
-  }
-
   Optional<bool> getCachedInheritsSuperclassInitializers() const {
     if (Bits.ClassDecl.ComputedInheritsSuperclassInits)
       return Bits.ClassDecl.InheritsSuperclassInits;
@@ -4089,7 +4078,7 @@ class ClassDecl final : public NominalTypeDecl {
 
   /// Get all the members of this class, synthesizing any implicit members
   /// that appear in the vtable if needed.
-  DeclRange getEmittedMembers() const;
+  ArrayRef<Decl *> getEmittedMembers() const;
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {
@@ -5502,35 +5491,10 @@ class ParamDecl : public VarDecl {
   }
 
   /// Does this parameter reject temporary pointer conversions?
-  bool isNonEphemeral() const {
-    if (getAttrs().hasAttribute<NonEphemeralAttr>())
-      return true;
-
-    // Only pointer parameters can be non-ephemeral.
-    auto ty = getInterfaceType();
-    if (!ty->lookThroughSingleOptionalType()->getAnyPointerElementType())
-      return false;
-
-    // Enum element pointer parameters are always non-ephemeral.
-    auto *parentDecl = getDeclContext()->getAsDecl();
-    if (parentDecl && isa<EnumElementDecl>(parentDecl))
-      return true;
-
-    return false;
-  }
+  bool isNonEphemeral() const;
 
   /// Attempt to apply an implicit `@_nonEphemeral` attribute to this parameter.
-  void setNonEphemeralIfPossible() {
-    // Don't apply the attribute if this isn't a pointer param.
-    auto type = getInterfaceType();
-    if (!type->lookThroughSingleOptionalType()->getAnyPointerElementType())
-      return;
-
-    if (!getAttrs().hasAttribute<NonEphemeralAttr>()) {
-      auto &ctx = getASTContext();
-      getAttrs().add(new (ctx) NonEphemeralAttr(/*IsImplicit*/ true));
-    }
-  }
+  void setNonEphemeralIfPossible();
 
   /// Remove the type of this varargs element designator, without the array
   /// type wrapping it.  A parameter like "Int..." will have formal parameter
diff --git a/include/swift/AST/DiagnosticEngine.h b/include/swift/AST/DiagnosticEngine.h
index 3abd15ea0f224..ef9160641981e 100644
--- a/include/swift/AST/DiagnosticEngine.h
+++ b/include/swift/AST/DiagnosticEngine.h
@@ -18,9 +18,10 @@
 #ifndef SWIFT_BASIC_DIAGNOSTICENGINE_H
 #define SWIFT_BASIC_DIAGNOSTICENGINE_H
 
-#include "swift/AST/TypeLoc.h"
 #include "swift/AST/DeclNameLoc.h"
 #include "swift/AST/DiagnosticConsumer.h"
+#include "swift/AST/LocalizationFormat.h"
+#include "swift/AST/TypeLoc.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/VersionTuple.h"
@@ -629,7 +630,7 @@ namespace swift {
     DiagnosticState(DiagnosticState &&) = default;
     DiagnosticState &operator=(DiagnosticState &&) = default;
   };
-    
+
   /// Class responsible for formatting diagnostics and presenting them
   /// to the user.
   class DiagnosticEngine {
@@ -663,6 +664,10 @@ namespace swift {
     /// but rather stored until all transactions complete.
     llvm::StringSet<llvm::BumpPtrAllocator &> TransactionStrings;
 
+    /// Diagnostic producer to handle the logic behind retrieving a localized
+    /// diagnostic message.
+    std::unique_ptr<diag::LocalizationProducer> localization;
+
     /// The number of open diagnostic transactions. Diagnostics are only
     /// emitted once all transactions have closed.
     unsigned TransactionCount = 0;
@@ -734,6 +739,13 @@ namespace swift {
       return diagnosticDocumentationPath;
     }
 
+    void setLocalization(std::string locale, std::string path) {
+      assert(!locale.empty());
+      assert(!path.empty());
+      localization =
+          std::make_unique<diag::YAMLLocalizationProducer>(locale, path);
+    }
+
     void ignoreDiagnostic(DiagID id) {
       state.setDiagnosticBehavior(id, DiagnosticState::Behavior::Ignore);
     }
@@ -955,8 +967,7 @@ namespace swift {
     void emitTentativeDiagnostics();
 
   public:
-    static const char *diagnosticStringFor(const DiagID id,
-                                           bool printDiagnosticName);
+    const char *diagnosticStringFor(const DiagID id, bool printDiagnosticName);
 
     /// If there is no clear .dia file for a diagnostic, put it in the one
     /// corresponding to the SourceLoc given here.
diff --git a/include/swift/AST/DiagnosticsFrontend.def b/include/swift/AST/DiagnosticsFrontend.def
index 7aa018966646b..3557e0486cb58 100644
--- a/include/swift/AST/DiagnosticsFrontend.def
+++ b/include/swift/AST/DiagnosticsFrontend.def
@@ -76,6 +76,13 @@ ERROR(error_unknown_arg,none,
       "unknown argument: '%0'", (StringRef))
 ERROR(error_invalid_arg_value,none,
       "invalid value '%1' in '%0'", (StringRef, StringRef))
+WARNING(warning_invalid_locale_code,none,
+      "unsupported locale code; supported locale codes are: '%0'", (StringRef))
+WARNING(warning_locale_path_not_found,none,
+      "specified localization directory '%0' does not exist, "
+      "translation is disabled", (StringRef))
+WARNING(warning_cannot_find_locale_file,none,
+      "cannot find translations for '%0' at '%1': no such file", (StringRef, StringRef))
 WARNING(warning_cannot_multithread_batch_mode,none,
       "ignoring -num-threads argument; cannot multithread batch mode", ())
 ERROR(error_unsupported_option_argument,none,
@@ -251,6 +258,14 @@ ERROR(previous_installname_map_corrupted,none,
       "previous install name map from %0 is malformed",
       (StringRef))
 
+ERROR(explicit_swift_module_map_missing,none,
+      "cannot open explicit Swift module map from %0",
+      (StringRef))
+
+ERROR(explicit_swift_module_map_corrupted,none,
+      "explicit Swift module map from %0 is malformed",
+      (StringRef))
+
 REMARK(default_previous_install_name, none,
       "default previous install name for %0 is %1", (StringRef, StringRef))
 
@@ -299,6 +314,9 @@ ERROR(error_optimization_remark_pattern, none, "%0 in '%1'",
 ERROR(error_invalid_debug_prefix_map, none,
       "invalid argument '%0' to -debug-prefix-map; it must be of the form "
       "'original=remapped'", (StringRef))
+ERROR(error_invalid_coverage_prefix_map, none,
+      "invalid argument '%0' to -coverage-prefix-map; it must be of the form "
+      "'original=remapped'", (StringRef))
 
 
 ERROR(error_unable_to_write_swift_ranges_file, none,
diff --git a/include/swift/AST/DiagnosticsSIL.def b/include/swift/AST/DiagnosticsSIL.def
index 34ca3c7b08c86..047a9b3366fe0 100644
--- a/include/swift/AST/DiagnosticsSIL.def
+++ b/include/swift/AST/DiagnosticsSIL.def
@@ -496,17 +496,28 @@ NOTE(autodiff_cannot_differentiate_through_multiple_results,none,
      "cannot differentiate through multiple results", ())
 NOTE(autodiff_cannot_differentiate_through_inout_arguments,none,
      "cannot differentiate through 'inout' arguments", ())
-// TODO(TF-1149): Remove this diagnostic.
-NOTE(autodiff_loadable_value_addressonly_tangent_unsupported,none,
-     "cannot yet differentiate value whose type %0 has a compile-time known "
-     "size, but whose 'TangentVector' contains stored properties of unknown "
-     "size; consider modifying %1 to use fewer generic parameters in stored "
-     "properties", (Type, Type))
 NOTE(autodiff_enums_unsupported,none,
      "differentiating enum values is not yet supported", ())
+NOTE(autodiff_stored_property_parent_not_differentiable,none,
+     "cannot differentiate access to property '%0.%1' because '%0' does not "
+     "conform to 'Differentiable'", (StringRef, StringRef))
+NOTE(autodiff_stored_property_not_differentiable,none,
+     "cannot differentiate access to property '%0.%1' because property type %2 "
+     "does not conform to 'Differentiable'", (StringRef, StringRef, Type))
+NOTE(autodiff_stored_property_tangent_not_struct,none,
+     "cannot differentiate access to property '%0.%1' because "
+     "'%0.TangentVector' is not a struct", (StringRef, StringRef))
 NOTE(autodiff_stored_property_no_corresponding_tangent,none,
-     "property cannot be differentiated because '%0.TangentVector' does not "
-     "have a member named '%1'", (StringRef, StringRef))
+     "cannot differentiate access to property '%0.%1' because "
+     "'%0.TangentVector' does not have a stored property named '%1'",
+     (StringRef, StringRef))
+NOTE(autodiff_tangent_property_wrong_type,none,
+     "cannot differentiate access to property '%0.%1' because "
+     "'%0.TangentVector.%1' does not have expected type %2",
+     (StringRef, StringRef, /*originalPropertyTanType*/ Type))
+NOTE(autodiff_tangent_property_not_stored,none,
+     "cannot differentiate access to property '%0.%1' because "
+     "'%0.TangentVector.%1' is not a stored property", (StringRef, StringRef))
 NOTE(autodiff_coroutines_not_supported,none,
      "differentiation of coroutine calls is not yet supported", ())
 NOTE(autodiff_cannot_differentiate_writes_to_global_variables,none,
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
index 7467f35798830..f40b05ee93584 100644
--- a/include/swift/AST/DiagnosticsSema.def
+++ b/include/swift/AST/DiagnosticsSema.def
@@ -253,6 +253,10 @@ ERROR(no_candidates_match_result_type,none,
       "no '%0' candidates produce the expected contextual result type %1",
       (StringRef, Type))
 
+ERROR(no_candidates_match_argument_type,none,
+      "no '%0' candidates produce the expected type %1 for parameter #%2",
+      (StringRef, Type, unsigned))
+
 ERROR(cannot_infer_closure_parameter_type,none,
       "unable to infer type of a closure parameter %0 in the current context",
        (StringRef))
@@ -1071,6 +1075,9 @@ ERROR(optional_base_not_unwrapped,none,
 NOTE(optional_base_chain,none,
      "chain the optional using '?' to access member %0 only for non-'nil' "
      "base values", (DeclNameRef))
+NOTE(optional_base_remove_optional_for_keypath_root, none,
+     "use unwrapped type %0 as key path root", (Type))
+
 ERROR(missing_unwrap_optional_try,none,
       "value of optional type %0 not unwrapped; did you mean to use 'try!' "
       "or chain with '?'?",
@@ -1794,11 +1801,11 @@ ERROR(type_cannot_conform_to_nsobject,none,
 
 ERROR(use_of_equal_instead_of_equality,none,
       "use of '=' in a boolean context, did you mean '=='?", ())
-
 ERROR(type_cannot_conform, none,
-      "%select{|value of protocol }0type %1 cannot conform to %2; "
-      "only struct/enum/class types can conform to protocols",
-      (bool, Type, Type))
+      "%select{type %1|protocol %1 as a type}0 cannot conform to "
+      "%select{%3|the protocol itself}2; "
+      "only concrete types such as structs, enums and classes can conform to protocols",
+      (bool, Type, bool, Type))
 NOTE(required_by_opaque_return,none,
     "required by opaque return type of %0 %1", (DescriptiveDeclKind, DeclName))
 NOTE(required_by_decl,none,
@@ -2685,7 +2692,8 @@ ERROR(decl_from_hidden_module,none,
       "in an extension with public or '@usableFromInline' members|"
       "in an extension with conditional conformances}2; "
       "%select{%3 has been imported as implementation-only|"
-      "it is an SPI imported from %3}4",
+      "it is an SPI imported from %3|"
+      "it is SPI}4",
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 ERROR(conformance_from_implementation_only_module,none,
       "cannot use conformance of %0 to %1 %select{here|as property wrapper here|"
@@ -3087,6 +3095,16 @@ ERROR(derivative_attr_class_member_dynamic_self_result_unsupported,none,
 ERROR(derivative_attr_nonfinal_class_init_unsupported,none,
       "cannot register derivative for 'init' in a non-final class; consider "
       "making %0 final", (Type))
+ERROR(derivative_attr_unsupported_accessor_kind,none,
+      "cannot register derivative for %0", (/*accessorKind*/ DescriptiveDeclKind))
+// TODO(SR-13096): Remove this temporary diagnostic.
+ERROR(derivative_attr_class_setter_unsupported,none,
+      "cannot yet register derivative for class property or subscript setters",
+      ())
+// TODO(TF-982): Remove this temporary diagnostic.
+NOTE(derivative_attr_protocol_requirement_unsupported,none,
+     "cannot yet register derivative default implementation for protocol "
+     "requirements", ())
 ERROR(derivative_attr_original_already_has_derivative,none,
       "a derivative already exists for %0", (DeclName))
 NOTE(derivative_attr_duplicate_note,none,
@@ -3122,13 +3140,25 @@ NOTE(transpose_attr_wrt_self_self_type_mismatch_note,none,
      "%1", (Type, Type))
 
 // Automatic differentiation attributes
-ERROR(autodiff_attr_original_decl_invalid_kind,none,
-      "%0 is not a 'func', 'init', 'subscript', or 'var' computed property "
-      "declaration", (DeclNameRef))
-ERROR(autodiff_attr_original_decl_none_valid_found,none,
-      "could not find function %0 with expected type %1", (DeclNameRef, Type))
-ERROR(autodiff_attr_original_decl_not_same_type_context,none,
-      "%0 is not defined in the current type context", (DeclNameRef))
+ERROR(autodiff_attr_original_decl_ambiguous,none,
+      "referenced declaration %0 is ambiguous", (DeclNameRef))
+NOTE(autodiff_attr_original_decl_ambiguous_candidate,none,
+     "candidate %0 found here", (DescriptiveDeclKind))
+ERROR(autodiff_attr_original_decl_none_valid,none,
+      "referenced declaration %0 could not be resolved", (DeclNameRef))
+NOTE(autodiff_attr_original_decl_invalid_kind,none,
+     "candidate %0 is not a 'func', 'init', 'subscript', or 'var' computed "
+     "property declaration", (DescriptiveDeclKind))
+NOTE(autodiff_attr_original_decl_missing_accessor,none,
+     "candidate %0 does not have a %1",
+     (DescriptiveDeclKind, /*accessorDeclKind*/ DescriptiveDeclKind))
+NOTE(autodiff_attr_original_decl_type_mismatch,none,
+     "candidate %0 does not have "
+     "%select{expected type|type equal to or less constrained than}2 %1",
+     (DescriptiveDeclKind, Type, /*hasGenericSignature*/ bool))
+NOTE(autodiff_attr_original_decl_not_same_type_context,none,
+     "candidate %0 is not defined in the current type context",
+     (DescriptiveDeclKind))
 ERROR(autodiff_attr_original_void_result,none,
       "cannot differentiate void function %0", (DeclName))
 ERROR(autodiff_attr_original_multiple_semantic_results,none,
@@ -3137,6 +3167,8 @@ ERROR(autodiff_attr_original_multiple_semantic_results,none,
 ERROR(autodiff_attr_result_not_differentiable,none,
       "can only differentiate functions with results that conform to "
       "'Differentiable', but %0 does not conform to 'Differentiable'", (Type))
+ERROR(autodiff_attr_opaque_result_type_unsupported,none,
+      "cannot differentiate functions returning opaque result types", ())
 
 // differentiation `wrt` parameters clause
 ERROR(diff_function_no_parameters,none,
@@ -4759,7 +4791,8 @@ WARNING(resilience_decl_unavailable_warn,
 ERROR(inlinable_decl_ref_from_hidden_module,
       none, "%0 %1 cannot be used in " FRAGILE_FUNC_KIND "2 "
       "because %select{%3 was imported implementation-only|"
-      "it is an SPI imported from %3}4",
+      "it is an SPI imported from %3|"
+      "it is SPI}4",
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 
 #undef FRAGILE_FUNC_KIND
diff --git a/include/swift/AST/EducationalNotes.def b/include/swift/AST/EducationalNotes.def
index ca30032f17a5f..e4e0ec2a3bd89 100644
--- a/include/swift/AST/EducationalNotes.def
+++ b/include/swift/AST/EducationalNotes.def
@@ -59,11 +59,23 @@ EDUCATIONAL_NOTES(property_wrapper_failable_init,
 EDUCATIONAL_NOTES(property_wrapper_type_requirement_not_accessible,
                   "property-wrapper-requirements.md")
 
+EDUCATIONAL_NOTES(opaque_type_var_no_init, "opaque-type-inference.md")
+EDUCATIONAL_NOTES(opaque_type_no_underlying_type_candidates,
+                  "opaque-type-inference.md")
+EDUCATIONAL_NOTES(opaque_type_mismatched_underlying_type_candidates,
+                  "opaque-type-inference.md")
+EDUCATIONAL_NOTES(opaque_type_self_referential_underlying_type,
+                  "opaque-type-inference.md")
+EDUCATIONAL_NOTES(opaque_type_var_no_underlying_type,
+                  "opaque-type-inference.md")
+
+
 EDUCATIONAL_NOTES(missing_append_interpolation,
                   "string-interpolation-conformance.md")
 EDUCATIONAL_NOTES(append_interpolation_static,
                   "string-interpolation-conformance.md")
 EDUCATIONAL_NOTES(append_interpolation_void_or_discardable,
                   "string-interpolation-conformance.md")
+EDUCATIONAL_NOTES(type_cannot_conform, "protocol-type-non-conformance.md")                
 
 #undef EDUCATIONAL_NOTES
diff --git a/include/swift/AST/Expr.h b/include/swift/AST/Expr.h
index 1cb0976cdfd5e..eaca55f951348 100644
--- a/include/swift/AST/Expr.h
+++ b/include/swift/AST/Expr.h
@@ -5380,6 +5380,13 @@ class KeyPathExpr : public Expr {
       return Loc;
     }
     
+    SourceRange getSourceRange() const {
+      if (auto *indexExpr = getIndexExpr()) {
+        return indexExpr->getSourceRange();
+      }
+      return Loc;
+    }
+    
     Kind getKind() const {
       return KindValue;
     }
diff --git a/include/swift/AST/FineGrainedDependencies.h b/include/swift/AST/FineGrainedDependencies.h
index e904cf4fbe703..bd53f9492211a 100644
--- a/include/swift/AST/FineGrainedDependencies.h
+++ b/include/swift/AST/FineGrainedDependencies.h
@@ -19,6 +19,7 @@
 #include "swift/Basic/Range.h"
 #include "swift/Basic/ReferenceDependencyKeys.h"
 #include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/SetVector.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/YAMLParser.h"
@@ -684,7 +685,7 @@ class SourceFileDepGraphNode : public DepGraphNode {
   size_t sequenceNumber = ~0;
 
   /// Holds the sequence numbers of definitions I depend upon.
-  std::unordered_set<size_t> defsIDependUpon;
+  llvm::SetVector<size_t> defsIDependUpon;
 
   /// True iff a Decl exists for this node.
   /// If a provides and a depends in the existing system both have the same key,
diff --git a/include/swift/AST/GenericSignature.h b/include/swift/AST/GenericSignature.h
index 271e07899698f..68e13a83baa88 100644
--- a/include/swift/AST/GenericSignature.h
+++ b/include/swift/AST/GenericSignature.h
@@ -136,8 +136,10 @@ class GenericSignature {
     return hash_value(sig.getPointer());
   }
 
-  void print(raw_ostream &OS, PrintOptions Options = PrintOptions()) const;
-  void print(ASTPrinter &Printer, PrintOptions Opts = PrintOptions()) const;
+  void print(raw_ostream &OS,
+             const PrintOptions &Options = PrintOptions()) const;
+  void print(ASTPrinter &Printer,
+             const PrintOptions &Opts = PrintOptions()) const;
   SWIFT_DEBUG_DUMP;
   std::string getAsString() const;
 
diff --git a/include/swift/AST/IRGenOptions.h b/include/swift/AST/IRGenOptions.h
index 279fdcefb3c4e..ef745ec6b3772 100644
--- a/include/swift/AST/IRGenOptions.h
+++ b/include/swift/AST/IRGenOptions.h
@@ -169,6 +169,9 @@ class IRGenOptions {
   /// Path prefixes that should be rewritten in debug info.
   PathRemapper DebugPrefixMap;
 
+  /// Path prefixes that should be rewritten in coverage info.
+  PathRemapper CoveragePrefixMap;
+
   /// What level of debug info to generate.
   IRGenDebugInfoLevel DebugInfoLevel : 2;
 
@@ -281,6 +284,9 @@ class IRGenOptions {
   /// Whether to disable using mangled names for accessing concrete type metadata.
   unsigned DisableConcreteTypeMetadataMangledNameAccessors : 1;
 
+  /// The number of threads for multi-threaded code generation.
+  unsigned NumThreads = 0;
+
   /// Path to the profdata file to be used for PGO, or the empty string.
   std::string UseProfile = "";
 
@@ -380,6 +386,10 @@ class IRGenOptions {
   llvm::hash_code getPCHHashComponents() const {
     return llvm::hash_value(0);
   }
+
+  bool hasMultipleIRGenThreads() const { return NumThreads > 1; }
+  bool shouldPerformIRGenerationInParallel() const { return NumThreads != 0; }
+  bool hasMultipleIGMs() const { return hasMultipleIRGenThreads(); }
 };
 
 } // end namespace swift
diff --git a/include/swift/AST/IRGenRequests.h b/include/swift/AST/IRGenRequests.h
index 3cd8212176aee..3887d8f8dca7c 100644
--- a/include/swift/AST/IRGenRequests.h
+++ b/include/swift/AST/IRGenRequests.h
@@ -172,6 +172,13 @@ struct IRGenDescriptor {
                            outModuleHash,
                            LinkerDirectives};
   }
+
+  /// Retrieves the files to perform IR generation for.
+  TinyPtrVector<FileUnit *> getFiles() const;
+
+  /// For a single file, returns its parent module, otherwise returns the module
+  /// itself.
+  ModuleDecl *getParentModule() const;
 };
 
 /// Report that a request of the given kind is being evaluated, so it
@@ -180,10 +187,10 @@ template<typename Request>
 void reportEvaluatedRequest(UnifiedStatsReporter &stats,
                             const Request &request);
 
-class IRGenSourceFileRequest
-    : public SimpleRequest<IRGenSourceFileRequest,
-                           GeneratedModule(IRGenDescriptor),
-                           RequestFlags::Uncached|RequestFlags::DependencySource> {
+class IRGenRequest
+    : public SimpleRequest<IRGenRequest, GeneratedModule(IRGenDescriptor),
+                           RequestFlags::Uncached |
+                               RequestFlags::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -194,33 +201,12 @@ class IRGenSourceFileRequest
   GeneratedModule
   evaluate(Evaluator &evaluator, IRGenDescriptor desc) const;
 
-public:
-  bool isCached() const { return true; }
-
 public:
   // Incremental dependencies.
   evaluator::DependencySource
   readDependencySource(const evaluator::DependencyRecorder &) const;
 };
 
-class IRGenWholeModuleRequest
-    : public SimpleRequest<IRGenWholeModuleRequest,
-                           GeneratedModule(IRGenDescriptor),
-                           RequestFlags::Uncached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  GeneratedModule
-  evaluate(Evaluator &evaluator, IRGenDescriptor desc) const;
-
-public:
-  bool isCached() const { return true; }
-};
-
 void simple_display(llvm::raw_ostream &out, const IRGenDescriptor &d);
 
 SourceLoc extractNearestSourceLoc(const IRGenDescriptor &desc);
diff --git a/include/swift/AST/IRGenTypeIDZone.def b/include/swift/AST/IRGenTypeIDZone.def
index d865c79247fb0..e3f2ff3fba08a 100644
--- a/include/swift/AST/IRGenTypeIDZone.def
+++ b/include/swift/AST/IRGenTypeIDZone.def
@@ -14,10 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-SWIFT_REQUEST(IRGen, IRGenSourceFileRequest,
+SWIFT_REQUEST(IRGen, IRGenRequest,
               GeneratedModule(IRGenDescriptor),
               Uncached, NoLocationInfo)
-SWIFT_REQUEST(IRGen, IRGenWholeModuleRequest,
-              GeneratedModule(IRGenDescriptor),
-              Uncached, NoLocationInfo)
-
diff --git a/include/swift/AST/LocalizationFormat.h b/include/swift/AST/LocalizationFormat.h
new file mode 100644
index 0000000000000..a4205bb85be72
--- /dev/null
+++ b/include/swift/AST/LocalizationFormat.h
@@ -0,0 +1,69 @@
+//===--- LocalizationFormat.h - YAML format for Diagnostic Messages ---*-
+// C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the format for localized diagnostic messages.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_LOCALIZATIONFORMAT_H
+#define SWIFT_LOCALIZATIONFORMAT_H
+
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/YAMLParser.h"
+#include "llvm/Support/YAMLTraits.h"
+#include <string>
+#include <type_traits>
+
+namespace swift {
+enum class DiagID : uint32_t;
+
+namespace diag {
+class LocalizationProducer {
+public:
+  /// If the  message isn't available/localized in the current `yaml` file,
+  /// return the fallback default message.
+  virtual llvm::StringRef getMessageOr(swift::DiagID id,
+                                       llvm::StringRef defaultMessage) const {
+    return defaultMessage;
+  }
+
+  virtual ~LocalizationProducer() {}
+};
+
+class YAMLLocalizationProducer final : public LocalizationProducer {
+public:
+  std::vector<std::string> diagnostics;
+  explicit YAMLLocalizationProducer(std::string locale, std::string path);
+  llvm::StringRef getMessageOr(swift::DiagID id,
+                               llvm::StringRef defaultMessage) const override;
+};
+
+class LocalizationInput : public llvm::yaml::Input {
+  using Input::Input;
+
+  /// Read diagnostics in the YAML file iteratively
+  template <typename T, typename Context>
+  friend typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
+                                 void>::type
+  readYAML(llvm::yaml::IO &io, T &Seq, bool, Context &Ctx);
+
+  template <typename T>
+  friend typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
+                                 LocalizationInput &>::type
+  operator>>(LocalizationInput &yin, T &diagnostics);
+};
+
+} // namespace diag
+} // namespace swift
+
+#endif
diff --git a/include/swift/AST/LocalizationLanguages.def b/include/swift/AST/LocalizationLanguages.def
new file mode 100644
index 0000000000000..98bae1c23f8e1
--- /dev/null
+++ b/include/swift/AST/LocalizationLanguages.def
@@ -0,0 +1,207 @@
+//===--- LocalizationLanguages.def - Localization Languages ----*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file has all language codes defined by ISO 639-1 for localization.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SUPPORTED_LOCALE
+#define SUPPORTED_LOCALE(Code, Language)
+#endif
+
+SUPPORTED_LOCALE(ab, Abkhazian)
+SUPPORTED_LOCALE(aa, Afar)
+SUPPORTED_LOCALE(af, Afrikaans)
+SUPPORTED_LOCALE(ak, Akan)
+SUPPORTED_LOCALE(sq, Albanian)
+SUPPORTED_LOCALE(am, Amharic)
+SUPPORTED_LOCALE(ar, Arabic)
+SUPPORTED_LOCALE(an, Aragonese)
+SUPPORTED_LOCALE(hy, Armenian)
+SUPPORTED_LOCALE(as, Assamese)
+SUPPORTED_LOCALE(av, Avaric)
+SUPPORTED_LOCALE(ae, Avestan)
+SUPPORTED_LOCALE(ay, Aymara)
+SUPPORTED_LOCALE(az, Azerbaijani)
+SUPPORTED_LOCALE(bm, Bambara)
+SUPPORTED_LOCALE(ba, Bashkir)
+SUPPORTED_LOCALE(eu, Basque)
+SUPPORTED_LOCALE(be, Belarusian)
+SUPPORTED_LOCALE(bn, Bengali)
+SUPPORTED_LOCALE(bh, Bihari languages)
+SUPPORTED_LOCALE(bi, Bislama)
+SUPPORTED_LOCALE(bs, Bosnian)
+SUPPORTED_LOCALE(br, Breton)
+SUPPORTED_LOCALE(bg, Bulgarian)
+SUPPORTED_LOCALE(my, Burmese)
+SUPPORTED_LOCALE(ca, Catalan)
+SUPPORTED_LOCALE(km, Central Khmer)
+SUPPORTED_LOCALE(ch, Chamorro)
+SUPPORTED_LOCALE(ce, Chechen)
+SUPPORTED_LOCALE(ny, Chichewa)
+SUPPORTED_LOCALE(zh, Chinese)
+SUPPORTED_LOCALE(cu, Church Slavonic)
+SUPPORTED_LOCALE(cv, Chuvash)
+SUPPORTED_LOCALE(kw, Cornish)
+SUPPORTED_LOCALE(co, Corsican)
+SUPPORTED_LOCALE(cr, Cree)
+SUPPORTED_LOCALE(hr, Croatian)
+SUPPORTED_LOCALE(cs, Czech)
+SUPPORTED_LOCALE(da, Danish)
+SUPPORTED_LOCALE(dv, Divehi)
+SUPPORTED_LOCALE(nl, Dutch)
+SUPPORTED_LOCALE(dz, Dzongkha)
+SUPPORTED_LOCALE(en, English)
+SUPPORTED_LOCALE(eo, Esperanto)
+SUPPORTED_LOCALE(et, Estonian)
+SUPPORTED_LOCALE(ee, Ewe)
+SUPPORTED_LOCALE(fo, Faroese)
+SUPPORTED_LOCALE(fj, Fijian)
+SUPPORTED_LOCALE(fi, Finnish)
+SUPPORTED_LOCALE(fr, French)
+SUPPORTED_LOCALE(ff, Fulah)
+SUPPORTED_LOCALE(gd, Gaelic)
+SUPPORTED_LOCALE(gl, Galician)
+SUPPORTED_LOCALE(lg, Ganda)
+SUPPORTED_LOCALE(ka, Georgian)
+SUPPORTED_LOCALE(de, German)
+SUPPORTED_LOCALE(ki, Kikuyu)
+SUPPORTED_LOCALE(el, Greek)
+SUPPORTED_LOCALE(kl, Kalaallisut)
+SUPPORTED_LOCALE(gn, Guarani)
+SUPPORTED_LOCALE(gu, Gujarati)
+SUPPORTED_LOCALE(ht, Haitian Creole)
+SUPPORTED_LOCALE(ha, Hausa)
+SUPPORTED_LOCALE(he, Hebrew)
+SUPPORTED_LOCALE(hz, Herero)
+SUPPORTED_LOCALE(hi, Hindi)
+SUPPORTED_LOCALE(ho, Hiri Motu)
+SUPPORTED_LOCALE(hu, Hungarian)
+SUPPORTED_LOCALE(is, Icelandic)
+SUPPORTED_LOCALE(io, Ido)
+SUPPORTED_LOCALE(ig, Igbo)
+SUPPORTED_LOCALE(id, Indonesian)
+SUPPORTED_LOCALE(ia, Interlingua)
+SUPPORTED_LOCALE(ie, Interlingue)
+SUPPORTED_LOCALE(iu, Inuktitut)
+SUPPORTED_LOCALE(ik, Inupiaq)
+SUPPORTED_LOCALE(ga, Irish)
+SUPPORTED_LOCALE(it, Italian)
+SUPPORTED_LOCALE(ja, Japanese)
+SUPPORTED_LOCALE(jv, Javanese)
+SUPPORTED_LOCALE(kn, Kannada)
+SUPPORTED_LOCALE(kr, Kanuri)
+SUPPORTED_LOCALE(ks, Kashmiri)
+SUPPORTED_LOCALE(kk, Kazakh)
+SUPPORTED_LOCALE(rw, Kinyarwanda)
+SUPPORTED_LOCALE(kv, Komi)
+SUPPORTED_LOCALE(kg, Kongo)
+SUPPORTED_LOCALE(ko, Korean)
+SUPPORTED_LOCALE(kj, Kwanyama)
+SUPPORTED_LOCALE(ku, Kurdish)
+SUPPORTED_LOCALE(ky, Kyrgyz)
+SUPPORTED_LOCALE(lo, Lao)
+SUPPORTED_LOCALE(la, Latin)
+SUPPORTED_LOCALE(lv, Latvian)
+SUPPORTED_LOCALE(lb, Letzeburgesch)
+SUPPORTED_LOCALE(li, Limburgish)
+SUPPORTED_LOCALE(ln, Lingala)
+SUPPORTED_LOCALE(lt, Lithuanian)
+SUPPORTED_LOCALE(lu, Luba-Katanga)
+SUPPORTED_LOCALE(mk, Macedonian)
+SUPPORTED_LOCALE(mg, Malagasy)
+SUPPORTED_LOCALE(ms, Malay)
+SUPPORTED_LOCALE(ml, Malayalam)
+SUPPORTED_LOCALE(mt, Maltese)
+SUPPORTED_LOCALE(gv, Manx)
+SUPPORTED_LOCALE(mi, Maori)
+SUPPORTED_LOCALE(mr, Marathi)
+SUPPORTED_LOCALE(mh, Marshallese)
+SUPPORTED_LOCALE(ro, Romanian)
+SUPPORTED_LOCALE(mn, Mongolian)
+SUPPORTED_LOCALE(na, Nauru)
+SUPPORTED_LOCALE(nv, Navajo)
+SUPPORTED_LOCALE(nd, Northern Ndebele)
+SUPPORTED_LOCALE(ng, Ndonga)
+SUPPORTED_LOCALE(ne, Nepali)
+SUPPORTED_LOCALE(se, Northern Sami)
+SUPPORTED_LOCALE(no, Norwegian)
+SUPPORTED_LOCALE(nb, Norwegian Bokmål)
+SUPPORTED_LOCALE(nn, Norwegian Nynorsk)
+SUPPORTED_LOCALE(ii, Nuosu Sichuan Yi)
+SUPPORTED_LOCALE(oc, Occitan)
+SUPPORTED_LOCALE(oj, Ojibwa)
+SUPPORTED_LOCALE(or, Oriya)
+SUPPORTED_LOCALE(om, Oromo)
+SUPPORTED_LOCALE(os, Ossetian)
+SUPPORTED_LOCALE(pi, Pali)
+SUPPORTED_LOCALE(pa, Panjabi)
+SUPPORTED_LOCALE(ps, Pashto)
+SUPPORTED_LOCALE(fa, Persian)
+SUPPORTED_LOCALE(pl, Polish)
+SUPPORTED_LOCALE(pt, Portuguese)
+SUPPORTED_LOCALE(qu, Quechua)
+SUPPORTED_LOCALE(rm, Romansh)
+SUPPORTED_LOCALE(rn, Rundi)
+SUPPORTED_LOCALE(ru, Russian)
+SUPPORTED_LOCALE(sm, Samoan)
+SUPPORTED_LOCALE(sg, Sango)
+SUPPORTED_LOCALE(sa, Sanskrit)
+SUPPORTED_LOCALE(sc, Sardinian)
+SUPPORTED_LOCALE(sr, Serbian)
+SUPPORTED_LOCALE(sn, Shona)
+SUPPORTED_LOCALE(sd, Sindhi)
+SUPPORTED_LOCALE(si, Sinhala Sinhalese)
+SUPPORTED_LOCALE(sk, Slovak)
+SUPPORTED_LOCALE(sl, Slovenian)
+SUPPORTED_LOCALE(so, Somali)
+SUPPORTED_LOCALE(st, Sotho Southern)
+SUPPORTED_LOCALE(nr, South Ndebele)
+SUPPORTED_LOCALE(es, Spanish Castilian)
+SUPPORTED_LOCALE(su, Sundanese)
+SUPPORTED_LOCALE(sw, Swahili)
+SUPPORTED_LOCALE(ss, Swati)
+SUPPORTED_LOCALE(sv, Swedish)
+SUPPORTED_LOCALE(tl, Tagalog)
+SUPPORTED_LOCALE(ty, Tahitian)
+SUPPORTED_LOCALE(tg, Tajik)
+SUPPORTED_LOCALE(ta, Tamil)
+SUPPORTED_LOCALE(tt, Tatar)
+SUPPORTED_LOCALE(te, Telugu)
+SUPPORTED_LOCALE(th, Thai)
+SUPPORTED_LOCALE(bo, Tibetan)
+SUPPORTED_LOCALE(ti, Tigrinya)
+SUPPORTED_LOCALE(to, Tonga)
+SUPPORTED_LOCALE(ts, Tsonga)
+SUPPORTED_LOCALE(tn, Tswana)
+SUPPORTED_LOCALE(tr, Turkish)
+SUPPORTED_LOCALE(tk, Turkmen)
+SUPPORTED_LOCALE(tw, Twi)
+SUPPORTED_LOCALE(ug, Uighur)
+SUPPORTED_LOCALE(uk, Ukrainian)
+SUPPORTED_LOCALE(ur, Urdu)
+SUPPORTED_LOCALE(uz, Uzbek)
+SUPPORTED_LOCALE(ve, Venda)
+SUPPORTED_LOCALE(vi, Vietnamese)
+SUPPORTED_LOCALE(vo, Volap_k)
+SUPPORTED_LOCALE(wa, Walloon)
+SUPPORTED_LOCALE(cy, Welsh)
+SUPPORTED_LOCALE(fy, Western Frisian)
+SUPPORTED_LOCALE(wo, Wolof)
+SUPPORTED_LOCALE(xh, Xhosa)
+SUPPORTED_LOCALE(yi, Yiddish)
+SUPPORTED_LOCALE(yo, Yoruba)
+SUPPORTED_LOCALE(za, Zhuang Chuang)
+SUPPORTED_LOCALE(zu, Zulu)
+
+#undef SUPPORTED_LOCALE
+
diff --git a/include/swift/AST/ModuleDependencies.h b/include/swift/AST/ModuleDependencies.h
index 47ff92fa8f3e4..e948157c832ac 100644
--- a/include/swift/AST/ModuleDependencies.h
+++ b/include/swift/AST/ModuleDependencies.h
@@ -73,6 +73,11 @@ class SwiftModuleDependenciesStorage : public ModuleDependenciesStorageBase {
   /// interface.
   const std::vector<std::string> buildCommandLine;
 
+  /// To build a PCM to be used by this Swift module, we need to append these
+  /// arguments to the generic PCM build arguments reported from the dependency
+  /// graph.
+  const std::vector<std::string> extraPCMArgs;
+
   /// The hash value that will be used for the generated module
   const std::string contextHash;
 
@@ -92,10 +97,12 @@ class SwiftModuleDependenciesStorage : public ModuleDependenciesStorageBase {
       const std::string &compiledModulePath,
       const Optional<std::string> &swiftInterfaceFile,
       ArrayRef<StringRef> buildCommandLine,
+      ArrayRef<StringRef> extraPCMArgs,
       StringRef contextHash
   ) : ModuleDependenciesStorageBase(/*isSwiftModule=*/true, compiledModulePath),
       swiftInterfaceFile(swiftInterfaceFile),
       buildCommandLine(buildCommandLine.begin(), buildCommandLine.end()),
+      extraPCMArgs(extraPCMArgs.begin(), extraPCMArgs.end()),
       contextHash(contextHash) { }
 
   ModuleDependenciesStorageBase *clone() const override {
@@ -173,13 +180,15 @@ class ModuleDependencies {
   /// Describe the module dependencies for a Swift module that can be
   /// built from a Swift interface file (\c .swiftinterface).
   static ModuleDependencies forSwiftInterface(
-      const std::string &compiledModulePath,
       const std::string &swiftInterfaceFile,
       ArrayRef<StringRef> buildCommands,
+      ArrayRef<StringRef> extraPCMArgs,
       StringRef contextHash) {
+    std::string compiledModulePath;
     return ModuleDependencies(
         std::make_unique<SwiftModuleDependenciesStorage>(
-          compiledModulePath, swiftInterfaceFile, buildCommands, contextHash));
+          compiledModulePath, swiftInterfaceFile, buildCommands,
+          extraPCMArgs, contextHash));
   }
 
   /// Describe the module dependencies for a serialized or parsed Swift module.
@@ -187,7 +196,17 @@ class ModuleDependencies {
       const std::string &compiledModulePath) {
     return ModuleDependencies(
         std::make_unique<SwiftModuleDependenciesStorage>(
-          compiledModulePath, None, ArrayRef<StringRef>(), StringRef()));
+          compiledModulePath, None, ArrayRef<StringRef>(),
+          ArrayRef<StringRef>(), StringRef()));
+  }
+
+  /// Describe the main Swift module.
+  static ModuleDependencies forMainSwiftModule(ArrayRef<StringRef> extraPCMArgs) {
+    std::string compiledModulePath;
+    return ModuleDependencies(
+        std::make_unique<SwiftModuleDependenciesStorage>(
+          compiledModulePath, None, ArrayRef<StringRef>(), extraPCMArgs,
+          StringRef()));
   }
 
   /// Describe the module dependencies for a Clang module that can be
diff --git a/include/swift/AST/ModuleLoader.h b/include/swift/AST/ModuleLoader.h
index 6abeebcb8b8ba..a1c91e205a981 100644
--- a/include/swift/AST/ModuleLoader.h
+++ b/include/swift/AST/ModuleLoader.h
@@ -60,13 +60,22 @@ enum class Bridgeability : unsigned {
   Full
 };
 
+/// Specifies which dependencies the intermodule dependency tracker records.
+enum class IntermoduleDepTrackingMode {
+  /// Records both system and non-system dependencies.
+  IncludeSystem,
+
+  /// Records only non-system dependencies.
+  ExcludeSystem,
+};
+
 /// Records dependencies on files outside of the current module;
 /// implemented in terms of a wrapped clang::DependencyCollector.
 class DependencyTracker {
   std::shared_ptr<clang::DependencyCollector> clangCollector;
 public:
   explicit DependencyTracker(
-      bool TrackSystemDeps,
+      IntermoduleDepTrackingMode Mode,
       std::shared_ptr<llvm::FileCollector> FileCollector = {});
 
   /// Adds a file as a dependency.
@@ -89,6 +98,7 @@ struct SubCompilerInstanceInfo {
   CompilerInstance* Instance;
   StringRef Hash;
   ArrayRef<StringRef> BuildArguments;
+  ArrayRef<StringRef> ExtraPCMArgs;
 };
 
 /// Abstract interface to run an action in a sub ASTContext.
@@ -97,7 +107,8 @@ struct InterfaceSubContextDelegate {
                                StringRef interfacePath,
                                StringRef outputPath,
                                SourceLoc diagLoc,
-  llvm::function_ref<bool(ASTContext&,ArrayRef<StringRef>, StringRef)> action) = 0;
+  llvm::function_ref<bool(ASTContext&,ArrayRef<StringRef>,
+                          ArrayRef<StringRef>, StringRef)> action) = 0;
   virtual bool runInSubCompilerInstance(StringRef moduleName,
                                         StringRef interfacePath,
                                         StringRef outputPath,
diff --git a/include/swift/AST/PlatformKind.h b/include/swift/AST/PlatformKind.h
index f03d5adc8f7bf..be687b449b403 100644
--- a/include/swift/AST/PlatformKind.h
+++ b/include/swift/AST/PlatformKind.h
@@ -20,6 +20,7 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Config.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/VersionTuple.h"
 
 namespace swift {
 
@@ -65,6 +66,9 @@ PlatformKind targetPlatform(const LangOptions &LangOpts);
 /// an explicit attribute for the child.
 bool inheritsAvailabilityFromPlatform(PlatformKind Child, PlatformKind Parent);
 
+llvm::VersionTuple canonicalizePlatformVersion(
+    PlatformKind platform, const llvm::VersionTuple &version);
+
 } // end namespace swift
 
 #endif
diff --git a/include/swift/AST/SILOptions.h b/include/swift/AST/SILOptions.h
index ac41b9e6aac0f..1ff15e19922e2 100644
--- a/include/swift/AST/SILOptions.h
+++ b/include/swift/AST/SILOptions.h
@@ -40,9 +40,6 @@ class SILOptions {
   /// Controls the aggressiveness of the loop unroller.
   int UnrollThreshold = 250;
 
-  /// The number of threads for multi-threaded code generation.
-  int NumThreads = 0;
-  
   /// Controls whether to pull in SIL from partial modules during the
   /// merge modules step. Could perhaps be merged with the link mode
   /// above but the interactions between all the flags are tricky.
@@ -161,10 +158,6 @@ class SILOptions {
   /// Enable large loadable types IRGen pass.
   bool EnableLargeLoadableTypes = true;
 
-  /// Should the default pass pipelines strip ownership during the diagnostic
-  /// pipeline or after serialization.
-  bool StripOwnershipAfterSerialization = true;
-
   /// The name of the file to which the backend should save optimization
   /// records.
   std::string OptRecordFile;
@@ -187,10 +180,6 @@ class SILOptions {
   bool shouldOptimize() const {
     return OptMode > OptimizationMode::NoOptimization;
   }
-
-  bool hasMultipleIRGenThreads() const { return NumThreads > 1; }
-  bool shouldPerformIRGenerationInParallel() const { return NumThreads != 0; }
-  bool hasMultipleIGMs() const { return hasMultipleIRGenThreads(); }
 };
 
 } // end namespace swift
diff --git a/include/swift/AST/SearchPathOptions.h b/include/swift/AST/SearchPathOptions.h
index 36fc930d589ef..cd65528e48f17 100644
--- a/include/swift/AST/SearchPathOptions.h
+++ b/include/swift/AST/SearchPathOptions.h
@@ -85,6 +85,8 @@ class SearchPathOptions {
   /// The paths to a set of explicitly built modules from interfaces.
   std::vector<std::string> ExplicitSwiftModules;
 
+  /// A map of explict Swift module information.
+  std::string ExplicitSwiftModuleMap;
 private:
   static StringRef
   pathStringFromFrameworkSearchPath(const FrameworkSearchPath &next) {
diff --git a/include/swift/AST/Stmt.h b/include/swift/AST/Stmt.h
index 513be8e40d774..7c8e535efbb2d 100644
--- a/include/swift/AST/Stmt.h
+++ b/include/swift/AST/Stmt.h
@@ -39,6 +39,8 @@ class Pattern;
 class PatternBindingDecl;
 class VarDecl;
 class CaseStmt;
+class DoCatchStmt;
+class SwitchStmt;
 
 enum class StmtKind {
 #define STMT(ID, PARENT) ID,
@@ -927,6 +929,7 @@ class CaseStmt final
                                     CaseLabelItem> {
   friend TrailingObjects;
 
+  Stmt *ParentStmt = nullptr;
   SourceLoc UnknownAttrLoc;
   SourceLoc ItemIntroducerLoc;
   SourceLoc ItemTerminatorLoc;
@@ -954,6 +957,14 @@ class CaseStmt final
 
   CaseParentKind getParentKind() const { return ParentKind; }
 
+  Stmt *getParentStmt() const { return ParentStmt; }
+  void setParentStmt(Stmt *S) {
+    assert(S && "Parent statement must be SwitchStmt or DoCatchStmt");
+    assert((ParentKind == CaseParentKind::Switch && isa<SwitchStmt>(S)) ||
+           (ParentKind == CaseParentKind::DoCatch && isa<DoCatchStmt>(S)));
+    ParentStmt = S;
+  }
+
   ArrayRef<CaseLabelItem> getCaseLabelItems() const {
     return {getTrailingObjects<CaseLabelItem>(), Bits.CaseStmt.NumPatterns};
   }
@@ -1161,6 +1172,8 @@ class DoCatchStmt final
     Bits.DoCatchStmt.NumCatches = catches.size();
     std::uninitialized_copy(catches.begin(), catches.end(),
                             getTrailingObjects<CaseStmt *>());
+    for (auto *catchStmt : getCatches())
+      catchStmt->setParentStmt(this);
   }
 
 public:
diff --git a/include/swift/AST/SubstitutionMap.h b/include/swift/AST/SubstitutionMap.h
index deb897f5053bb..2f3549fabf6ba 100644
--- a/include/swift/AST/SubstitutionMap.h
+++ b/include/swift/AST/SubstitutionMap.h
@@ -150,6 +150,10 @@ class SubstitutionMap {
   /// generic parameters.
   ArrayRef<Type> getReplacementTypes() const;
 
+  /// Retrieve the array of replacement types for the innermost generic
+  /// parameters.
+  ArrayRef<Type> getInnermostReplacementTypes() const;
+
   /// Query whether any replacement types in the map contain archetypes.
   bool hasArchetypes() const;
 
@@ -282,6 +286,12 @@ class SubstitutionMap {
   Type lookupSubstitution(CanSubstitutableType type) const;
 };
 
+inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                     const SubstitutionMap &subs) {
+  subs.dump(OS);
+  return OS;
+}
+
 /// A function object suitable for use as a \c TypeSubstitutionFn that
 /// queries an underlying \c SubstitutionMap.
 struct QuerySubstitutionMap {
diff --git a/include/swift/AST/TypeCheckRequests.h b/include/swift/AST/TypeCheckRequests.h
index 46d6b5ae0810a..48dd1a5b58301 100644
--- a/include/swift/AST/TypeCheckRequests.h
+++ b/include/swift/AST/TypeCheckRequests.h
@@ -1064,8 +1064,8 @@ class SynthesizeAccessorRequest :
 
 class EmittedMembersRequest :
     public SimpleRequest<EmittedMembersRequest,
-                         DeclRange(ClassDecl *),
-                         RequestFlags::SeparatelyCached> {
+                         ArrayRef<Decl *>(ClassDecl *),
+                         RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -1073,14 +1073,11 @@ class EmittedMembersRequest :
   friend SimpleRequest;
 
   // Evaluation.
-  DeclRange
+  ArrayRef<Decl *>
   evaluate(Evaluator &evaluator, ClassDecl *classDecl) const;
 
 public:
-  // Separate caching.
   bool isCached() const { return true; }
-  Optional<DeclRange> getCachedResult() const;
-  void cacheResult(DeclRange value) const;
 };
 
 class IsImplicitlyUnwrappedOptionalRequest :
@@ -2191,6 +2188,27 @@ class DerivativeAttrOriginalDeclRequest
   bool isCached() const { return true; }
 };
 
+/// Resolves the "tangent stored property" corresponding to an original stored
+/// property in a `Differentiable`-conforming type.
+class TangentStoredPropertyRequest
+    : public SimpleRequest<TangentStoredPropertyRequest,
+                           TangentPropertyInfo(VarDecl *, CanType),
+                           RequestFlags::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  TangentPropertyInfo evaluate(Evaluator &evaluator, VarDecl *originalField,
+                               CanType parentType) const;
+
+public:
+  // Caching.
+  bool isCached() const { return true; }
+};
+
 /// Checks whether a type eraser has a viable initializer.
 class TypeEraserHasViableInitRequest
     : public SimpleRequest<TypeEraserHasViableInitRequest,
diff --git a/include/swift/AST/TypeCheckerTypeIDZone.def b/include/swift/AST/TypeCheckerTypeIDZone.def
index 2acdda4869312..2f5ee6f22796a 100644
--- a/include/swift/AST/TypeCheckerTypeIDZone.def
+++ b/include/swift/AST/TypeCheckerTypeIDZone.def
@@ -65,8 +65,8 @@ SWIFT_REQUEST(TypeChecker, TypeEraserHasViableInitRequest,
 SWIFT_REQUEST(TypeChecker, DynamicallyReplacedDeclRequest,
               ValueDecl *(ValueDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, EmittedMembersRequest, DeclRange(ClassDecl *),
-              SeparatelyCached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, EmittedMembersRequest, ArrayRef<Decl *>(ClassDecl *),
+              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, EnumRawValuesRequest,
               evaluator::SideEffect (EnumDecl *, TypeResolutionStage),
               SeparatelyCached, NoLocationInfo)
@@ -203,6 +203,8 @@ SWIFT_REQUEST(TypeChecker, SuperclassTypeRequest,
 SWIFT_REQUEST(TypeChecker, SynthesizeAccessorRequest,
               AccessorDecl *(AbstractStorageDecl *, AccessorKind),
               SeparatelyCached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, TangentStoredPropertyRequest,
+              llvm::Expected<VarDecl *>(VarDecl *, CanType), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyRequest,
               bool(AbstractFunctionDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, TypeCheckFunctionBodyAtLocRequest,
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
index abe0baf5a6a08..34d48b6e27622 100644
--- a/include/swift/AST/Types.h
+++ b/include/swift/AST/Types.h
@@ -24,7 +24,6 @@
 #include "swift/AST/Ownership.h"
 #include "swift/AST/ProtocolConformanceRef.h"
 #include "swift/AST/Requirement.h"
-#include "swift/AST/SILLayout.h"
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/AST/Type.h"
 #include "swift/AST/TypeAlignments.h"
@@ -786,6 +785,10 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   
   /// Check if this is a nominal type defined at the top level of the Swift module
   bool isStdlibType();
+  
+  /// Check if this is either an Array, Set or Dictionary collection type defined
+  /// at the top level of the Swift module
+  bool isKnownStdlibCollectionType();
 
   /// If this is a class type or a bound generic class type, returns the
   /// (possibly generic) class.
@@ -1813,13 +1816,10 @@ class TypeAliasType final
     return *getTrailingObjects<SubstitutionMap>();
   }
 
-  /// Get the innermost generic arguments, which correspond to the generic
-  /// arguments that are directly applied to the typealias declaration in
-  /// produced by \c getDecl().
-  ///
-  /// The result can be empty, if the declaration itself is non-generic but
-  /// the parent is generic.
-  SmallVector<Type, 2> getInnermostGenericArgs() const;
+  /// Get the direct generic arguments, which correspond to the generic
+  /// arguments that are directly applied to the typealias declaration
+  /// this type references.
+  ArrayRef<Type> getDirectGenericArgs() const;
 
   // Support for FoldingSet.
   void Profile(llvm::FoldingSetNodeID &id) const;
@@ -2888,6 +2888,10 @@ class AnyFunctionType : public TypeBase {
 
     Param getWithoutLabel() const { return Param(Ty, Identifier(), Flags); }
 
+    Param withLabel(Identifier newLabel) const {
+      return Param(Ty, newLabel, Flags);
+    }
+
     Param withType(Type newType) const { return Param(newType, Label, Flags); }
 
     Param withFlags(ParameterTypeFlags flags) const {
@@ -3640,7 +3644,7 @@ inline CanGenericSignature CanAnyFunctionType::getOptGenericSignature() const {
 }
 
 /// Conventions for passing arguments as parameters.
-enum class ParameterConvention {
+enum class ParameterConvention : uint8_t {
   /// This argument is passed indirectly, i.e. by directly passing the address
   /// of an object in memory.  The callee is responsible for destroying the
   /// object.  The callee may assume that the address does not alias any valid
@@ -3686,7 +3690,7 @@ enum class ParameterConvention {
 };
 // Check that the enum values fit inside Bits.SILFunctionType.
 static_assert(unsigned(ParameterConvention::Direct_Guaranteed) < (1<<3),
-              "fits in Bits.SILFunctionType and SILParameterInfo");
+              "fits in Bits.SILFunctionType");
 
 // Does this parameter convention require indirect storage? This reflects a
 // SILFunctionType's formal (immutable) conventions, as opposed to the transient
@@ -3745,7 +3749,7 @@ inline bool isGuaranteedParameter(ParameterConvention conv) {
 }
 
 /// The differentiability of a SIL function type parameter.
-enum class SILParameterDifferentiability : unsigned {
+enum class SILParameterDifferentiability : bool {
   /// Either differentiable or not applicable.
   ///
   /// - If the function type is not `@differentiable`, parameter
@@ -3763,8 +3767,9 @@ enum class SILParameterDifferentiability : unsigned {
 
 /// A parameter type and the rules for passing it.
 class SILParameterInfo {
-  llvm::PointerIntPair<CanType, 3, ParameterConvention> TypeAndConvention;
-  SILParameterDifferentiability Differentiability : 1;
+  CanType Type;
+  ParameterConvention Convention;
+  SILParameterDifferentiability Differentiability;
 
 public:
   SILParameterInfo() = default;//: Ty(), Convention((ParameterConvention)0) {}
@@ -3772,7 +3777,7 @@ class SILParameterInfo {
       CanType type, ParameterConvention conv,
       SILParameterDifferentiability differentiability =
           SILParameterDifferentiability::DifferentiableOrNotApplicable)
-      : TypeAndConvention(type, conv), Differentiability(differentiability) {
+      : Type(type), Convention(conv), Differentiability(differentiability) {
     assert(type->isLegalSILType() && "SILParameterInfo has illegal SIL type");
   }
 
@@ -3781,7 +3786,7 @@ class SILParameterInfo {
   ///
   /// For most purposes, you probably want \c getArgumentType .
   CanType getInterfaceType() const {
-    return TypeAndConvention.getPointer();
+    return Type;
   }
   
   /// Return the type of a call argument matching this parameter.
@@ -3789,7 +3794,7 @@ class SILParameterInfo {
   /// \c t must refer back to the function type this is a parameter for.
   CanType getArgumentType(SILModule &M, const SILFunctionType *t, TypeExpansionContext context) const;
   ParameterConvention getConvention() const {
-    return TypeAndConvention.getInt();
+    return Convention;
   }
   // Does this parameter convention require indirect storage? This reflects a
   // SILFunctionType's formal (immutable) conventions, as opposed to the
@@ -3908,7 +3913,7 @@ class SILParameterInfo {
 };
 
 /// Conventions for returning values.
-enum class ResultConvention {
+enum class ResultConvention : uint8_t {
   /// This result is returned indirectly, i.e. by passing the address
   /// of an uninitialized object in memory.  The callee is responsible
   /// for leaving an initialized object at this address.  The callee
@@ -3943,7 +3948,7 @@ inline bool isIndirectFormalResult(ResultConvention convention) {
 }
 
 /// The differentiability of a SIL function type result.
-enum class SILResultDifferentiability : unsigned {
+enum class SILResultDifferentiability : bool {
   /// Either differentiable or not applicable.
   ///
   /// - If the function type is not `@differentiable`, result
@@ -3961,15 +3966,16 @@ enum class SILResultDifferentiability : unsigned {
 
 /// A result type and the rules for returning it.
 class SILResultInfo {
-  llvm::PointerIntPair<CanType, 3, ResultConvention> TypeAndConvention;
-  SILResultDifferentiability Differentiability : 1;
+  CanType Type;
+  ResultConvention Convention;
+  SILResultDifferentiability Differentiability;
 
 public:
   SILResultInfo() = default;
   SILResultInfo(CanType type, ResultConvention conv,
                 SILResultDifferentiability differentiability =
                     SILResultDifferentiability::DifferentiableOrNotApplicable)
-      : TypeAndConvention(type, conv), Differentiability(differentiability) {
+      : Type(type), Convention(conv), Differentiability(differentiability) {
     assert(type->isLegalSILType() && "SILResultInfo has illegal SIL type");
   }
 
@@ -3978,7 +3984,7 @@ class SILResultInfo {
   ///
   /// For most purposes, you probably want \c getReturnValueType .
   CanType getInterfaceType() const {
-    return TypeAndConvention.getPointer();
+    return Type;
   }
   
   /// The type of a return value corresponding to this result.
@@ -3988,7 +3994,7 @@ class SILResultInfo {
                              TypeExpansionContext context) const;
 
   ResultConvention getConvention() const {
-    return TypeAndConvention.getInt();
+    return Convention;
   }
 
   SILResultDifferentiability getDifferentiability() const {
@@ -4056,8 +4062,9 @@ class SILResultInfo {
   }
 
   void profile(llvm::FoldingSetNodeID &id) {
-    id.AddPointer(TypeAndConvention.getOpaqueValue());
-    id.AddInteger((unsigned)getDifferentiability());
+    id.AddPointer(Type.getPointer());
+    id.AddInteger(unsigned(getConvention()));
+    id.AddInteger(unsigned(getDifferentiability()));
   }
 
   SWIFT_DEBUG_DUMP;
@@ -4074,7 +4081,8 @@ class SILResultInfo {
   getOwnershipKind(SILFunction &, CanSILFunctionType fTy) const; // in SILType.cpp
 
   bool operator==(SILResultInfo rhs) const {
-    return TypeAndConvention == rhs.TypeAndConvention;
+    return Type == rhs.Type && Convention == rhs.Convention
+      && Differentiability == rhs.Differentiability;
   }
   bool operator!=(SILResultInfo rhs) const {
     return !(*this == rhs);
@@ -5567,25 +5575,7 @@ class ArchetypeType : public SubstitutableType,
   /// find a particular nested type by name, directly, or look at the
   /// protocols to which this archetype conforms.
   ArrayRef<std::pair<Identifier, Type>>
-  getKnownNestedTypes(bool resolveTypes = true) const {
-    return getAllNestedTypes(/*resolveTypes=*/false);
-  }
-
-  /// Retrieve the nested types of this archetype.
-  ///
-  /// \param resolveTypes Whether to eagerly resolve the nested types
-  /// (defaults to \c true). Otherwise, the nested types might be
-  /// null.
-  ///
-  /// FIXME: This operation should go away, because it breaks recursive
-  /// protocol constraints.
-  ArrayRef<std::pair<Identifier, Type>>
-  getAllNestedTypes(bool resolveTypes = true) const;
-
-  /// Set the nested types to a copy of the given array of
-  /// archetypes.
-  void setNestedTypes(ASTContext &Ctx,
-                      ArrayRef<std::pair<Identifier, Type>> Nested);
+  getKnownNestedTypes() const;
 
   /// Register a nested type with the given name.
   void registerNestedType(Identifier name, Type nested);
diff --git a/include/swift/AST/diagnostics/en.yaml b/include/swift/AST/diagnostics/en.yaml
new file mode 100644
index 0000000000000..561ed57dfff71
--- /dev/null
+++ b/include/swift/AST/diagnostics/en.yaml
@@ -0,0 +1,19 @@
+#===--- en.yaml - Localized diagnostic messages for English ---*- YAML -*-===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===----------------------------------------------------------------------===#
+#
+# This file defines the diagnostic messages for the English language.
+# Each diagnostic is described in the following format:
+# - id: "<diagnostic-id>"
+#   msg: "<diagnostic-message>"
+# 
+#===----------------------------------------------------------------------===#
+
diff --git a/include/swift/Basic/DiagnosticOptions.h b/include/swift/Basic/DiagnosticOptions.h
index 31e6149412692..e2f1c5ef22b71 100644
--- a/include/swift/Basic/DiagnosticOptions.h
+++ b/include/swift/Basic/DiagnosticOptions.h
@@ -67,6 +67,11 @@ class DiagnosticOptions {
 
   std::string DiagnosticDocumentationPath = "";
 
+  std::string LocalizationCode = "";
+
+  // Diagnostic messages directory path.
+  std::string LocalizationPath = "";
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {
diff --git a/include/swift/Basic/Mangler.h b/include/swift/Basic/Mangler.h
index 93c0875f52d0b..c14d78fac68ee 100644
--- a/include/swift/Basic/Mangler.h
+++ b/include/swift/Basic/Mangler.h
@@ -14,6 +14,7 @@
 #define SWIFT_BASIC_MANGLER_H
 
 #include "swift/Demangling/ManglingUtils.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/DenseMap.h"
@@ -24,6 +25,7 @@
 
 namespace swift {
 namespace Mangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 void printManglingStats();
 
@@ -204,6 +206,7 @@ class Mangler {
   }
 };
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Mangle
 } // end namespace swift
 
diff --git a/include/swift/Basic/OptionSet.h b/include/swift/Basic/OptionSet.h
index a5e0d25aa00b6..c5758b250ca9c 100644
--- a/include/swift/Basic/OptionSet.h
+++ b/include/swift/Basic/OptionSet.h
@@ -21,6 +21,7 @@
 
 #include <type_traits>
 #include <cstdint>
+#include <initializer_list>
 
 namespace swift {
 
@@ -58,6 +59,10 @@ class OptionSet {
   /// Create an option set with only the given option set.
   constexpr OptionSet(Flags flag) : Storage(static_cast<StorageType>(flag)) {}
 
+  /// Create an option set containing the given options.
+  constexpr OptionSet(std::initializer_list<Flags> flags)
+      : Storage(combineFlags(flags)) {}
+
   /// Create an option set from raw storage.
   explicit constexpr OptionSet(StorageType storage) : Storage(storage) {}
 
@@ -136,6 +141,14 @@ class OptionSet {
 
   static void _checkResultTypeOperatorOr(...) {}
 
+  static constexpr StorageType
+  combineFlags(const std::initializer_list<Flags> &flags) {
+    OptionSet result;
+    for (Flags flag : flags)
+      result |= flag;
+    return result.Storage;
+  }
+
   static_assert(!std::is_same<decltype(_checkResultTypeOperatorOr(Flags())),
                               Flags>::value,
                 "operator| should produce an OptionSet");
diff --git a/include/swift/ClangImporter/ClangImporter.h b/include/swift/ClangImporter/ClangImporter.h
index e894dd1855535..128886f6c0bed 100644
--- a/include/swift/ClangImporter/ClangImporter.h
+++ b/include/swift/ClangImporter/ClangImporter.h
@@ -175,7 +175,7 @@ class ClangImporter final : public ClangModuleLoader {
   /// Create a new clang::DependencyCollector customized to
   /// ClangImporter's specific uses.
   static std::shared_ptr<clang::DependencyCollector>
-  createDependencyCollector(bool TrackSystemDeps,
+  createDependencyCollector(IntermoduleDepTrackingMode Mode,
                             std::shared_ptr<llvm::FileCollector> FileCollector);
 
   /// Append visible module names to \p names. Note that names are possibly
diff --git a/include/swift/Demangling/Demangle.h b/include/swift/Demangling/Demangle.h
index 61934a820e357..bb1b286847f14 100644
--- a/include/swift/Demangling/Demangle.h
+++ b/include/swift/Demangling/Demangle.h
@@ -25,6 +25,7 @@
 #include <cstdint>
 #include "llvm/ADT/StringRef.h"
 #include "swift/Runtime/Config.h"
+#include "swift/Demangling/NamespaceMacros.h"
 
 namespace llvm {
   class raw_ostream;
@@ -32,6 +33,7 @@ namespace llvm {
 
 namespace swift {
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 enum class SymbolicReferenceKind : uint8_t;
 
@@ -621,6 +623,7 @@ bool isFunctionAttr(Node::Kind kind);
 /// contain symbolic references.
 llvm::StringRef makeSymbolicMangledNameStringRef(const char *base);
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Demangle
 } // end namespace swift
 
diff --git a/include/swift/Demangling/Demangler.h b/include/swift/Demangling/Demangler.h
index 30da4d715c917..3616ff426af86 100644
--- a/include/swift/Demangling/Demangler.h
+++ b/include/swift/Demangling/Demangler.h
@@ -20,6 +20,7 @@
 #define SWIFT_DEMANGLING_DEMANGLER_H
 
 #include "swift/Demangling/Demangle.h"
+#include "swift/Demangling/NamespaceMacros.h"
 
 //#define NODE_FACTORY_DEBUGGING
 
@@ -28,6 +29,7 @@ using llvm::StringRef;
 
 namespace swift {
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 class CharVector;
   
@@ -622,6 +624,7 @@ template <size_t Size> class StackAllocatedDemangler : public Demangler {
 
 NodePointer demangleOldSymbolAsNode(StringRef MangledName,
                                     NodeFactory &Factory);
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Demangle
 } // end namespace swift
 
diff --git a/include/swift/Demangling/ManglingUtils.h b/include/swift/Demangling/ManglingUtils.h
index c1afbb4f0def3..e15872004ddab 100644
--- a/include/swift/Demangling/ManglingUtils.h
+++ b/include/swift/Demangling/ManglingUtils.h
@@ -14,10 +14,12 @@
 #define SWIFT_DEMANGLING_MANGLINGUTILS_H
 
 #include "llvm/ADT/StringRef.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/Punycode.h"
 
 namespace swift {
 namespace Mangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 using llvm::StringRef;
 
@@ -190,9 +192,8 @@ void mangleIdentifier(Mangler &M, StringRef ident) {
       // Mangle the sub-string up to the next word substitution (or to the end
       // of the identifier - that's why we added the dummy-word).
       // The first thing: we add the encoded sub-string length.
+      bool first = true;
       M.Buffer << (Repl.StringPos - Pos);
-      assert(!isDigit(ident[Pos]) &&
-             "first char of sub-string may not be a digit");
       do {
         // Update the start position of new added words, so that they refer to
         // the begin of the whole mangled Buffer.
@@ -201,9 +202,16 @@ void mangleIdentifier(Mangler &M, StringRef ident) {
           M.Words[WordsInBuffer].start = M.getBufferStr().size();
           WordsInBuffer++;
         }
+        // Error recovery. We sometimes need to mangle identifiers coming
+        // from invalid code.
+        if (first && isDigit(ident[Pos]))
+          M.Buffer << 'X';
         // Add a literal character of the sub-string.
-        M.Buffer << ident[Pos];
+        else
+          M.Buffer << ident[Pos];
+
         Pos++;
+        first = false;
       } while (Pos < Repl.StringPos);
     }
     // Is it a "real" word substitution (and not the dummy-word)?
@@ -311,6 +319,7 @@ class SubstitutionMerging {
   }
 };
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Mangle
 } // end namespace swift
 
diff --git a/include/swift/Demangling/NamespaceMacros.h b/include/swift/Demangling/NamespaceMacros.h
new file mode 100644
index 0000000000000..66c3d9ea87073
--- /dev/null
+++ b/include/swift/Demangling/NamespaceMacros.h
@@ -0,0 +1,35 @@
+//===--- NamespaceMacros.h - Macros for inline namespaces -------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// Macros that conditionally define an inline namespace so that symbols used in
+// multiple places (such as in the compiler and in the runtime library) can be
+// given distinct mangled names in different contexts without affecting client
+// usage in source.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_DEMANGLING_NAMESPACE_MACROS_H
+#define SWIFT_DEMANGLING_NAMESPACE_MACROS_H
+
+#if defined(__cplusplus)
+
+#if defined(SWIFT_INLINE_NAMESPACE)
+#define SWIFT_BEGIN_INLINE_NAMESPACE inline namespace SWIFT_INLINE_NAMESPACE {
+#define SWIFT_END_INLINE_NAMESPACE }
+#else
+#define SWIFT_BEGIN_INLINE_NAMESPACE
+#define SWIFT_END_INLINE_NAMESPACE
+#endif
+
+#endif
+
+#endif // SWIFT_DEMANGLING_NAMESPACE_MACROS_H
diff --git a/include/swift/Demangling/Punycode.h b/include/swift/Demangling/Punycode.h
index 8d32e53581c92..01eb08d593d7d 100644
--- a/include/swift/Demangling/Punycode.h
+++ b/include/swift/Demangling/Punycode.h
@@ -28,11 +28,13 @@
 #define SWIFT_DEMANGLING_PUNYCODE_H
 
 #include "llvm/ADT/StringRef.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include <vector>
 #include <cstdint>
 
 namespace swift {
 namespace Punycode {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 using llvm::StringRef;
 
@@ -58,6 +60,7 @@ bool encodePunycodeUTF8(StringRef InputUTF8, std::string &OutPunycode,
 
 bool decodePunycodeUTF8(StringRef InputPunycode, std::string &OutUTF8);
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Punycode
 } // end namespace swift
 
diff --git a/include/swift/Demangling/TypeDecoder.h b/include/swift/Demangling/TypeDecoder.h
index 2e293989934ee..89631c291b36e 100644
--- a/include/swift/Demangling/TypeDecoder.h
+++ b/include/swift/Demangling/TypeDecoder.h
@@ -20,6 +20,7 @@
 
 #include "swift/ABI/MetadataValues.h"
 #include "swift/Demangling/Demangler.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Runtime/Unreachable.h"
 #include "swift/Strings.h"
@@ -28,6 +29,7 @@
 
 namespace swift {
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 enum class ImplMetatypeRepresentation {
   Thin,
@@ -1152,6 +1154,7 @@ decodeMangledType(BuilderType &Builder,
 }
 
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Demangle
 } // end namespace swift
 
diff --git a/include/swift/Frontend/Frontend.h b/include/swift/Frontend/Frontend.h
index f8cad378fc6ae..72555f19f02e0 100644
--- a/include/swift/Frontend/Frontend.h
+++ b/include/swift/Frontend/Frontend.h
@@ -498,10 +498,6 @@ class CompilerInstance {
     Diagnostics.removeConsumer(*DC);
   }
 
-  void createDependencyTracker(bool TrackSystemDeps) {
-    assert(!Context && "must be called before setup()");
-    DepTracker = std::make_unique<DependencyTracker>(TrackSystemDeps);
-  }
   DependencyTracker *getDependencyTracker() { return DepTracker.get(); }
   const DependencyTracker *getDependencyTracker() const { return DepTracker.get(); }
 
@@ -582,6 +578,7 @@ class CompilerInstance {
   bool setUpASTContextIfNeeded();
   void setupStatsReporter();
   void setupDiagnosticVerifierIfNeeded();
+  void setupDependencyTrackerIfNeeded();
   Optional<unsigned> setUpCodeCompletionBuffer();
 
   /// Set up all state in the CompilerInstance to process the given input file.
diff --git a/include/swift/Frontend/FrontendOptions.h b/include/swift/Frontend/FrontendOptions.h
index 201202cd983a1..306df2cb29719 100644
--- a/include/swift/Frontend/FrontendOptions.h
+++ b/include/swift/Frontend/FrontendOptions.h
@@ -27,7 +27,7 @@ namespace llvm {
 }
 
 namespace swift {
-
+enum class IntermoduleDepTrackingMode;
 
 /// Options for controlling the behavior of the frontend.
 class FrontendOptions {
@@ -134,6 +134,7 @@ class FrontendOptions {
     DumpPCM, ///< Dump information about a precompiled Clang module
 
     ScanDependencies,   ///< Scan dependencies of Swift source files
+    PrintVersion,       ///< Print version information.
   };
 
   /// Indicates the action the user requested that the frontend perform.
@@ -236,9 +237,10 @@ class FrontendOptions {
   /// See the \ref SILOptions.EmitSortedSIL flag.
   bool EmitSortedSIL = false;
 
-  /// Indicates whether the dependency tracker should track system
-  /// dependencies as well.
-  bool TrackSystemDeps = false;
+  /// Specifies the collection mode for the intermodule dependency tracker.
+  /// Note that if set, the dependency tracker will be enabled even if no
+  /// output path is configured.
+  Optional<IntermoduleDepTrackingMode> IntermoduleDependencyTracking;
 
   /// Should we serialize the hashes of dependencies (vs. the modification
   /// times) when compiling a module interface?
@@ -287,9 +289,6 @@ class FrontendOptions {
   /// -dump-scope-maps.
   SmallVector<std::pair<unsigned, unsigned>, 2> DumpScopeMapLocations;
 
-  /// Indicates whether the action will immediately run code.
-  static bool isActionImmediate(ActionType);
-
   /// \return true if action only parses without doing other compilation steps.
   static bool shouldActionOnlyParse(ActionType);
 
@@ -317,6 +316,9 @@ class FrontendOptions {
     return ImplicitImportModuleNames;
   }
 
+  /// Whether we're configured to track system intermodule dependencies.
+  bool shouldTrackSystemDependencies() const;
+
 private:
   static bool canActionEmitDependencies(ActionType);
   static bool canActionEmitReferenceDependencies(ActionType);
diff --git a/include/swift/Frontend/ModuleInterfaceLoader.h b/include/swift/Frontend/ModuleInterfaceLoader.h
index 22c183beb2c69..edfd4c75e81be 100644
--- a/include/swift/Frontend/ModuleInterfaceLoader.h
+++ b/include/swift/Frontend/ModuleInterfaceLoader.h
@@ -150,6 +150,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
   create(ASTContext &ctx,
          DependencyTracker *tracker, ModuleLoadingMode loadMode,
          ArrayRef<std::string> ExplicitModulePaths,
+         StringRef ExplicitSwiftModuleMap,
          bool IgnoreSwiftSourceInfoFile);
 
   /// Append visible module names to \p names. Note that names are possibly
@@ -201,7 +202,6 @@ class ModuleInterfaceLoader : public SerializedModuleLoaderBase {
     std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) override;
 
   bool isCached(StringRef DepPath) override;
-
 public:
   static std::unique_ptr<ModuleInterfaceLoader>
   create(ASTContext &ctx, StringRef cacheDir, StringRef prebuiltCacheDir,
@@ -234,6 +234,9 @@ class ModuleInterfaceLoader : public SerializedModuleLoaderBase {
     StringRef ModuleName, StringRef InPath, StringRef OutPath,
     bool SerializeDependencyHashes, bool TrackSystemDependencies,
     ModuleInterfaceLoaderOptions Opts);
+
+  std::string getUpToDateCompiledModuleForInterface(StringRef moduleName,
+                                                    StringRef interfacePath) override;
 };
 
 struct InterfaceSubContextDelegateImpl: InterfaceSubContextDelegate {
@@ -244,7 +247,6 @@ struct InterfaceSubContextDelegateImpl: InterfaceSubContextDelegate {
   llvm::StringSaver ArgSaver;
   std::vector<StringRef> GenericArgs;
   CompilerInvocation subInvocation;
-  std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
 
   template<typename ...ArgTypes>
   InFlightDiagnostic diagnose(StringRef interfacePath,
@@ -280,7 +282,8 @@ struct InterfaceSubContextDelegateImpl: InterfaceSubContextDelegate {
                        StringRef interfacePath,
                        StringRef outputPath,
                        SourceLoc diagLoc,
-    llvm::function_ref<bool(ASTContext&, ArrayRef<StringRef>, StringRef)> action) override;
+    llvm::function_ref<bool(ASTContext&, ArrayRef<StringRef>,
+                            ArrayRef<StringRef>, StringRef)> action) override;
   bool runInSubCompilerInstance(StringRef moduleName,
                                 StringRef interfacePath,
                                 StringRef outputPath,
diff --git a/include/swift/IDE/ConformingMethodList.h b/include/swift/IDE/ConformingMethodList.h
index 1dbe1c3770972..d755f080798ae 100644
--- a/include/swift/IDE/ConformingMethodList.h
+++ b/include/swift/IDE/ConformingMethodList.h
@@ -42,6 +42,7 @@ class ConformingMethodListConsumer {
 public:
   virtual ~ConformingMethodListConsumer() {}
   virtual void handleResult(const ConformingMethodListResult &result) = 0;
+  virtual void setReusingASTContext(bool flag) = 0;
 };
 
 /// Printing consumer
@@ -53,6 +54,7 @@ class PrintingConformingMethodListConsumer
   PrintingConformingMethodListConsumer(llvm::raw_ostream &OS) : OS(OS) {}
 
   void handleResult(const ConformingMethodListResult &result) override;
+  void setReusingASTContext(bool flag) override {}
 };
 
 /// Create a factory for code completion callbacks.
diff --git a/include/swift/IDE/TypeContextInfo.h b/include/swift/IDE/TypeContextInfo.h
index 2bb8c95053710..ed12906edf303 100644
--- a/include/swift/IDE/TypeContextInfo.h
+++ b/include/swift/IDE/TypeContextInfo.h
@@ -38,6 +38,7 @@ class TypeContextInfoConsumer {
 public:
   virtual ~TypeContextInfoConsumer() {}
   virtual void handleResults(ArrayRef<TypeContextInfoItem>) = 0;
+  virtual void setReusingASTContext(bool flag) = 0;
 };
 
 /// Printing consumer
@@ -48,6 +49,7 @@ class PrintingTypeContextInfoConsumer : public TypeContextInfoConsumer {
   PrintingTypeContextInfoConsumer(llvm::raw_ostream &OS) : OS(OS) {}
 
   void handleResults(ArrayRef<TypeContextInfoItem>) override;
+  void setReusingASTContext(bool flag) override {}
 };
 
 /// Create a factory for code completion callbacks.
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
index 42b4e5db2974c..2da46f6f1c087 100644
--- a/include/swift/Option/FrontendOptions.td
+++ b/include/swift/Option/FrontendOptions.td
@@ -220,6 +220,10 @@ def disable_implicit_swift_modules: Flag<["-"], "disable-implicit-swift-modules"
 def swift_module_file
   : Separate<["-"], "swift-module-file">, MetaVarName<"<path>">,
     HelpText<"Specify Swift module explicitly built from textual interface">;
+
+def explict_swift_module_map
+  : Separate<["-"], "explicit-swift-module-map-file">, MetaVarName<"<path>">,
+    HelpText<"Specify a JSON file containing information of explict Swift modules">;
 }
 
 
@@ -289,10 +293,6 @@ def disable_sil_partial_apply : Flag<["-"], "disable-sil-partial-apply">,
 def enable_spec_devirt : Flag<["-"], "enable-spec-devirt">,
   HelpText<"Enable speculative devirtualization pass.">;
 
-def enable_ownership_stripping_after_serialization
-  : Flag<["-"], "enable-ownership-stripping-after-serialization">,
-  HelpText<"Strip ownership after serialization">;
-
 def disable_access_control : Flag<["-"], "disable-access-control">,
   HelpText<"Don't respect access control restrictions">;
 def enable_access_control : Flag<["-"], "enable-access-control">,
diff --git a/include/swift/Option/Options.td b/include/swift/Option/Options.td
index edaf19bdc3559..226a26d64a367 100644
--- a/include/swift/Option/Options.td
+++ b/include/swift/Option/Options.td
@@ -213,7 +213,7 @@ def help_hidden : Flag<["-", "--"], "help-hidden">,
 
 def v : Flag<["-"], "v">, Flags<[DoesNotAffectIncrementalBuild]>,
   HelpText<"Show commands to run and use verbose output">;
-def version : Flag<["-", "--"], "version">,
+def version : Flag<["-", "--"], "version">, Flags<[FrontendOption]>,
   HelpText<"Print version information and exit">;
 
 def parseable_output : Flag<["-"], "parseable-output">,
@@ -389,6 +389,14 @@ def diagnostic_style : Separate<["-"], "diagnostic-style">,
 def diagnostic_style_EQ : Joined<["-"], "diagnostic-style=">,
   Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
   MetaVarName<"<style>">, Alias<diagnostic_style>;
+def locale : Separate<["-"], "locale">,
+  Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
+  HelpText<"Choose a language for diagnostic messages">,
+  MetaVarName<"<locale-code>">;
+def localization_path : Separate<["-"], "localization-path">,
+  Flags<[FrontendOption, DoesNotAffectIncrementalBuild, ArgumentIsPath]>,
+  HelpText<"Path to localized diagnostic messages directory">,
+  MetaVarName<"<path>">;
 
 def module_cache_path : Separate<["-"], "module-cache-path">,
   Flags<[FrontendOption, DoesNotAffectIncrementalBuild, ArgumentIsPath]>,
@@ -724,6 +732,9 @@ def gdwarf_types : Flag<["-"], "gdwarf-types">,
 def debug_prefix_map : Separate<["-"], "debug-prefix-map">,
     Flags<[FrontendOption]>,
     HelpText<"Remap source paths in debug info">;
+def coverage_prefix_map : Separate<["-"], "coverage-prefix-map">,
+  Flags<[FrontendOption]>,
+  HelpText<"Remap source paths in coverage info">;
 
 def debug_info_format : Joined<["-"], "debug-info-format=">,
   Flags<[FrontendOption]>,
diff --git a/include/swift/Reflection/ReflectionContext.h b/include/swift/Reflection/ReflectionContext.h
index 059149eaa26e2..610507ce6577c 100644
--- a/include/swift/Reflection/ReflectionContext.h
+++ b/include/swift/Reflection/ReflectionContext.h
@@ -320,10 +320,8 @@ class ReflectionContext
         
         // FIXME: This code needs to be cleaned up and updated
         // to make it work for 32 bit platforms.
-        if (SectionName != ".sw5cptr" && SectionName != ".sw5bltn") {
-          Begin = Begin.atByteOffset(8);
-          Size -= 16;
-        }
+        Begin = Begin.atByteOffset(8);
+        Size -= 16;
 
         return {Begin, Size};
       }
@@ -838,6 +836,18 @@ class ReflectionContext
     return 0;
   }
 
+  /// Get the name of a metadata tag, if known.
+  llvm::Optional<std::string> metadataAllocationTagName(int Tag) {
+    switch (Tag) {
+#define TAG(name, value)                                                       \
+  case value:                                                                  \
+    return std::string(#name);
+#include "../../../stdlib/public/runtime/MetadataAllocatorTags.def"
+    default:
+      return llvm::None;
+    }
+  }
+
   /// Iterate the metadata allocations in the target process, calling Call with
   /// each allocation found. Returns None on success, and a string describing
   /// the error on failure.
diff --git a/include/swift/Remote/InProcessMemoryReader.h b/include/swift/Remote/InProcessMemoryReader.h
index 2f6b5b535a437..c5147e56db9c0 100644
--- a/include/swift/Remote/InProcessMemoryReader.h
+++ b/include/swift/Remote/InProcessMemoryReader.h
@@ -38,7 +38,7 @@ class InProcessMemoryReader final : public MemoryReader {
 #else
     auto applePlatform = false;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
     auto iosDerivedPlatform = true;
 #else
     auto iosDerivedPlatform = false;
@@ -67,7 +67,7 @@ class InProcessMemoryReader final : public MemoryReader {
     case DLQ_GetObjCReservedLowBits: {
       auto result = static_cast<uint8_t *>(outBuffer);
       if (applePlatform && !iosDerivedPlatform && (sizeof(void *) == 8)) {
-        // Obj-C reserves low bit on 64-bit macOS only.
+        // Obj-C reserves low bit on 64-bit Intel macOS only.
         // Other Apple platforms don't reserve this bit (even when
         // running on x86_64-based simulators).
         *result = 1;
diff --git a/include/swift/Runtime/Metadata.h b/include/swift/Runtime/Metadata.h
index 07fab802ee940..4ad4b8751ab31 100644
--- a/include/swift/Runtime/Metadata.h
+++ b/include/swift/Runtime/Metadata.h
@@ -29,29 +29,9 @@ namespace swift {
 // allocator. This is encoded in a header on each allocation when metadata
 // iteration is enabled, and allows tools to know where each allocation came
 // from.
-//
-// Some of these values are also declared in SwiftRemoteMirrorTypes.h. Those
-// values must be kept stable to preserve compatibility.
 enum MetadataAllocatorTags : uint16_t {
-  UnusedTag = 0,
-  BoxesTag,
-  ObjCClassWrappersTag,
-  FunctionTypesTag,
-  MetatypeTypesTag,
-  ExistentialMetatypeValueWitnessTablesTag,
-  ExistentialMetatypesTag,
-  ExistentialTypesTag,
-  OpaqueExistentialValueWitnessTablesTag,
-  ClassExistentialValueWitnessTablesTag,
-  ForeignWitnessTablesTag,
-  ResilientMetadataAllocatorTag,
-  MetadataTag,
-  TupleCacheTag,
-  GenericMetadataCacheTag,
-  ForeignMetadataCacheTag,
-  GenericWitnessTableCacheTag,
-  GenericClassMetadataTag,
-  GenericValueMetadataTag,
+#define TAG(name, value) name##Tag = value,
+#include "../../../stdlib/public/runtime/MetadataAllocatorTags.def"
 };
 
 template <typename Runtime> struct MetadataAllocationBacktraceHeader {
@@ -314,6 +294,20 @@ const
 /// the same context.
 bool equalContexts(const ContextDescriptor *a, const ContextDescriptor *b);
 
+/// Determines whether two type context descriptors describe the same type
+/// context.
+///
+/// Runtime availability: Swift 5.4.
+///
+/// \param lhs The first type context descriptor to compare.
+/// \param rhs The second type context descriptor to compare.
+///
+/// \returns true if both describe the same type context, false otherwise.
+SWIFT_RUNTIME_EXPORT
+SWIFT_CC(swift)
+bool swift_compareTypeContextDescriptors(const TypeContextDescriptor *lhs,
+                                         const TypeContextDescriptor *rhs);
+
 /// Compute the bounds of class metadata with a resilient superclass.
 ClassMetadataBounds getResilientMetadataBounds(
                                            const ClassDescriptor *descriptor);
@@ -429,6 +423,21 @@ const WitnessTable *swift_getAssociatedConformanceWitness(
                                   const ProtocolRequirement *reqBase,
                                   const ProtocolRequirement *assocConformance);
 
+/// Determine whether two protocol conformance descriptors describe the same
+/// conformance of a type to a protocol.
+///
+/// Runtime availability: Swift 5.4
+///
+/// \param lhs The first protocol conformance descriptor to compare.
+/// \param rhs The second protocol conformance descriptor to compare.
+///
+/// \returns true if both describe the same conformance, false otherwise.
+SWIFT_RUNTIME_EXPORT
+SWIFT_CC(swift)
+bool swift_compareProtocolConformanceDescriptors(
+    const ProtocolConformanceDescriptor *lhs,
+    const ProtocolConformanceDescriptor *rhs);
+
 /// Fetch a uniqued metadata for a function type.
 SWIFT_RUNTIME_EXPORT
 const FunctionTypeMetadata *
diff --git a/include/swift/Runtime/RuntimeFunctions.def b/include/swift/Runtime/RuntimeFunctions.def
index aad8ab980660a..910c1d2788245 100644
--- a/include/swift/Runtime/RuntimeFunctions.def
+++ b/include/swift/Runtime/RuntimeFunctions.def
@@ -616,6 +616,18 @@ FUNCTION(GetForeignTypeMetadata, swift_getForeignTypeMetadata,
          ARGS(SizeTy, TypeMetadataPtrTy),
          ATTRS(NoUnwind, ReadNone)) // only writes to runtime-private fields
 
+// SWIFT_RUNTIME_EXPORT
+// SWIFT_CC(swift)
+// bool swift_compareTypeContextDescriptors(const TypeContextDescriptor *lhs,
+//                                          const TypeContextDescriptor *rhs);
+FUNCTION(CompareTypeContextDescriptors, 
+         swift_compareTypeContextDescriptors, SwiftCC, 
+         CompareTypeContextDescriptorsAvailability,
+         RETURNS(Int1Ty),
+         ARGS(TypeContextDescriptorPtrTy, 
+              TypeContextDescriptorPtrTy),
+         ATTRS(NoUnwind, ReadNone))
+
 // MetadataResponse swift_getSingletonMetadata(MetadataRequest request,
 //                                             TypeContextDescriptor *type);
 FUNCTION(GetSingletonMetadata, swift_getSingletonMetadata,
@@ -723,6 +735,18 @@ FUNCTION(GetAssociatedConformanceWitness,
               ProtocolRequirementStructTy->getPointerTo()),
          ATTRS(NoUnwind, ReadNone))
 
+// SWIFT_RUNTIME_EXPORT
+//     SWIFT_CC(swift) bool swift_compareProtocolConformanceDescriptors(
+//         const ProtocolConformanceDescriptor *lhs,
+//         const ProtocolConformanceDescriptor *rhs);
+FUNCTION(CompareProtocolConformanceDescriptors, 
+         swift_compareProtocolConformanceDescriptors, SwiftCC, 
+         CompareProtocolConformanceDescriptorsAvailability,
+         RETURNS(Int1Ty),
+         ARGS(ProtocolConformanceDescriptorPtrTy, 
+              ProtocolConformanceDescriptorPtrTy),
+         ATTRS(NoUnwind, ReadNone))
+
 // Metadata *swift_getMetatypeMetadata(Metadata *instanceTy);
 FUNCTION(GetMetatypeMetadata, swift_getMetatypeMetadata, C_CC, AlwaysAvailable,
          RETURNS(TypeMetadataPtrTy),
diff --git a/include/swift/SIL/AbstractionPattern.h b/include/swift/SIL/AbstractionPattern.h
index 22f550d39a741..ca64fd6022f14 100644
--- a/include/swift/SIL/AbstractionPattern.h
+++ b/include/swift/SIL/AbstractionPattern.h
@@ -179,15 +179,26 @@ class AbstractionPattern {
     /// type.  ObjCMethod is valid.  OtherData is an encoded foreign
     /// error index.
     ObjCMethodType,
-    /// The uncurried imported type of a C++ method. OrigType is valid and is a
-    /// function type. CXXMethod is valid.
+    /// The uncurried imported type of a C++ non-operator non-static member
+    /// function. OrigType is valid and is a function type. CXXMethod is valid.
     CXXMethodType,
-    /// The curried imported type of a C++ method. OrigType is valid and is a
-    /// function type. CXXMethod is valid.
+    /// The curried imported type of a C++ non-operator non-static member
+    /// function. OrigType is valid and is a function type. CXXMethod is valid.
     CurriedCXXMethodType,
-    /// The partially-applied curried imported type of a C++ method. OrigType is
-    /// valid and is a function type. CXXMethod is valid.
+    /// The partially-applied curried imported type of a C++ non-operator
+    /// non-static member function. OrigType is valid and is a function type.
+    /// CXXMethod is valid.
     PartialCurriedCXXMethodType,
+    /// The uncurried imported type of a C++ operator non-static member
+    /// function. OrigType is valid and is a function type. CXXMethod is valid.
+    CXXOperatorMethodType,
+    /// The curried imported type of a C++ operator non-static member function.
+    /// OrigType is valid and is a function type. CXXMethod is valid.
+    CurriedCXXOperatorMethodType,
+    /// The partially-applied curried imported type of a C++ operator non-static
+    /// member function. OrigType is valid and is a function type. CXXMethod is
+    /// valid.
+    PartialCurriedCXXOperatorMethodType,
     /// A Swift function whose parameters and results are opaque. This is
     /// like `AP::Type<T>((T) -> T)`, except that the number of parameters is
     /// unspecified.
@@ -341,6 +352,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
       return true;
 
     default:
@@ -465,6 +479,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
       return true;
     case Kind::Invalid:
     case Kind::Opaque:
@@ -541,6 +558,10 @@ class AbstractionPattern {
   static AbstractionPattern
   getCurriedCXXMethod(CanType origType, const AbstractFunctionDecl *function);
 
+  static AbstractionPattern
+  getCurriedCXXOperatorMethod(CanType origType,
+                              const AbstractFunctionDecl *function);
+
   /// Return an abstraction pattern for the uncurried type of a C++ method.
   ///
   /// For example, if the original function is:
@@ -556,6 +577,15 @@ class AbstractionPattern {
     return pattern;
   }
 
+  static AbstractionPattern
+  getCXXOperatorMethod(CanType origType, const clang::CXXMethodDecl *method) {
+    assert(isa<AnyFunctionType>(origType));
+    AbstractionPattern pattern;
+    pattern.initCXXMethod(nullptr, origType, method,
+                          Kind::CXXOperatorMethodType);
+    return pattern;
+  }
+
   /// Return an abstraction pattern for the curried type of a C++ method.
   ///
   /// For example, if the original function is:
@@ -572,6 +602,16 @@ class AbstractionPattern {
     return pattern;
   }
 
+  static AbstractionPattern
+  getCurriedCXXOperatorMethod(CanType origType,
+                              const clang::CXXMethodDecl *method) {
+    assert(isa<AnyFunctionType>(origType));
+    AbstractionPattern pattern;
+    pattern.initCXXMethod(nullptr, origType, method,
+                          Kind::CurriedCXXOperatorMethodType);
+    return pattern;
+  }
+
   /// For a C-function-as-method pattern,
   /// get the index of the C function parameter that was imported as the
   /// `self` parameter of the imported method, or None if this is a static
@@ -678,6 +718,17 @@ class AbstractionPattern {
     return pattern;
   }
 
+  static AbstractionPattern
+  getPartialCurriedCXXOperatorMethod(CanGenericSignature signature,
+                                     CanType origType,
+                                     const clang::CXXMethodDecl *method) {
+    assert(isa<AnyFunctionType>(origType));
+    AbstractionPattern pattern;
+    pattern.initCXXMethod(signature, origType, method,
+                          Kind::PartialCurriedCXXOperatorMethodType);
+    return pattern;
+  }
+
 public:
   /// Return an abstraction pattern for the type of an Objective-C method.
   static AbstractionPattern
@@ -813,6 +864,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
       return OrigType;
@@ -849,6 +903,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
       assert(signature || !type->hasTypeParameter());
@@ -886,6 +943,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
       return true;
     }
     llvm_unreachable("bad kind");
@@ -923,7 +983,9 @@ class AbstractionPattern {
   /// If so, it is legal to call getCXXMethod().
   bool isCXXMethod() const {
     return (getKind() == Kind::CXXMethodType ||
-            getKind() == Kind::CurriedCXXMethodType);
+            getKind() == Kind::CurriedCXXMethodType ||
+            getKind() == Kind::CXXOperatorMethodType ||
+            getKind() == Kind::CurriedCXXOperatorMethodType);
   }
 
   const clang::CXXMethodDecl *getCXXMethod() const {
@@ -958,6 +1020,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       return false;
@@ -994,6 +1059,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
       return dyn_cast<TYPE>(getType());
@@ -1022,6 +1090,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       // We assume that the Clang type might provide additional structure.
@@ -1051,6 +1122,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       return false;
@@ -1078,6 +1152,9 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
+    case Kind::CXXOperatorMethodType:
+    case Kind::CurriedCXXOperatorMethodType:
+    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       llvm_unreachable("pattern is not a tuple");      
diff --git a/include/swift/SIL/ApplySite.h b/include/swift/SIL/ApplySite.h
index 6f8b911f46369..de97fef3e9bf0 100644
--- a/include/swift/SIL/ApplySite.h
+++ b/include/swift/SIL/ApplySite.h
@@ -21,9 +21,11 @@
 #ifndef SWIFT_SIL_APPLYSITE_H
 #define SWIFT_SIL_APPLYSITE_H
 
+#include "swift/SIL/SILArgument.h"
 #include "swift/SIL/SILBasicBlock.h"
-#include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/SILFunction.h"
+#include "swift/SIL/SILInstruction.h"
+#include "llvm/ADT/ArrayRef.h"
 
 namespace swift {
 
@@ -502,6 +504,34 @@ class FullApplySite : public ApplySite {
     return getSubstCalleeConv().hasIndirectSILResults();
   }
 
+  /// If our apply site has a single direct result SILValue, return that
+  /// SILValue. Return SILValue() otherwise.
+  ///
+  /// This means that:
+  ///
+  /// 1. If we have an ApplyInst, we just visit the apply.
+  /// 2. If we have a TryApplyInst, we visit the first argument of the normal
+  ///    block.
+  /// 3. If we have a BeginApplyInst, we return SILValue() since the begin_apply
+  ///    yields values instead of returning them. A returned value should only
+  ///    be valid after a full apply site has completely finished executing.
+  SILValue getSingleDirectResult() const {
+    switch (getKind()) {
+    case FullApplySiteKind::ApplyInst:
+      return SILValue(cast<ApplyInst>(getInstruction()));
+    case FullApplySiteKind::BeginApplyInst: {
+      return SILValue();
+    }
+    case FullApplySiteKind::TryApplyInst: {
+      auto *normalBlock = cast<TryApplyInst>(getInstruction())->getNormalBB();
+      assert(normalBlock->getNumArguments() == 1 &&
+             "Expected try apply to have a single result");
+      return normalBlock->getArgument(0);
+    }
+    }
+    llvm_unreachable("Covered switch isn't covered?!");
+  }
+
   unsigned getNumIndirectSILResults() const {
     return getSubstCalleeConv().getNumIndirectSILResults();
   }
diff --git a/include/swift/SIL/PrettyStackTrace.h b/include/swift/SIL/PrettyStackTrace.h
index 74ddc5b463397..7b62b3d6ec8ac 100644
--- a/include/swift/SIL/PrettyStackTrace.h
+++ b/include/swift/SIL/PrettyStackTrace.h
@@ -45,12 +45,25 @@ class PrettyStackTraceSILLocation : public llvm::PrettyStackTraceEntry {
 
 /// Observe that we are doing some processing of a SIL function.
 class PrettyStackTraceSILFunction : public llvm::PrettyStackTraceEntry {
-  const SILFunction *TheFn;
-  const char *Action;
+  const SILFunction *func;
+
+  /// An inline buffer of characters used if we are passed a twine.
+  SmallString<256> data;
+
+  /// This points either at a user provided const char * string or points at the
+  /// inline message buffer that is initialized with data from a twine on
+  /// construction.
+  StringRef action;
+
 public:
-  PrettyStackTraceSILFunction(const char *action, const SILFunction *F)
-    : TheFn(F), Action(action) {}
-  virtual void print(llvm::raw_ostream &OS) const;
+  PrettyStackTraceSILFunction(const char *action, const SILFunction *func)
+      : func(func), data(), action(action) {}
+
+  PrettyStackTraceSILFunction(llvm::Twine &&twine, const SILFunction *func)
+      : func(func), data(), action(twine.toNullTerminatedStringRef(data)) {}
+
+  virtual void print(llvm::raw_ostream &os) const;
+
 protected:
   void printFunctionInfo(llvm::raw_ostream &out) const;
 };
diff --git a/include/swift/SIL/SILBuilder.h b/include/swift/SIL/SILBuilder.h
index 3d8dbbf19be1d..10422ec523278 100644
--- a/include/swift/SIL/SILBuilder.h
+++ b/include/swift/SIL/SILBuilder.h
@@ -631,6 +631,10 @@ class SILBuilder {
     return insert(new (getModule()) GlobalValueInst(getSILDebugLocation(Loc), g,
                                                     getTypeExpansionContext()));
   }
+  BaseAddrForOffsetInst *createBaseAddrForOffset(SILLocation Loc, SILType Ty) {
+    return insert(new (F->getModule())
+                  BaseAddrForOffsetInst(getSILDebugLocation(Loc), Ty));
+  }
   IntegerLiteralInst *createIntegerLiteral(IntegerLiteralExpr *E);
 
   IntegerLiteralInst *createIntegerLiteral(SILLocation Loc, SILType Ty,
@@ -722,7 +726,8 @@ class SILBuilder {
   }
 
   LoadBorrowInst *createLoadBorrow(SILLocation Loc, SILValue LV) {
-    assert(isLoadableOrOpaque(LV->getType()));
+    assert(isLoadableOrOpaque(LV->getType()) &&
+           !LV->getType().isTrivial(getFunction()));
     return insert(new (getModule())
                       LoadBorrowInst(getSILDebugLocation(Loc), LV));
   }
@@ -733,11 +738,19 @@ class SILBuilder {
                       BeginBorrowInst(getSILDebugLocation(Loc), LV));
   }
 
+  /// Convenience function for creating a load_borrow on non-trivial values and
+  /// load [trivial] on trivial values. Becomes load unqualified in non-ossa
+  /// functions.
   SILValue emitLoadBorrowOperation(SILLocation loc, SILValue v) {
     if (!hasOwnership()) {
       return emitLoadValueOperation(loc, v,
                                     LoadOwnershipQualifier::Unqualified);
     }
+
+    if (v->getType().isTrivial(getFunction())) {
+      return emitLoadValueOperation(loc, v, LoadOwnershipQualifier::Trivial);
+    }
+
     return createLoadBorrow(loc, v);
   }
 
@@ -873,6 +886,33 @@ class SILBuilder {
                       StoreBorrowInst(getSILDebugLocation(Loc), Src, DestAddr));
   }
 
+  /// A helper function for emitting store_borrow in operations where one must
+  /// handle both ossa and non-ossa code.
+  ///
+  /// In words:
+  ///
+  /// * If the function does not have ownership, this just emits an unqualified
+  ///   store.
+  ///
+  /// * If the function has ownership, but the type is trivial, use store
+  ///   [trivial].
+  ///
+  /// * Otherwise, emit an actual store_borrow.
+  void emitStoreBorrowOperation(SILLocation loc, SILValue src,
+                                SILValue destAddr) {
+    if (!hasOwnership()) {
+      return emitStoreValueOperation(loc, src, destAddr,
+                                     StoreOwnershipQualifier::Unqualified);
+    }
+
+    if (src->getType().isTrivial(getFunction())) {
+      return emitStoreValueOperation(loc, src, destAddr,
+                                     StoreOwnershipQualifier::Trivial);
+    }
+
+    createStoreBorrow(loc, src, destAddr);
+  }
+
   MarkUninitializedInst *
   createMarkUninitialized(SILLocation Loc, SILValue src,
                           MarkUninitializedInst::Kind k) {
diff --git a/include/swift/SIL/SILCloner.h b/include/swift/SIL/SILCloner.h
index 331ec7fb1ac61..24d4fadca8dbe 100644
--- a/include/swift/SIL/SILCloner.h
+++ b/include/swift/SIL/SILCloner.h
@@ -1030,6 +1030,15 @@ SILCloner<ImplClass>::visitGlobalValueInst(GlobalValueInst *Inst) {
                                            Inst->getReferencedGlobal()));
 }
 
+template<typename ImplClass>
+void
+SILCloner<ImplClass>::visitBaseAddrForOffsetInst(BaseAddrForOffsetInst *Inst) {
+  getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
+  recordClonedInstruction(
+      Inst, getBuilder().createBaseAddrForOffset(getOpLocation(Inst->getLoc()),
+                                                  getOpType(Inst->getType())));
+}
+
 template<typename ImplClass>
 void
 SILCloner<ImplClass>::visitIntegerLiteralInst(IntegerLiteralInst *Inst) {
diff --git a/include/swift/SIL/SILDeclRef.h b/include/swift/SIL/SILDeclRef.h
index 542435e3ef3ec..3d1232e7553e8 100644
--- a/include/swift/SIL/SILDeclRef.h
+++ b/include/swift/SIL/SILDeclRef.h
@@ -21,7 +21,6 @@
 
 #include "swift/AST/ClangNode.h"
 #include "swift/AST/TypeAlignments.h"
-#include "swift/SIL/SILLinkage.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PointerUnion.h"
@@ -47,6 +46,7 @@ namespace swift {
   enum class SubclassScope : unsigned char;
   class SILModule;
   class SILLocation;
+  enum class SILLinkage : uint8_t;
   class AnyFunctionRef;
 
 /// How a method is dispatched.
@@ -309,7 +309,7 @@ struct SILDeclRef {
   /// function.
   SILDeclRef asAutoDiffDerivativeFunction(
       AutoDiffDerivativeFunctionIdentifier *derivativeId) const {
-    assert(!derivativeFunctionIdentifier);
+    assert(derivativeId);
     SILDeclRef declRef = *this;
     declRef.derivativeFunctionIdentifier = derivativeId;
     return declRef;
@@ -423,22 +423,6 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SILDeclRef C) {
   return OS;
 }
 
-// FIXME: This should not be necessary, but it looks like visibility rules for
-// extension members are slightly bogus, and so some protocol witness thunks
-// need to be public.
-//
-// We allow a 'public' member of an extension to witness a public
-// protocol requirement, even if the extended type is not public;
-// then SILGen gives the member private linkage, ignoring the more
-// visible access level it was given in the AST.
-inline bool
-fixmeWitnessHasLinkageThatNeedsToBePublic(SILDeclRef witness) {
-  auto witnessLinkage = witness.getLinkage(ForDefinition);
-  return !hasPublicVisibility(witnessLinkage)
-         && (!hasSharedVisibility(witnessLinkage)
-             || !witness.isSerialized());
-}
-
 } // end swift namespace
 
 namespace llvm {
diff --git a/include/swift/SIL/SILGlobalVariable.h b/include/swift/SIL/SILGlobalVariable.h
index e6a08be1305f0..da0b8d36ebd19 100644
--- a/include/swift/SIL/SILGlobalVariable.h
+++ b/include/swift/SIL/SILGlobalVariable.h
@@ -37,6 +37,9 @@ class SILGlobalVariable
   : public llvm::ilist_node<SILGlobalVariable>,
     public SILAllocated<SILGlobalVariable>
 {
+public:
+  using const_iterator = SILBasicBlock::const_iterator;
+
 private:
   friend class SILModule;
   friend class SILBuilder;
@@ -157,6 +160,9 @@ class SILGlobalVariable
     return dyn_cast_or_null<ObjectInst>(getStaticInitializerValue()) != nullptr;
   }
 
+  const_iterator begin() const { return StaticInitializerBlock.begin(); }
+  const_iterator end() const { return StaticInitializerBlock.end(); }
+
   /// Returns true if \p I is a valid instruction to be contained in the
   /// static initializer.
   static bool isValidStaticInitializerInst(const SILInstruction *I,
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
index 0f7bd45022eb5..d57e8454a096e 100644
--- a/include/swift/SIL/SILInstruction.h
+++ b/include/swift/SIL/SILInstruction.h
@@ -375,6 +375,12 @@ class SILInstruction
     /// The instruction may read memory.
     MayRead,
     /// The instruction may write to memory.
+    /// This includes destroying or taking from memory (e.g. destroy_addr,
+    /// copy_addr [take], load [take]).
+    /// Although, physically, destroying or taking does not modify the memory,
+    /// it is important to model it is a write. Optimizations must not assume
+    /// that the value stored in memory is still available for loading after
+    /// the memory is destroyed or taken.
     MayWrite,
     /// The instruction may read or write memory.
     MayReadWrite,
@@ -3207,6 +3213,20 @@ class GlobalAddrInst
       : InstructionBase(DebugLoc, Ty, nullptr) {}
 };
 
+/// Creates a base address for offset calculations.
+class BaseAddrForOffsetInst
+    : public InstructionBase<SILInstructionKind::BaseAddrForOffsetInst,
+                             LiteralInst> {
+  friend SILBuilder;
+
+  BaseAddrForOffsetInst(SILDebugLocation DebugLoc, SILType Ty)
+      : InstructionBase(DebugLoc, Ty) {}
+
+public:
+  ArrayRef<Operand> getAllOperands() const { return {}; }
+  MutableArrayRef<Operand> getAllOperands() { return {}; }
+};
+
 /// Gives the value of a global variable.
 ///
 /// The referenced global variable must be a statically initialized object.
@@ -5752,6 +5772,13 @@ class FieldIndexCacheBase : public SingleValueInstruction {
     return s;
   }
 
+  static bool classof(const SILNode *node) {
+    SILNodeKind kind = node->getKind();
+    return kind == SILNodeKind::StructExtractInst ||
+           kind == SILNodeKind::StructElementAddrInst ||
+           kind == SILNodeKind::RefElementAddrInst;
+  }
+
 private:
   unsigned cacheFieldIndex();
 };
diff --git a/include/swift/SIL/SILLinkage.h b/include/swift/SIL/SILLinkage.h
index 180e4f990bd9f..3b1f5a20d172e 100644
--- a/include/swift/SIL/SILLinkage.h
+++ b/include/swift/SIL/SILLinkage.h
@@ -15,6 +15,9 @@
 
 #include "llvm/Support/ErrorHandling.h"
 
+// FIXME: Remove after fixmeWitnessHasLinkageThatNeedsToBePublic is removed.
+#include "swift/SIL/SILDeclRef.h"
+
 namespace swift {
 
 class ValueDecl;
@@ -265,6 +268,22 @@ inline SILLinkage effectiveLinkageForClassMember(SILLinkage linkage,
   return linkage;
 }
 
+// FIXME: This should not be necessary, but it looks like visibility rules for
+// extension members are slightly bogus, and so some protocol witness thunks
+// need to be public.
+//
+// We allow a 'public' member of an extension to witness a public
+// protocol requirement, even if the extended type is not public;
+// then SILGen gives the member private linkage, ignoring the more
+// visible access level it was given in the AST.
+inline bool
+fixmeWitnessHasLinkageThatNeedsToBePublic(SILDeclRef witness) {
+  auto witnessLinkage = witness.getLinkage(ForDefinition);
+  return !hasPublicVisibility(witnessLinkage)
+         && (!hasSharedVisibility(witnessLinkage)
+             || !witness.isSerialized());
+}
+
 } // end swift namespace
 
 #endif
diff --git a/include/swift/SIL/SILNodes.def b/include/swift/SIL/SILNodes.def
index 44adf50b7aea8..352589fde1a81 100644
--- a/include/swift/SIL/SILNodes.def
+++ b/include/swift/SIL/SILNodes.def
@@ -458,6 +458,8 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
                       LiteralInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(GlobalAddrInst, global_addr,
                       LiteralInst, None, DoesNotRelease)
+    SINGLE_VALUE_INST(BaseAddrForOffsetInst, base_addr_for_offset,
+                      LiteralInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(GlobalValueInst, global_value,
                       LiteralInst, None, DoesNotRelease)
     SINGLE_VALUE_INST(IntegerLiteralInst, integer_literal,
diff --git a/include/swift/SIL/SILType.h b/include/swift/SIL/SILType.h
index 752c33f7ef8a3..f36f27177223c 100644
--- a/include/swift/SIL/SILType.h
+++ b/include/swift/SIL/SILType.h
@@ -18,14 +18,11 @@
 #ifndef SWIFT_SIL_SILTYPE_H
 #define SWIFT_SIL_SILTYPE_H
 
-#include "swift/AST/CanTypeVisitor.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/Types.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "swift/SIL/SILAllocated.h"
-#include "swift/SIL/SILArgumentConvention.h"
 #include "llvm/ADT/Hashing.h"
-#include "swift/SIL/SILDeclRef.h"
 
 namespace swift {
 
@@ -624,17 +621,18 @@ template<> Can##ID##Type SILType::getAs<ID##Type>() const = delete;  \
 template<> Can##ID##Type SILType::castTo<ID##Type>() const = delete; \
 template<> bool SILType::is<ID##Type>() const = delete;
 NON_SIL_TYPE(Function)
+NON_SIL_TYPE(GenericFunction)
 NON_SIL_TYPE(AnyFunction)
 NON_SIL_TYPE(LValue)
+NON_SIL_TYPE(InOut)
 #undef NON_SIL_TYPE
 
-CanSILFunctionType getNativeSILFunctionType(
-    Lowering::TypeConverter &TC, TypeExpansionContext context,
-    Lowering::AbstractionPattern origType, CanAnyFunctionType substType,
-    Optional<SILDeclRef> origConstant = None,
-    Optional<SILDeclRef> constant = None,
-    Optional<SubstitutionMap> reqtSubs = None,
-    ProtocolConformanceRef witnessMethodConformance = ProtocolConformanceRef());
+#define TYPE(ID, PARENT)
+#define UNCHECKED_TYPE(ID, PARENT)                                   \
+template<> Can##ID##Type SILType::getAs<ID##Type>() const = delete;  \
+template<> Can##ID##Type SILType::castTo<ID##Type>() const = delete; \
+template<> bool SILType::is<ID##Type>() const = delete;
+#include "swift/AST/TypeNodes.def"
 
 inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SILType T) {
   T.print(OS);
diff --git a/include/swift/SIL/SILVTableVisitor.h b/include/swift/SIL/SILVTableVisitor.h
index b9be52452b402..de8419b238601 100644
--- a/include/swift/SIL/SILVTableVisitor.h
+++ b/include/swift/SIL/SILVTableVisitor.h
@@ -18,55 +18,11 @@
 #ifndef SWIFT_SIL_SILVTABLEVISITOR_H
 #define SWIFT_SIL_SILVTABLEVISITOR_H
 
-#include <string>
-
 #include "swift/AST/Decl.h"
 #include "swift/AST/Types.h"
-#include "swift/AST/ASTMangler.h"
 
 namespace swift {
 
-// Utility class for deterministically ordering vtable entries for
-// synthesized methods.
-struct SortedFuncList {
-  using Entry = std::pair<std::string, AbstractFunctionDecl *>;
-  SmallVector<Entry, 2> elts;
-  bool sorted = false;
-
-  void add(AbstractFunctionDecl *afd) {
-    Mangle::ASTMangler mangler;
-    std::string mangledName;
-    if (auto *cd = dyn_cast<ConstructorDecl>(afd))
-      mangledName = mangler.mangleConstructorEntity(cd, 0);
-    else
-      mangledName = mangler.mangleEntity(afd);
-
-    elts.push_back(std::make_pair(mangledName, afd));
-  }
-
-  bool empty() { return elts.empty(); }
-
-  void sort() {
-    assert(!sorted);
-    sorted = true;
-    std::sort(elts.begin(),
-              elts.end(),
-              [](const Entry &lhs, const Entry &rhs) -> bool {
-                return lhs.first < rhs.first;
-              });
-  }
-
-  decltype(elts)::const_iterator begin() const {
-    assert(sorted);
-    return elts.begin();
-  }
-
-  decltype(elts)::const_iterator end() const {
-    assert(sorted);
-    return elts.end();
-  }
-};
-
 /// A CRTP class for visiting virtually-dispatched methods of a class.
 ///
 /// You must override these two methods in your subclass:
@@ -192,33 +148,8 @@ template <class T> class SILVTableVisitor {
     if (!theClass->hasKnownSwiftImplementation())
       return;
 
-    // Note that while vtable order is not ABI, we still want it to be
-    // consistent between translation units.
-    //
-    // So, sort synthesized members by their mangled name, since they
-    // are added lazily during type checking, with the remaining ones
-    // forced at the end.
-    SortedFuncList synthesizedMembers;
-
-    for (auto member : theClass->getEmittedMembers()) {
-      if (auto *afd = dyn_cast<AbstractFunctionDecl>(member)) {
-        if (afd->isSynthesized()) {
-          synthesizedMembers.add(afd);
-          continue;
-        }
-      }
-
+    for (auto member : theClass->getEmittedMembers())
       maybeAddMember(member);
-    }
-
-    if (synthesizedMembers.empty())
-      return;
-
-    synthesizedMembers.sort();
-
-    for (const auto &pair : synthesizedMembers) {
-      maybeAddMember(pair.second);
-    }
   }
 };
 
diff --git a/include/swift/SIL/SILValue.h b/include/swift/SIL/SILValue.h
index 6884c85e92de8..37064391dd50a 100644
--- a/include/swift/SIL/SILValue.h
+++ b/include/swift/SIL/SILValue.h
@@ -20,6 +20,8 @@
 #include "swift/Basic/Range.h"
 #include "swift/Basic/ArrayRefView.h"
 #include "swift/Basic/STLExtras.h"
+#include "swift/SIL/SILAllocated.h"
+#include "swift/SIL/SILArgumentConvention.h"
 #include "swift/SIL/SILNode.h"
 #include "swift/SIL/SILType.h"
 #include "llvm/ADT/ArrayRef.h"
diff --git a/include/swift/SIL/TypeLowering.h b/include/swift/SIL/TypeLowering.h
index 1b3757f23a75f..42db005ea3bdf 100644
--- a/include/swift/SIL/TypeLowering.h
+++ b/include/swift/SIL/TypeLowering.h
@@ -1095,6 +1095,15 @@ class TypeConverter {
 };
 
 } // namespace Lowering
+
+CanSILFunctionType getNativeSILFunctionType(
+    Lowering::TypeConverter &TC, TypeExpansionContext context,
+    Lowering::AbstractionPattern origType, CanAnyFunctionType substType,
+    Optional<SILDeclRef> origConstant = None,
+    Optional<SILDeclRef> constant = None,
+    Optional<SubstitutionMap> reqtSubs = None,
+    ProtocolConformanceRef witnessMethodConformance = ProtocolConformanceRef());
+
 } // namespace swift
 
 namespace llvm {
diff --git a/include/swift/SILOptimizer/Differentiation/ADContext.h b/include/swift/SILOptimizer/Differentiation/ADContext.h
index 1b0426aed0f1e..a5bf5e86f1505 100644
--- a/include/swift/SILOptimizer/Differentiation/ADContext.h
+++ b/include/swift/SILOptimizer/Differentiation/ADContext.h
@@ -253,11 +253,9 @@ ADContext::emitNondifferentiabilityError(SILValue value,
     getADDebugStream() << "For value:\n" << value;
     getADDebugStream() << "With invoker:\n" << invoker << '\n';
   });
-  auto valueLoc = value.getLoc().getSourceLoc();
   // If instruction does not have a valid location, use the function location
   // as a fallback. Improves diagnostics in some cases.
-  if (valueLoc.isInvalid())
-    valueLoc = value->getFunction()->getLocation().getSourceLoc();
+  auto valueLoc = getValidLocation(value).getSourceLoc();
   return emitNondifferentiabilityError(valueLoc, invoker, diag,
                                        std::forward<U>(args)...);
 }
@@ -272,12 +270,10 @@ ADContext::emitNondifferentiabilityError(SILInstruction *inst,
     getADDebugStream() << "For instruction:\n" << *inst;
     getADDebugStream() << "With invoker:\n" << invoker << '\n';
   });
-  auto instLoc = inst->getLoc().getSourceLoc();
   // If instruction does not have a valid location, use the function location
   // as a fallback. Improves diagnostics for `ref_element_addr` generated in
   // synthesized stored property getters.
-  if (instLoc.isInvalid())
-    instLoc = inst->getFunction()->getLocation().getSourceLoc();
+  auto instLoc = getValidLocation(inst).getSourceLoc();
   return emitNondifferentiabilityError(instLoc, invoker, diag,
                                        std::forward<U>(args)...);
 }
diff --git a/include/swift/SILOptimizer/Differentiation/Common.h b/include/swift/SILOptimizer/Differentiation/Common.h
index a4d8637b386d8..2f996740b08b6 100644
--- a/include/swift/SILOptimizer/Differentiation/Common.h
+++ b/include/swift/SILOptimizer/Differentiation/Common.h
@@ -17,6 +17,8 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_COMMON_H
 #define SWIFT_SILOPTIMIZER_UTILS_DIFFERENTIATION_COMMON_H
 
+#include "swift/AST/DiagnosticsSIL.h"
+#include "swift/AST/Expr.h"
 #include "swift/AST/SemanticAttrs.h"
 #include "swift/SIL/SILDifferentiabilityWitness.h"
 #include "swift/SIL/SILFunction.h"
@@ -24,15 +26,18 @@
 #include "swift/SIL/TypeSubstCloner.h"
 #include "swift/SILOptimizer/Analysis/ArraySemantic.h"
 #include "swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h"
+#include "swift/SILOptimizer/Differentiation/DifferentiationInvoker.h"
 
 namespace swift {
 
+namespace autodiff {
+
+class ADContext;
+
 //===----------------------------------------------------------------------===//
 // Helpers
 //===----------------------------------------------------------------------===//
 
-namespace autodiff {
-
 /// Prints an "[AD] " prefix to `llvm::dbgs()` and returns the debug stream.
 /// This is being used to print short debug messages within the AD pass.
 raw_ostream &getADDebugStream();
@@ -136,6 +141,36 @@ template <class Inst> Inst *peerThroughFunctionConversions(SILValue value) {
   return nullptr;
 }
 
+//===----------------------------------------------------------------------===//
+// Diagnostic utilities
+//===----------------------------------------------------------------------===//
+
+// Returns `v`'s location if it is valid. Otherwise, returns `v`'s function's
+// location as as a fallback. Used for diagnostics.
+SILLocation getValidLocation(SILValue v);
+
+// Returns `inst`'s location if it is valid. Otherwise, returns `inst`'s
+// function's location as as a fallback. Used for diagnostics.
+SILLocation getValidLocation(SILInstruction *inst);
+
+//===----------------------------------------------------------------------===//
+// Tangent property lookup utilities
+//===----------------------------------------------------------------------===//
+
+/// Returns the tangent stored property of the given original stored property
+/// and base type. On error, emits diagnostic and returns nullptr.
+VarDecl *getTangentStoredProperty(ADContext &context, VarDecl *originalField,
+                                  CanType baseType, SILLocation loc,
+                                  DifferentiationInvoker invoker);
+
+/// Returns the tangent stored property of the original stored property
+/// referenced by the given projection instruction with the given base type.
+/// On error, emits diagnostic and returns nullptr.
+VarDecl *getTangentStoredProperty(ADContext &context,
+                                  FieldIndexCacheBase *projectionInst,
+                                  CanType baseType,
+                                  DifferentiationInvoker invoker);
+
 //===----------------------------------------------------------------------===//
 // Code emission utilities
 //===----------------------------------------------------------------------===//
diff --git a/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h b/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
index 964923f2267bf..ccdfb99768de1 100644
--- a/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
+++ b/include/swift/SILOptimizer/Differentiation/PullbackEmitter.h
@@ -105,8 +105,8 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
   /// A set used to remember local allocations that were destroyed.
   llvm::SmallDenseSet<SILValue> destroyedLocalAllocations;
 
-  /// The seed argument in the pullback function.
-  SILArgument *seed = nullptr;
+  /// The seed arguments of the pullback function.
+  SmallVector<SILArgument *, 4> seeds;
 
   llvm::BumpPtrAllocator allocator;
 
@@ -218,6 +218,9 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
 
   Optional<TangentSpace> getTangentSpace(CanType type);
 
+  /// Returns the tangent value category of the given value.
+  SILValueCategory getTangentValueCategory(SILValue v);
+
   /// Assuming the given type conforms to `Differentiable` after remapping,
   /// returns the associated tangent space type.
   SILType getRemappedTangentType(SILType type);
@@ -264,6 +267,8 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
   SILValue getAdjointProjection(SILBasicBlock *origBB,
                                 SILValue originalProjection);
 
+  SILValue &getAdjointBuffer(SILBasicBlock *origBB, SILValue originalBuffer);
+
   SILBasicBlock::iterator getNextFunctionLocalAllocationInsertionPoint();
 
   /// Creates and returns a local allocation with the given type.
@@ -273,8 +278,6 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
   /// `destroyedLocalAllocations` are also destroyed in the pullback exit.
   AllocStackInst *createFunctionLocalAllocation(SILType type, SILLocation loc);
 
-  SILValue &getAdjointBuffer(SILBasicBlock *origBB, SILValue originalBuffer);
-
   /// Accumulates `rhsBufferAccess` into the adjoint buffer corresponding to
   /// `originalBuffer`.
   void addToAdjointBuffer(SILBasicBlock *origBB, SILValue originalBuffer,
diff --git a/include/swift/SILOptimizer/PassManager/Passes.def b/include/swift/SILOptimizer/PassManager/Passes.def
index 88630d491744e..82f18120c6038 100644
--- a/include/swift/SILOptimizer/PassManager/Passes.def
+++ b/include/swift/SILOptimizer/PassManager/Passes.def
@@ -283,6 +283,8 @@ PASS(PerformanceSILLinker, "performance-linker",
      "Deserialize all referenced SIL functions")
 PASS(RawSILInstLowering, "raw-sil-inst-lowering",
      "Lower all raw SIL instructions to canonical equivalents.")
+PASS(TempLValueOpt, "temp-lvalue-opt",
+     "Remove short-lived immutable temporary l-values")
 PASS(TempRValueOpt, "temp-rvalue-opt",
      "Remove short-lived immutable temporary copies")
 PASS(SideEffectsDumper, "side-effects-dump",
diff --git a/include/swift/SILOptimizer/Utils/SpecializationMangler.h b/include/swift/SILOptimizer/Utils/SpecializationMangler.h
index a280c3f1d14de..6006521020b3a 100644
--- a/include/swift/SILOptimizer/Utils/SpecializationMangler.h
+++ b/include/swift/SILOptimizer/Utils/SpecializationMangler.h
@@ -14,6 +14,7 @@
 #define SWIFT_SILOPTIMIZER_UTILS_SPECIALIZATIONMANGLER_H
 
 #include "swift/Demangling/Demangler.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/SIL/SILLinkage.h"
@@ -21,6 +22,7 @@
 
 namespace swift {
 namespace Mangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 enum class SpecializationKind : uint8_t {
   Generic,
@@ -169,6 +171,7 @@ class FunctionSignatureSpecializationMangler : public SpecializationMangler {
   void mangleReturnValue(ReturnValueModifierIntBase RetMod);
 };
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Mangle
 } // end namespace swift
 
diff --git a/include/swift/Serialization/SerializedModuleLoader.h b/include/swift/Serialization/SerializedModuleLoader.h
index 558b1891bad02..df1788fc8cd9a 100644
--- a/include/swift/Serialization/SerializedModuleLoader.h
+++ b/include/swift/Serialization/SerializedModuleLoader.h
@@ -200,6 +200,11 @@ class SerializedModuleLoaderBase : public ModuleLoader {
   virtual Optional<ModuleDependencies> getModuleDependencies(
       StringRef moduleName, ModuleDependenciesCache &cache,
       InterfaceSubContextDelegate &delegate) override;
+
+  virtual std::string getUpToDateCompiledModuleForInterface(StringRef moduleName,
+                                                      StringRef interfacePath) {
+    return std::string();
+  }
 };
 
 /// Imports serialized Swift modules into an ASTContext.
diff --git a/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h b/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h
index 01e6f43ab717f..7394547bef39c 100644
--- a/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h
+++ b/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h
@@ -324,16 +324,24 @@ const char *swift_reflection_iterateMetadataAllocations(
 /// Given a metadata allocation, return the metadata it points to. Returns NULL
 /// on failure. Despite the name, not all allocations point to metadata.
 /// Currently, this will return a metadata only for allocations with tag
-/// SWIFT_GENERIC_METADATA_CACHE_ALLOCATION. Support for additional tags may be
-/// added in the future. The caller must gracefully handle failure.
+/// GenericMetadataCache. Support for additional tags may be added in the
+/// future. The caller must gracefully handle failure.
 SWIFT_REMOTE_MIRROR_LINKAGE
 swift_reflection_ptr_t swift_reflection_allocationMetadataPointer(
   SwiftReflectionContextRef ContextRef,
   swift_metadata_allocation_t Allocation);
 
+/// Return the name of a metadata allocation tag, or NULL if the tag is unknown.
+/// This pointer remains valid until the next swift_reflection call on the given
+/// context.
+SWIFT_REMOTE_MIRROR_LINKAGE
+const char *
+swift_reflection_metadataAllocationTagName(SwiftReflectionContextRef ContextRef,
+                                           swift_metadata_allocation_tag_t Tag);
+
 /// Backtrace iterator callback passed to
 /// swift_reflection_iterateMetadataAllocationBacktraces
-typedef void (*swift_metadataAllocationIterator)(
+typedef void (*swift_metadataAllocationBacktraceIterator)(
     swift_reflection_ptr_t AllocationPtr, size_t Count,
     const swift_reflection_ptr_t Ptrs[], void *ContextPtr);
 
@@ -350,8 +358,8 @@ typedef void (*swift_metadataAllocationIterator)(
 /// swift_reflection call on the given context.
 SWIFT_REMOTE_MIRROR_LINKAGE
 const char *swift_reflection_iterateMetadataAllocationBacktraces(
-    SwiftReflectionContextRef ContextRef, swift_metadataAllocationIterator Call,
-    void *ContextPtr);
+    SwiftReflectionContextRef ContextRef,
+    swift_metadataAllocationBacktraceIterator Call, void *ContextPtr);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h b/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h
index e97d686e45da3..0b07ec7633390 100644
--- a/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h
+++ b/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorLegacyInterop.h
@@ -585,7 +585,7 @@ swift_reflection_interop_minimalDataLayoutQueryFunction8(
 #else
     int applePlatform = 0;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
     int iosDerivedPlatform = 1;
 #else
     int iosDerivedPlatform = 0;
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 2a617a3616ec1..bf3b609c68d30 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -156,6 +156,11 @@ struct ASTContext::Implementation {
   /// The set of cleanups to be called when the ASTContext is destroyed.
   std::vector<std::function<void(void)>> Cleanups;
 
+  /// The set of top-level modules we have loaded.
+  /// This map is used for iteration, therefore it's a MapVector and not a
+  /// DenseMap.
+  llvm::MapVector<Identifier, ModuleDecl *> LoadedModules;
+
   // FIXME: This is a StringMap rather than a StringSet because StringSet
   // doesn't allow passing in a pre-existing allocator.
   llvm::StringMap<Identifier::Aligner, llvm::BumpPtrAllocator&>
@@ -258,6 +263,9 @@ struct ASTContext::Implementation {
   /// The module loader used to load Clang modules from DWARF.
   ClangModuleLoader *TheDWARFModuleLoader = nullptr;
 
+  /// The module loader used to load Swift textual interface.
+  ModuleLoader *TheModuleInterfaceLoader = nullptr;
+
   /// Map from Swift declarations to raw comments.
   llvm::DenseMap<const Decl *, RawComment> RawComments;
 
@@ -1445,14 +1453,15 @@ void ASTContext::addSearchPath(StringRef searchPath, bool isFramework,
 }
 
 void ASTContext::addModuleLoader(std::unique_ptr<ModuleLoader> loader,
-                                 bool IsClang, bool IsDwarf) {
+                                 bool IsClang, bool IsDwarf, bool IsInterface) {
   if (IsClang && !IsDwarf && !getImpl().TheClangModuleLoader)
     getImpl().TheClangModuleLoader =
         static_cast<ClangModuleLoader *>(loader.get());
   if (IsClang && IsDwarf && !getImpl().TheDWARFModuleLoader)
     getImpl().TheDWARFModuleLoader =
         static_cast<ClangModuleLoader *>(loader.get());
-
+  if (IsInterface && !getImpl().TheModuleInterfaceLoader)
+    getImpl().TheModuleInterfaceLoader = loader.get();
   getImpl().ModuleLoaders.push_back(std::move(loader));
 }
 
@@ -1527,6 +1536,10 @@ ClangModuleLoader *ASTContext::getDWARFModuleLoader() const {
   return getImpl().TheDWARFModuleLoader;
 }
 
+ModuleLoader *ASTContext::getModuleInterfaceLoader() const {
+  return getImpl().TheModuleInterfaceLoader;
+}
+
 ModuleDecl *ASTContext::getLoadedModule(
     ArrayRef<Located<Identifier>> ModulePath) const {
   assert(!ModulePath.empty());
@@ -1538,8 +1551,18 @@ ModuleDecl *ASTContext::getLoadedModule(
   return nullptr;
 }
 
+iterator_range<llvm::MapVector<Identifier, ModuleDecl *>::const_iterator>
+ASTContext::getLoadedModules() const {
+  return {getImpl().LoadedModules.begin(), getImpl().LoadedModules.end()};
+}
+
 ModuleDecl *ASTContext::getLoadedModule(Identifier ModuleName) const {
-  return LoadedModules.lookup(ModuleName);
+  return getImpl().LoadedModules.lookup(ModuleName);
+}
+
+void ASTContext::addLoadedModule(ModuleDecl *M) {
+  assert(M);
+  getImpl().LoadedModules[M->getName()] = M;
 }
 
 static AllocationArena getArena(GenericSignature genericSig) {
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
index a8c26677f43bc..df7b9e300fc23 100644
--- a/lib/AST/ASTDumper.cpp
+++ b/lib/AST/ASTDumper.cpp
@@ -900,6 +900,12 @@ namespace {
 
     void visitEnumElementDecl(EnumElementDecl *EED) {
       printCommon(EED, "enum_element_decl");
+      if (auto *paramList = EED->getParameterList()) {
+        Indent += 2;
+        OS << "\n";
+        printParameterList(paramList);
+        Indent -= 2;
+      }
       PrintWithColorRAII(OS, ParenthesisColor) << ')';
     }
 
@@ -1011,7 +1017,7 @@ namespace {
       if (P->isAutoClosure())
         OS << " autoclosure";
 
-      if (P->isNonEphemeral())
+      if (P->getAttrs().hasAttribute<NonEphemeralAttr>())
         OS << " nonEphemeral";
 
       if (P->getDefaultArgumentKind() != DefaultArgumentKind::None) {
@@ -1038,11 +1044,6 @@ namespace {
       OS.indent(Indent);
       PrintWithColorRAII(OS, ParenthesisColor) << '(';
       PrintWithColorRAII(OS, ParameterColor) << "parameter_list";
-      Indent += 2;
-      for (auto P : *params) {
-        OS << '\n';
-        printParameter(P);
-      }
 
       if (!ctx && params->size() != 0 && params->get(0))
         ctx = &params->get(0)->getASTContext();
@@ -1056,8 +1057,14 @@ namespace {
         }
       }
 
-      PrintWithColorRAII(OS, ParenthesisColor) << ')';
+      Indent += 2;
+      for (auto P : *params) {
+        OS << '\n';
+        printParameter(P);
+      }
       Indent -= 2;
+
+      PrintWithColorRAII(OS, ParenthesisColor) << ')';
     }
 
     void printAbstractFunctionDecl(AbstractFunctionDecl *D) {
@@ -1884,6 +1891,10 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
 
   void visitCodeCompletionExpr(CodeCompletionExpr *E) {
     printCommon(E, "code_completion_expr");
+    if (E->getBase()) {
+      OS << '\n';
+      printRec(E->getBase());
+    }
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
   }
 
@@ -3513,7 +3524,7 @@ namespace {
       if (T->getParent())
         printRec("parent", T->getParent());
 
-      for (auto arg : T->getInnermostGenericArgs())
+      for (const auto &arg : T->getDirectGenericArgs())
         printRec(arg);
       PrintWithColorRAII(OS, ParenthesisColor) << ')';
     }
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
index ec579237a8311..64c84455b14e3 100644
--- a/lib/AST/ASTMangler.cpp
+++ b/lib/AST/ASTMangler.cpp
@@ -28,6 +28,7 @@
 #include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/ProtocolConformanceRef.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/Demangling/ManglingUtils.h"
@@ -677,8 +678,10 @@ std::string ASTMangler::mangleAccessorEntityAsUSR(AccessorKind kind,
   llvm::SaveAndRestore<bool> allowUnnamedRAII(AllowNamelessEntities, true);
   Buffer << USRPrefix;
   appendAccessorEntity(getCodeForAccessorKind(kind), decl, isStatic);
-  // We have a custom prefix, so finalize() won't verify for us. Do it manually.
-  verify(Storage.str().drop_front(USRPrefix.size()));
+  // We have a custom prefix, so finalize() won't verify for us. If we're not
+  // in invalid code (coming from an IDE caller) verify manually.
+  if (!decl->isInvalid())
+    verify(Storage.str().drop_front(USRPrefix.size()));
   return finalize();
 }
 
@@ -2739,7 +2742,7 @@ void ASTMangler::appendConstructorEntity(const ConstructorDecl *ctor,
 }
 
 void ASTMangler::appendDestructorEntity(const DestructorDecl *dtor,
-                                     bool isDeallocating) {
+                                        bool isDeallocating) {
   appendContextOf(dtor);
   appendOperator(isDeallocating ? "fD" : "fd");
 }
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
index 56fe31e3f8a91..d9e3b6f6960e3 100644
--- a/lib/AST/ASTPrinter.cpp
+++ b/lib/AST/ASTPrinter.cpp
@@ -30,6 +30,7 @@
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/PrintOptions.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/Stmt.h"
 #include "swift/AST/TypeVisitor.h"
 #include "swift/AST/TypeWalker.h"
@@ -475,7 +476,7 @@ void StreamPrinter::printText(StringRef Text) {
 /// Whether we will be printing a TypeLoc by using the TypeRepr printer
 static bool willUseTypeReprPrinting(TypeLoc tyLoc,
                                     Type currentType,
-                                    PrintOptions options) {
+                                    const PrintOptions &options) {
   // Special case for when transforming archetypes
   if (currentType && tyLoc.getType())
     return false;
@@ -686,7 +687,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
     }
   }
 
-  void printTypeWithOptions(Type T, PrintOptions options) {
+  void printTypeWithOptions(Type T, const PrintOptions &options) {
     if (options.TransformContext) {
       // FIXME: it's not clear exactly what we want to keep from the existing
       // options, and what we want to discard.
@@ -736,7 +737,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
     printTransformedTypeWithOptions(T, Options);
   }
 
-  void printTypeLocWithOptions(const TypeLoc &TL, PrintOptions options) {
+  void printTypeLocWithOptions(const TypeLoc &TL, const PrintOptions &options) {
     if (CurrentType && TL.getType()) {
       printTransformedTypeWithOptions(TL.getType(), options);
       return;
@@ -1081,7 +1082,7 @@ void PrintAST::printTypedPattern(const TypedPattern *TP) {
 
 /// Determines if we are required to print the name of a property declaration,
 /// or if we can elide it by printing a '_' instead.
-static bool mustPrintPropertyName(VarDecl *decl, PrintOptions opts) {
+static bool mustPrintPropertyName(VarDecl *decl, const PrintOptions &opts) {
   // If we're not allowed to omit the name, we must print it.
   if (!opts.OmitNameOfInaccessibleProperties) return true;
 
@@ -2636,8 +2637,10 @@ static bool isEscaping(Type type) {
   return false;
 }
 
-static void printParameterFlags(ASTPrinter &printer, PrintOptions options,
-                                ParameterTypeFlags flags, bool escaping) {
+static void printParameterFlags(ASTPrinter &printer,
+                                const PrintOptions &options,
+                                ParameterTypeFlags flags,
+                                bool escaping) {
   if (!options.excludeAttrKind(TAK_autoclosure) && flags.isAutoClosure())
     printer.printAttrName("@autoclosure ");
   if (!options.excludeAttrKind(TAK_noDerivative) && flags.isNoDerivative())
@@ -3812,7 +3815,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     }
 
     printQualifiedType(T);
-    printGenericArgs(T->getInnermostGenericArgs());
+    printGenericArgs(T->getDirectGenericArgs());
   }
 
   void visitParenType(ParenType *T) {
@@ -4680,12 +4683,13 @@ void GenericSignatureImpl::print(ASTPrinter &Printer, PrintOptions PO) const {
   GenericSignature(const_cast<GenericSignatureImpl *>(this)).print(Printer, PO);
 }
 
-void GenericSignature::print(raw_ostream &OS, PrintOptions Opts) const {
+void GenericSignature::print(raw_ostream &OS, const PrintOptions &Opts) const {
   StreamPrinter Printer(OS);
   print(Printer, Opts);
 }
 
-void GenericSignature::print(ASTPrinter &Printer, PrintOptions Opts) const {
+void GenericSignature::print(ASTPrinter &Printer,
+                             const PrintOptions &Opts) const {
   if (isNull()) {
     Printer << "<null>";
     return;
diff --git a/lib/AST/Attr.cpp b/lib/AST/Attr.cpp
index 8173205f3d2cf..5369fe49b2251 100644
--- a/lib/AST/Attr.cpp
+++ b/lib/AST/Attr.cpp
@@ -528,8 +528,8 @@ static std::string getDifferentiationParametersClauseString(
 /// - If `omitWrtClause` is true, omit printing the `wrt:` differentiation
 ///   parameters clause.
 static void printDifferentiableAttrArguments(
-    const DifferentiableAttr *attr, ASTPrinter &printer, PrintOptions Options,
-    const Decl *D, bool omitWrtClause = false) {
+    const DifferentiableAttr *attr, ASTPrinter &printer,
+    const PrintOptions &Options, const Decl *D, bool omitWrtClause = false) {
   assert(D);
   // Create a temporary string for the attribute argument text.
   std::string attrArgText;
@@ -749,8 +749,11 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     if (auto *VD = dyn_cast<ValueDecl>(D)) {
       if (auto *BD = VD->getOverriddenDecl()) {
         if (!BD->hasClangNode() &&
-            VD->isEffectiveLinkageMoreVisibleThan(BD))
+            !BD->getFormalAccessScope(VD->getDeclContext(),
+                                      /*treatUsableFromInlineAsPublic*/ true)
+                 .isPublic()) {
           return false;
+        }
       }
     }
     break;
@@ -1711,9 +1714,8 @@ void DifferentiableAttr::setParameterIndices(IndexSubset *paramIndices) {
 
 GenericEnvironment *DifferentiableAttr::getDerivativeGenericEnvironment(
     AbstractFunctionDecl *original) const {
-  GenericEnvironment *derivativeGenEnv = original->getGenericEnvironment();
   if (auto derivativeGenSig = getDerivativeGenericSignature())
-    return derivativeGenEnv = derivativeGenSig->getGenericEnvironment();
+    return derivativeGenSig->getGenericEnvironment();
   return original->getGenericEnvironment();
 }
 
diff --git a/lib/AST/AutoDiff.cpp b/lib/AST/AutoDiff.cpp
index df1376a6cc41a..83b7d981f08db 100644
--- a/lib/AST/AutoDiff.cpp
+++ b/lib/AST/AutoDiff.cpp
@@ -421,3 +421,134 @@ void DerivativeFunctionTypeError::log(raw_ostream &OS) const {
   }
   }
 }
+
+bool swift::operator==(const TangentPropertyInfo::Error &lhs,
+                       const TangentPropertyInfo::Error &rhs) {
+  if (lhs.kind != rhs.kind)
+    return false;
+  switch (lhs.kind) {
+  case TangentPropertyInfo::Error::Kind::NoDerivativeOriginalProperty:
+  case TangentPropertyInfo::Error::Kind::NominalParentNotDifferentiable:
+  case TangentPropertyInfo::Error::Kind::OriginalPropertyNotDifferentiable:
+  case TangentPropertyInfo::Error::Kind::ParentTangentVectorNotStruct:
+  case TangentPropertyInfo::Error::Kind::TangentPropertyNotFound:
+  case TangentPropertyInfo::Error::Kind::TangentPropertyNotStored:
+    return true;
+  case TangentPropertyInfo::Error::Kind::TangentPropertyWrongType:
+    return lhs.getType()->isEqual(rhs.getType());
+  }
+}
+
+void swift::simple_display(llvm::raw_ostream &os, TangentPropertyInfo info) {
+  os << "{ ";
+  os << "tangent property: "
+     << (info.tangentProperty ? info.tangentProperty->printRef() : "null");
+  if (info.error) {
+    os << ", error: ";
+    switch (info.error->kind) {
+    case TangentPropertyInfo::Error::Kind::NoDerivativeOriginalProperty:
+      os << "'@noDerivative' original property has no tangent property";
+      break;
+    case TangentPropertyInfo::Error::Kind::NominalParentNotDifferentiable:
+      os << "nominal parent does not conform to 'Differentiable'";
+      break;
+    case TangentPropertyInfo::Error::Kind::OriginalPropertyNotDifferentiable:
+      os << "original property type does not conform to 'Differentiable'";
+      break;
+    case TangentPropertyInfo::Error::Kind::ParentTangentVectorNotStruct:
+      os << "'TangentVector' type is not a struct";
+      break;
+    case TangentPropertyInfo::Error::Kind::TangentPropertyNotFound:
+      os << "'TangentVector' struct does not have stored property with the "
+            "same name as the original property";
+      break;
+    case TangentPropertyInfo::Error::Kind::TangentPropertyWrongType:
+      os << "tangent property's type is not equal to the original property's "
+            "'TangentVector' type";
+      break;
+    case TangentPropertyInfo::Error::Kind::TangentPropertyNotStored:
+      os << "'TangentVector' property '" << info.tangentProperty->getName()
+         << "' is not a stored property";
+      break;
+    }
+  }
+  os << " }";
+}
+
+TangentPropertyInfo TangentStoredPropertyRequest::evaluate(
+    Evaluator &evaluator, VarDecl *originalField, CanType baseType) const {
+  assert(((originalField->hasStorage() && originalField->isInstanceMember()) ||
+          originalField->hasAttachedPropertyWrapper()) &&
+         "Expected a stored property or a property-wrapped property");
+  auto *parentDC = originalField->getDeclContext();
+  assert(parentDC->isTypeContext());
+  auto *moduleDecl = originalField->getModuleContext();
+  auto parentTan =
+      baseType->getAutoDiffTangentSpace(LookUpConformanceInModule(moduleDecl));
+  // Error if parent nominal type does not conform to `Differentiable`.
+  if (!parentTan) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::NominalParentNotDifferentiable);
+  }
+  // Error if original stored property is `@noDerivative`.
+  if (originalField->getAttrs().hasAttribute<NoDerivativeAttr>()) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::NoDerivativeOriginalProperty);
+  }
+  // Error if original property's type does not conform to `Differentiable`.
+  auto originalFieldType = baseType->getTypeOfMember(
+      originalField->getModuleContext(), originalField);
+  auto originalFieldTan = originalFieldType->getAutoDiffTangentSpace(
+      LookUpConformanceInModule(moduleDecl));
+  if (!originalFieldTan) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::OriginalPropertyNotDifferentiable);
+  }
+  // Get the parent `TangentVector` type.
+  auto parentTanType =
+      baseType->getAutoDiffTangentSpace(LookUpConformanceInModule(moduleDecl))
+          ->getType();
+  auto *parentTanStruct = parentTanType->getStructOrBoundGenericStruct();
+  // Error if parent `TangentVector` is not a struct.
+  if (!parentTanStruct) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::ParentTangentVectorNotStruct);
+  }
+  // Find the corresponding field in the tangent space.
+  VarDecl *tanField = nullptr;
+  // If `TangentVector` is the original struct, then the tangent property is the
+  // original property.
+  if (parentTanStruct == parentDC->getSelfStructDecl()) {
+    tanField = originalField;
+  }
+  // Otherwise, look up the field by name.
+  else {
+    auto tanFieldLookup =
+        parentTanStruct->lookupDirect(originalField->getName());
+    llvm::erase_if(tanFieldLookup,
+                   [](ValueDecl *v) { return !isa<VarDecl>(v); });
+    // Error if tangent property could not be found.
+    if (tanFieldLookup.empty()) {
+      return TangentPropertyInfo(
+          TangentPropertyInfo::Error::Kind::TangentPropertyNotFound);
+    }
+    tanField = cast<VarDecl>(tanFieldLookup.front());
+  }
+  // Error if tangent property's type is not equal to the original property's
+  // `TangentVector` type.
+  auto originalFieldTanType = originalFieldTan->getType();
+  auto tanFieldType =
+      parentTanType->getTypeOfMember(tanField->getModuleContext(), tanField);
+  if (!originalFieldTanType->isEqual(tanFieldType)) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::TangentPropertyWrongType,
+        originalFieldTanType);
+  }
+  // Error if tangent property is not a stored property.
+  if (!tanField->hasStorage()) {
+    return TangentPropertyInfo(
+        TangentPropertyInfo::Error::Kind::TangentPropertyNotStored);
+  }
+  // Otherwise, tangent property is valid.
+  return TangentPropertyInfo(tanField);
+}
diff --git a/lib/AST/Availability.cpp b/lib/AST/Availability.cpp
index 7eacce69db72e..48cb3911128e6 100644
--- a/lib/AST/Availability.cpp
+++ b/lib/AST/Availability.cpp
@@ -246,9 +246,16 @@ AvailabilityContext ASTContext::getSwift50Availability() {
     return AvailabilityContext::alwaysAvailable();
 
   if (target.isMacOSX()) {
+    if (target.isAArch64())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
                             VersionRange::allGTE(llvm::VersionTuple(10,14,4)));
   } else if (target.isiOS()) {
+    if (target.isAArch64() &&
+        (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
                             VersionRange::allGTE(llvm::VersionTuple(12,2)));
   } else if (target.isWatchOS()) {
@@ -274,9 +281,16 @@ AvailabilityContext ASTContext::getSwift51Availability() {
     return AvailabilityContext::alwaysAvailable();
 
   if (target.isMacOSX()) {
+    if (target.isAArch64())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
                             VersionRange::allGTE(llvm::VersionTuple(10,15,0)));
   } else if (target.isiOS()) {
+    if (target.isAArch64() &&
+        (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
                             VersionRange::allGTE(llvm::VersionTuple(13,0,0)));
   } else if (target.isWatchOS()) {
@@ -295,24 +309,42 @@ AvailabilityContext ASTContext::getPrespecializedGenericMetadataAvailability() {
   return getSwift53Availability();
 }
 
+AvailabilityContext ASTContext::getCompareTypeContextDescriptorsAvailability() {
+  return getSwiftFutureAvailability();
+}
+
+AvailabilityContext
+ASTContext::getCompareProtocolConformanceDescriptorsAvailability() {
+  return getSwiftFutureAvailability();
+}
+
 AvailabilityContext ASTContext::getSwift52Availability() {
   auto target = LangOpts.Target;
 
   if (target.getArchName() == "arm64e")
     return AvailabilityContext::alwaysAvailable();
 
-  if (target.isMacOSX() ) {
+  if (target.isMacOSX()) {
+    if (target.isAArch64())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(10, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(10, 15, 4)));
   } else if (target.isiOS()) {
+    if (target.isAArch64() &&
+        (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(13, 4, 0)));
   } else if (target.isWatchOS()) {
+    if (target.isArch64Bit())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
-  } else {
-    return AvailabilityContext::alwaysAvailable();
+        VersionRange::allGTE(llvm::VersionTuple(6, 2, 0)));
   }
+  return AvailabilityContext::alwaysAvailable();
 }
 
 AvailabilityContext ASTContext::getSwift53Availability() {
@@ -322,14 +354,26 @@ AvailabilityContext ASTContext::getSwift53Availability() {
     return AvailabilityContext::alwaysAvailable();
 
   if (target.isMacOSX() ) {
+    if (target.isAArch64())
+      return AvailabilityContext::alwaysAvailable();
+
+    llvm::VersionTuple macOVersion53(10, 16, 0);
+    macOVersion53 = canonicalizePlatformVersion(PlatformKind::OSX, macOVersion53);
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(10, 99, 0)));
+        VersionRange::allGTE(macOVersion53));
   } else if (target.isiOS()) {
+    if (target.isAArch64() &&
+        (target.isSimulatorEnvironment() || target.isMacCatalystEnvironment()))
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(14, 0, 0)));
   } else if (target.isWatchOS()) {
+    if (target.isArch64Bit())
+      return AvailabilityContext::alwaysAvailable();
+
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(7, 0, 0)));
   } else {
     return AvailabilityContext::alwaysAvailable();
   }
@@ -340,7 +384,7 @@ AvailabilityContext ASTContext::getSwiftFutureAvailability() {
 
   if (target.isMacOSX() ) {
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(10, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
   } else if (target.isiOS()) {
     return AvailabilityContext(
         VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
index 26d74feb33012..1cac247b15134 100644
--- a/lib/AST/CMakeLists.txt
+++ b/lib/AST/CMakeLists.txt
@@ -56,6 +56,7 @@ add_swift_host_library(swiftAST STATIC
   IndexSubset.cpp
   InlinableText.cpp
   LayoutConstraint.cpp
+  LocalizationFormat.cpp
   Module.cpp
   ModuleDependencies.cpp
   ModuleLoader.cpp
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 53bede44749f5..e377aa4789b49 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -1297,7 +1297,16 @@ bool ExtensionDecl::isConstrainedExtension() const {
 
 bool ExtensionDecl::isEquivalentToExtendedContext() const {
   auto decl = getExtendedNominal();
-  return getParentModule() == decl->getParentModule()
+  bool extendDeclFromSameModule = false;
+  if (!decl->getAlternateModuleName().empty()) {
+    // if the extended type was defined in the same module with the extension,
+    // we should consider them as the same module to preserve ABI stability.
+    extendDeclFromSameModule = decl->getAlternateModuleName() ==
+      getParentModule()->getNameStr();
+  } else {
+    extendDeclFromSameModule = decl->getParentModule() == getParentModule();
+  }
+  return extendDeclFromSameModule
     && !isConstrainedExtension()
     && !getDeclaredInterfaceType()->isExistentialType();
 }
@@ -3545,17 +3554,9 @@ static bool checkAccess(const DeclContext *useDC, const ValueDecl *VD,
     return useSF && useSF->hasTestableOrPrivateImport(access, sourceModule);
   }
   case AccessLevel::Public:
-  case AccessLevel::Open: {
-    if (useDC && VD->isSPI()) {
-      auto useModuleScopeContext = useDC->getModuleScopeContext();
-      if (useModuleScopeContext == sourceDC->getModuleScopeContext()) return true;
-
-      auto *useSF = dyn_cast<SourceFile>(useModuleScopeContext);
-      return !useSF || useSF->isImportedAsSPI(VD);
-    }
+  case AccessLevel::Open:
     return true;
   }
-  }
   llvm_unreachable("bad access level");
 }
 
@@ -4280,11 +4281,11 @@ DestructorDecl *ClassDecl::getDestructor() const {
                            nullptr);
 }
 
-DeclRange ClassDecl::getEmittedMembers() const {
+ArrayRef<Decl *> ClassDecl::getEmittedMembers() const {
   ASTContext &ctx = getASTContext();
   return evaluateOrDefault(ctx.evaluator,
                            EmittedMembersRequest{const_cast<ClassDecl *>(this)},
-                           getMembers());
+                           ArrayRef<Decl *>());
 }
 
 /// Synthesizer callback for an empty implicit function body.
@@ -4313,6 +4314,10 @@ GetDestructorRequest::evaluate(Evaluator &evaluator, ClassDecl *CD) const {
   if (ctx.LangOpts.EnableObjCInterop)
     CD->recordObjCMethod(DD, DD->getObjCSelector());
 
+  // Mark it as synthesized to make its location in getEmittedMembers()
+  // deterministic.
+  DD->setSynthesized(true);
+
   return DD;
 }
 
@@ -6261,6 +6266,36 @@ SourceRange ParamDecl::getSourceRange() const {
   return startLoc;
 }
 
+bool ParamDecl::isNonEphemeral() const {
+  if (getAttrs().hasAttribute<NonEphemeralAttr>())
+    return true;
+
+  // Only enum element parameters are non-ephemeral without '@_nonEphemeral'.
+  auto *parentDecl = getDeclContext()->getAsDecl();
+  if (!parentDecl || !isa<EnumElementDecl>(parentDecl))
+    return false;
+
+  // Only pointer parameters can be non-ephemeral.
+  auto ty = getInterfaceType();
+  if (!ty->lookThroughSingleOptionalType()->getAnyPointerElementType())
+    return false;
+
+  return true;
+}
+
+void ParamDecl::setNonEphemeralIfPossible() {
+  assert(hasInterfaceType() && "Must be pre-typechecked.");
+  // Don't apply the attribute if this isn't a pointer param.
+  auto type = getInterfaceType();
+  if (!type->lookThroughSingleOptionalType()->getAnyPointerElementType())
+    return;
+
+  if (!getAttrs().hasAttribute<NonEphemeralAttr>()) {
+    auto &ctx = getASTContext();
+    getAttrs().add(new (ctx) NonEphemeralAttr(/*IsImplicit*/ true));
+  }
+}
+
 Type ParamDecl::getVarargBaseTy(Type VarArgT) {
   TypeBase *T = VarArgT.getPointer();
   if (auto *AT = dyn_cast<ArraySliceType>(T))
diff --git a/lib/AST/DiagnosticEngine.cpp b/lib/AST/DiagnosticEngine.cpp
index f0d5f76df87c9..9e0094d02b279 100644
--- a/lib/AST/DiagnosticEngine.cpp
+++ b/lib/AST/DiagnosticEngine.cpp
@@ -20,6 +20,7 @@
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticSuppression.h"
+#include "swift/AST/LocalizationFormat.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/PrintOptions.h"
@@ -1011,10 +1012,17 @@ void DiagnosticEngine::emitDiagnostic(const Diagnostic &diagnostic) {
 
 const char *DiagnosticEngine::diagnosticStringFor(const DiagID id,
                                                   bool printDiagnosticName) {
+  // TODO: Print diagnostic names from `localization`.
   if (printDiagnosticName) {
     return debugDiagnosticStrings[(unsigned)id];
   }
-  return diagnosticStrings[(unsigned)id];
+  auto defaultMessage = diagnosticStrings[(unsigned)id];
+  if (localization) {
+    auto localizedMessage =
+        localization.get()->getMessageOr(id, defaultMessage);
+    return localizedMessage.data();
+  }
+  return defaultMessage;
 }
 
 const char *InFlightDiagnostic::fixItStringFor(const FixItID id) {
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index da1abe0e0b28f..4ed744025e9c1 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -2012,7 +2012,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
     body = body->getSemanticsProvidingExpr();
 
     if (auto *openExistential = dyn_cast<OpenExistentialExpr>(body)) {
-      body = openExistential->getSubExpr();
+      body = openExistential->getSubExpr()->getSemanticsProvidingExpr();
     }
 
     if (auto *outerCall = dyn_cast<ApplyExpr>(body)) {
@@ -2032,7 +2032,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
       innerBody = innerBody->getSemanticsProvidingExpr();
 
       if (auto *openExistential = dyn_cast<OpenExistentialExpr>(innerBody)) {
-        innerBody = openExistential->getSubExpr();
+        innerBody = openExistential->getSubExpr()->getSemanticsProvidingExpr();
         if (auto *ICE = dyn_cast<ImplicitConversionExpr>(innerBody))
           innerBody = ICE->getSyntacticSubExpr();
       }
diff --git a/lib/AST/GenericSignature.cpp b/lib/AST/GenericSignature.cpp
index a8858e687c021..9b6befde6a9ea 100644
--- a/lib/AST/GenericSignature.cpp
+++ b/lib/AST/GenericSignature.cpp
@@ -236,18 +236,27 @@ CanGenericSignature::getCanonical(TypeArrayView<GenericTypeParamType> params,
              "Left-hand side is not canonical");
       break;
 
-    case RequirementKind::SameType:
-      assert(reqt.getFirstType()->isTypeParameter() &&
-             "Left-hand side must be a type parameter");
+    case RequirementKind::SameType: {
+      auto isCanonicalAnchor = [&](Type type) {
+        if (auto *dmt = type->getAs<DependentMemberType>())
+          return canSig->isCanonicalTypeInContext(dmt->getBase());
+        return type->is<GenericTypeParamType>();
+      };
+
+      auto firstType = reqt.getFirstType();
+      auto secondType = reqt.getSecondType();
+      assert(isCanonicalAnchor(firstType));
+
       if (reqt.getSecondType()->isTypeParameter()) {
-        assert(compareDependentTypes(reqt.getFirstType(), reqt.getSecondType())
-                 < 0 &&
+        assert(isCanonicalAnchor(secondType));
+        assert(compareDependentTypes(firstType, secondType) < 0 &&
                "Out-of-order type parameters in same-type constraint");
       } else {
-        assert(canSig->isCanonicalTypeInContext(reqt.getSecondType()) &&
+        assert(canSig->isCanonicalTypeInContext(secondType) &&
                "Concrete same-type isn't canonical in its own context");
       }
       break;
+    }
 
     case RequirementKind::Conformance:
       assert(reqt.getFirstType()->isTypeParameter() &&
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
index 08414cae27b50..7d05c54be064f 100644
--- a/lib/AST/GenericSignatureBuilder.cpp
+++ b/lib/AST/GenericSignatureBuilder.cpp
@@ -845,6 +845,11 @@ const RequirementSource *RequirementSource::getMinimalConformanceSource(
 
       if (parentEquivClass->concreteType)
         derivedViaConcrete = true;
+      else if (parentEquivClass->superclass &&
+               builder.lookupConformance(parentType->getCanonicalType(),
+                                         parentEquivClass->superclass,
+                                         source->getProtocolDecl()))
+        derivedViaConcrete = true;
 
       // The parent potential archetype must conform to the protocol in which
       // this requirement resides. Add this constraint.
diff --git a/lib/AST/ImportCache.cpp b/lib/AST/ImportCache.cpp
index 352b582990f59..ed9c77b3631f9 100644
--- a/lib/AST/ImportCache.cpp
+++ b/lib/AST/ImportCache.cpp
@@ -179,11 +179,10 @@ ImportSet &ImportCache::getImportSet(const DeclContext *dc) {
       ModuleDecl::ImportedModule{ModuleDecl::AccessPathTy(), mod});
 
   if (file) {
-    ModuleDecl::ImportFilter importFilter;
-    importFilter |= ModuleDecl::ImportFilterKind::Private;
-    importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-    importFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
-    file->getImportedModules(imports, importFilter);
+    file->getImportedModules(imports,
+                             {ModuleDecl::ImportFilterKind::Private,
+                              ModuleDecl::ImportFilterKind::ImplementationOnly,
+                              ModuleDecl::ImportFilterKind::SPIAccessControl});
   }
 
   auto &result = getImportSet(ctx, imports);
@@ -265,11 +264,10 @@ ImportCache::getAllAccessPathsNotShadowedBy(const ModuleDecl *mod,
       ModuleDecl::ImportedModule{ModuleDecl::AccessPathTy(), currentMod});
 
   if (auto *file = dyn_cast<FileUnit>(dc)) {
-    ModuleDecl::ImportFilter importFilter;
-    importFilter |= ModuleDecl::ImportFilterKind::Private;
-    importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-    importFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
-    file->getImportedModules(stack, importFilter);
+    file->getImportedModules(stack,
+                             {ModuleDecl::ImportFilterKind::Private,
+                              ModuleDecl::ImportFilterKind::ImplementationOnly,
+                              ModuleDecl::ImportFilterKind::SPIAccessControl});
   }
 
   SmallVector<ModuleDecl::AccessPathTy, 4> accessPaths;
diff --git a/lib/AST/LocalizationFormat.cpp b/lib/AST/LocalizationFormat.cpp
new file mode 100644
index 0000000000000..f0af4a133288a
--- /dev/null
+++ b/lib/AST/LocalizationFormat.cpp
@@ -0,0 +1,129 @@
+//===--- LocalizationFormat.cpp - YAML format for Diagnostic Messages ---*-
+// C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the format for localized diagnostic messages.
+//
+//===----------------------------------------------------------------------===//
+
+#include "swift/AST/LocalizationFormat.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/YAMLParser.h"
+#include "llvm/Support/YAMLTraits.h"
+#include <string>
+#include <type_traits>
+
+namespace {
+enum LocalDiagID : uint32_t {
+#define DIAG(KIND, ID, Options, Text, Signature) ID,
+#include "swift/AST/DiagnosticsAll.def"
+  NumDiags
+};
+
+struct DiagnosticNode {
+  uint32_t id;
+  std::string msg;
+};
+} // namespace
+
+namespace llvm {
+namespace yaml {
+
+template <> struct ScalarEnumerationTraits<LocalDiagID> {
+  static void enumeration(IO &io, LocalDiagID &value) {
+#define DIAG(KIND, ID, Options, Text, Signature)                               \
+  io.enumCase(value, #ID, LocalDiagID::ID);
+#include "swift/AST/DiagnosticsAll.def"
+  }
+};
+
+template <> struct MappingTraits<DiagnosticNode> {
+  static void mapping(IO &io, DiagnosticNode &node) {
+    LocalDiagID diagID;
+    io.mapRequired("id", diagID);
+    io.mapRequired("msg", node.msg);
+    node.id = static_cast<uint32_t>(diagID);
+  }
+};
+
+} // namespace yaml
+} // namespace llvm
+
+namespace swift {
+namespace diag {
+
+YAMLLocalizationProducer::YAMLLocalizationProducer(std::string locale,
+                                                   std::string path) {
+  llvm::SmallString<128> DiagnosticsFilePath(path);
+  llvm::sys::path::append(DiagnosticsFilePath, locale);
+  llvm::sys::path::replace_extension(DiagnosticsFilePath, ".yaml");
+  auto FileBufOrErr = llvm::MemoryBuffer::getFileOrSTDIN(DiagnosticsFilePath);
+  // Absence of localizations shouldn't crash the compiler.
+  if (!FileBufOrErr)
+    return;
+  llvm::MemoryBuffer *document = FileBufOrErr->get();
+  diag::LocalizationInput yin(document->getBuffer());
+  yin >> diagnostics;
+}
+
+llvm::StringRef
+YAMLLocalizationProducer::getMessageOr(swift::DiagID id,
+                                       llvm::StringRef defaultMessage) const {
+  if (diagnostics.empty())
+    return defaultMessage;
+  const std::string &diagnosticMessage = diagnostics[(unsigned)id];
+  if (diagnosticMessage.empty())
+    return defaultMessage;
+  return diagnosticMessage;
+}
+
+template <typename T, typename Context>
+typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value, void>::type
+readYAML(llvm::yaml::IO &io, T &Seq, bool, Context &Ctx) {
+  unsigned count = io.beginSequence();
+  if (count)
+    Seq.resize(LocalDiagID::NumDiags);
+  for (unsigned i = 0; i < count; ++i) {
+    void *SaveInfo;
+    if (io.preflightElement(i, SaveInfo)) {
+      DiagnosticNode current;
+      yamlize(io, current, true, Ctx);
+      io.postflightElement(SaveInfo);
+      // YAML file isn't guaranteed to have diagnostics in order of their
+      // declaration in `.def` files, to accommodate that we need to leave
+      // holes in diagnostic array for diagnostics which haven't yet been
+      // localized and for the ones that have `DiagnosticNode::id`
+      // indicates their position.
+      Seq[static_cast<unsigned>(current.id)] = std::move(current.msg);
+    }
+  }
+  io.endSequence();
+}
+
+template <typename T>
+typename std::enable_if<llvm::yaml::has_SequenceTraits<T>::value,
+                        LocalizationInput &>::type
+operator>>(LocalizationInput &yin, T &diagnostics) {
+  llvm::yaml::EmptyContext Ctx;
+  if (yin.setCurrentDocument()) {
+    // If YAML file's format doesn't match the current format in
+    // DiagnosticMessageFormat, will throw an error.
+    readYAML(yin, diagnostics, true, Ctx);
+  }
+  return yin;
+}
+
+} // namespace diag
+} // namespace swift
diff --git a/lib/AST/ModuleLoader.cpp b/lib/AST/ModuleLoader.cpp
index 978488df4e801..db4c5b68305a3 100644
--- a/lib/AST/ModuleLoader.cpp
+++ b/lib/AST/ModuleLoader.cpp
@@ -30,14 +30,15 @@ class FileCollector;
 namespace swift {
 
 DependencyTracker::DependencyTracker(
-    bool TrackSystemDeps, std::shared_ptr<llvm::FileCollector> FileCollector)
+    IntermoduleDepTrackingMode Mode,
+    std::shared_ptr<llvm::FileCollector> FileCollector)
     // NB: The ClangImporter believes it's responsible for the construction of
     // this instance, and it static_cast<>s the instance pointer to its own
     // subclass based on that belief. If you change this to be some other
     // instance, you will need to change ClangImporter's code to handle the
     // difference.
-    : clangCollector(ClangImporter::createDependencyCollector(TrackSystemDeps,
-                                                              FileCollector)) {}
+    : clangCollector(
+          ClangImporter::createDependencyCollector(Mode, FileCollector)) {}
 
 void
 DependencyTracker::addDependency(StringRef File, bool IsSystem) {
diff --git a/lib/AST/PlatformKind.cpp b/lib/AST/PlatformKind.cpp
index 707ba4473b5fe..2d283c951b654 100644
--- a/lib/AST/PlatformKind.cpp
+++ b/lib/AST/PlatformKind.cpp
@@ -20,6 +20,7 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorHandling.h"
 
+
 using namespace swift;
 
 StringRef swift::platformString(PlatformKind platform) {
@@ -155,3 +156,17 @@ bool swift::inheritsAvailabilityFromPlatform(PlatformKind Child,
 
   return false;
 }
+
+llvm::VersionTuple swift::canonicalizePlatformVersion(
+    PlatformKind platform, const llvm::VersionTuple &version) {
+
+  // Canonicalize macOS version for macOS Big Sur to treat
+  // 10.16 as 11.0.
+  if (platform == PlatformKind::OSX ||
+      platform == PlatformKind::OSXApplicationExtension) {
+    return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
+                                                  version);
+  }
+
+  return version;
+}
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
index d2ee30cedbcdb..c070a55d3cd8a 100644
--- a/lib/AST/Stmt.cpp
+++ b/lib/AST/Stmt.cpp
@@ -479,6 +479,9 @@ SwitchStmt *SwitchStmt::create(LabeledStmtInfo LabelInfo, SourceLoc SwitchLoc,
 
   std::uninitialized_copy(Cases.begin(), Cases.end(),
                           theSwitch->getTrailingObjects<ASTNode>());
+  for (auto *caseStmt : theSwitch->getCases())
+    caseStmt->setParentStmt(theSwitch);
+
   return theSwitch;
 }
 
diff --git a/lib/AST/SubstitutionMap.cpp b/lib/AST/SubstitutionMap.cpp
index 4e7e13ac21204..fea4ffc0a0b4d 100644
--- a/lib/AST/SubstitutionMap.cpp
+++ b/lib/AST/SubstitutionMap.cpp
@@ -97,6 +97,13 @@ ArrayRef<Type> SubstitutionMap::getReplacementTypes() const {
   return getReplacementTypesBuffer();
 }
 
+ArrayRef<Type> SubstitutionMap::getInnermostReplacementTypes() const {
+  if (empty()) return { };
+
+  return getReplacementTypes().take_back(
+      getGenericSignature()->getInnermostGenericParams().size());
+}
+
 GenericSignature SubstitutionMap::getGenericSignature() const {
   return storage ? storage->getGenericSignature() : nullptr;
 }
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index ce805c53898f1..4c59a9f812fa5 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -29,6 +29,7 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/AST/TypeLoc.h"
 #include "swift/AST/TypeRepr.h"
@@ -759,6 +760,16 @@ bool TypeBase::isStdlibType() {
   return false;
 }
 
+bool TypeBase::isKnownStdlibCollectionType() {
+  if (auto *structType = getAs<BoundGenericStructType>()) {
+    auto &ctx = getASTContext();
+    auto *decl = structType->getDecl();
+    return decl == ctx.getArrayDecl() || decl == ctx.getDictionaryDecl() ||
+           decl == ctx.getSetDecl();
+  }
+  return false;
+}
+
 /// Remove argument labels from the function type.
 Type TypeBase::removeArgumentLabels(unsigned numArgumentLabels) {
   // If there is nothing to remove, don't.
@@ -1384,26 +1395,12 @@ Type SugarType::getSinglyDesugaredTypeSlow() {
   return UnderlyingType;
 }
 
-SmallVector<Type, 2> TypeAliasType::getInnermostGenericArgs() const {
-  SmallVector<Type, 2> result;
+ArrayRef<Type> TypeAliasType::getDirectGenericArgs() const {
+  if (!typealias->isGeneric()) return { };
 
-  // If the typealias is not generic, there are no generic arguments
-  if (!typealias->isGeneric()) return result;
-
-  // If the substitution map is empty, bail out.
-  auto subMap = getSubstitutionMap();
-  if (subMap.empty()) return result;
-
-  // Retrieve the substitutions for the generic parameters (only).
-  auto genericSig = subMap.getGenericSignature();
-  unsigned numAllGenericParams = genericSig->getGenericParams().size();
-  unsigned numMyGenericParams = typealias->getGenericParams()->size();
-  result.reserve(numMyGenericParams);
-  unsigned startIndex = numAllGenericParams - numMyGenericParams;
-  for (auto gp : genericSig->getGenericParams().slice(startIndex)) {
-    result.push_back(Type(gp).subst(subMap));
-  }
-  return result;
+  // Otherwise, the innermost replacement types are the direct
+  // generic arguments.
+  return getSubstitutionMap().getInnermostReplacementTypes();
 }
 
 unsigned GenericTypeParamType::getDepth() const {
@@ -3223,7 +3220,11 @@ void ArchetypeType::populateNestedTypes() const {
 
   // Record the nested types.
   auto mutableThis = const_cast<ArchetypeType *>(this);
-  mutableThis->setNestedTypes(mutableThis->getASTContext(), nestedTypes);
+
+  std::sort(nestedTypes.begin(), nestedTypes.end(), OrderArchetypeByName());
+  auto &Ctx = mutableThis->getASTContext();
+  mutableThis->NestedTypes = Ctx.AllocateCopy(nestedTypes);
+  mutableThis->Bits.ArchetypeType.ExpandedNestedTypes = true;
 }
 
 Type ArchetypeType::getNestedType(Identifier Name) const {
@@ -3263,28 +3264,11 @@ bool ArchetypeType::hasNestedType(Identifier Name) const {
 }
 
 ArrayRef<std::pair<Identifier, Type>>
-ArchetypeType::getAllNestedTypes(bool resolveTypes) const {
+ArchetypeType::getKnownNestedTypes() const {
   populateNestedTypes();
-
-  if (resolveTypes) {
-    for (auto &nested : NestedTypes) {
-      if (!nested.second)
-        resolveNestedType(nested);
-    }
-  }
-
   return NestedTypes;
 }
 
-void ArchetypeType::setNestedTypes(
-                                 ASTContext &Ctx,
-                                 ArrayRef<std::pair<Identifier, Type>> Nested) {
-  assert(!Bits.ArchetypeType.ExpandedNestedTypes && "Already expanded");
-  NestedTypes = Ctx.AllocateCopy(Nested);
-  std::sort(NestedTypes.begin(), NestedTypes.end(), OrderArchetypeByName());
-  Bits.ArchetypeType.ExpandedNestedTypes = true;
-}
-
 void ArchetypeType::registerNestedType(Identifier name, Type nested) {
   populateNestedTypes();
 
diff --git a/lib/AST/TypeCheckRequests.cpp b/lib/AST/TypeCheckRequests.cpp
index 41276bd6d1956..12887f1be18e7 100644
--- a/lib/AST/TypeCheckRequests.cpp
+++ b/lib/AST/TypeCheckRequests.cpp
@@ -783,23 +783,6 @@ void SynthesizeAccessorRequest::cacheResult(AccessorDecl *accessor) const {
   storage->setSynthesizedAccessor(kind, accessor);
 }
 
-//----------------------------------------------------------------------------//
-// EmittedMembersRequest computation.
-//----------------------------------------------------------------------------//
-
-Optional<DeclRange>
-EmittedMembersRequest::getCachedResult() const {
-  auto *classDecl = std::get<0>(getStorage());
-  if (classDecl->hasForcedEmittedMembers())
-    return classDecl->getMembers();
-  return None;
-}
-
-void EmittedMembersRequest::cacheResult(DeclRange result) const {
-  auto *classDecl = std::get<0>(getStorage());
-  classDecl->setHasForcedEmittedMembers();
-}
-
 //----------------------------------------------------------------------------//
 // IsImplicitlyUnwrappedOptionalRequest computation.
 //----------------------------------------------------------------------------//
diff --git a/lib/AST/TypeWalker.cpp b/lib/AST/TypeWalker.cpp
index aed203667230e..f5be4e10b5223 100644
--- a/lib/AST/TypeWalker.cpp
+++ b/lib/AST/TypeWalker.cpp
@@ -39,7 +39,7 @@ class Traversal : public TypeVisitor<Traversal, bool>
     if (auto parent = ty->getParent())
       if (doIt(parent)) return true;
 
-    for (auto arg : ty->getInnermostGenericArgs())
+    for (const auto &arg : ty->getDirectGenericArgs())
       if (doIt(arg))
         return true;
     
diff --git a/lib/Basic/Platform.cpp b/lib/Basic/Platform.cpp
index 9f46b1785a548..e58ff28914164 100644
--- a/lib/Basic/Platform.cpp
+++ b/lib/Basic/Platform.cpp
@@ -387,6 +387,9 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
   if (Triple.isMacOSX()) {
     Triple.getMacOSXVersion(Major, Minor, Micro);
     if (Major == 10) {
+      if (Triple.isAArch64() && Minor <= 16)
+        return llvm::VersionTuple(5, 3);
+
       if (Minor <= 14) {
         return llvm::VersionTuple(5, 0);
       } else if (Minor <= 15) {
@@ -396,9 +399,18 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
           return llvm::VersionTuple(5, 2);
         }
       }
+    } else if (Major == 11) {
+      return llvm::VersionTuple(5, 3);
     }
   } else if (Triple.isiOS()) { // includes tvOS
     Triple.getiOSVersion(Major, Minor, Micro);
+
+    // arm64 simulators and macCatalyst are introduced in iOS 14.0/tvOS 14.0
+    // with Swift 5.3
+    if (Triple.isAArch64() && Major <= 14 &&
+        (Triple.isSimulatorEnvironment() || Triple.isMacCatalystEnvironment()))
+      return llvm::VersionTuple(5, 3);
+
     if (Major <= 12) {
       return llvm::VersionTuple(5, 0);
     } else if (Major <= 13) {
diff --git a/lib/Basic/Statistic.cpp b/lib/Basic/Statistic.cpp
index 4881e84a5121a..762e31050ca8c 100644
--- a/lib/Basic/Statistic.cpp
+++ b/lib/Basic/Statistic.cpp
@@ -17,7 +17,6 @@
 #include "swift/Basic/Timer.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
-#include "swift/SIL/SILFunction.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Config/config.h"
 #include "llvm/Support/FileSystem.h"
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
index 142ab1d3b358a..539b3027cc09b 100644
--- a/lib/ClangImporter/ClangImporter.cpp
+++ b/lib/ClangImporter/ClangImporter.cpp
@@ -328,12 +328,13 @@ class ClangImporterDependencyCollector : public clang::DependencyCollector
   /// The FileCollector is used by LLDB to generate reproducers. It's not used
   /// by Swift to track dependencies.
   std::shared_ptr<llvm::FileCollector> FileCollector;
-  const bool TrackSystemDeps;
+  const IntermoduleDepTrackingMode Mode;
 
 public:
   ClangImporterDependencyCollector(
-      bool TrackSystemDeps, std::shared_ptr<llvm::FileCollector> FileCollector)
-      : FileCollector(FileCollector), TrackSystemDeps(TrackSystemDeps) {}
+      IntermoduleDepTrackingMode Mode,
+      std::shared_ptr<llvm::FileCollector> FileCollector)
+      : FileCollector(FileCollector), Mode(Mode) {}
 
   void excludePath(StringRef filename) {
     ExcludedPaths.insert(filename);
@@ -345,7 +346,9 @@ class ClangImporterDependencyCollector : public clang::DependencyCollector
             || Filename == ImporterImpl::bridgingHeaderBufferName);
   }
 
-  bool needSystemDependencies() override { return TrackSystemDeps; }
+  bool needSystemDependencies() override {
+    return Mode == IntermoduleDepTrackingMode::IncludeSystem;
+  }
 
   bool sawDependency(StringRef Filename, bool FromClangModule,
                      bool IsSystem, bool IsClangModuleFile,
@@ -375,8 +378,9 @@ class ClangImporterDependencyCollector : public clang::DependencyCollector
 
 std::shared_ptr<clang::DependencyCollector>
 ClangImporter::createDependencyCollector(
-    bool TrackSystemDeps, std::shared_ptr<llvm::FileCollector> FileCollector) {
-  return std::make_shared<ClangImporterDependencyCollector>(TrackSystemDeps,
+    IntermoduleDepTrackingMode Mode,
+    std::shared_ptr<llvm::FileCollector> FileCollector) {
+  return std::make_shared<ClangImporterDependencyCollector>(Mode,
                                                             FileCollector);
 }
 
@@ -724,11 +728,20 @@ importer::addCommonInvocationArguments(
     invocationArgStrs.push_back("-mcpu=" + importerOpts.TargetCPU);
 
   } else if (triple.isOSDarwin()) {
-    // Special case: arm64 defaults to the "cyclone" CPU for Darwin,
-    // and arm64e defaults to the "vortex" CPU for Darwin,
-    // but Clang only detects this if we use -arch.
+    // Special case CPU based on known deployments:
+    //   - arm64 deploys to cyclone
+    //   - arm64 on macOS
+    //   - arm64 for iOS/tvOS/watchOS simulators
+    //   - arm64e deploys to vortex
+    // and arm64e (everywhere) and arm64e macOS defaults to the "vortex" CPU
+    // for Darwin, but Clang only detects this if we use -arch.
     if (triple.getArchName() == "arm64e")
       invocationArgStrs.push_back("-mcpu=vortex");
+    else if (triple.isAArch64() && triple.isMacOSX())
+      invocationArgStrs.push_back("-mcpu=vortex");
+    else if (triple.isAArch64() && triple.isSimulatorEnvironment() &&
+             (triple.isiOS() || triple.isWatchOS()))
+      invocationArgStrs.push_back("-mcpu=vortex");
     else if (triple.getArch() == llvm::Triple::aarch64 ||
              triple.getArch() == llvm::Triple::aarch64_be) {
       invocationArgStrs.push_back("-mcpu=cyclone");
@@ -1825,9 +1838,9 @@ ModuleDecl *ClangImporter::Implementation::finishLoadingClangModule(
   if (clangModule->isSubModule()) {
     finishLoadingClangModule(clangModule->getTopLevelModule(), importLoc);
   } else {
-    ModuleDecl *&loaded = SwiftContext.LoadedModules[result->getName()];
-    if (!loaded)
-      loaded = result;
+
+    if (!SwiftContext.getLoadedModule(result->getName()))
+      SwiftContext.addLoadedModule(result);
   }
 
   return result;
@@ -3368,10 +3381,12 @@ ModuleDecl *ClangModuleUnit::getOverlayModule() const {
     if (overlay == M) {
       overlay = nullptr;
     } else {
-      auto &sharedModuleRef = Ctx.LoadedModules[M->getName()];
+      // FIXME: This bizarre and twisty invariant is due to nested
+      // re-entrancy in both clang module loading and overlay module loading.
+      auto *sharedModuleRef = Ctx.getLoadedModule(M->getName());
       assert(!sharedModuleRef || sharedModuleRef == overlay ||
              sharedModuleRef == M);
-      sharedModuleRef = overlay;
+      Ctx.addLoadedModule(overlay);
     }
 
     auto mutableThis = const_cast<ClangModuleUnit *>(this);
@@ -3585,6 +3600,18 @@ void ClangImporter::Implementation::lookupValue(
   auto &clangCtx = getClangASTContext();
   auto clangTU = clangCtx.getTranslationUnitDecl();
 
+  // For operators we have to look up static member functions in addition to the
+  // top-level function lookup below.
+  if (name.isOperator()) {
+    for (auto entry : table.lookupMemberOperators(name.getBaseName())) {
+      if (isVisibleClangEntry(entry)) {
+        if (auto decl = dyn_cast<ValueDecl>(
+                importDeclReal(entry->getMostRecentDecl(), CurrentVersion)))
+          consumer.foundDecl(decl, DeclVisibilityKind::VisibleAtTopLevel);
+      }
+    }
+  }
+
   for (auto entry : table.lookup(name.getBaseName(), clangTU)) {
     // If the entry is not visible, skip it.
     if (!isVisibleClangEntry(entry)) continue;
diff --git a/lib/ClangImporter/ClangModuleDependencyScanner.cpp b/lib/ClangImporter/ClangModuleDependencyScanner.cpp
index 739aa8444d22a..e48f784ea9bc4 100644
--- a/lib/ClangImporter/ClangModuleDependencyScanner.cpp
+++ b/lib/ClangImporter/ClangModuleDependencyScanner.cpp
@@ -28,11 +28,11 @@ using namespace clang::tooling;
 using namespace clang::tooling::dependencies;
 
 class swift::ClangModuleDependenciesCacheImpl {
-  /// The name of the file used for the "import hack" to compute module
+  /// Cache the names of the files used for the "import hack" to compute module
   /// dependencies.
   /// FIXME: This should go away once Clang's dependency scanning library
   /// can scan by module name.
-  std::string importHackFile;
+  llvm::StringMap<std::string> importHackFileCache;
 
 public:
   /// Set containing all of the Clang modules that have already been seen.
@@ -43,38 +43,41 @@ class swift::ClangModuleDependenciesCacheImpl {
   DependencyScanningTool tool;
 
   ClangModuleDependenciesCacheImpl()
-      : service(ScanningMode::MinimizedSourcePreprocessing,
-                ScanningOutputFormat::Full),
+      : importHackFileCache(),
+        service(ScanningMode::MinimizedSourcePreprocessing, ScanningOutputFormat::Full),
         tool(service) { }
   ~ClangModuleDependenciesCacheImpl();
 
   /// Retrieve the name of the file used for the "import hack" that is
   /// used to scan the dependencies of a Clang module.
-  llvm::ErrorOr<StringRef> getImportHackFile();
+  llvm::ErrorOr<StringRef> getImportHackFile(StringRef moduleName);
 };
 
 ClangModuleDependenciesCacheImpl::~ClangModuleDependenciesCacheImpl() {
-  if (!importHackFile.empty()) {
-    llvm::sys::fs::remove(importHackFile);
+  if (!importHackFileCache.empty()) {
+    for (auto& it: importHackFileCache) {
+      llvm::sys::fs::remove(it.second);
+    }
   }
 }
 
-llvm::ErrorOr<StringRef> ClangModuleDependenciesCacheImpl::getImportHackFile() {
-  if (!importHackFile.empty())
-    return importHackFile;
+llvm::ErrorOr<StringRef> ClangModuleDependenciesCacheImpl::getImportHackFile(StringRef moduleName) {
+  auto cacheIt = importHackFileCache.find(moduleName.str());
+  if (cacheIt != importHackFileCache.end())
+    return cacheIt->second;
 
   // Create a temporary file.
   int resultFD;
   SmallString<128> resultPath;
   if (auto error = llvm::sys::fs::createTemporaryFile(
-          "import-hack", "m", resultFD, resultPath))
+          "import-hack-" + moduleName.str(), "c", resultFD, resultPath))
     return error;
 
   llvm::raw_fd_ostream out(resultFD, /*shouldClose=*/true);
-  out << "@import HACK_MODULE_NAME;\n";
+  out << "#pragma clang module import " << moduleName.str() << ";\n";
   llvm::sys::RemoveFileOnSignal(resultPath);
-  importHackFile = resultPath.str().str();
-  return importHackFile;
+  importHackFileCache.insert(std::make_pair(moduleName, resultPath.str().str()));
+  return importHackFileCache[moduleName];
 }
 
 namespace {
@@ -229,9 +232,23 @@ void ClangImporter::recordModuleDependencies(
       swiftArgs.push_back(arg.str());
     };
     // Add all args inheritted from creating the importer.
-    for (auto arg: allArgs) {
-      addClangArg(arg);
+    auto It = allArgs.begin();
+    while(It != allArgs.end()) {
+      StringRef arg = *It;
+      // Remove the -target arguments because we should use the target triple
+      // from the depending Swift modules.
+      if (arg == "-target") {
+        It += 2;
+      } else if (arg.startswith("-fapinotes-swift-version=")) {
+        // Remove the apinotes version because we should use the language version
+        // specified in the interface file.
+        It += 1;
+      } else {
+        addClangArg(*It);
+        ++ It;
+      }
     }
+
     // Swift frontend action: -emit-pcm
     swiftArgs.push_back("-emit-pcm");
     swiftArgs.push_back("-module-name");
@@ -269,12 +286,11 @@ Optional<ModuleDependencies> ClangImporter::getModuleDependencies(
   auto clangImpl = getOrCreateClangImpl(cache);
 
   // HACK! Replace the module import buffer name with the source file hack.
-  auto importHackFile = clangImpl->getImportHackFile();
+  auto importHackFile = clangImpl->getImportHackFile(moduleName);
   if (!importHackFile) {
     // FIXME: Emit a diagnostic here.
     return None;
   }
-
   // Reform the Clang importer options.
   // FIXME: Just save a reference or copy so we can get this back.
   ClangImporterOptions importerOpts;
@@ -285,12 +301,6 @@ Optional<ModuleDependencies> ClangImporter::getModuleDependencies(
     getClangDepScanningInvocationArguments(
       ctx, importerOpts, *importHackFile);
 
-  // HACK! Trick out a .m file to use to import the module we name.
-  std::string moduleNameHackDefine =
-      ("-DHACK_MODULE_NAME=" + moduleName).str();
-  commandLineArgs.push_back(moduleNameHackDefine);
-  commandLineArgs.push_back("-fmodules-ignore-macro=HACK_MODULE_NAME");
-
   std::string workingDir =
       ctx.SourceMgr.getFileSystem()->getCurrentWorkingDirectory().get();
   CompileCommand command(workingDir, *importHackFile, commandLineArgs, "-");
@@ -298,7 +308,6 @@ Optional<ModuleDependencies> ClangImporter::getModuleDependencies(
 
   auto clangDependencies = clangImpl->tool.getFullDependencies(
       database, workingDir, clangImpl->alreadySeen);
-
   if (!clangDependencies) {
     // FIXME: Route this to a normal diagnostic.
     llvm::logAllUnhandledErrors(clangDependencies.takeError(), llvm::errs());
@@ -307,7 +316,6 @@ Optional<ModuleDependencies> ClangImporter::getModuleDependencies(
 
   // Record module dependencies for each module we found.
   recordModuleDependencies(cache, *clangDependencies);
-
   return cache.findDependencies(moduleName, ModuleDependenciesKind::Clang);
 }
 
diff --git a/lib/ClangImporter/DWARFImporter.cpp b/lib/ClangImporter/DWARFImporter.cpp
index 1774a1bdecb93..7848a683f7fd4 100644
--- a/lib/ClangImporter/DWARFImporter.cpp
+++ b/lib/ClangImporter/DWARFImporter.cpp
@@ -121,9 +121,8 @@ ModuleDecl *ClangImporter::Implementation::loadModuleDWARF(
   (void) namelookup::getAllImports(decl);
 
   // Register the module with the ASTContext so it is available for lookups.
-  ModuleDecl *&loaded = SwiftContext.LoadedModules[name];
-  if (!loaded)
-    loaded = decl;
+  if (!SwiftContext.getLoadedModule(name))
+    SwiftContext.addLoadedModule(decl);
 
   return decl;
 }
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
index 6ee66bc9003a5..bddc7536ba997 100644
--- a/lib/ClangImporter/ImportDecl.cpp
+++ b/lib/ClangImporter/ImportDecl.cpp
@@ -1272,11 +1272,7 @@ synthesizeStructDefaultConstructorBody(AbstractFunctionDecl *afd,
   auto assign = new (ctx) AssignExpr(lhs, SourceLoc(), call, /*implicit*/ true);
   assign->setType(emptyTuple);
 
-  auto result = TupleExpr::createEmpty(ctx, SourceLoc(), SourceLoc(),
-                                       /*Implicit=*/true);
-  result->setType(emptyTuple);
-
-  auto ret = new (ctx) ReturnStmt(SourceLoc(), result, /*Implicit=*/true);
+  auto ret = new (ctx) ReturnStmt(SourceLoc(), nullptr, /*Implicit=*/true);
 
   // Create the function body.
   auto body = BraceStmt::create(ctx, SourceLoc(), {assign, ret}, SourceLoc());
@@ -3805,14 +3801,20 @@ namespace {
             decl->isVariadic(), isInSystemModule(dc), name, bodyParams);
 
         if (auto *mdecl = dyn_cast<clang::CXXMethodDecl>(decl)) {
-          if (!mdecl->isStatic()) {
+          if (mdecl->isStatic() ||
+              // C++ operators that are implemented as non-static member
+              // functions get imported into Swift as static member functions
+              // that use an additional parameter for the left-hand side operand
+              // instead of the receiver object.
+              mdecl->getDeclName().getNameKind() ==
+                  clang::DeclarationName::CXXOperatorName) {
+            selfIdx = None;
+          } else {
             selfIdx = 0;
             // Workaround until proper const support is handled: Force
             // everything to be mutating. This implicitly makes the parameter
             // indirect.
             selfIsInOut = true;
-          } else {
-            selfIdx = None;
           }
         }
       }
@@ -5025,27 +5027,6 @@ namespace {
       }
       result->setSuperclass(superclassType);
 
-      // Mark the class as runtime-only if it is named 'OS_object', even
-      // if it doesn't have the runtime-only Clang attribute. This is a
-      // targeted fix allowing IRGen to emit convenience initializers
-      // correctly.
-      //
-      // FIXME: Remove this once SILGen gets proper support for factory
-      // initializers.
-      if (decl->getName() == "OS_object" ||
-          decl->getName() == "OS_os_log") {
-        result->setForeignClassKind(ClassDecl::ForeignKind::RuntimeOnly);
-      }
-
-      // If the superclass is runtime-only, our class is also. This only
-      // matters in the case above.
-      if (superclassType) {
-        auto superclassDecl = cast<ClassDecl>(superclassType->getAnyNominal());
-        auto kind = superclassDecl->getForeignClassKind();
-        if (kind != ClassDecl::ForeignKind::Normal)
-          result->setForeignClassKind(kind);
-      }
-
       // Import protocols this class conforms to.
       importObjCProtocols(result, decl->getReferencedProtocols(),
                           inheritedTypes);
diff --git a/lib/ClangImporter/ImportName.cpp b/lib/ClangImporter/ImportName.cpp
index 964f8195a40a4..1611d20507369 100644
--- a/lib/ClangImporter/ImportName.cpp
+++ b/lib/ClangImporter/ImportName.cpp
@@ -32,6 +32,7 @@
 #include "swift/ClangImporter/ClangImporterOptions.h"
 #include "swift/Parse/Parser.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/DeclCXX.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/Module.h"
 #include "clang/Basic/OperatorKinds.h"
@@ -1426,14 +1427,26 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
     case clang::OverloadedOperatorKind::OO_Percent:
     case clang::OverloadedOperatorKind::OO_Amp:
     case clang::OverloadedOperatorKind::OO_Pipe:
+    case clang::OverloadedOperatorKind::OO_Less:
+    case clang::OverloadedOperatorKind::OO_Greater:
     case clang::OverloadedOperatorKind::OO_LessLess:
     case clang::OverloadedOperatorKind::OO_GreaterGreater:
+    case clang::OverloadedOperatorKind::OO_EqualEqual:
+    case clang::OverloadedOperatorKind::OO_ExclaimEqual:
+    case clang::OverloadedOperatorKind::OO_LessEqual:
+    case clang::OverloadedOperatorKind::OO_GreaterEqual:
     case clang::OverloadedOperatorKind::OO_AmpAmp:
     case clang::OverloadedOperatorKind::OO_PipePipe:
       if (auto FD = dyn_cast<clang::FunctionDecl>(D)) {
         baseName = clang::getOperatorSpelling(op);
         isFunction = true;
-        argumentNames.resize(FD->param_size());
+        argumentNames.resize(
+            FD->param_size() +
+            // C++ operators that are implemented as non-static member functions
+            // get imported into Swift as static member functions that use an
+            // additional parameter for the left-hand side operand instead of
+            // the receiver object.
+            (isa<clang::CXXMethodDecl>(D) ? 1 : 0));
       } else {
         // This can happen for example for templated operators functions.
         // We don't support those, yet.
diff --git a/lib/ClangImporter/ImportType.cpp b/lib/ClangImporter/ImportType.cpp
index 87c5518c3e1e3..91c9ead25f758 100644
--- a/lib/ClangImporter/ImportType.cpp
+++ b/lib/ClangImporter/ImportType.cpp
@@ -27,11 +27,13 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/ParameterList.h"
+#include "swift/AST/Type.h"
 #include "swift/AST/Types.h"
 #include "swift/ClangImporter/ClangModule.h"
 #include "swift/Parse/Token.h"
 #include "swift/Strings.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/DeclCXX.h"
 #include "clang/AST/TypeVisitor.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Lex/Preprocessor.h"
@@ -1708,6 +1710,30 @@ ParameterList *ClangImporter::Implementation::importFunctionParameterList(
   unsigned index = 0;
   SmallBitVector nonNullArgs = getNonNullArgs(clangDecl, params);
 
+  // C++ operators that are implemented as non-static member functions get
+  // imported into Swift as static methods that have an additional
+  // parameter for the left-hand side operand instead of the receiver object.
+  if (auto CMD = dyn_cast<clang::CXXMethodDecl>(clangDecl)) {
+    if (clangDecl->isOverloadedOperator()) {
+      auto param = new (SwiftContext)
+          ParamDecl(SourceLoc(), SourceLoc(), Identifier(), SourceLoc(),
+                    SwiftContext.getIdentifier("lhs"), dc);
+
+      auto parent = CMD->getParent();
+      auto parentType = importType(
+          parent->getASTContext().getRecordType(parent),
+          ImportTypeKind::Parameter, allowNSUIntegerAsInt, Bridgeability::None);
+
+      param->setInterfaceType(parentType.getType());
+
+      // Workaround until proper const support is handled: Force everything to
+      // be mutating. This implicitly makes the parameter indirect.
+      param->setSpecifier(ParamSpecifier::InOut);
+
+      parameters.push_back(param);
+    }
+  }
+
   for (auto param : params) {
     auto paramTy = param->getType();
     if (paramTy->isVoidType()) {
diff --git a/lib/ClangImporter/SwiftLookupTable.cpp b/lib/ClangImporter/SwiftLookupTable.cpp
index fa034ee544627..74a64dcb025d5 100644
--- a/lib/ClangImporter/SwiftLookupTable.cpp
+++ b/lib/ClangImporter/SwiftLookupTable.cpp
@@ -20,6 +20,7 @@
 #include "swift/AST/DiagnosticsClangImporter.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/Version.h"
+#include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Preprocessor.h"
@@ -795,6 +796,35 @@ SwiftLookupTable::lookupObjCMembers(SerializedSwiftName baseName) {
   return result;
 }
 
+SmallVector<clang::NamedDecl *, 4>
+SwiftLookupTable::lookupMemberOperators(SerializedSwiftName baseName) {
+  SmallVector<clang::NamedDecl *, 4> result;
+
+  // Find the lookup table entry for this base name.
+  auto known = findOrCreate(LookupTable, baseName,
+                            [](auto &results, auto &Reader, auto Name) {
+                              return (void)Reader.lookup(Name, results);
+                            });
+  if (known == LookupTable.end())
+    return result;
+
+  // Walk each of the entries.
+  for (auto &entry : known->second) {
+    // We're only looking for C++ operators
+    if (entry.Context.first != ContextKind::Tag) {
+      continue;
+    }
+
+    // Map each of the declarations.
+    for (auto &stored : entry.DeclsOrMacros) {
+      assert(isDeclEntry(stored) && "Not a declaration?");
+      result.push_back(mapStoredDecl(stored));
+    }
+  }
+
+  return result;
+}
+
 ArrayRef<clang::ObjCCategoryDecl *> SwiftLookupTable::categories() {
   if (!Categories.empty() || !Reader) return Categories;
 
diff --git a/lib/ClangImporter/SwiftLookupTable.h b/lib/ClangImporter/SwiftLookupTable.h
index fe980625c0ff8..0a5afe26e0d4d 100644
--- a/lib/ClangImporter/SwiftLookupTable.h
+++ b/lib/ClangImporter/SwiftLookupTable.h
@@ -528,6 +528,10 @@ class SwiftLookupTable {
   SmallVector<clang::NamedDecl *, 4>
   lookupObjCMembers(SerializedSwiftName baseName);
 
+  /// Lookup member operators with the given base name, regardless of context.
+  SmallVector<clang::NamedDecl *, 4>
+  lookupMemberOperators(SerializedSwiftName baseName);
+
   /// Retrieve the set of Objective-C categories and extensions.
   ArrayRef<clang::ObjCCategoryDecl *> categories();
 
diff --git a/lib/Demangling/CMakeLists.txt b/lib/Demangling/CMakeLists.txt
index 8716652298f84..86897b52f1356 100644
--- a/lib/Demangling/CMakeLists.txt
+++ b/lib/Demangling/CMakeLists.txt
@@ -11,3 +11,12 @@ add_swift_host_library(swiftDemangling STATIC
 target_compile_definitions(swiftDemangling PRIVATE
   LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1)
 
+# NOTE: Runtime libraries that depend on swiftDemangling should define
+# SWIFT_INLINE_NAMESPACE to specify the identifier that will be used for an
+# inline namespace that will be added around the symbols defined by this
+# library. This keeps the demangling symbols in those libraries distinct
+# from those in the compiler, which prevents ODR violations in certain
+# contexts; for example, on platforms that support statically linking the
+# Swift standard library, it allows this to happen safely when the binary
+# also links in compiler libraries that may not match exactly with the
+# runtime version.
diff --git a/lib/Demangling/Context.cpp b/lib/Demangling/Context.cpp
index 7c2e986b3985f..17626a3bf8989 100644
--- a/lib/Demangling/Context.cpp
+++ b/lib/Demangling/Context.cpp
@@ -16,9 +16,11 @@
 
 #include "swift/Demangling/Demangler.h"
 #include "swift/Demangling/ManglingMacros.h"
+#include "swift/Demangling/NamespaceMacros.h"
 
 namespace swift {
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 //////////////////////////////////
 // Context member functions     //
@@ -248,5 +250,6 @@ std::string demangleTypeAsString(const char *MangledName,
                                   Options);
 }
 
+SWIFT_END_INLINE_NAMESPACE
 } // namespace Demangle
 } // namespace swift
diff --git a/lib/Demangling/RemanglerBase.h b/lib/Demangling/RemanglerBase.h
index d0f9fc3f56bc2..a98467fead023 100644
--- a/lib/Demangling/RemanglerBase.h
+++ b/lib/Demangling/RemanglerBase.h
@@ -18,6 +18,7 @@
 #define SWIFT_DEMANGLING_BASEREMANGLER_H
 
 #include "swift/Demangling/Demangler.h"
+#include "swift/Demangling/NamespaceMacros.h"
 #include <unordered_map>
 
 using namespace swift::Demangle;
@@ -25,6 +26,7 @@ using llvm::StringRef;
 
 namespace swift {
 namespace Demangle {
+SWIFT_BEGIN_INLINE_NAMESPACE
 
 // An entry in the remangler's substitution map.
 class SubstitutionEntry {
@@ -163,6 +165,7 @@ class RemanglerBase {
   }
 };
 
+SWIFT_END_INLINE_NAMESPACE
 } // end namespace Demangle
 } // end namespace swift
 
diff --git a/lib/Driver/DarwinToolChains.cpp b/lib/Driver/DarwinToolChains.cpp
index bfd3bd442d3cc..a7153dc064e52 100644
--- a/lib/Driver/DarwinToolChains.cpp
+++ b/lib/Driver/DarwinToolChains.cpp
@@ -13,6 +13,7 @@
 #include "ToolChains.h"
 
 #include "swift/AST/DiagnosticsDriver.h"
+#include "swift/AST/PlatformKind.h"
 #include "swift/Basic/Dwarf.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Platform.h"
@@ -591,6 +592,14 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
     if (tripleIsMacCatalystEnvironment(triple)) {
       triple.getiOSVersion(major, minor, micro);
 
+      // Mac Catalyst on arm was introduced with an iOS deployment target of
+      // 14.0; the linker doesn't want to see a deployment target before that.
+      if (major < 14 && triple.isAArch64()) {
+        major = 14;
+        minor = 0;
+        micro = 0;
+      }
+
       // Mac Catalyst was introduced with an iOS deployment target of 13.0;
       // the linker doesn't want to see a deployment target before that.
       if (major < 13) {
@@ -602,12 +611,41 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
       switch (getDarwinPlatformKind((triple))) {
       case DarwinPlatformKind::MacOS:
         triple.getMacOSXVersion(major, minor, micro);
+
+        // The first deployment of arm64 for macOS is version 10.16;
+        if (triple.isAArch64() && major <= 10 && minor < 16) {
+          llvm::VersionTuple firstMacARM64e(10, 16, 0);
+          firstMacARM64e = canonicalizePlatformVersion(PlatformKind::OSX,
+                                                       firstMacARM64e);
+          major = firstMacARM64e.getMajor();
+          minor = firstMacARM64e.getMinor().getValueOr(0);
+          micro = firstMacARM64e.getSubminor().getValueOr(0);
+        }
+
+        // Temporary hack: adjust macOS version passed to the linker from
+        // 11 down to 10.16, but only for x86.
+        if (triple.isX86() && major == 11) {
+          major = 10;
+          minor = 16;
+          micro = 0;
+        }
+
         break;
       case DarwinPlatformKind::IPhoneOS:
       case DarwinPlatformKind::IPhoneOSSimulator:
       case DarwinPlatformKind::TvOS:
       case DarwinPlatformKind::TvOSSimulator:
         triple.getiOSVersion(major, minor, micro);
+
+        // The first deployment of arm64 simulators is iOS/tvOS 14.0;
+        // the linker doesn't want to see a deployment target before that.
+        if (triple.isSimulatorEnvironment() && triple.isAArch64() &&
+            major < 14) {
+          major = 14;
+          minor = 0;
+          micro = 0;
+        }
+
         break;
       case DarwinPlatformKind::WatchOS:
       case DarwinPlatformKind::WatchOSSimulator:
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index d0be6bc80fd3a..4f38b90bd1b2b 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -179,6 +179,12 @@ static void validateDebugInfoArgs(DiagnosticEngine &diags,
   for (auto A : args.getAllArgValues(options::OPT_debug_prefix_map))
     if (A.find('=') == StringRef::npos)
       diags.diagnose(SourceLoc(), diag::error_invalid_debug_prefix_map, A);
+
+  // Check for any -coverage-prefix-map options that aren't of the form
+  // 'original=remapped' (either side can be empty, however).
+  for (auto A : args.getAllArgValues(options::OPT_coverage_prefix_map))
+    if (A.find('=') == StringRef::npos)
+      diags.diagnose(SourceLoc(), diag::error_invalid_coverage_prefix_map, A);
 }
 
 static void validateVerifyIncrementalDependencyArgs(DiagnosticEngine &diags,
@@ -1958,6 +1964,7 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
         }
       case file_types::TY_AutolinkFile:
       case file_types::TY_Object:
+      case file_types::TY_TBD:
         // Object inputs are only okay if linking.
         if (OI.shouldLink()) {
           AllLinkerInputs.push_back(Current);
@@ -1981,7 +1988,6 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
       case file_types::TY_IndexData:
       case file_types::TY_PCH:
       case file_types::TY_ImportedModules:
-      case file_types::TY_TBD:
       case file_types::TY_ModuleTrace:
       case file_types::TY_YAMLOptRecord:
       case file_types::TY_BitstreamOptRecord:
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index b1d6f97b0e887..3e158c76274cf 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -242,6 +242,8 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   inputArgs.AddLastArg(arguments,
                        options::OPT_emit_fine_grained_dependency_sourcefile_dot_files);
   inputArgs.AddLastArg(arguments, options::OPT_package_description_version);
+  inputArgs.AddLastArg(arguments, options::OPT_locale);
+  inputArgs.AddLastArg(arguments, options::OPT_localization_path);
   inputArgs.AddLastArg(arguments, options::OPT_serialize_diagnostics_path);
   inputArgs.AddLastArg(arguments, options::OPT_debug_diagnostic_names);
   inputArgs.AddLastArg(arguments, options::OPT_print_educational_notes);
@@ -262,6 +264,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
 
   // Pass on file paths that should be remapped in debug info.
   inputArgs.AddAllArgs(arguments, options::OPT_debug_prefix_map);
+  inputArgs.AddAllArgs(arguments, options::OPT_coverage_prefix_map);
 
   // Pass through the values passed to -Xfrontend.
   inputArgs.AddAllArgValues(arguments, options::OPT_Xfrontend);
diff --git a/lib/Driver/UnixToolChains.cpp b/lib/Driver/UnixToolChains.cpp
index 59f24a4eafe1e..14a5e88a54de0 100644
--- a/lib/Driver/UnixToolChains.cpp
+++ b/lib/Driver/UnixToolChains.cpp
@@ -337,7 +337,7 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
         Twine("-u", llvm::getInstrProfRuntimeHookVarName())));
   }
 
-  // Run clang++ in verbose mode if "-v" is set
+  // Run clang in verbose mode if "-v" is set
   if (context.Args.hasArg(options::OPT_v)) {
     Arguments.push_back("-v");
   }
diff --git a/lib/Driver/WindowsToolChains.cpp b/lib/Driver/WindowsToolChains.cpp
index 0fe623675eb1a..749f0c902a80c 100644
--- a/lib/Driver/WindowsToolChains.cpp
+++ b/lib/Driver/WindowsToolChains.cpp
@@ -112,7 +112,7 @@ toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
 
   // Rely on `-libc` to correctly identify the MSVC Runtime Library.  We use
   // `-nostartfiles` as that limits the difference to just the
-  // `-defaultlib:libcmt` which is passed unconditionally with the `clang++`
+  // `-defaultlib:libcmt` which is passed unconditionally with the `clang`
   // driver rather than the `clang-cl` driver.
   Arguments.push_back("-nostartfiles");
 
@@ -186,7 +186,7 @@ toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
   context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xclang_linker);
 
-  // Run clang++ in verbose mode if "-v" is set
+  // Run clang in verbose mode if "-v" is set
   if (context.Args.hasArg(options::OPT_v)) {
     Arguments.push_back("-v");
   }
diff --git a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
index f5f28b1a4e793..812890d7aec58 100644
--- a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
+++ b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
@@ -81,14 +81,19 @@ bool ArgsToFrontendOptionsConverter::convert(
 
   Opts.EnableImplicitDynamic |= Args.hasArg(OPT_enable_implicit_dynamic);
 
-  Opts.TrackSystemDeps |= Args.hasArg(OPT_track_system_dependencies);
+  if (Args.hasArg(OPT_track_system_dependencies)) {
+    Opts.IntermoduleDependencyTracking =
+        IntermoduleDepTrackingMode::IncludeSystem;
+  }
 
   Opts.DisableImplicitModules |= Args.hasArg(OPT_disable_implicit_swift_modules);
 
   // Always track system dependencies when scanning dependencies.
   if (const Arg *ModeArg = Args.getLastArg(OPT_modes_Group)) {
-    if (ModeArg->getOption().matches(OPT_scan_dependencies))
-      Opts.TrackSystemDeps = true;
+    if (ModeArg->getOption().matches(OPT_scan_dependencies)) {
+      Opts.IntermoduleDependencyTracking =
+          IntermoduleDepTrackingMode::IncludeSystem;
+    }
   }
 
   Opts.SerializeModuleInterfaceDependencyHashes |=
@@ -97,8 +102,6 @@ bool ArgsToFrontendOptionsConverter::convert(
   Opts.RemarkOnRebuildFromModuleInterface |=
     Args.hasArg(OPT_Rmodule_interface_rebuild);
 
-  Opts.DisableInterfaceFileLock |= Args.hasArg(OPT_disable_interface_lockfile);
-
   computePrintStatsOptions();
   computeDebugTimeOptions();
   computeTBDOptions();
@@ -144,6 +147,15 @@ bool ArgsToFrontendOptionsConverter::convert(
     Opts.RequestedAction = determineRequestedAction(Args);
   }
 
+  if (Opts.RequestedAction == FrontendOptions::ActionType::CompileModuleFromInterface) {
+    // The situations where we use this action, e.g. explicit module building and
+    // generating prebuilt module cache, don't need synchronization. We should avoid
+    // using lock files for them.
+    Opts.DisableInterfaceFileLock = true;
+  } else {
+    Opts.DisableInterfaceFileLock |= Args.hasArg(OPT_disable_interface_lockfile);
+  }
+
   if (Opts.RequestedAction == FrontendOptions::ActionType::Immediate &&
       Opts.InputsAndOutputs.hasPrimaryInputs()) {
     Diags.diagnose(SourceLoc(), diag::error_immediate_mode_primary_file);
@@ -314,6 +326,10 @@ ArgsToFrontendOptionsConverter::determineRequestedAction(const ArgList &args) {
       // (Setting up module output will be handled below.)
       return FrontendOptions::ActionType::EmitModuleOnly;
     }
+
+    if (args.hasArg(OPT_version))
+      return FrontendOptions::ActionType::PrintVersion;
+
     return FrontendOptions::ActionType::NoneAction;
   }
   Option Opt = A->getOption();
@@ -386,7 +402,8 @@ bool ArgsToFrontendOptionsConverter::setUpInputKindAndImmediateArgs() {
   if (Opts.InputsAndOutputs.verifyInputs(
           Diags, treatAsSIL,
           Opts.RequestedAction == FrontendOptions::ActionType::REPL,
-          Opts.RequestedAction == FrontendOptions::ActionType::NoneAction)) {
+          (Opts.RequestedAction == FrontendOptions::ActionType::NoneAction ||
+           Opts.RequestedAction == FrontendOptions::ActionType::PrintVersion))){
     return true;
   }
   if (Opts.RequestedAction == FrontendOptions::ActionType::Immediate) {
@@ -539,7 +556,8 @@ bool ArgsToFrontendOptionsConverter::checkUnusedSupplementaryOutputPaths()
      return true;
    }
   if (!FrontendOptions::canActionEmitInterface(Opts.RequestedAction) &&
-      Opts.InputsAndOutputs.hasModuleInterfaceOutputPath()) {
+      (Opts.InputsAndOutputs.hasModuleInterfaceOutputPath() ||
+       Opts.InputsAndOutputs.hasPrivateModuleInterfaceOutputPath())) {
     Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_interface);
     return true;
   }
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index c1fc9ac970bf5..fa1ee67f03b91 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -34,6 +34,11 @@ using namespace llvm::opt;
 /// The path for Swift libraries in the OS on Darwin.
 #define DARWIN_OS_LIBRARY_PATH "/usr/lib/swift"
 
+static constexpr const char *const localeCodes[] = {
+#define SUPPORTED_LOCALE(Code, Language) #Code,
+#include "swift/AST/LocalizationLanguages.def"
+};
+
 swift::CompilerInvocation::CompilerInvocation() {
   setTargetTriple(llvm::sys::getDefaultTargetTriple());
 }
@@ -57,6 +62,14 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
   llvm::sys::path::append(DiagnosticDocsPath, "share", "doc", "swift",
                           "diagnostics");
   DiagnosticOpts.DiagnosticDocumentationPath = std::string(DiagnosticDocsPath.str());
+
+  // Compute the path of the YAML diagnostic messages directory files
+  // in the toolchain.
+  llvm::SmallString<128> DiagnosticMessagesDir(Path);
+  llvm::sys::path::remove_filename(DiagnosticMessagesDir); // Remove /swift
+  llvm::sys::path::remove_filename(DiagnosticMessagesDir); // Remove /bin
+  llvm::sys::path::append(DiagnosticMessagesDir, "share", "swift");
+  DiagnosticOpts.LocalizationPath = std::string(DiagnosticMessagesDir.str());
 }
 
 void CompilerInvocation::setDefaultPrebuiltCacheIfNecessary() {
@@ -872,6 +885,8 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
   for (auto A: Args.filtered(OPT_swift_module_file)) {
     Opts.ExplicitSwiftModules.push_back(resolveSearchPath(A->getValue()));
   }
+  if (const Arg *A = Args.getLastArg(OPT_explict_swift_module_map))
+    Opts.ExplicitSwiftModuleMap = A->getValue();
   // Opts.RuntimeIncludePath is set by calls to
   // setRuntimeIncludePath() or setMainExecutablePath().
   // Opts.RuntimeImportPath is set by calls to
@@ -926,6 +941,43 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
   if (Arg *A = Args.getLastArg(OPT_diagnostic_documentation_path)) {
     Opts.DiagnosticDocumentationPath = A->getValue();
   }
+  if (Arg *A = Args.getLastArg(OPT_locale)) {
+    std::string localeCode = A->getValue();
+
+    // Check if the locale code is available.
+    if (llvm::none_of(localeCodes, [&](const char *locale) {
+          return localeCode == locale;
+        })) {
+      std::string availableLocaleCodes = "";
+      llvm::interleave(
+          std::begin(localeCodes), std::end(localeCodes),
+          [&](std::string locale) { availableLocaleCodes += locale; },
+          [&] { availableLocaleCodes += ", "; });
+
+      Diags.diagnose(SourceLoc(), diag::warning_invalid_locale_code,
+                     availableLocaleCodes);
+    } else {
+      Opts.LocalizationCode = localeCode;
+    }
+  }
+  if (Arg *A = Args.getLastArg(OPT_localization_path)) {
+    if (!llvm::sys::fs::exists(A->getValue())) {
+      Diags.diagnose(SourceLoc(), diag::warning_locale_path_not_found,
+                     A->getValue());
+    } else if (!Opts.LocalizationCode.empty()) {
+      // Check if the localization path exists but it doesn't have a file
+      // for the specified locale code.
+      llvm::SmallString<128> localizationPath(A->getValue());
+      llvm::sys::path::append(localizationPath, Opts.LocalizationCode);
+      llvm::sys::path::replace_extension(localizationPath, ".yaml");
+      if (!llvm::sys::fs::exists(localizationPath)) {
+        Diags.diagnose(SourceLoc(), diag::warning_cannot_find_locale_file,
+                       Opts.LocalizationCode, localizationPath);
+      }
+
+      Opts.LocalizationPath = A->getValue();
+    }
+  }
   assert(!(Opts.WarningsAsErrors && Opts.SuppressWarnings) &&
          "conflicting arguments; should have been caught by driver");
 
@@ -991,18 +1043,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
       return true;
     }
   }
-  if (const Arg *A = Args.getLastArg(OPT_num_threads)) {
-    if (StringRef(A->getValue()).getAsInteger(10, Opts.NumThreads)) {
-      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
-                     A->getAsString(Args), A->getValue());
-      return true;
-    }
-    if (environmentVariableRequestedMaximumDeterminism()) {
-      Opts.NumThreads = 1;
-      Diags.diagnose(SourceLoc(), diag::remark_max_determinism_overriding,
-                     "-num-threads");
-    }
-  }
 
   // If we're only emitting a module, stop optimizations once we've serialized
   // the SIL for the module.
@@ -1101,7 +1141,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
     Args.hasArg(OPT_disable_sil_partial_apply);
   Opts.VerifySILOwnership &= !Args.hasArg(OPT_disable_sil_ownership_verifier);
   Opts.EnableLargeLoadableTypes |= Args.hasArg(OPT_enable_large_loadable_types);
-  Opts.StripOwnershipAfterSerialization |= Args.hasArg(OPT_enable_ownership_stripping_after_serialization);
   Opts.EnableDynamicReplacementCanCallPreviousImplementation = !Args.hasArg(
       OPT_disable_previous_implementation_calls_in_dynamic_replacements);
 
@@ -1208,7 +1247,7 @@ static bool ParseTBDGenArgs(TBDGenOptions &Opts, ArgList &Args,
                             CompilerInvocation &Invocation) {
   using namespace options;
 
-  Opts.HasMultipleIGMs = Invocation.getSILOptions().hasMultipleIGMs();
+  Opts.HasMultipleIGMs = Invocation.getIRGenOptions().hasMultipleIGMs();
 
   if (const Arg *A = Args.getLastArg(OPT_module_link_name)) {
     Opts.ModuleLinkName = A->getValue();
@@ -1307,6 +1346,11 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
     Opts.DebugPrefixMap.addMapping(SplitMap.first, SplitMap.second);
   }
 
+  for (auto A : Args.getAllArgValues(options::OPT_coverage_prefix_map)) {
+    auto SplitMap = StringRef(A).split('=');
+    Opts.CoveragePrefixMap.addMapping(SplitMap.first, SplitMap.second);
+  }
+
   for (const Arg *A : Args.filtered(OPT_Xcc)) {
     StringRef Opt = A->getValue();
     if (Opt.startswith("-D") || Opt.startswith("-U"))
@@ -1537,6 +1581,19 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
         getRuntimeCompatVersion();
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_num_threads)) {
+    if (StringRef(A->getValue()).getAsInteger(10, Opts.NumThreads)) {
+      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
+                     A->getAsString(Args), A->getValue());
+      return true;
+    }
+    if (environmentVariableRequestedMaximumDeterminism()) {
+      Opts.NumThreads = 1;
+      Diags.diagnose(SourceLoc(), diag::remark_max_determinism_overriding,
+                     "-num-threads");
+    }
+  }
+
   return false;
 }
 
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
index 36c99310b587e..09cac32bb8873 100644
--- a/lib/Frontend/Frontend.cpp
+++ b/lib/Frontend/Frontend.cpp
@@ -288,9 +288,36 @@ void CompilerInstance::setupDiagnosticVerifierIfNeeded() {
   }
 }
 
+void CompilerInstance::setupDependencyTrackerIfNeeded() {
+  assert(!Context && "Must be called before the ASTContext is created");
+
+  const auto &Invocation = getInvocation();
+  const auto &opts = Invocation.getFrontendOptions();
+
+  // Note that we may track dependencies even when we don't need to write them
+  // directly; in particular, -track-system-dependencies affects how module
+  // interfaces get loaded, and so we need to be consistently tracking system
+  // dependencies throughout the compiler.
+  auto collectionMode = opts.IntermoduleDependencyTracking;
+  if (!collectionMode) {
+    // If we have an output path specified, but no other tracking options,
+    // default to non-system dependency tracking.
+    if (opts.InputsAndOutputs.hasDependencyTrackerPath() ||
+        !opts.IndexStorePath.empty()) {
+      collectionMode = IntermoduleDepTrackingMode::ExcludeSystem;
+    }
+  }
+  if (!collectionMode)
+    return;
+
+  DepTracker = std::make_unique<DependencyTracker>(*collectionMode);
+}
+
 bool CompilerInstance::setup(const CompilerInvocation &Invok) {
   Invocation = Invok;
 
+  setupDependencyTrackerIfNeeded();
+
   // If initializing the overlay file system fails there's no sense in
   // continuing because the compiler will read the wrong files.
   if (setUpVirtualFileSystemOverlays())
@@ -383,6 +410,11 @@ void CompilerInstance::setUpDiagnosticOptions() {
   }
   Diagnostics.setDiagnosticDocumentationPath(
       Invocation.getDiagnosticOptions().DiagnosticDocumentationPath);
+  if (!Invocation.getDiagnosticOptions().LocalizationCode.empty()) {
+    Diagnostics.setLocalization(
+        Invocation.getDiagnosticOptions().LocalizationCode,
+        Invocation.getDiagnosticOptions().LocalizationPath);
+  }
 }
 
 // The ordering of ModuleLoaders is important!
@@ -457,6 +489,7 @@ bool CompilerInstance::setUpModuleLoaders() {
         *Context,
         getDependencyTracker(), MLM,
         Invocation.getSearchPathOptions().ExplicitSwiftModules,
+        Invocation.getSearchPathOptions().ExplicitSwiftModuleMap,
         IgnoreSourceInfoFile);
     Context->addModuleLoader(std::move(ESML));
   }
@@ -471,7 +504,7 @@ bool CompilerInstance::setUpModuleLoaders() {
         getDependencyTracker(), MLM, FEOpts.PreferInterfaceForModules,
         LoaderOpts,
         IgnoreSourceInfoFile);
-    Context->addModuleLoader(std::move(PIML));
+    Context->addModuleLoader(std::move(PIML), false, false, true);
   }
 
   std::unique_ptr<SerializedModuleLoader> SML =
@@ -684,8 +717,8 @@ bool CompilerInvocation::shouldImportSwiftONoneSupport() const {
   // This optimization is disabled by -track-system-dependencies to preserve
   // the explicit dependency.
   const auto &options = getFrontendOptions();
-  return options.TrackSystemDeps
-      || FrontendOptions::doesActionGenerateSIL(options.RequestedAction);
+  return options.shouldTrackSystemDependencies() ||
+         FrontendOptions::doesActionGenerateSIL(options.RequestedAction);
 }
 
 ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
@@ -751,7 +784,8 @@ ModuleDecl *CompilerInstance::getMainModule() const {
     if (Invocation.getFrontendOptions().EnableLibraryEvolution)
       MainModule->setResilienceStrategy(ResilienceStrategy::Resilient);
 
-    Context->LoadedModules[MainModule->getName()] = MainModule;
+    // Register the main module with the AST context.
+    Context->addLoadedModule(MainModule);
 
     // Create and add the module's files.
     SmallVector<FileUnit *, 16> files;
@@ -773,7 +807,7 @@ ModuleDecl *CompilerInstance::getMainModule() const {
 void CompilerInstance::setMainModule(ModuleDecl *newMod) {
   assert(newMod->isMainModule());
   MainModule = newMod;
-  Context->LoadedModules[newMod->getName()] = newMod;
+  Context->addLoadedModule(newMod);
 }
 
 void CompilerInstance::performParseAndResolveImportsOnly() {
diff --git a/lib/Frontend/FrontendOptions.cpp b/lib/Frontend/FrontendOptions.cpp
index ea3632401c8e5..1e1253ddcb6c5 100644
--- a/lib/Frontend/FrontendOptions.cpp
+++ b/lib/Frontend/FrontendOptions.cpp
@@ -13,6 +13,7 @@
 #include "swift/Frontend/FrontendOptions.h"
 
 #include "swift/AST/DiagnosticsFrontend.h"
+#include "swift/AST/ModuleLoader.h"
 #include "swift/Option/Options.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Strings.h"
@@ -53,6 +54,7 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
     return true;
   case ActionType::Immediate:
   case ActionType::REPL:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::EmitAssembly:
   case ActionType::EmitIR:
@@ -67,45 +69,6 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
   llvm_unreachable("Unknown ActionType");
 }
 
-bool FrontendOptions::isActionImmediate(ActionType action) {
-  switch (action) {
-  case ActionType::NoneAction:
-  case ActionType::Parse:
-  case ActionType::ResolveImports:
-  case ActionType::Typecheck:
-  case ActionType::DumpParse:
-  case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
-  case ActionType::DumpInterfaceHash:
-  case ActionType::PrintAST:
-  case ActionType::DumpScopeMaps:
-  case ActionType::DumpTypeRefinementContexts:
-  case ActionType::EmitPCH:
-  case ActionType::EmitSILGen:
-  case ActionType::EmitSIL:
-  case ActionType::EmitSIBGen:
-  case ActionType::EmitSIB:
-  case ActionType::EmitModuleOnly:
-  case ActionType::MergeModules:
-  case ActionType::CompileModuleFromInterface:
-    return false;
-  case ActionType::Immediate:
-  case ActionType::REPL:
-    return true;
-  case ActionType::EmitAssembly:
-  case ActionType::EmitIR:
-  case ActionType::EmitBC:
-  case ActionType::EmitObject:
-  case ActionType::EmitImportedModules:
-  case ActionType::DumpTypeInfo:
-  case ActionType::EmitPCM:
-  case ActionType::DumpPCM:
-  case ActionType::ScanDependencies:
-    return false;
-  }
-  llvm_unreachable("Unknown ActionType");
-}
-
 bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
   switch (action) {
   case FrontendOptions::ActionType::Parse:
@@ -114,6 +77,7 @@ bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
   case FrontendOptions::ActionType::DumpInterfaceHash:
   case FrontendOptions::ActionType::EmitImportedModules:
   case FrontendOptions::ActionType::ScanDependencies:
+  case FrontendOptions::ActionType::PrintVersion:
     return true;
   default:
     return false;
@@ -163,6 +127,7 @@ FrontendOptions::formatForPrincipalOutputFileForAction(ActionType action) {
   case ActionType::DumpTypeRefinementContexts:
   case ActionType::DumpTypeInfo:
   case ActionType::DumpPCM:
+  case ActionType::PrintVersion:
     return TY_Nothing;
 
   case ActionType::EmitPCH:
@@ -230,6 +195,7 @@ bool FrontendOptions::canActionEmitDependencies(ActionType action) {
   case ActionType::Immediate:
   case ActionType::REPL:
   case ActionType::DumpPCM:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::ResolveImports:
   case ActionType::Typecheck:
@@ -271,6 +237,7 @@ bool FrontendOptions::canActionEmitReferenceDependencies(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::Typecheck:
   case ActionType::MergeModules:
@@ -318,6 +285,7 @@ bool FrontendOptions::canActionEmitObjCHeader(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::Typecheck:
   case ActionType::MergeModules:
@@ -354,6 +322,7 @@ bool FrontendOptions::canActionEmitLoadedModuleTrace(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::ResolveImports:
   case ActionType::Typecheck:
@@ -396,6 +365,7 @@ bool FrontendOptions::canActionEmitModule(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::MergeModules:
   case ActionType::EmitModuleOnly:
@@ -449,6 +419,7 @@ bool FrontendOptions::canActionEmitInterface(ActionType action) {
   case ActionType::EmitBC:
   case ActionType::EmitAssembly:
   case ActionType::EmitObject:
+  case ActionType::PrintVersion:
     return true;
   }
   llvm_unreachable("unhandled action");
@@ -488,6 +459,7 @@ bool FrontendOptions::doesActionProduceOutput(ActionType action) {
   case ActionType::NoneAction:
   case ActionType::Immediate:
   case ActionType::REPL:
+  case ActionType::PrintVersion:
     return false;
   }
   llvm_unreachable("Unknown ActionType");
@@ -527,6 +499,7 @@ bool FrontendOptions::doesActionProduceTextualOutput(ActionType action) {
   case ActionType::DumpTypeInfo:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return true;
   }
   llvm_unreachable("unhandled action");
@@ -551,6 +524,7 @@ bool FrontendOptions::doesActionGenerateSIL(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::EmitSILGen:
   case ActionType::EmitSIBGen:
@@ -596,6 +570,7 @@ bool FrontendOptions::doesActionGenerateIR(ActionType action) {
   case ActionType::EmitPCM:
   case ActionType::DumpPCM:
   case ActionType::ScanDependencies:
+  case ActionType::PrintVersion:
     return false;
   case ActionType::Immediate:
   case ActionType::REPL:
@@ -618,3 +593,8 @@ const PrimarySpecificPaths &
 FrontendOptions::getPrimarySpecificPathsForPrimary(StringRef filename) const {
   return InputsAndOutputs.getPrimarySpecificPathsForPrimary(filename);
 }
+
+bool FrontendOptions::shouldTrackSystemDependencies() const {
+  return IntermoduleDependencyTracking ==
+         IntermoduleDepTrackingMode::IncludeSystem;
+}
diff --git a/lib/Frontend/ModuleInterfaceLoader.cpp b/lib/Frontend/ModuleInterfaceLoader.cpp
index 5e573ceb6412b..0052183c7d4f1 100644
--- a/lib/Frontend/ModuleInterfaceLoader.cpp
+++ b/lib/Frontend/ModuleInterfaceLoader.cpp
@@ -36,6 +36,7 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/YAMLTraits.h"
+#include "llvm/Support/YAMLParser.h"
 #include "ModuleInterfaceBuilder.h"
 
 using namespace swift;
@@ -589,11 +590,9 @@ class ModuleInterfaceLoaderImpl {
     return path.startswith(resourceDir);
   }
 
-  /// Finds the most appropriate .swiftmodule, whose dependencies are up to
-  /// date, that we can load for the provided .swiftinterface file.
-  llvm::ErrorOr<DiscoveredModule> discoverUpToDateModuleForInterface(
-    StringRef modulePath, StringRef cachedOutputPath,
-    SmallVectorImpl<FileDependency> &deps) {
+  llvm::ErrorOr<DiscoveredModule>
+  discoverUpToDateCompiledModuleForInterface(SmallVectorImpl<FileDependency> &deps,
+                                             std::string &UsableModulePath) {
     auto notFoundError =
       std::make_error_code(std::errc::no_such_file_or_directory);
 
@@ -618,7 +617,90 @@ class ModuleInterfaceLoaderImpl {
     case ModuleLoadingMode::OnlySerialized:
       llvm_unreachable("module interface loader should not have been created");
     }
+    // [Note: ModuleInterfaceLoader-defer-to-SerializedModuleLoader]
+    // If there's a module adjacent to the .swiftinterface that we can
+    // _likely_ load (it validates OK and is up to date), bail early with
+    // errc::not_supported, so the next (serialized) loader in the chain will
+    // load it.
+    // Alternately, if there's a .swiftmodule present but we can't even
+    // read it (for whatever reason), we should let the other module loader
+    // diagnose it.
+
+    if (shouldLoadAdjacentModule) {
+      auto adjacentModuleBuffer = fs.getBufferForFile(modulePath);
+      if (adjacentModuleBuffer) {
+        if (serializedASTBufferIsUpToDate(modulePath, *adjacentModuleBuffer.get(),
+                                          deps)) {
+          LLVM_DEBUG(llvm::dbgs() << "Found up-to-date module at "
+                                  << modulePath
+                                  << "; deferring to serialized module loader\n");
+          UsableModulePath = modulePath.str();
+          return std::make_error_code(std::errc::not_supported);
+        } else if (isInResourceDir(modulePath) &&
+                   loadMode == ModuleLoadingMode::PreferSerialized) {
+          // Special-case here: If we're loading a .swiftmodule from the resource
+          // dir adjacent to the compiler, defer to the serialized loader instead
+          // of falling back. This is mainly to support development of Swift,
+          // where one might change the module format version but forget to
+          // recompile the standard library. If that happens, don't fall back
+          // and silently recompile the standard library -- instead, error like
+          // we used to.
+          LLVM_DEBUG(llvm::dbgs() << "Found out-of-date module in the "
+                                     "resource-dir at "
+                                  << modulePath
+                                  << "; deferring to serialized module loader "
+                                     "to diagnose\n");
+          return std::make_error_code(std::errc::not_supported);
+        } else {
+          LLVM_DEBUG(llvm::dbgs() << "Found out-of-date module at "
+                                  << modulePath << "\n");
+          rebuildInfo.setModuleKind(modulePath,
+                                    ModuleRebuildInfo::ModuleKind::Normal);
+        }
+      } else if (adjacentModuleBuffer.getError() != notFoundError) {
+        LLVM_DEBUG(llvm::dbgs() << "Found unreadable module at "
+                                << modulePath
+                                << "; deferring to serialized module loader\n");
+        return std::make_error_code(std::errc::not_supported);
+      }
+    }
+
+    // If we have a prebuilt cache path, check that too if the interface comes
+    // from the SDK.
+    if (!prebuiltCacheDir.empty()) {
+      llvm::SmallString<256> scratch;
+      std::unique_ptr<llvm::MemoryBuffer> moduleBuffer;
+      Optional<StringRef> path = computePrebuiltModulePath(scratch);
+      if (!path) {
+        // Hack: deal with prebuilds of modules that still use the target-based
+        // names.
+        path = computeFallbackPrebuiltModulePath(scratch);
+      }
+      if (path) {
+        if (swiftModuleIsUpToDate(*path, deps, moduleBuffer)) {
+          LLVM_DEBUG(llvm::dbgs() << "Found up-to-date prebuilt module at "
+                                  << path->str() << "\n");
+          UsableModulePath = path->str();
+          return DiscoveredModule::prebuilt(*path, std::move(moduleBuffer));
+        } else {
+          LLVM_DEBUG(llvm::dbgs() << "Found out-of-date prebuilt module at "
+                                  << path->str() << "\n");
+          rebuildInfo.setModuleKind(*path,
+                                    ModuleRebuildInfo::ModuleKind::Prebuilt);
+        }
+      }
+    }
 
+    // Couldn't find an up-to-date .swiftmodule, will need to build module from
+    // interface.
+    return notFoundError;
+  }
+
+  /// Finds the most appropriate .swiftmodule, whose dependencies are up to
+  /// date, that we can load for the provided .swiftinterface file.
+  llvm::ErrorOr<DiscoveredModule> discoverUpToDateModuleForInterface(
+    StringRef cachedOutputPath,
+    SmallVectorImpl<FileDependency> &deps) {
 
     // First, check the cached module path. Whatever's in this cache represents
     // the most up-to-date knowledge we have about the module.
@@ -661,85 +743,8 @@ class ModuleInterfaceLoaderImpl {
                                   ModuleRebuildInfo::ModuleKind::Cached);
       }
     }
-
-    // If we weren't able to open the file for any reason, including it not
-    // existing, keep going.
-
-    // If we have a prebuilt cache path, check that too if the interface comes
-    // from the SDK.
-    if (!prebuiltCacheDir.empty()) {
-      llvm::SmallString<256> scratch;
-      std::unique_ptr<llvm::MemoryBuffer> moduleBuffer;
-      Optional<StringRef> path = computePrebuiltModulePath(scratch);
-      if (!path) {
-        // Hack: deal with prebuilds of modules that still use the target-based
-        // names.
-        path = computeFallbackPrebuiltModulePath(scratch);
-      }
-      if (path) {
-        if (swiftModuleIsUpToDate(*path, deps, moduleBuffer)) {
-          LLVM_DEBUG(llvm::dbgs() << "Found up-to-date prebuilt module at "
-                                  << path->str() << "\n");
-          return DiscoveredModule::prebuilt(*path, std::move(moduleBuffer));
-        } else {
-          LLVM_DEBUG(llvm::dbgs() << "Found out-of-date prebuilt module at "
-                                  << path->str() << "\n");
-          rebuildInfo.setModuleKind(*path,
-                                    ModuleRebuildInfo::ModuleKind::Prebuilt);
-        }
-      }
-    }
-
-    // [Note: ModuleInterfaceLoader-defer-to-SerializedModuleLoader]
-    // Finally, if there's a module adjacent to the .swiftinterface that we can
-    // _likely_ load (it validates OK and is up to date), bail early with
-    // errc::not_supported, so the next (serialized) loader in the chain will
-    // load it.
-    // Alternately, if there's a .swiftmodule present but we can't even
-    // read it (for whatever reason), we should let the other module loader
-    // diagnose it.
-    if (!shouldLoadAdjacentModule)
-      return notFoundError;
-
-    auto adjacentModuleBuffer = fs.getBufferForFile(modulePath);
-    if (adjacentModuleBuffer) {
-      if (serializedASTBufferIsUpToDate(modulePath, *adjacentModuleBuffer.get(),
-                                        deps)) {
-        LLVM_DEBUG(llvm::dbgs() << "Found up-to-date module at "
-                                << modulePath
-                                << "; deferring to serialized module loader\n");
-        return std::make_error_code(std::errc::not_supported);
-      } else if (isInResourceDir(modulePath) &&
-                 loadMode == ModuleLoadingMode::PreferSerialized) {
-        // Special-case here: If we're loading a .swiftmodule from the resource
-        // dir adjacent to the compiler, defer to the serialized loader instead
-        // of falling back. This is mainly to support development of Swift,
-        // where one might change the module format version but forget to
-        // recompile the standard library. If that happens, don't fall back
-        // and silently recompile the standard library -- instead, error like
-        // we used to.
-        LLVM_DEBUG(llvm::dbgs() << "Found out-of-date module in the "
-                                   "resource-dir at "
-                                << modulePath
-                                << "; deferring to serialized module loader "
-                                   "to diagnose\n");
-        return std::make_error_code(std::errc::not_supported);
-      } else {
-        LLVM_DEBUG(llvm::dbgs() << "Found out-of-date module at "
-                                << modulePath << "\n");
-        rebuildInfo.setModuleKind(modulePath,
-                                  ModuleRebuildInfo::ModuleKind::Normal);
-      }
-    } else if (adjacentModuleBuffer.getError() != notFoundError) {
-      LLVM_DEBUG(llvm::dbgs() << "Found unreadable module at "
-                              << modulePath
-                              << "; deferring to serialized module loader\n");
-      return std::make_error_code(std::errc::not_supported);
-    }
-
-    // Couldn't find an up-to-date .swiftmodule, will need to build module from
-    // interface.
-    return notFoundError;
+    std::string usableModulePath;
+    return discoverUpToDateCompiledModuleForInterface(deps, usableModulePath);
   }
 
   /// Writes the "forwarding module" that will forward to a module in the
@@ -849,7 +854,7 @@ class ModuleInterfaceLoaderImpl {
     // in the cache, or in the prebuilt cache.
     SmallVector<FileDependency, 16> allDeps;
     auto moduleOrErr =
-      discoverUpToDateModuleForInterface(modulePath, cachedOutputPath, allDeps);
+      discoverUpToDateModuleForInterface(cachedOutputPath, allDeps);
 
     // If we errored with anything other than 'no such file or directory',
     // fail this load and let the other module loader diagnose it.
@@ -995,6 +1000,25 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
   return std::error_code();
 }
 
+std::string
+ModuleInterfaceLoader::getUpToDateCompiledModuleForInterface(StringRef moduleName,
+                                                      StringRef interfacePath) {
+  // Derive .swiftmodule path from the .swiftinterface path.
+  auto newExt = file_types::getExtension(file_types::TY_SwiftModuleFile);
+  llvm::SmallString<32> modulePath = interfacePath;
+  llvm::sys::path::replace_extension(modulePath, newExt);
+  ModuleInterfaceLoaderImpl Impl(
+                Ctx, modulePath, interfacePath, moduleName,
+                CacheDir, PrebuiltCacheDir, SourceLoc(),
+                Opts,
+                dependencyTracker,
+                llvm::is_contained(PreferInterfaceForModules, moduleName) ?
+                  ModuleLoadingMode::PreferInterface : LoadMode);
+  SmallVector<FileDependency, 16> allDeps;
+  std::string usableModulePath;
+  Impl.discoverUpToDateCompiledModuleForInterface(allDeps, usableModulePath);
+  return usableModulePath;
+}
 
 bool ModuleInterfaceLoader::buildSwiftModuleFromSwiftInterface(
     SourceManager &SourceMgr, DiagnosticEngine &Diags,
@@ -1050,6 +1074,13 @@ void InterfaceSubContextDelegateImpl::inheritOptionsForBuildingInterface(
     GenericArgs.push_back(triple);
   }
 
+  // Inherit the Swift language version
+  subInvocation.getLangOptions().EffectiveLanguageVersion =
+    LangOpts.EffectiveLanguageVersion;
+  GenericArgs.push_back("-swift-version");
+  GenericArgs.push_back(ArgSaver.save(subInvocation.getLangOptions()
+    .EffectiveLanguageVersion.asAPINotesVersionString()));
+
   subInvocation.setImportSearchPaths(SearchPathOpts.ImportSearchPaths);
   llvm::for_each(SearchPathOpts.ImportSearchPaths,
                  [&](const std::string &path) {
@@ -1197,9 +1228,14 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
     GenericArgs.push_back("-prebuilt-module-cache-path");
     GenericArgs.push_back(prebuiltCachePath);
   }
-  subInvocation.getFrontendOptions().TrackSystemDeps = trackSystemDependencies;
   if (trackSystemDependencies) {
+    subInvocation.getFrontendOptions().IntermoduleDependencyTracking =
+        IntermoduleDepTrackingMode::IncludeSystem;
     GenericArgs.push_back("-track-system-dependencies");
+  } else {
+    // Always track at least the non-system dependencies for interface building.
+    subInvocation.getFrontendOptions().IntermoduleDependencyTracking =
+        IntermoduleDepTrackingMode::ExcludeSystem;
   }
   if (LoaderOpts.disableImplicitSwiftModule) {
     subInvocation.getFrontendOptions().DisableImplicitModules = true;
@@ -1214,6 +1250,15 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
     GenericArgs.push_back("-swift-module-file");
     GenericArgs.push_back(ArgSaver.save(EM));
   }
+  // Pass down -explicit-swift-module-map-file
+  // FIXME: we shouldn't need this. Remove it?
+  StringRef explictSwiftModuleMap = searchPathOpts.ExplicitSwiftModuleMap;
+  subInvocation.getSearchPathOptions().ExplicitSwiftModuleMap =
+    explictSwiftModuleMap;
+  if (!explictSwiftModuleMap.empty()) {
+    GenericArgs.push_back("-explicit-swift-module-map-file");
+    GenericArgs.push_back(explictSwiftModuleMap);
+  }
   if (clangImporter) {
     // We need to add these extra clang flags because explict module building
     // related flags are all there: -fno-implicit-modules, -fmodule-map-file=,
@@ -1314,7 +1359,7 @@ InterfaceSubContextDelegateImpl::getCacheHash(StringRef useInterfacePath) {
 
       // Whether or not we're tracking system dependencies affects the
       // invalidation behavior of this cache item.
-      subInvocation.getFrontendOptions().TrackSystemDeps);
+      subInvocation.getFrontendOptions().shouldTrackSystemDependencies());
 
   return llvm::APInt(64, H).toString(36, /*Signed=*/false);
 }
@@ -1323,10 +1368,12 @@ bool InterfaceSubContextDelegateImpl::runInSubContext(StringRef moduleName,
                                                       StringRef interfacePath,
                                                       StringRef outputPath,
                                                       SourceLoc diagLoc,
-    llvm::function_ref<bool(ASTContext&, ArrayRef<StringRef>, StringRef)> action) {
+    llvm::function_ref<bool(ASTContext&, ArrayRef<StringRef>,
+                            ArrayRef<StringRef>, StringRef)> action) {
   return runInSubCompilerInstance(moduleName, interfacePath, outputPath, diagLoc,
                                   [&](SubCompilerInstanceInfo &info){
     return action(info.Instance->getASTContext(), info.BuildArguments,
+                  info.ExtraPCMArgs,
                   info.Hash);
   });
 }
@@ -1340,7 +1387,7 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
   assert(BuildArgs.size() == GenericArgs.size());
   // Configure inputs
   subInvocation.getFrontendOptions().InputsAndOutputs
-    .addPrimaryInputFile(interfacePath);
+    .addInputFile(interfacePath);
   BuildArgs.push_back(interfacePath);
   subInvocation.setModuleName(moduleName);
   BuildArgs.push_back("-module-name");
@@ -1357,13 +1404,12 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
   }
 
   // Configure the outputs in front-end options. There must be an equal number of
-  // primary inputs and outputs.
-  auto N = subInvocation.getFrontendOptions().InputsAndOutputs
-    .primaryInputCount();
-  std::vector<std::string> outputFiles(N, "/<unused>");
+  // inputs and outputs.
+  std::vector<std::string> outputFiles{"/<unused>"};
+  std::vector<SupplementaryOutputPaths> ModuleOutputPaths;
   ModuleOutputPaths.emplace_back();
   ModuleOutputPaths.back().ModuleOutputPath = outputPath.str();
-  assert(N == ModuleOutputPaths.size());
+  assert(subInvocation.getFrontendOptions().InputsAndOutputs.isWholeModule());
   subInvocation.getFrontendOptions().InputsAndOutputs
     .setMainAndSupplementaryOutputs(outputFiles, ModuleOutputPaths);
 
@@ -1391,13 +1437,21 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
 
   ForwardingDiagnosticConsumer FDC(Diags);
   subInstance.addDiagnosticConsumer(&FDC);
-  subInstance.createDependencyTracker(subInvocation.getFrontendOptions()
-    .TrackSystemDeps);
   if (subInstance.setup(subInvocation)) {
     return true;
   }
   info.BuildArguments = BuildArgs;
   info.Hash = CacheHash;
+  auto target =  *(std::find(BuildArgs.rbegin(), BuildArgs.rend(), "-target") - 1);
+  auto langVersion = *(std::find(BuildArgs.rbegin(), BuildArgs.rend(),
+                                 "-swift-version") - 1);
+  std::array<StringRef, 6> ExtraPCMArgs = {
+    // PCMs should use the target triple the interface will be using to build
+    "-Xcc", "-target", "-Xcc", target,
+    // PCMs should use the effective Swift language version for apinotes.
+    "-Xcc", ArgSaver.save((llvm::Twine("-fapinotes-swift-version=") + langVersion).str())
+  };
+  info.ExtraPCMArgs = ExtraPCMArgs;
   // Run the action under the sub compiler instance.
   return action(info);
 }
@@ -1405,12 +1459,102 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
 struct ExplicitSwiftModuleLoader::Implementation {
   // Information about explicitly specified Swift module files.
   struct ExplicitModuleInfo {
-    // Path of the module file.
-    StringRef path;
-    // Buffer of the module content.
+    // Path of the .swiftmodule file.
+    StringRef modulePath;
+    // Path of the .swiftmoduledoc file.
+    StringRef moduleDocPath;
+    // Path of the .swiftsourceinfo file.
+    StringRef moduleSourceInfoPath;
+    // Opened buffer for the .swiftmodule file.
     std::unique_ptr<llvm::MemoryBuffer> moduleBuffer;
   };
+  ASTContext &Ctx;
+  llvm::BumpPtrAllocator Allocator;
+  llvm::StringSaver Saver;
   llvm::StringMap<ExplicitModuleInfo> ExplicitModuleMap;
+  Implementation(ASTContext &Ctx): Ctx(Ctx), Saver(Allocator) {}
+
+  StringRef getScalaNodeText(llvm::yaml::Node *N) {
+    SmallString<32> Buffer;
+    return Saver.save(cast<llvm::yaml::ScalarNode>(N)->getValue(Buffer));
+  }
+
+  bool parseSingleModuleEntry(llvm::yaml::Node &node) {
+    using namespace llvm::yaml;
+    auto *mapNode = dyn_cast<MappingNode>(&node);
+    if (!mapNode)
+      return true;
+    StringRef moduleName;
+    ExplicitModuleInfo result;
+    for (auto &entry: *mapNode) {
+      auto key = getScalaNodeText(entry.getKey());
+      auto val = getScalaNodeText(entry.getValue());
+      if (key == "moduleName") {
+        moduleName = val;
+      } else if (key == "modulePath") {
+        result.modulePath = val;
+      } else if (key == "docPath") {
+        result.moduleDocPath = val;
+      } else if (key == "sourceInfoPath") {
+        result.moduleSourceInfoPath = val;
+      } else {
+        // Being forgiving for future fields.
+        continue;
+      }
+    }
+    if (moduleName.empty())
+      return true;
+    ExplicitModuleMap[moduleName] = std::move(result);
+    return false;
+  }
+  //  [
+  //    {
+  //      "moduleName": "A",
+  //      "modulePath": "A.swiftmodule",
+  //      "docPath": "A.swiftdoc",
+  //      "sourceInfoPath": "A.swiftsourceinfo"
+  //    },
+  //    {
+  //      "moduleName": "B",
+  //      "modulePath": "B.swiftmodule",
+  //      "docPath": "B.swiftdoc",
+  //      "sourceInfoPath": "B.swiftsourceinfo"
+  //    }
+  //  ]
+  void parseSwiftExplicitModuleMap(StringRef fileName) {
+    using namespace llvm::yaml;
+    // Load the input file.
+    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> fileBufOrErr =
+      llvm::MemoryBuffer::getFile(fileName);
+    if (!fileBufOrErr) {
+      Ctx.Diags.diagnose(SourceLoc(), diag::explicit_swift_module_map_missing,
+                         fileName);
+      return;
+    }
+    StringRef Buffer = fileBufOrErr->get()->getBuffer();
+    // Use a new source manager instead of the one from ASTContext because we
+    // don't want the JSON file to be persistent.
+    llvm::SourceMgr SM;
+    Stream Stream(llvm::MemoryBufferRef(Buffer, fileName), SM);
+    for (auto DI = Stream.begin(); DI != Stream.end(); ++ DI) {
+      assert(DI != Stream.end() && "Failed to read a document");
+      if (auto *MN = dyn_cast_or_null<SequenceNode>(DI->getRoot())) {
+        for (auto &entry: *MN) {
+          if (parseSingleModuleEntry(entry)) {
+            Ctx.Diags.diagnose(SourceLoc(),
+                               diag::explicit_swift_module_map_corrupted,
+                               fileName);
+            return;
+          }
+        }
+      } else {
+        Ctx.Diags.diagnose(SourceLoc(),
+                           diag::explicit_swift_module_map_corrupted,
+                           fileName);
+        return;
+      }
+    }
+  }
 };
 
 ExplicitSwiftModuleLoader::ExplicitSwiftModuleLoader(
@@ -1420,7 +1564,7 @@ ExplicitSwiftModuleLoader::ExplicitSwiftModuleLoader(
       bool IgnoreSwiftSourceInfoFile):
         SerializedModuleLoaderBase(ctx, tracker, loadMode,
                                    IgnoreSwiftSourceInfoFile),
-        Impl(*new Implementation()) {}
+        Impl(*new Implementation(ctx)) {}
 
 ExplicitSwiftModuleLoader::~ExplicitSwiftModuleLoader() { delete &Impl; }
 
@@ -1438,9 +1582,37 @@ std::error_code ExplicitSwiftModuleLoader::findModuleFilesInDirectory(
   if (it == Impl.ExplicitModuleMap.end()) {
     return std::make_error_code(std::errc::not_supported);
   }
-  // We found an explicit module matches the given name, give the buffer
-  // back to the caller side.
-  *ModuleBuffer = std::move(it->getValue().moduleBuffer);
+  auto &moduleInfo = it->getValue();
+  if (moduleInfo.moduleBuffer) {
+    // We found an explicit module matches the given name, give the buffer
+    // back to the caller side.
+    *ModuleBuffer = std::move(moduleInfo.moduleBuffer);
+    return std::error_code();
+  }
+
+  auto &fs = *Ctx.SourceMgr.getFileSystem();
+  // Open .swiftmodule file
+  auto moduleBuf = fs.getBufferForFile(moduleInfo.modulePath);
+  if (!moduleBuf) {
+    // We cannot read the module content, diagnose.
+    Ctx.Diags.diagnose(SourceLoc(), diag::error_opening_explicit_module_file,
+                       moduleInfo.modulePath);
+    return moduleBuf.getError();
+  }
+  *ModuleBuffer = std::move(moduleBuf.get());
+
+  // Open .swiftdoc file
+  if (!moduleInfo.moduleDocPath.empty()) {
+    auto moduleDocBuf = fs.getBufferForFile(moduleInfo.moduleDocPath);
+    if (moduleBuf)
+      *ModuleDocBuffer = std::move(moduleDocBuf.get());
+  }
+  // Open .swiftsourceinfo file
+  if (!moduleInfo.moduleSourceInfoPath.empty()) {
+    auto moduleSourceInfoBuf = fs.getBufferForFile(moduleInfo.moduleSourceInfoPath);
+    if (moduleSourceInfoBuf)
+      *ModuleSourceInfoBuffer = std::move(moduleSourceInfoBuf.get());
+  }
   return std::error_code();
 }
 
@@ -1455,11 +1627,19 @@ std::unique_ptr<ExplicitSwiftModuleLoader>
 ExplicitSwiftModuleLoader::create(ASTContext &ctx,
     DependencyTracker *tracker, ModuleLoadingMode loadMode,
     ArrayRef<std::string> ExplicitModulePaths,
+    StringRef ExplicitSwiftModuleMap,
     bool IgnoreSwiftSourceInfoFile) {
   auto result = std::unique_ptr<ExplicitSwiftModuleLoader>(
     new ExplicitSwiftModuleLoader(ctx, tracker, loadMode,
                                   IgnoreSwiftSourceInfoFile));
   auto &Impl = result->Impl;
+  // If the explicit module map is given, try parse it.
+  if (!ExplicitSwiftModuleMap.empty()) {
+    // Parse a JSON file to collect explicitly built modules.
+    Impl.parseSwiftExplicitModuleMap(ExplicitSwiftModuleMap);
+  }
+  // Collect .swiftmodule paths from -swift-module-path
+  // FIXME: remove these.
   for (auto path: ExplicitModulePaths) {
     std::string name;
     // Load the explicit module into a buffer and get its name.
@@ -1467,7 +1647,7 @@ ExplicitSwiftModuleLoader::create(ASTContext &ctx,
     if (buffer) {
       // Register this module for future loading.
       auto &entry = Impl.ExplicitModuleMap[name];
-      entry.path = path;
+      entry.modulePath = path;
       entry.moduleBuffer = std::move(buffer);
     } else {
       // We cannot read the module content, diagnose.
diff --git a/lib/Frontend/ModuleInterfaceSupport.cpp b/lib/Frontend/ModuleInterfaceSupport.cpp
index 27d4c8ec30d3c..3b14762c34523 100644
--- a/lib/Frontend/ModuleInterfaceSupport.cpp
+++ b/lib/Frontend/ModuleInterfaceSupport.cpp
@@ -100,13 +100,11 @@ static void printImports(raw_ostream &out,
                          ModuleDecl *M) {
   // FIXME: This is very similar to what's in Serializer::writeInputBlock, but
   // it's not obvious what higher-level optimization would be factored out here.
-  ModuleDecl::ImportFilter allImportFilter;
-  allImportFilter |= ModuleDecl::ImportFilterKind::Public;
-  allImportFilter |= ModuleDecl::ImportFilterKind::Private;
-  allImportFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
-
   SmallVector<ModuleDecl::ImportedModule, 8> allImports;
-  M->getImportedModules(allImports, allImportFilter);
+  M->getImportedModules(allImports,
+                        {ModuleDecl::ImportFilterKind::Public,
+                         ModuleDecl::ImportFilterKind::Private,
+                         ModuleDecl::ImportFilterKind::SPIAccessControl});
   ModuleDecl::removeDuplicateImports(allImports);
   diagnoseScopedImports(M->getASTContext().Diags, allImports);
 
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
index 8610dbc96e654..369f92268751a 100644
--- a/lib/FrontendTool/FrontendTool.cpp
+++ b/lib/FrontendTool/FrontendTool.cpp
@@ -199,10 +199,10 @@ static bool emitMakeDependenciesIfNeeded(DiagnosticEngine &diags,
   return false;
 }
 
-static bool emitMakeDependenciesIfNeeded(DiagnosticEngine &diags,
+static void emitMakeDependenciesIfNeeded(DiagnosticEngine &diags,
                                          DependencyTracker *depTracker,
                                          const FrontendOptions &opts) {
-  return opts.InputsAndOutputs.forEachInputProducingSupplementaryOutput(
+  opts.InputsAndOutputs.forEachInputProducingSupplementaryOutput(
       [&](const InputFile &f) -> bool {
         return emitMakeDependenciesIfNeeded(diags, depTracker, opts, f);
       });
@@ -436,7 +436,7 @@ static bool emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
     importedModules.insert(import.importedModule);
 
   llvm::DenseMap<StringRef, ModuleDecl *> pathToModuleDecl;
-  for (auto &module : ctxt.LoadedModules) {
+  for (const auto &module : ctxt.getLoadedModules()) {
     ModuleDecl *loadedDecl = module.second;
     if (!loadedDecl)
       llvm::report_fatal_error("Expected loaded modules to be non-null.");
@@ -480,11 +480,11 @@ static bool emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
   return true;
 }
 
-static bool
+static void
 emitLoadedModuleTraceForAllPrimariesIfNeeded(ModuleDecl *mainModule,
                                              DependencyTracker *depTracker,
                                              const FrontendOptions &opts) {
-  return opts.InputsAndOutputs.forEachInputProducingSupplementaryOutput(
+  opts.InputsAndOutputs.forEachInputProducingSupplementaryOutput(
       [&](const InputFile &input) -> bool {
         return emitLoadedModuleTraceIfNeeded(
           mainModule, depTracker, opts.PrebuiltModuleCachePath,
@@ -682,15 +682,15 @@ static void countStatsOfSourceFile(UnifiedStatsReporter &Stats,
   }
 }
 
-static void countStatsPostSema(UnifiedStatsReporter &Stats,
-                               CompilerInstance& Instance) {
+static void countASTStats(UnifiedStatsReporter &Stats,
+                          CompilerInstance& Instance) {
   auto &C = Stats.getFrontendCounters();
   auto &SM = Instance.getSourceMgr();
   C.NumSourceBuffers = SM.getLLVMSourceMgr().getNumBuffers();
   C.NumLinkLibraries = Instance.getLinkLibraries().size();
 
   auto const &AST = Instance.getASTContext();
-  C.NumLoadedModules = AST.LoadedModules.size();
+  C.NumLoadedModules = AST.getNumLoadedModules();
 
   if (auto *D = Instance.getDependencyTracker()) {
     C.NumDependencies = D->getDependencies().size();
@@ -793,7 +793,7 @@ static bool buildModuleFromInterface(CompilerInstance &Instance) {
       PrebuiltCachePath, Invocation.getModuleName(), InputPath,
       Invocation.getOutputFilename(),
       FEOpts.SerializeModuleInterfaceDependencyHashes,
-      FEOpts.TrackSystemDeps, LoaderOpts);
+      FEOpts.shouldTrackSystemDependencies(), LoaderOpts);
 }
 
 static bool compileLLVMIR(CompilerInstance &Instance) {
@@ -1154,15 +1154,22 @@ static void emitIndexData(const CompilerInstance &Instance) {
 
 /// Emits all "one-per-module" supplementary outputs that don't depend on
 /// anything past type-checking.
-///
-/// These are extracted out so that they can be invoked early when using
-/// `-typecheck`, but skipped for any mode that runs SIL diagnostics if there's
-/// an error found there (to get those diagnostics back to the user faster).
 static bool emitAnyWholeModulePostTypeCheckSupplementaryOutputs(
     CompilerInstance &Instance) {
   const auto &Invocation = Instance.getInvocation();
   const FrontendOptions &opts = Invocation.getFrontendOptions();
 
+  // FIXME: Whole-module outputs with a non-whole-module action ought to
+  // be disallowed, but the driver implements -index-file mode by generating a
+  // regular whole-module frontend command line and modifying it to index just
+  // one file (by making it a primary) instead of all of them. If that
+  // invocation also has flags to emit whole-module supplementary outputs, the
+  // compiler can crash trying to access information for non-type-checked
+  // declarations in the non-primary files. For now, prevent those crashes by
+  // guarding the emission of whole-module supplementary outputs.
+  if (!opts.InputsAndOutputs.isWholeModule())
+    return false;
+
   // Record whether we failed to emit any of these outputs, but keep going; one
   // failure does not mean skipping the rest.
   bool hadAnyError = false;
@@ -1217,29 +1224,139 @@ static bool emitAnyWholeModulePostTypeCheckSupplementaryOutputs(
   return hadAnyError;
 }
 
+static void dumpAPIIfNeeded(const CompilerInstance &Instance) {
+  using namespace llvm::sys;
+  const auto &Invocation = Instance.getInvocation();
+  StringRef OutDir = Invocation.getFrontendOptions().DumpAPIPath;
+  if (OutDir.empty())
+    return;
+
+  auto getOutPath = [&](SourceFile *SF) -> std::string {
+    SmallString<256> Path = OutDir;
+    StringRef Filename = SF->getFilename();
+    path::append(Path, path::filename(Filename));
+    return std::string(Path.str());
+  };
+
+  std::unordered_set<std::string> Filenames;
+
+  auto dumpFile = [&](SourceFile *SF) -> bool {
+    SmallString<512> TempBuf;
+    llvm::raw_svector_ostream TempOS(TempBuf);
+
+    PrintOptions PO = PrintOptions::printInterface();
+    PO.PrintOriginalSourceText = true;
+    PO.Indent = 2;
+    PO.PrintAccess = false;
+    PO.SkipUnderscoredStdlibProtocols = true;
+    SF->print(TempOS, PO);
+    if (TempOS.str().trim().empty())
+      return false; // nothing to show.
+
+    std::string OutPath = getOutPath(SF);
+    bool WasInserted = Filenames.insert(OutPath).second;
+    if (!WasInserted) {
+      llvm::errs() << "multiple source files ended up with the same dump API "
+                      "filename to write to: " << OutPath << '\n';
+      return true;
+    }
+
+    std::error_code EC;
+    llvm::raw_fd_ostream OS(OutPath, EC, fs::FA_Read | fs::FA_Write);
+    if (EC) {
+      llvm::errs() << "error opening file '" << OutPath << "': "
+                   << EC.message() << '\n';
+      return true;
+    }
+
+    OS << TempOS.str();
+    return false;
+  };
+
+  std::error_code EC = fs::create_directories(OutDir);
+  if (EC) {
+    llvm::errs() << "error creating directory '" << OutDir << "': "
+                 << EC.message() << '\n';
+    return;
+  }
+
+  for (auto *FU : Instance.getMainModule()->getFiles()) {
+    if (auto *SF = dyn_cast<SourceFile>(FU))
+      if (dumpFile(SF))
+        return;
+  }
+}
+
 /// Perform any actions that must have access to the ASTContext, and need to be
 /// delayed until the Swift compile pipeline has finished. This may be called
 /// before or after LLVM depending on when the ASTContext gets freed.
 static void performEndOfPipelineActions(CompilerInstance &Instance) {
   assert(Instance.hasASTContext());
   auto &ctx = Instance.getASTContext();
+  const auto &Invocation = Instance.getInvocation();
+  const auto &opts = Invocation.getFrontendOptions();
+
+  // If we were asked to print Clang stats, do so.
+  if (opts.PrintClangStats && ctx.getClangModuleLoader())
+    ctx.getClangModuleLoader()->printStatistics();
+
+  // Report AST stats if needed.
+  if (auto *stats = ctx.Stats)
+    countASTStats(*stats, Instance);
+
+  // Report mangling stats if there was no error.
+  if (!ctx.hadError())
+    Mangle::printManglingStats();
 
   // Make sure we didn't load a module during a parse-only invocation, unless
   // it's -emit-imported-modules, which can load modules.
-  auto action = Instance.getInvocation().getFrontendOptions().RequestedAction;
+  auto action = opts.RequestedAction;
   if (FrontendOptions::shouldActionOnlyParse(action) &&
       action != FrontendOptions::ActionType::EmitImportedModules) {
-    assert(ctx.LoadedModules.size() == 1 &&
+    assert(ctx.getNumLoadedModules() == 1 &&
            "Loaded a module during parse-only");
-    assert(ctx.LoadedModules.front().second == Instance.getMainModule());
+    assert(ctx.getLoadedModules().begin()->second == Instance.getMainModule());
   }
 
   // Verify the AST for all the modules we've loaded.
   ctx.verifyAllLoadedModules();
 
+  // Verify generic signatures if we've been asked to.
+  verifyGenericSignaturesIfNeeded(Invocation, ctx);
+
+  // Emit any additional outputs that we only need for a successful compilation.
+  // We don't want to unnecessarily delay getting any errors back to the user.
+  if (!ctx.hadError()) {
+    emitLoadedModuleTraceForAllPrimariesIfNeeded(
+        Instance.getMainModule(), Instance.getDependencyTracker(), opts);
+    
+    emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance);
+
+    dumpAPIIfNeeded(Instance);
+  }
+
+  // Verify reference dependencies of the current compilation job. Note this
+  // must be run *before* verifying diagnostics so that the former can be tested
+  // via the latter.
+  if (opts.EnableIncrementalDependencyVerifier) {
+    if (!Instance.getPrimarySourceFiles().empty()) {
+      swift::verifyDependencies(Instance.getSourceMgr(),
+                                Instance.getPrimarySourceFiles());
+    } else {
+      swift::verifyDependencies(Instance.getSourceMgr(),
+                                Instance.getMainModule()->getFiles());
+    }
+  }
+
   // Emit dependencies and index data.
   emitReferenceDependenciesForAllPrimaryInputsIfNeeded(Instance);
   emitIndexData(Instance);
+  emitMakeDependenciesIfNeeded(Instance.getDiags(),
+                               Instance.getDependencyTracker(), opts);
+
+  // Emit information about the parsed primaries.
+  emitSwiftRangesForAllPrimaryInputsIfNeeded(Instance);
+  emitCompiledSourceForAllPrimaryInputsIfNeeded(Instance);
 }
 
 /// Performs the compile requested by the user.
@@ -1262,7 +1379,13 @@ static bool performCompile(CompilerInstance &Instance,
     return precompileClangModule(Instance);
   if (Action == FrontendOptions::ActionType::DumpPCM)
     return dumpPrecompiledClangModule(Instance);
-
+  if (Action == FrontendOptions::ActionType::PrintVersion) {
+    llvm::outs() << version::getSwiftFullVersion(
+      version::Version::getCurrentLanguageVersion()) << '\n';
+    llvm::outs() << "Target: "
+      << Invocation.getLangOptions().Target.str() << '\n';
+    return false;
+  }
   if (Action == FrontendOptions::ActionType::CompileModuleFromInterface)
     return buildModuleFromInterface(Instance);
 
@@ -1280,13 +1403,23 @@ static bool performCompile(CompilerInstance &Instance,
       return true;
   }
 
+  bool didFinishPipeline = false;
   SWIFT_DEFER {
+    assert(didFinishPipeline && "Returned without calling finishPipeline");
+  };
+
+  auto finishPipeline = [&](bool hadError) -> bool {
     // We might have freed the ASTContext already, but in that case we would
     // have already performed these actions.
-    if (Instance.hasASTContext())
+    if (Instance.hasASTContext()) {
       performEndOfPipelineActions(Instance);
+      hadError |= Instance.getASTContext().hadError();
+    }
+    didFinishPipeline = true;
+    return hadError;
   };
 
+  auto &Context = Instance.getASTContext();
   if (FrontendOptions::shouldActionOnlyParse(Action)) {
     // Parsing gets triggered lazily, but let's make sure we have the right
     // input kind.
@@ -1298,11 +1431,11 @@ static bool performCompile(CompilerInstance &Instance,
     (void)kind;
   } else if (Action == FrontendOptions::ActionType::ResolveImports) {
     Instance.performParseAndResolveImportsOnly();
+    return finishPipeline(Context.hadError());
   } else {
     Instance.performSema();
   }
 
-  ASTContext &Context = Instance.getASTContext();
   if (Action == FrontendOptions::ActionType::Parse) {
     // A -parse invocation only cares about the side effects of parsing, so
     // force the parsing of all the source files.
@@ -1310,27 +1443,15 @@ static bool performCompile(CompilerInstance &Instance,
       if (auto *SF = dyn_cast<SourceFile>(file))
         (void)SF->getTopLevelDecls();
     }
-    return Context.hadError();
+    return finishPipeline(Context.hadError());
   }
 
-  if (Action == FrontendOptions::ActionType::ScanDependencies) {
-    scanDependencies(Instance);
-  }
-
-  (void)emitMakeDependenciesIfNeeded(Instance.getDiags(),
-                                     Instance.getDependencyTracker(), opts);
-
-  if (Action == FrontendOptions::ActionType::ResolveImports ||
-      Action == FrontendOptions::ActionType::ScanDependencies)
-    return Context.hadError();
+  if (Action == FrontendOptions::ActionType::ScanDependencies)
+    return finishPipeline(scanDependencies(Instance));
 
   if (observer)
     observer->performedSemanticAnalysis(Instance);
 
-  if (auto *Stats = Context.Stats) {
-    countStatsPostSema(*Stats, Instance);
-  }
-
   {
     FrontendOptions::DebugCrashMode CrashMode = opts.CrashMode;
     if (CrashMode == FrontendOptions::DebugCrashMode::AssertAfterParse)
@@ -1339,8 +1460,6 @@ static bool performCompile(CompilerInstance &Instance,
       debugFailWithCrash();
   }
 
-  verifyGenericSignaturesIfNeeded(Invocation, Context);
-
   (void)migrator::updateCodeAndEmitRemapIfNeeded(&Instance);
 
   if (Action == FrontendOptions::ActionType::REPL) {
@@ -1349,43 +1468,20 @@ static bool performCompile(CompilerInstance &Instance,
   }
 
   if (auto r = dumpASTIfNeeded(Instance))
-    return *r;
-
-  // If we were asked to print Clang stats, do so.
-  if (opts.PrintClangStats && Context.getClangModuleLoader())
-    Context.getClangModuleLoader()->printStatistics();
-
-  emitSwiftRangesForAllPrimaryInputsIfNeeded(Instance);
-  emitCompiledSourceForAllPrimaryInputsIfNeeded(Instance);
+    return finishPipeline(*r);
 
   if (Context.hadError())
-    return true;
-
-  (void)emitLoadedModuleTraceForAllPrimariesIfNeeded(
-      Instance.getMainModule(), Instance.getDependencyTracker(), opts);
+    return finishPipeline(/*hadError*/ true);
 
   // We've just been told to perform a typecheck, so we can return now.
-  if (Action == FrontendOptions::ActionType::Typecheck) {
-    // FIXME: Whole-module outputs with a non-whole-module -typecheck ought to
-    // be disallowed, but the driver implements -index-file mode by generating a
-    // regular whole-module frontend command line and modifying it to index just
-    // one file (by making it a primary) instead of all of them. If that
-    // invocation also has flags to emit whole-module supplementary outputs, the
-    // compiler can crash trying to access information for non-type-checked
-    // declarations in the non-primary files. For now, prevent those crashes by
-    // guarding the emission of whole-module supplementary outputs.
-    if (opts.InputsAndOutputs.isWholeModule()) {
-      if (emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance)) {
-        return true;
-      }
-    }
-    return false;
-  }
+  if (Action == FrontendOptions::ActionType::Typecheck)
+    return finishPipeline(/*hadError*/ false);
 
   assert(FrontendOptions::doesActionGenerateSIL(Action) &&
          "All actions not requiring SILGen must have been handled!");
 
-  return performCompileStepsPostSema(Instance, ReturnValue, observer);
+  return finishPipeline(
+      performCompileStepsPostSema(Instance, ReturnValue, observer));
 }
 
 static bool serializeSIB(SILModule *SM, const PrimarySpecificPaths &PSPs,
@@ -1530,18 +1626,7 @@ static void freeASTContextIfPossible(CompilerInstance &Instance) {
     return;
   }
 
-  // If we're going to dump the API of the module, we cannot tear down
-  // the ASTContext, as that would cause the module to be freed prematurely.
   const auto &opts = Instance.getInvocation().getFrontendOptions();
-  if (!opts.DumpAPIPath.empty()) {
-    return;
-  }
-
-  // Verifying incremental dependencies relies on access to the Swift Module's
-  // source files.
-  if (opts.EnableIncrementalDependencyVerifier) {
-    return;
-  }
 
   // If there are multiple primary inputs it is too soon to free
   // the ASTContext, etc.. OTOH, if this compilation generates code for > 1
@@ -1650,8 +1735,6 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   if (observer)
     observer->performedSILProcessing(*SM);
 
-  emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance);
-
   if (Action == FrontendOptions::ActionType::EmitSIB)
     return serializeSIB(SM.get(), PSPs, Context, MSF);
 
@@ -1773,68 +1856,6 @@ static void emitIndexDataForSourceFile(SourceFile *PrimarySourceFile,
   }
 }
 
-/// Returns true if an error occurred.
-static bool dumpAPI(ModuleDecl *Mod, StringRef OutDir) {
-  using namespace llvm::sys;
-
-  auto getOutPath = [&](SourceFile *SF) -> std::string {
-    SmallString<256> Path = OutDir;
-    StringRef Filename = SF->getFilename();
-    path::append(Path, path::filename(Filename));
-    return std::string(Path.str());
-  };
-
-  std::unordered_set<std::string> Filenames;
-
-  auto dumpFile = [&](SourceFile *SF) -> bool {
-    SmallString<512> TempBuf;
-    llvm::raw_svector_ostream TempOS(TempBuf);
-
-    PrintOptions PO = PrintOptions::printInterface();
-    PO.PrintOriginalSourceText = true;
-    PO.Indent = 2;
-    PO.PrintAccess = false;
-    PO.SkipUnderscoredStdlibProtocols = true;
-    SF->print(TempOS, PO);
-    if (TempOS.str().trim().empty())
-      return false; // nothing to show.
-
-    std::string OutPath = getOutPath(SF);
-    bool WasInserted = Filenames.insert(OutPath).second;
-    if (!WasInserted) {
-      llvm::errs() << "multiple source files ended up with the same dump API "
-                      "filename to write to: " << OutPath << '\n';
-      return true;
-    }
-
-    std::error_code EC;
-    llvm::raw_fd_ostream OS(OutPath, EC, fs::FA_Read | fs::FA_Write);
-    if (EC) {
-      llvm::errs() << "error opening file '" << OutPath << "': "
-                   << EC.message() << '\n';
-      return true;
-    }
-
-    OS << TempOS.str();
-    return false;
-  };
-
-  std::error_code EC = fs::create_directories(OutDir);
-  if (EC) {
-    llvm::errs() << "error creating directory '" << OutDir << "': "
-                 << EC.message() << '\n';
-    return true;
-  }
-
-  for (auto *FU : Mod->getFiles()) {
-    if (auto *SF = dyn_cast<SourceFile>(FU))
-      if (dumpFile(SF))
-        return true;
-  }
-
-  return false;
-}
-
 /// Creates a diagnostic consumer that handles dispatching diagnostics to
 /// multiple output files, based on the supplementary output paths specified by
 /// \p inputsAndOutputs.
@@ -2190,18 +2211,6 @@ int swift::performFrontend(ArrayRef<const char *> Args,
   const DiagnosticOptions &diagOpts = Invocation.getDiagnosticOptions();
   bool verifierEnabled = diagOpts.VerifyMode != DiagnosticOptions::NoVerify;
 
-  if (Invocation.getFrontendOptions()
-          .InputsAndOutputs.hasDependencyTrackerPath() ||
-      !Invocation.getFrontendOptions().IndexStorePath.empty() ||
-      Invocation.getFrontendOptions().TrackSystemDeps) {
-    // Note that we're tracking dependencies even when we don't need to write
-    // them directly; in particular, -track-system-dependencies affects how
-    // module interfaces get loaded, and so we need to be consistently tracking
-    // system dependencies throughout the compiler.
-    Instance->createDependencyTracker(
-        Invocation.getFrontendOptions().TrackSystemDeps);
-  }
-
   if (Instance->setup(Invocation)) {
     return finishDiagProcessing(1, /*verifierEnabled*/ false);
   }
@@ -2219,27 +2228,6 @@ int swift::performFrontend(ArrayRef<const char *> Args,
 
   int ReturnValue = 0;
   bool HadError = performCompile(*Instance, Args, ReturnValue, observer);
-  if (!HadError) {
-    Mangle::printManglingStats();
-  }
-
-  if (!HadError && !Invocation.getFrontendOptions().DumpAPIPath.empty()) {
-    HadError = dumpAPI(Instance->getMainModule(),
-                       Invocation.getFrontendOptions().DumpAPIPath);
-  }
-
-  // Verify reference dependencies of the current compilation job *before*
-  // verifying diagnostics so that the former can be tested via the latter.
-  if (Invocation.getFrontendOptions().EnableIncrementalDependencyVerifier) {
-    if (!Instance->getPrimarySourceFiles().empty()) {
-      HadError |= swift::verifyDependencies(Instance->getSourceMgr(),
-                                            Instance->getPrimarySourceFiles());
-    } else {
-      HadError |= swift::verifyDependencies(
-          Instance->getSourceMgr(),
-          Instance->getMainModule()->getFiles());
-    }
-  }
 
   if (verifierEnabled) {
     DiagnosticEngine &diags = Instance->getDiags();
diff --git a/lib/FrontendTool/ImportedModules.cpp b/lib/FrontendTool/ImportedModules.cpp
index 240d3eda376f1..90a33895ee52a 100644
--- a/lib/FrontendTool/ImportedModules.cpp
+++ b/lib/FrontendTool/ImportedModules.cpp
@@ -78,15 +78,12 @@ bool swift::emitImportedModules(ASTContext &Context, ModuleDecl *mainModule,
   StringRef implicitHeaderPath = opts.ImplicitObjCHeaderPath;
   if (!implicitHeaderPath.empty()) {
     if (!clangImporter->importBridgingHeader(implicitHeaderPath, mainModule)) {
-      ModuleDecl::ImportFilter importFilter;
-      importFilter |= ModuleDecl::ImportFilterKind::Public;
-      importFilter |= ModuleDecl::ImportFilterKind::Private;
-      importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-      importFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
-
       SmallVector<ModuleDecl::ImportedModule, 16> imported;
       clangImporter->getImportedHeaderModule()->getImportedModules(
-          imported, importFilter);
+          imported, {ModuleDecl::ImportFilterKind::Public,
+                     ModuleDecl::ImportFilterKind::Private,
+                     ModuleDecl::ImportFilterKind::ImplementationOnly,
+                     ModuleDecl::ImportFilterKind::SPIAccessControl});
 
       for (auto IM : imported) {
         if (auto clangModule = IM.importedModule->findUnderlyingClangModule())
diff --git a/lib/FrontendTool/ScanDependencies.cpp b/lib/FrontendTool/ScanDependencies.cpp
index ab0c1f4160c59..b8f34d9defabe 100644
--- a/lib/FrontendTool/ScanDependencies.cpp
+++ b/lib/FrontendTool/ScanDependencies.cpp
@@ -78,7 +78,7 @@ static std::vector<ModuleDependencyID> resolveDirectDependencies(
                                               ModuleCachePath,
                                               FEOpts.PrebuiltModuleCachePath,
                                               FEOpts.SerializeModuleInterfaceDependencyHashes,
-                                              FEOpts.TrackSystemDeps);
+                                              FEOpts.shouldTrackSystemDependencies());
   // Find the dependencies of every module this module directly depends on.
   std::vector<ModuleDependencyID> result;
   for (auto dependsOn : knownDependencies.getModuleDependencies()) {
@@ -338,9 +338,26 @@ static void writeJSON(llvm::raw_ostream &out,
           out << "\n";
         }
         out.indent(5 * 2);
-        out << "]\n";
+        out << "],\n";
+      } else if (!swiftDeps->compiledModulePath.empty()) {
+        writeJSONSingleField(
+            out, "compiledModulePath",
+            swiftDeps->compiledModulePath, 5,
+            /*trailingComma=*/false);
+      }
+      if (!swiftDeps->extraPCMArgs.empty()) {
+        out.indent(5 * 2);
+        out << "\"extraPcmArgs\": [\n";
+        for (auto &arg :swiftDeps->extraPCMArgs) {
+          out.indent(6 * 2);
+          out << "\"" << arg << "\"";
+          if (&arg != &swiftDeps->extraPCMArgs.back())
+            out << ",";
+          out << "\n";
+        }
+        out.indent(5 * 2);
+        out << (swiftDeps->bridgingHeaderFile.hasValue() ? "],\n" : "]\n");
       }
-
       /// Bridging header and its source file dependencies, if any.
       if (swiftDeps->bridgingHeaderFile) {
         out.indent(5 * 2);
@@ -412,9 +429,16 @@ bool swift::scanDependencies(CompilerInstance &instance) {
   llvm::SmallString<32> mainModulePath = mainModule->getName().str();
   llvm::sys::path::replace_extension(mainModulePath, newExt);
 
+  std::string apinotesVer = (llvm::Twine("-fapinotes-swift-version=")
+    + instance.getASTContext().LangOpts.EffectiveLanguageVersion
+      .asAPINotesVersionString()).str();
   // Compute the dependencies of the main module.
   auto mainDependencies =
-      ModuleDependencies::forSwiftModule(mainModulePath.str().str());
+    ModuleDependencies::forMainSwiftModule({
+      // ExtraPCMArgs
+      "-Xcc", "-target", "-Xcc", instance.getASTContext().LangOpts.Target.str(),
+      "-Xcc", apinotesVer
+    });
   {
     llvm::StringSet<> alreadyAddedModules;
     for (auto fileUnit : mainModule->getFiles()) {
@@ -438,12 +462,6 @@ bool swift::scanDependencies(CompilerInstance &instance) {
       break;
     }
 
-    // Swift -Onone support library.
-    if (invocation.shouldImportSwiftONoneSupport()) {
-      mainDependencies.addModuleDependency(
-          SWIFT_ONONE_SUPPORT, alreadyAddedModules);
-    }
-
     // Add any implicit module names.
     for (const auto &moduleName : importInfo.ModuleNames) {
       mainDependencies.addModuleDependency(moduleName.str(), alreadyAddedModules);
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
index 09e5cab31d771..aff9699acf673 100644
--- a/lib/IDE/CodeCompletion.cpp
+++ b/lib/IDE/CodeCompletion.cpp
@@ -2085,15 +2085,13 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   }
 
   void collectImportedModules(llvm::StringSet<> &ImportedModules) {
-    ModuleDecl::ImportFilter ImportFilter;
-    ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-    ImportFilter |= ModuleDecl::ImportFilterKind::Private;
-    ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-
     SmallVector<ModuleDecl::ImportedModule, 16> Imported;
     SmallVector<ModuleDecl::ImportedModule, 16> FurtherImported;
-    CurrDeclContext->getParentSourceFile()->getImportedModules(Imported,
-                                                               ImportFilter);
+    CurrDeclContext->getParentSourceFile()->getImportedModules(
+        Imported,
+        {ModuleDecl::ImportFilterKind::Public,
+         ModuleDecl::ImportFilterKind::Private,
+         ModuleDecl::ImportFilterKind::ImplementationOnly});
     while (!Imported.empty()) {
       ModuleDecl *MD = Imported.back().importedModule;
       Imported.pop_back();
@@ -4430,9 +4428,17 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     if (AttrKind == DAK_Available) {
       if (ParamIndex == 0) {
         addDeclAttrParamKeyword("*", "Platform", false);
+
+      // For code completion, suggest 'macOS' instead of 'OSX'.
 #define AVAILABILITY_PLATFORM(X, PrettyName)                                  \
+      if (StringRef(#X) == "OSX")                                             \
+        addDeclAttrParamKeyword("macOS", "Platform", false);                  \
+      else if (StringRef(#X) == "OSXApplicationExtension")                    \
+        addDeclAttrParamKeyword("macOSApplicationExtension", "Platform", false); \
+      else                                                                    \
         addDeclAttrParamKeyword(#X, "Platform", false);
 #include "swift/AST/PlatformKinds.def"
+
       } else {
         addDeclAttrParamKeyword("unavailable", "", false);
         addDeclAttrParamKeyword("message", "Specify message", true);
@@ -6152,15 +6158,29 @@ void CodeCompletionCallbacksImpl::doneParsing() {
       if (IsAtStartOfLine) {
         //   foo() {}
         //   <HERE>
-        // Global completion.
+
         auto &Sink = CompletionContext.getResultSink();
-        addDeclKeywords(Sink);
-        addStmtKeywords(Sink, MaybeFuncBody);
-        addSuperKeyword(Sink);
-        addLetVarKeywords(Sink);
-        addExprKeywords(Sink);
-        addAnyTypeKeyword(Sink, CurDeclContext->getASTContext().TheAnyType);
-        DoPostfixExprBeginning();
+        if (isa<Initializer>(CurDeclContext))
+          CurDeclContext = CurDeclContext->getParent();
+
+        if (CurDeclContext->isTypeContext()) {
+          // Override completion (CompletionKind::NominalMemberBeginning).
+          addDeclKeywords(Sink);
+          addLetVarKeywords(Sink);
+          SmallVector<StringRef, 0> ParsedKeywords;
+          CompletionOverrideLookup OverrideLookup(Sink, Context, CurDeclContext,
+                                                  ParsedKeywords, SourceLoc());
+          OverrideLookup.getOverrideCompletions(SourceLoc());
+        } else {
+          // Global completion (CompletionKind::PostfixExprBeginning).
+          addDeclKeywords(Sink);
+          addStmtKeywords(Sink, MaybeFuncBody);
+          addSuperKeyword(Sink);
+          addLetVarKeywords(Sink);
+          addExprKeywords(Sink);
+          addAnyTypeKeyword(Sink, Context.TheAnyType);
+          DoPostfixExprBeginning();
+        }
       } else {
         //   foo() {} <HERE>
         // Member completion.
@@ -6172,15 +6192,33 @@ void CodeCompletionCallbacksImpl::doneParsing() {
         if (analyzedExpr->getEndLoc() != CodeCompleteTokenExpr->getLoc())
           break;
 
-        // If the call expression doesn't have a type, infer it from the
-        // possible callee info.
         Type resultTy = analyzedExpr->getType();
-        if (!resultTy) {
-          if (ContextInfo.getPossibleCallees().empty())
-            break;
-          auto calleeInfo = ContextInfo.getPossibleCallees()[0];
-          resultTy = calleeInfo.Type->getResult();
-          analyzedExpr->setType(resultTy);
+        // If the call expression doesn't have a type, fallback to:
+        if (!resultTy || resultTy->is<ErrorType>()) {
+          // 1) Try to type check removing CodeCompletionExpr from the call.
+          Expr *removedExpr = analyzedExpr;
+          removeCodeCompletionExpr(CurDeclContext->getASTContext(),
+                                   removedExpr);
+          ConcreteDeclRef referencedDecl;
+          auto optT = getTypeOfCompletionContextExpr(
+              CurDeclContext->getASTContext(), CurDeclContext,
+              CompletionTypeCheckKind::Normal, removedExpr, referencedDecl);
+          if (optT) {
+            resultTy = *optT;
+            analyzedExpr->setType(resultTy);
+          }
+        }
+        if (!resultTy || resultTy->is<ErrorType>()) {
+          // 2) Infer it from the possible callee info.
+          if (!ContextInfo.getPossibleCallees().empty()) {
+            auto calleeInfo = ContextInfo.getPossibleCallees()[0];
+            resultTy = calleeInfo.Type->getResult();
+            analyzedExpr->setType(resultTy);
+          }
+        }
+        if (!resultTy || resultTy->is<ErrorType>()) {
+          // 3) Give up providing postfix completions.
+          break;
         }
 
         auto &SM = CurDeclContext->getASTContext().SourceMgr;
@@ -6339,13 +6377,12 @@ void CodeCompletionCallbacksImpl::doneParsing() {
         Lookup.addModuleName(curModule);
 
       // Add results for all imported modules.
-      ModuleDecl::ImportFilter ImportFilter;
-      ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-      ImportFilter |= ModuleDecl::ImportFilterKind::Private;
-      ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
       SmallVector<ModuleDecl::ImportedModule, 4> Imports;
       auto *SF = CurDeclContext->getParentSourceFile();
-      SF->getImportedModules(Imports, ImportFilter);
+      SF->getImportedModules(
+          Imports, {ModuleDecl::ImportFilterKind::Public,
+                    ModuleDecl::ImportFilterKind::Private,
+                    ModuleDecl::ImportFilterKind::ImplementationOnly});
 
       for (auto Imported : Imports) {
         for (auto Import : namelookup::getAllImports(Imported.importedModule))
diff --git a/lib/IDE/CompletionInstance.cpp b/lib/IDE/CompletionInstance.cpp
index e1aadf8a5b610..95fb4a2e4efda 100644
--- a/lib/IDE/CompletionInstance.cpp
+++ b/lib/IDE/CompletionInstance.cpp
@@ -495,10 +495,10 @@ bool CompletionInstance::performNewOperation(
 
   auto TheInstance = std::make_unique<CompilerInstance>();
 
-  // Track dependencies in fast-completion mode to invalidate the compiler
-  // instance if any dependent files are modified.
-  if (isCachedCompletionRequested)
-    TheInstance->createDependencyTracker(false);
+  // Track non-system dependencies in fast-completion mode to invalidate the
+  // compiler instance if any dependent files are modified.
+  Invocation.getFrontendOptions().IntermoduleDependencyTracking =
+      IntermoduleDepTrackingMode::ExcludeSystem;
 
   {
     auto &CI = *TheInstance;
diff --git a/lib/IDE/ExprContextAnalysis.cpp b/lib/IDE/ExprContextAnalysis.cpp
index 05aeef6bef665..602f5f32b19c3 100644
--- a/lib/IDE/ExprContextAnalysis.cpp
+++ b/lib/IDE/ExprContextAnalysis.cpp
@@ -12,6 +12,7 @@
 
 #include "ExprContextAnalysis.h"
 #include "swift/AST/ASTContext.h"
+#include "swift/AST/ASTVisitor.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
@@ -181,6 +182,81 @@ Expr *swift::ide::findParsedExpr(const DeclContext *DC,
   return finder.get();
 }
 
+//===----------------------------------------------------------------------===//
+// removeCodeCompletionExpr(ASTContext, Expr)
+//===----------------------------------------------------------------------===//
+
+namespace {
+// TODO: Implement other expressions?
+class CCExprRemover: public ASTWalker, public ExprVisitor<CCExprRemover, Expr *> {
+  ASTContext &Ctx;
+
+public:
+  bool Removed = false;
+
+  CCExprRemover(ASTContext &Ctx) : Ctx(Ctx) {}
+
+  Expr *visitCallExpr(CallExpr *E) {
+    SourceLoc lParenLoc, rParenLoc;
+    SmallVector<Identifier, 2> argLabels;
+    SmallVector<SourceLoc, 2> argLabelLocs;
+    SmallVector<Expr *, 2> args;
+    SmallVector<TrailingClosure, 2> trailingClosures;
+    bool removing = false;
+
+    if (auto paren = dyn_cast<ParenExpr>(E->getArg())) {
+      if (isa<CodeCompletionExpr>(paren->getSubExpr())) {
+        lParenLoc = paren->getLParenLoc();
+        rParenLoc = paren->getRParenLoc();
+        removing = true;
+      }
+    } else if (auto tuple = dyn_cast<TupleExpr>(E->getArg())) {
+      lParenLoc = tuple->getLParenLoc();
+      rParenLoc = tuple->getRParenLoc();
+      for (unsigned i = 0, e = tuple->getNumElements(); i != e; ++i) {
+        if (isa<CodeCompletionExpr>(tuple->getElement(i))) {
+          removing = true;
+          continue;
+        }
+
+        if (i < E->getUnlabeledTrailingClosureIndex()) {
+          // Normal arguments.
+          argLabels.push_back(E->getArgumentLabels()[i]);
+          argLabelLocs.push_back(E->getArgumentLabelLocs()[i]);
+          args.push_back(tuple->getElement(i));
+        } else {
+          // Trailing closure arguments.
+          trailingClosures.emplace_back(E->getArgumentLabels()[i],
+                                        E->getArgumentLabelLocs()[i],
+                                        tuple->getElement(i));
+        }
+      }
+    }
+    if (removing) {
+      Removed = true;
+      return CallExpr::create(Ctx, E->getFn(), lParenLoc, args, argLabels,
+                              argLabelLocs, rParenLoc, trailingClosures,
+                              E->isImplicit());
+    }
+    return E;
+  }
+
+  Expr *visitExpr(Expr *E) {
+    return E;
+  }
+
+  std::pair<bool, Expr *> walkToExprPre(Expr *E) override {
+    return {true, visit(E)};
+  }
+};
+}
+
+bool swift::ide::removeCodeCompletionExpr(ASTContext &Ctx, Expr *&expr) {
+  CCExprRemover remover(Ctx);
+  expr = expr->walk(remover);
+  return remover.Removed;
+}
+
 //===----------------------------------------------------------------------===//
 // getReturnTypeFromContext(DeclContext)
 //===----------------------------------------------------------------------===//
diff --git a/lib/IDE/ExprContextAnalysis.h b/lib/IDE/ExprContextAnalysis.h
index 38c9443c46a1d..d6b039693fb70 100644
--- a/lib/IDE/ExprContextAnalysis.h
+++ b/lib/IDE/ExprContextAnalysis.h
@@ -34,6 +34,13 @@ void typeCheckContextAt(DeclContext *DC, SourceLoc Loc);
 /// exact the same as \p TargetRange. Returns \c nullptr if not found.
 Expr *findParsedExpr(const DeclContext *DC, SourceRange TargetRange);
 
+/// Remove \c CodeCompletionExpr from \p expr . Returns \c true if it actually
+/// mutated the expression.
+///
+/// NOTE: Currently, this only removes CodeCompletionExpr at call argument
+///       position.
+bool removeCodeCompletionExpr(ASTContext &Ctx, Expr *&expr);
+
 /// Returns expected return type of the given decl context.
 /// \p DC should be an \c AbstractFunctionDecl or an \c AbstractClosureExpr.
 Type getReturnTypeFromContext(const DeclContext *DC);
diff --git a/lib/IDE/Formatting.cpp b/lib/IDE/Formatting.cpp
index 102e0786ebfe9..64a78e7ec12b3 100644
--- a/lib/IDE/Formatting.cpp
+++ b/lib/IDE/Formatting.cpp
@@ -1907,6 +1907,11 @@ class FormatWalker : public ASTWalker {
       return Aligner.getContextAndSetAlignment(CtxOverride);
     }
 
+    // There are no parens at this point, so if there are no parameters either,
+    // this shouldn't be a context (it's an implicit parameter list).
+    if (!PL->size())
+      return None;
+
     ListAligner Aligner(SM, TargetLocation, ContextLoc, Range.Start);
     for (auto *PD: *PL)
       Aligner.updateAlignment(PD->getSourceRange(), PD);
@@ -2337,8 +2342,17 @@ class FormatWalker : public ASTWalker {
         return None;
 
       ListAligner Aligner(SM, TargetLocation, L, L, R, true);
-      for (auto *Elem: AE->getElements())
-        Aligner.updateAlignment(Elem->getStartLoc(), Elem->getEndLoc(), Elem);
+      for (auto *Elem: AE->getElements()) {
+        SourceRange ElemRange = Elem->getSourceRange();
+        Aligner.updateAlignment(ElemRange, Elem);
+        if (isTargetContext(ElemRange)) {
+          Aligner.setAlignmentIfNeeded(CtxOverride);
+          return IndentContext {
+            ElemRange.Start,
+            !OutdentChecker::hasOutdent(SM, ElemRange, Elem)
+          };
+        }
+      }
       return Aligner.getContextAndSetAlignment(CtxOverride);
     }
 
diff --git a/lib/IDE/Refactoring.cpp b/lib/IDE/Refactoring.cpp
index a64ad89315458..7bd3af342739a 100644
--- a/lib/IDE/Refactoring.cpp
+++ b/lib/IDE/Refactoring.cpp
@@ -3451,7 +3451,9 @@ getDeclarationContextFromInfo(ResolvedCursorInfo Info) {
       return AddEquatableContext(NomDecl);
     }
   } else if (auto *ExtDecl = Info.ExtTyRef) {
-    return AddEquatableContext(ExtDecl);
+    if (ExtDecl->getExtendedNominal()) {
+      return AddEquatableContext(ExtDecl);
+    }
   }
   return AddEquatableContext();
 }
diff --git a/lib/IRGen/GenCoverage.cpp b/lib/IRGen/GenCoverage.cpp
index 699d1584e4eb1..a5d2e6d512f6e 100644
--- a/lib/IRGen/GenCoverage.cpp
+++ b/lib/IRGen/GenCoverage.cpp
@@ -18,6 +18,7 @@
 #include "IRGenModule.h"
 #include "SwiftTargetInfo.h"
 
+#include "swift/AST/IRGenOptions.h"
 #include "swift/SIL/SILModule.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Module.h"
@@ -60,6 +61,7 @@ void IRGenModule::emitCoverageMapping() {
     if (std::find(Files.begin(), Files.end(), M->getFile()) == Files.end())
       Files.push_back(M->getFile());
 
+  auto remapper = getOptions().CoveragePrefixMap;
   // Awkwardly munge absolute filenames into a vector of StringRefs.
   // TODO: This is heinous - the same thing is happening in clang, but the API
   // really needs to be cleaned up for both.
@@ -68,7 +70,7 @@ void IRGenModule::emitCoverageMapping() {
   for (StringRef Name : Files) {
     llvm::SmallString<256> Path(Name);
     llvm::sys::fs::make_absolute(Path);
-    FilenameStrs.push_back(std::string(Path.begin(), Path.end()));
+    FilenameStrs.push_back(remapper.remapPath(Path));
     FilenameRefs.push_back(FilenameStrs.back());
   }
 
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
index f79cec8c594e2..c8c22d832d097 100644
--- a/lib/IRGen/GenDecl.cpp
+++ b/lib/IRGen/GenDecl.cpp
@@ -443,6 +443,7 @@ class PrettySynthesizedFileUnitEmission : public llvm::PrettyStackTraceEntry {
 
 /// Emit all the top-level code in the source file.
 void IRGenModule::emitSourceFile(SourceFile &SF) {
+  assert(SF.ASTStage == SourceFile::TypeChecked);
   PrettySourceFileEmission StackEntry(SF);
 
   // Emit types and other global decls.
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
index a4db214165cee..eee980c55fa81 100644
--- a/lib/IRGen/GenMeta.cpp
+++ b/lib/IRGen/GenMeta.cpp
@@ -5104,7 +5104,6 @@ void IRGenModule::emitOpaqueTypeDecl(OpaqueTypeDecl *D) {
 bool irgen::methodRequiresReifiedVTableEntry(IRGenModule &IGM,
                                              const SILVTable *vtable,
                                              SILDeclRef method) {
-  auto &M = IGM.getSILModule();
   auto entry = vtable->getEntry(IGM.getSILModule(), method);
   if (!entry) {
     return true;
diff --git a/lib/IRGen/GenObjC.h b/lib/IRGen/GenObjC.h
index 64ec654afc3b2..c5d85996f9043 100644
--- a/lib/IRGen/GenObjC.h
+++ b/lib/IRGen/GenObjC.h
@@ -17,6 +17,7 @@
 #ifndef SWIFT_IRGEN_GENOBJC_H
 #define SWIFT_IRGEN_GENOBJC_H
 
+#include "swift/SIL/SILDeclRef.h"
 
 namespace llvm {
   class Type;
diff --git a/lib/IRGen/IRGen.cpp b/lib/IRGen/IRGen.cpp
index ca88f2efaccff..2f9d160152144 100644
--- a/lib/IRGen/IRGen.cpp
+++ b/lib/IRGen/IRGen.cpp
@@ -889,14 +889,16 @@ static void runIRGenPreparePasses(SILModule &Module,
 
 /// Generates LLVM IR, runs the LLVM passes and produces the output file.
 /// All this is done in a single thread.
-static GeneratedModule
-performIRGeneration(const IRGenOptions &Opts, ModuleDecl *M,
-                    std::unique_ptr<SILModule> SILMod, StringRef ModuleName,
-                    const PrimarySpecificPaths &PSPs,
-                    StringRef PrivateDiscriminator,
-                    SourceFile *SF = nullptr,
-                    llvm::GlobalVariable **outModuleHash = nullptr,
-                    llvm::StringSet<> *linkerDirectives = nullptr) {
+GeneratedModule IRGenRequest::evaluate(Evaluator &evaluator,
+                                       IRGenDescriptor desc) const {
+  const auto &Opts = desc.Opts;
+  const auto &PSPs = desc.PSPs;
+
+  auto SILMod = std::unique_ptr<SILModule>(desc.SILMod);
+  auto *M = desc.getParentModule();
+  auto filesToEmit = desc.getFiles();
+  auto *primaryFile = desc.Ctx.dyn_cast<SourceFile *>();
+
   auto &Ctx = M->getASTContext();
   assert(!Ctx.hadError());
 
@@ -906,9 +908,9 @@ performIRGeneration(const IRGenOptions &Opts, ModuleDecl *M,
   if (!targetMachine) return GeneratedModule::null();
 
   // Create the IR emitter.
-  IRGenModule IGM(irgen, std::move(targetMachine), SF, ModuleName,
+  IRGenModule IGM(irgen, std::move(targetMachine), primaryFile, desc.ModuleName,
                   PSPs.OutputFilename, PSPs.MainInputFilenameForDebugInfo,
-                  PrivateDiscriminator);
+                  desc.PrivateDiscriminator);
 
   initLLVMModule(IGM, *SILMod);
 
@@ -919,25 +921,17 @@ performIRGeneration(const IRGenOptions &Opts, ModuleDecl *M,
     FrontendStatsTracer tracer(Ctx.Stats, "IRGen");
 
     // Emit the module contents.
-    irgen.emitGlobalTopLevel(linkerDirectives);
-
-    if (SF) {
-      IGM.emitSourceFile(*SF);
-      // Emit synthesized file unit, if it exists.
-      if (auto *synthesizedFile = SF->getSynthesizedFile())
-        IGM.emitSynthesizedFileUnit(*synthesizedFile);
-    } else {
-      for (auto *File : M->getFiles()) {
-        if (auto *nextSF = dyn_cast<SourceFile>(File)) {
-          if (nextSF->ASTStage >= SourceFile::TypeChecked)
-            IGM.emitSourceFile(*nextSF);
-        } else if (auto *nextSFU = dyn_cast<SynthesizedFileUnit>(File)) {
-          IGM.emitSynthesizedFileUnit(*nextSFU);
-        } else {
-          File->collectLinkLibraries([&IGM](LinkLibrary LinkLib) {
-            IGM.addLinkLibrary(LinkLib);
-          });
-        }
+    irgen.emitGlobalTopLevel(desc.LinkerDirectives);
+
+    for (auto *file : filesToEmit) {
+      if (auto *nextSF = dyn_cast<SourceFile>(file)) {
+        IGM.emitSourceFile(*nextSF);
+      } else if (auto *nextSFU = dyn_cast<SynthesizedFileUnit>(file)) {
+        IGM.emitSynthesizedFileUnit(*nextSFU);
+      } else {
+        file->collectLinkLibraries([&IGM](LinkLibrary LinkLib) {
+          IGM.addLinkLibrary(LinkLib);
+        });
       }
     }
 
@@ -990,7 +984,7 @@ performIRGeneration(const IRGenOptions &Opts, ModuleDecl *M,
 
   embedBitcode(IGM.getModule(), Opts);
 
-  if (outModuleHash) {
+  if (auto **outModuleHash = desc.outModuleHash) {
     *outModuleHash = IGM.ModuleHash;
   } else {
     FrontendStatsTracer tracer(Ctx.Stats, "LLVM pipeline");
@@ -1111,7 +1105,7 @@ struct LLVMCodeGenThreads {
 /// All this is done in multiple threads.
 static void performParallelIRGeneration(
     const IRGenOptions &Opts, swift::ModuleDecl *M, std::unique_ptr<SILModule> SILMod,
-    StringRef ModuleName, int numThreads,
+    StringRef ModuleName,
     ArrayRef<std::string> outputFilenames,
     llvm::StringSet<> *linkerDirectives) {
 
@@ -1138,7 +1132,7 @@ static void performParallelIRGeneration(
   bool DidRunSILCodeGenPreparePasses = false;
   for (auto *File : M->getFiles()) {
     auto nextSF = dyn_cast<SourceFile>(File);
-    if (!nextSF || nextSF->ASTStage < SourceFile::TypeChecked)
+    if (!nextSF)
       continue;
     
     // There must be an output filename for each source file.
@@ -1285,7 +1279,8 @@ static void performParallelIRGeneration(
   llvm::sys::Mutex DiagMutex;
 
   // Start all the threads and do the LLVM compilation.
-  LLVMCodeGenThreads codeGenThreads(&irgen, &DiagMutex, numThreads - 1);
+
+  LLVMCodeGenThreads codeGenThreads(&irgen, &DiagMutex, Opts.NumThreads - 1);
   codeGenThreads.startThreads();
 
   // Free the memory occupied by the SILModule.
@@ -1306,31 +1301,19 @@ GeneratedModule swift::performIRGeneration(
     const PrimarySpecificPaths &PSPs,
     ArrayRef<std::string> parallelOutputFilenames,
     llvm::GlobalVariable **outModuleHash, llvm::StringSet<> *LinkerDirectives) {
-  auto desc = IRGenDescriptor::forWholeModule(
-      Opts, M, std::move(SILMod), ModuleName, PSPs,
-      parallelOutputFilenames, outModuleHash, LinkerDirectives);
-  return llvm::cantFail(
-      M->getASTContext().evaluator(IRGenWholeModuleRequest{desc}));
-}
-
-GeneratedModule
-IRGenWholeModuleRequest::evaluate(Evaluator &evaluator,
-                                  IRGenDescriptor desc) const {
-  auto *M = desc.Ctx.get<ModuleDecl *>();
-  if (desc.SILMod->getOptions().shouldPerformIRGenerationInParallel() &&
-      !desc.parallelOutputFilenames.empty()) {
-    const auto NumThreads = desc.SILMod->getOptions().NumThreads;
-    ::performParallelIRGeneration(
-        desc.Opts, M, std::unique_ptr<SILModule>(desc.SILMod), desc.ModuleName,
-        NumThreads, desc.parallelOutputFilenames, desc.LinkerDirectives);
+  if (Opts.shouldPerformIRGenerationInParallel() &&
+      !parallelOutputFilenames.empty()) {
+    ::performParallelIRGeneration(Opts, M, std::move(SILMod), ModuleName,
+                                  parallelOutputFilenames, LinkerDirectives);
     // TODO: Parallel LLVM compilation cannot be used if a (single) module is
     // needed as return value.
     return GeneratedModule::null();
   }
-  return ::performIRGeneration(
-      desc.Opts, M, std::unique_ptr<SILModule>(desc.SILMod), desc.ModuleName,
-      desc.PSPs, "", nullptr, desc.outModuleHash,
-      desc.LinkerDirectives);
+
+  auto desc = IRGenDescriptor::forWholeModule(
+      Opts, M, std::move(SILMod), ModuleName, PSPs, parallelOutputFilenames,
+      outModuleHash, LinkerDirectives);
+  return llvm::cantFail(M->getASTContext().evaluator(IRGenRequest{desc}));
 }
 
 GeneratedModule swift::
@@ -1343,18 +1326,7 @@ performIRGeneration(const IRGenOptions &Opts, SourceFile &SF,
   auto desc = IRGenDescriptor::forFile(Opts, SF, std::move(SILMod), ModuleName,
                                        PSPs, PrivateDiscriminator,
                                        outModuleHash, LinkerDirectives);
-  return llvm::cantFail(
-      SF.getASTContext().evaluator(IRGenSourceFileRequest{desc}));
-}
-
-GeneratedModule
-IRGenSourceFileRequest::evaluate(Evaluator &evaluator,
-                                 IRGenDescriptor desc) const {
-  auto *SF = desc.Ctx.get<SourceFile *>();
-  return ::performIRGeneration(
-      desc.Opts, SF->getParentModule(), std::unique_ptr<SILModule>(desc.SILMod),
-      desc.ModuleName, desc.PSPs, desc.PrivateDiscriminator,
-      SF, desc.outModuleHash, desc.LinkerDirectives);
+  return llvm::cantFail(SF.getASTContext().evaluator(IRGenRequest{desc}));
 }
 
 void
diff --git a/lib/IRGen/IRGenDebugInfo.cpp b/lib/IRGen/IRGenDebugInfo.cpp
index 41a640f3e96c3..b15fb6a69a6a1 100644
--- a/lib/IRGen/IRGenDebugInfo.cpp
+++ b/lib/IRGen/IRGenDebugInfo.cpp
@@ -1782,7 +1782,7 @@ IRGenDebugInfoImpl::IRGenDebugInfoImpl(const IRGenOptions &Opts,
       /* DWOId */ 0, /* SplitDebugInlining */ true,
       /* DebugInfoForProfiling */ false,
       llvm::DICompileUnit::DebugNameTableKind::Default,
-      /* RangesBaseAddress */ false, Sysroot, SDK);
+      /* RangesBaseAddress */ false, DebugPrefixMap.remapPath(Sysroot), SDK);
 
   // Because the swift compiler relies on Clang to setup the Module,
   // the clang CU is always created first.  Several dwarf-reading
@@ -1832,12 +1832,11 @@ void IRGenDebugInfoImpl::finalize() {
 
   // Get the list of imported modules (which may actually be different
   // from all ImportDecls).
-  ModuleDecl::ImportFilter ImportFilter;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Private;
-  ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
   SmallVector<ModuleDecl::ImportedModule, 8> ModuleWideImports;
-  IGM.getSwiftModule()->getImportedModules(ModuleWideImports, ImportFilter);
+  IGM.getSwiftModule()->getImportedModules(
+      ModuleWideImports, {ModuleDecl::ImportFilterKind::Public,
+                          ModuleDecl::ImportFilterKind::Private,
+                          ModuleDecl::ImportFilterKind::ImplementationOnly});
   for (auto M : ModuleWideImports)
     if (!ImportedModules.count(M.importedModule))
       DBuilder.createImportedModule(MainFile, getOrCreateModule(M), MainFile,
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
index 87f3207b6ef09..c7d01eb932b15 100644
--- a/lib/IRGen/IRGenModule.cpp
+++ b/lib/IRGen/IRGenModule.cpp
@@ -650,6 +650,26 @@ namespace RuntimeConstants {
     }
     return RuntimeAvailability::AlwaysAvailable;
   }
+
+  RuntimeAvailability
+  CompareTypeContextDescriptorsAvailability(ASTContext &Context) {
+    auto featureAvailability =
+        Context.getCompareTypeContextDescriptorsAvailability();
+    if (!isDeploymentAvailabilityContainedIn(Context, featureAvailability)) {
+      return RuntimeAvailability::ConditionallyAvailable;
+    }
+    return RuntimeAvailability::AlwaysAvailable;
+  }
+
+  RuntimeAvailability
+  CompareProtocolConformanceDescriptorsAvailability(ASTContext &Context) {
+    auto featureAvailability =
+        Context.getCompareProtocolConformanceDescriptorsAvailability();
+    if (!isDeploymentAvailabilityContainedIn(Context, featureAvailability)) {
+      return RuntimeAvailability::ConditionallyAvailable;
+    }
+    return RuntimeAvailability::AlwaysAvailable;
+  }
 } // namespace RuntimeConstants
 
 // We don't use enough attributes to justify generalizing the
diff --git a/lib/IRGen/IRGenModule.h b/lib/IRGen/IRGenModule.h
index 2eb6292c99b0c..19485b72bceae 100644
--- a/lib/IRGen/IRGenModule.h
+++ b/lib/IRGen/IRGenModule.h
@@ -1045,7 +1045,6 @@ class IRGenModule {
   llvm::StringMap<llvm::Constant*> GlobalUTF16Strings;
   llvm::StringMap<std::pair<llvm::GlobalVariable*, llvm::Constant*>>
     StringsForTypeRef;
-  llvm::DenseMap<CanType, llvm::GlobalVariable*> TypeRefs;
   llvm::StringMap<std::pair<llvm::GlobalVariable*, llvm::Constant*>> FieldNames;
   llvm::StringMap<llvm::Constant*> ObjCSelectorRefs;
   llvm::StringMap<llvm::Constant*> ObjCMethodNames;
diff --git a/lib/IRGen/IRGenRequests.cpp b/lib/IRGen/IRGenRequests.cpp
index 5116c83c1abde..0bb8963b44984 100644
--- a/lib/IRGen/IRGenRequests.cpp
+++ b/lib/IRGen/IRGenRequests.cpp
@@ -52,13 +52,40 @@ SourceLoc swift::extractNearestSourceLoc(const IRGenDescriptor &desc) {
   return SourceLoc();
 }
 
-evaluator::DependencySource IRGenSourceFileRequest::readDependencySource(
+TinyPtrVector<FileUnit *> IRGenDescriptor::getFiles() const {
+  // For a whole module, we emit IR for all files.
+  if (auto *mod = Ctx.dyn_cast<ModuleDecl *>())
+    return TinyPtrVector<FileUnit *>(mod->getFiles());
+
+  // For a primary source file, we emit IR for both it and potentially its
+  // SynthesizedFileUnit.
+  auto *SF = Ctx.get<SourceFile *>();
+  TinyPtrVector<FileUnit *> files;
+  files.push_back(SF);
+
+  if (auto *synthesizedFile = SF->getSynthesizedFile())
+    files.push_back(synthesizedFile);
+
+  return files;
+}
+
+ModuleDecl *IRGenDescriptor::getParentModule() const {
+  if (auto *SF = Ctx.dyn_cast<SourceFile *>())
+    return SF->getParentModule();
+  return Ctx.get<ModuleDecl *>();
+}
+
+evaluator::DependencySource IRGenRequest::readDependencySource(
     const evaluator::DependencyRecorder &e) const {
   auto &desc = std::get<0>(getStorage());
-  return {
-    desc.Ctx.dyn_cast<SourceFile *>(),
-    evaluator::DependencyScope::Cascading
-  };
+
+  // We don't track dependencies in whole-module mode.
+  if (auto *mod = desc.Ctx.dyn_cast<ModuleDecl *>()) {
+    return {nullptr, e.getActiveSourceScope()};
+  }
+
+  auto *SF = desc.Ctx.get<SourceFile *>();
+  return {SF, evaluator::DependencyScope::Cascading};
 }
 
 // Define request evaluation functions for each of the IRGen requests.
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
index 1942a358c7779..8f489458e455d 100644
--- a/lib/IRGen/IRGenSIL.cpp
+++ b/lib/IRGen/IRGenSIL.cpp
@@ -868,6 +868,7 @@ class IRGenSILFunction :
   void visitAllocGlobalInst(AllocGlobalInst *i);
   void visitGlobalAddrInst(GlobalAddrInst *i);
   void visitGlobalValueInst(GlobalValueInst *i);
+  void visitBaseAddrForOffsetInst(BaseAddrForOffsetInst *i);
 
   void visitIntegerLiteralInst(IntegerLiteralInst *i);
   void visitFloatLiteralInst(FloatLiteralInst *i);
@@ -2074,6 +2075,12 @@ void IRGenSILFunction::visitGlobalValueInst(GlobalValueInst *i) {
   setLoweredExplosion(i, e);
 }
 
+void IRGenSILFunction::visitBaseAddrForOffsetInst(BaseAddrForOffsetInst *i) {
+  auto storagePtrTy = IGM.getStoragePointerType(i->getType());
+  llvm::Value *addr = llvm::ConstantPointerNull::get(storagePtrTy);
+  setLoweredAddress(i, Address(addr, Alignment()));
+}
+
 void IRGenSILFunction::visitMetatypeInst(swift::MetatypeInst *i) {
   auto metaTy = i->getType().castTo<MetatypeType>();
   Explosion e;
diff --git a/lib/IRGen/MetadataRequest.cpp b/lib/IRGen/MetadataRequest.cpp
index d593ab3bcd095..4d607e6f885ed 100644
--- a/lib/IRGen/MetadataRequest.cpp
+++ b/lib/IRGen/MetadataRequest.cpp
@@ -33,6 +33,7 @@
 #include "IRGenMangler.h"
 #include "IRGenModule.h"
 #include "swift/AST/ASTContext.h"
+#include "swift/AST/CanTypeVisitor.h"
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/IRGenOptions.h"
@@ -1953,16 +1954,51 @@ static void emitCanonicalSpecializationsForGenericTypeMetadataAccessFunction(
       auto requirements = GenericTypeRequirements(IGF.IGM, nominal);
       int requirementIndex = 0;
       for (auto requirement : requirements.getRequirements()) {
-        if (requirement.Protocol) {
-          continue;
-        }
         auto parameter = requirement.TypeParameter;
         auto argument = parameter.subst(substitutions);
-        llvm::Constant *addr =
-            IGM.getAddrOfTypeMetadata(argument->getCanonicalType());
-        auto addrInt = IGF.Builder.CreateBitCast(addr, IGM.Int8PtrTy);
-        condition = IGF.Builder.CreateAnd(
-            condition, IGF.Builder.CreateICmpEQ(addrInt, valueAtIndex(requirementIndex)));
+        if (requirement.Protocol) {
+          auto conformance = substitutions.lookupConformance(
+              requirement.TypeParameter->getCanonicalType(),
+              requirement.Protocol);
+          ProtocolConformance *concreteConformance = conformance.getConcrete();
+          auto argumentNominal = argument->getAnyNominal();
+          if (argumentNominal && argumentNominal->isGenericContext()) {
+            // TODO: Statically specialize the witness table pattern for t's
+            //       conformance.
+            llvm_unreachable(
+                "Statically specializing metadata at generic types is "
+                "not supported.");
+          } else {
+            RootProtocolConformance *rootConformance =
+                concreteConformance->getRootConformance();
+            auto *expectedDescriptor =
+                IGF.IGM.getAddrOfProtocolConformanceDescriptor(rootConformance);
+            auto *witnessTable = valueAtIndex(requirementIndex);
+            auto *witnessBuffer =
+                IGF.Builder.CreateBitCast(witnessTable, IGM.Int8PtrPtrTy);
+            auto *uncastProvidedDescriptor =
+                IGF.Builder.CreateLoad(witnessBuffer, Alignment());
+            auto *providedDescriptor = IGF.Builder.CreateBitCast(
+                uncastProvidedDescriptor,
+                IGM.ProtocolConformanceDescriptorPtrTy);
+
+            auto *call = IGF.Builder.CreateCall(
+                IGF.IGM.getCompareProtocolConformanceDescriptorsFn(),
+                {providedDescriptor, expectedDescriptor});
+            call->setDoesNotThrow();
+            call->setCallingConv(IGF.IGM.SwiftCC);
+            call->addAttribute(llvm::AttributeList::FunctionIndex,
+                               llvm::Attribute::ReadNone);
+            condition = IGF.Builder.CreateAnd(condition, call);
+          }
+        } else {
+          llvm::Constant *addr =
+              IGM.getAddrOfTypeMetadata(argument->getCanonicalType());
+          auto addrInt = IGF.Builder.CreateBitCast(addr, IGM.Int8PtrTy);
+          condition = IGF.Builder.CreateAnd(
+              condition, IGF.Builder.CreateICmpEQ(
+                             addrInt, valueAtIndex(requirementIndex)));
+        }
         ++requirementIndex;
       }
       IGF.Builder.CreateCondBr(condition, specializationBlock, successorBlock);
@@ -2053,7 +2089,6 @@ MetadataResponse irgen::emitGenericTypeMetadataAccessFunction(
     emitCanonicalSpecializationsForGenericTypeMetadataAccessFunction(
         IGF, request, nominal, genericArgs, [&](int index) {
           llvm::Value *indexValue = llvm::ConstantInt::get(IGM.Int64Ty, index);
-          llvm::SmallVector<llvm::Value *, 1> indices{indexValue};
           llvm::Value *elementPointer =
               IGF.Builder.CreateGEP(argumentsBuffer, indexValue);
           llvm::LoadInst *retval = IGF.Builder.CreateLoad(
@@ -2226,8 +2261,6 @@ irgen::emitCanonicalSpecializedGenericTypeMetadataAccessFunction(
   }
   Type superclassType = theType->getSuperclass(/*useArchetypes=*/false);
   if (superclassType) {
-    auto superclass = superclassType->getCanonicalType();
-    auto *superclassNominal = superclass->getAnyNominal();
     emitIdempotentCanonicalSpecializedClassMetadataInitializationComponent(
         IGF, superclassType->getCanonicalType(), initializedTypes);
   }
diff --git a/lib/Index/Index.cpp b/lib/Index/Index.cpp
index 487eeace69098..24a716071c192 100644
--- a/lib/Index/Index.cpp
+++ b/lib/Index/Index.cpp
@@ -125,10 +125,10 @@ class SourceFileOrModule {
 
   void
   getImportedModules(SmallVectorImpl<ModuleDecl::ImportedModule> &Modules) const {
-    ModuleDecl::ImportFilter ImportFilter;
-    ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-    ImportFilter |= ModuleDecl::ImportFilterKind::Private;
-    ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
+    constexpr ModuleDecl::ImportFilter ImportFilter = {
+        ModuleDecl::ImportFilterKind::Public,
+        ModuleDecl::ImportFilterKind::Private,
+        ModuleDecl::ImportFilterKind::ImplementationOnly};
 
     if (auto *SF = SFOrMod.dyn_cast<SourceFile *>()) {
       SF->getImportedModules(Modules, ImportFilter);
diff --git a/lib/Index/IndexRecord.cpp b/lib/Index/IndexRecord.cpp
index d441ade35075f..9fdfe584c5af6 100644
--- a/lib/Index/IndexRecord.cpp
+++ b/lib/Index/IndexRecord.cpp
@@ -580,11 +580,9 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
     unitWriter.addRecordFile(recordFile, *FE, isSystemModule, mod);
   }
 
-  ModuleDecl::ImportFilter importFilter;
-  importFilter |= ModuleDecl::ImportFilterKind::Public;
-  importFilter |= ModuleDecl::ImportFilterKind::Private;
   SmallVector<ModuleDecl::ImportedModule, 8> imports;
-  module->getImportedModules(imports, importFilter);
+  module->getImportedModules(imports, {ModuleDecl::ImportFilterKind::Public,
+                                       ModuleDecl::ImportFilterKind::Private});
   StringScratchSpace moduleNameScratch;
   addModuleDependencies(imports, indexStorePath, indexSystemModules, skipStdlib,
                         targetTriple, clangCI, diags, unitWriter,
@@ -621,13 +619,11 @@ recordSourceFileUnit(SourceFile *primarySourceFile, StringRef indexUnitToken,
       getModuleInfoFromOpaqueModule);
 
   // Module dependencies.
-  ModuleDecl::ImportFilter importFilter;
-  importFilter |= ModuleDecl::ImportFilterKind::Public;
-  importFilter |= ModuleDecl::ImportFilterKind::Private;
-  importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-
   SmallVector<ModuleDecl::ImportedModule, 8> imports;
-  primarySourceFile->getImportedModules(imports, importFilter);
+  primarySourceFile->getImportedModules(
+      imports, {ModuleDecl::ImportFilterKind::Public,
+                ModuleDecl::ImportFilterKind::Private,
+                ModuleDecl::ImportFilterKind::ImplementationOnly});
   StringScratchSpace moduleNameScratch;
   addModuleDependencies(imports, indexStorePath, indexSystemModules, skipStdlib,
                         targetTriple, clangCI, diags, unitWriter,
diff --git a/lib/Markup/LineList.cpp b/lib/Markup/LineList.cpp
index 804c14b2f15ab..38e98b1b07170 100644
--- a/lib/Markup/LineList.cpp
+++ b/lib/Markup/LineList.cpp
@@ -78,7 +78,7 @@ static unsigned measureASCIIArt(StringRef S, unsigned NumLeadingSpaces) {
 
   if (S.startswith(" * "))
     return NumLeadingSpaces + 3;
-  if (S.startswith(" *\n") || S.startswith(" *\n\r"))
+  if (S.startswith(" *\n") || S.startswith(" *\r\n"))
     return NumLeadingSpaces + 2;
   return 0;
 }
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index b69991bafd180..8c2b0a42e0cd3 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -578,6 +578,20 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
     return nullptr;
   }
 
+  if (PlatformKind) {
+      if (!Introduced.empty())
+        Introduced.Version =
+            canonicalizePlatformVersion(*PlatformKind, Introduced.Version);
+
+      if (!Deprecated.empty())
+        Deprecated.Version =
+            canonicalizePlatformVersion(*PlatformKind, Deprecated.Version);
+
+      if (!Obsoleted.empty())
+        Obsoleted.Version =
+            canonicalizePlatformVersion(*PlatformKind, Obsoleted.Version);
+  }
+
   auto Attr = new (Context)
   AvailableAttr(AtLoc, SourceRange(AttrLoc, Tok.getLoc()),
                 PlatformKind.getValue(),
@@ -1037,11 +1051,24 @@ bool Parser::parseDifferentiableAttributeArguments(
   return false;
 }
 
+// Helper function that returns the accessor kind if a token is an accessor
+// label.
+static Optional<AccessorKind> isAccessorLabel(const Token &token) {
+  if (token.is(tok::identifier)) {
+    StringRef tokText = token.getText();
+    for (auto accessor : allAccessorKinds())
+      if (tokText == getAccessorLabel(accessor))
+        return accessor;
+  }
+  return None;
+}
+
 /// Helper function that parses 'type-identifier' for `parseQualifiedDeclName`.
 /// Returns true on error. Sets `baseType` to the parsed base type if present,
 /// or to `nullptr` if not. A missing base type is not considered an error.
 static bool parseBaseTypeForQualifiedDeclName(Parser &P, TypeRepr *&baseType) {
   baseType = nullptr;
+  Parser::BacktrackingScope backtrack(P);
 
   // If base type cannot be parsed, return false (no error).
   if (!P.canParseBaseTypeForQualifiedDeclName())
@@ -1057,6 +1084,28 @@ static bool parseBaseTypeForQualifiedDeclName(Parser &P, TypeRepr *&baseType) {
   // `parseTypeIdentifier(/*isParsingQualifiedDeclName*/ true)` leaves the
   // leading period unparsed to avoid syntax verification errors.
   assert(P.startsWithSymbol(P.Tok, '.') && "false");
+
+  // Check if this is a reference to a property or subscript accessor.
+  //
+  // Note: There is an parsing ambiguity here. An accessor label identifier
+  // (e.g. "set") may refer to the final declaration name component instead of
+  // an accessor kind.
+  //
+  // FIXME: It is wrong to backtrack parsing the entire base type if an accessor
+  // label is found. Instead, only the final component of the base type should
+  // be backtracked. It may be best to implement this in
+  // `Parser::parseTypeIdentifier`.
+  //
+  // Example: consider parsing `A.B.property.set`.
+  // Current behavior: base type is entirely backtracked.
+  // Ideal behavior: base type is parsed as `A.B`.
+  if (P.Tok.is(tok::period)) {
+    const Token &nextToken = P.peekToken();
+    if (isAccessorLabel(nextToken).hasValue())
+      return false;
+  }
+
+  backtrack.cancelBacktrack();
   P.consumeStartingCharacterOfCurrentToken(tok::period);
 
   // Set base type and return false (no error).
@@ -1079,20 +1128,52 @@ static bool parseBaseTypeForQualifiedDeclName(Parser &P, TypeRepr *&baseType) {
 static bool parseQualifiedDeclName(Parser &P, Diag<> nameParseError,
                                    TypeRepr *&baseType,
                                    DeclNameRefWithLoc &original) {
-  SyntaxParsingContext DeclNameContext(P.SyntaxContext,
-                                       SyntaxKind::QualifiedDeclName);
-  // Parse base type.
-  if (parseBaseTypeForQualifiedDeclName(P, baseType))
-    return true;
-  // Parse final declaration name.
-  original.Name = P.parseDeclNameRef(
-      original.Loc, nameParseError,
-      Parser::DeclNameFlag::AllowZeroArgCompoundNames |
-      Parser::DeclNameFlag::AllowKeywordsUsingSpecialNames |
-      Parser::DeclNameFlag::AllowOperators);
-  // The base type is optional, but the final unqualified declaration name is
-  // not. If name could not be parsed, return true for error.
-  return !original.Name;
+  {
+    SyntaxParsingContext DeclNameContext(P.SyntaxContext,
+                                         SyntaxKind::QualifiedDeclName);
+    // Parse base type.
+    if (parseBaseTypeForQualifiedDeclName(P, baseType))
+      return true;
+    // Parse final declaration name.
+    original.Name = P.parseDeclNameRef(
+        original.Loc, nameParseError,
+        Parser::DeclNameFlag::AllowZeroArgCompoundNames |
+            Parser::DeclNameFlag::AllowKeywordsUsingSpecialNames |
+            Parser::DeclNameFlag::AllowOperators);
+    // The base type is optional, but the final unqualified declaration name is
+    // not. If name could not be parsed, return true for error.
+    if (!original.Name)
+      return true;
+  }
+
+  // Parse an optional accessor kind.
+  //
+  // Note: there is an parsing ambiguity here.
+  //
+  // Example: `A.B.property.set` may be parsed as one of the following:
+  //
+  // 1. No accessor kind.
+  // - Base type: `A.B.property`
+  // - Declaration name: `set`
+  // - Accessor kind: <none>
+  //
+  // 2. Accessor kind exists.
+  // - Base type: `A.B`
+  // - Declaration name: `property`
+  // - Accessor kind: `set`
+  //
+  // Currently, we follow (2) because it's more useful in practice.
+  if (P.Tok.is(tok::period)) {
+    const Token &nextToken = P.peekToken();
+    Optional<AccessorKind> kind = isAccessorLabel(nextToken);
+    if (kind.hasValue()) {
+      original.AccessorKind = kind;
+      P.consumeIf(tok::period);
+      P.consumeIf(tok::identifier);
+    }
+  }
+
+  return false;
 }
 
 /// Parse a `@derivative(of:)` attribute, returning true on error.
@@ -1967,6 +2048,8 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
           continue;
         }
 
+        Version = canonicalizePlatformVersion(Platform, Version);
+
         Attributes.add(new (Context)
                        AvailableAttr(AtLoc, AttrRange,
                                      Platform,
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 57b4625999c37..a1fbbd7e24bf3 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -3225,7 +3225,7 @@ Parser::parseTrailingClosures(bool isExprBasic, SourceRange calleeRange,
       if (CodeCompletion)
         CodeCompletion->completeLabeledTrailingClosure(CCExpr, Tok.isAtStartOfLine());
       consumeToken(tok::code_complete);
-      result.hasCodeCompletion();
+      result.setHasCodeCompletion();
       closures.push_back({Identifier(), SourceLoc(), CCExpr});
       continue;
     }
@@ -3812,6 +3812,11 @@ Parser::parsePlatformVersionConstraintSpec() {
   // Register the platform name as a keyword token.
   TokReceiver->registerTokenKindChange(PlatformLoc, tok::contextual_keyword);
 
+  // Keep the original version around for run-time checks to support
+  // macOS Big Sur betas that report 10.16 at
+  // run time.
+  llvm::VersionTuple RuntimeVersion = Version;
+  Version = canonicalizePlatformVersion(*Platform, Version);
   return makeParserResult(new (Context) PlatformVersionConstraintAvailabilitySpec(
-      Platform.getValue(), PlatformLoc, Version, VersionRange));
+      Platform.getValue(), PlatformLoc, Version, RuntimeVersion, VersionRange));
 }
diff --git a/lib/SIL/IR/AbstractionPattern.cpp b/lib/SIL/IR/AbstractionPattern.cpp
index 4e58d38f021bf..98b35f470a549 100644
--- a/lib/SIL/IR/AbstractionPattern.cpp
+++ b/lib/SIL/IR/AbstractionPattern.cpp
@@ -168,6 +168,12 @@ AbstractionPattern::getCurriedCXXMethod(CanType origType,
   return getCurriedCXXMethod(origType, clangMethod);
 }
 
+AbstractionPattern AbstractionPattern::getCurriedCXXOperatorMethod(
+    CanType origType, const AbstractFunctionDecl *function) {
+  auto clangMethod = cast<clang::CXXMethodDecl>(function->getClangDecl());
+  return getCurriedCXXOperatorMethod(origType, clangMethod);
+}
+
 AbstractionPattern
 AbstractionPattern::getOptional(AbstractionPattern object) {
   switch (object.getKind()) {
@@ -183,6 +189,9 @@ AbstractionPattern::getOptional(AbstractionPattern object) {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::OpaqueFunction:
   case Kind::OpaqueDerivativeFunction:
     llvm_unreachable("cannot add optionality to non-type abstraction");
@@ -290,6 +299,9 @@ bool AbstractionPattern::matchesTuple(CanTupleType substType) {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::OpaqueFunction:
   case Kind::OpaqueDerivativeFunction:
     return false;
@@ -364,6 +376,9 @@ AbstractionPattern::getTupleElementType(unsigned index) const {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::OpaqueFunction:
   case Kind::OpaqueDerivativeFunction:
     llvm_unreachable("function types are not tuples");
@@ -470,6 +485,8 @@ AbstractionPattern AbstractionPattern::getFunctionResultType() const {
   }
   case Kind::CXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
     return AbstractionPattern(getGenericSignatureForFunctionComponent(),
                               getResultType(getType()),
                               getCXXMethod()->getReturnType().getTypePtr());
@@ -488,6 +505,10 @@ AbstractionPattern AbstractionPattern::getFunctionResultType() const {
   case Kind::CurriedCXXMethodType:
     return getPartialCurriedCXXMethod(getGenericSignatureForFunctionComponent(),
                                       getResultType(getType()), getCXXMethod());
+  case Kind::CurriedCXXOperatorMethodType:
+    return getPartialCurriedCXXOperatorMethod(
+        getGenericSignatureForFunctionComponent(), getResultType(getType()),
+        getCXXMethod());
   case Kind::PartialCurriedObjCMethodType:
   case Kind::ObjCMethodType:
     return AbstractionPattern(getGenericSignatureForFunctionComponent(),
@@ -525,6 +546,16 @@ AbstractionPattern::getFunctionParamType(unsigned index) const {
     assert(params.size() == 1);
     return getCXXMethodSelfPattern(params[0].getParameterType());
   }
+  case Kind::CurriedCXXOperatorMethodType: {
+    auto params = cast<AnyFunctionType>(getType()).getParams();
+    assert(params.size() == 1);
+
+    // The formal metatype parameter to a C++ member operator function imported
+    // as a static method is dropped on the floor. Leave it untransformed.
+    return AbstractionPattern::getDiscard(
+        getGenericSignatureForFunctionComponent(),
+        params[0].getParameterType());
+  }
   case Kind::CFunctionAsMethodType:
   case Kind::PartialCurriedCFunctionAsMethodType: {
     auto params = cast<AnyFunctionType>(getType()).getParams();
@@ -579,6 +610,26 @@ AbstractionPattern::getFunctionParamType(unsigned index) const {
                               paramType,
                               getClangFunctionParameterType(methodType, index));
   }
+  case Kind::CXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType: {
+    auto params = cast<AnyFunctionType>(getType()).getParams();
+    auto paramType = params[index].getParameterType();
+
+    // The first parameter holds the left-hand-side operand, which gets passed
+    // to the C++ function as the this pointer.
+    if (index == 0)
+      return getCXXMethodSelfPattern(paramType);
+
+    // A parameter of type () does not correspond to a Clang parameter.
+    if (paramType->isVoid())
+      return AbstractionPattern(paramType);
+    
+    // Otherwise, we're talking about the formal parameter clause.
+    auto methodType = getCXXMethod()->getType().getTypePtr();
+    return AbstractionPattern(
+        getGenericSignatureForFunctionComponent(), paramType,
+        getClangFunctionParameterType(methodType, index - 1));
+  }
   case Kind::CurriedObjCMethodType: {
     auto params = cast<AnyFunctionType>(getType()).getParams();
     assert(params.size() == 1);
@@ -660,6 +711,9 @@ AbstractionPattern AbstractionPattern::getOptionalObjectType() const {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::Tuple:
   case Kind::OpaqueFunction:
   case Kind::OpaqueDerivativeFunction:
@@ -703,6 +757,9 @@ AbstractionPattern AbstractionPattern::getReferenceStorageReferentType() const {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::Tuple:
   case Kind::OpaqueFunction:
   case Kind::OpaqueDerivativeFunction:
@@ -795,7 +852,16 @@ void AbstractionPattern::print(raw_ostream &out) const {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
-    out << (getKind() == Kind::CXXMethodType
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
+    out << (getKind() == Kind::CXXOperatorMethodType
+              ? "AP::CXXOperatorMethodType(" :
+            getKind() == Kind::CurriedCXXOperatorMethodType
+              ? "AP::CurriedCXXOperatorMethodType(" :
+            getKind() == Kind::PartialCurriedCXXOperatorMethodType
+              ? "AP::PartialCurriedCXXOperatorMethodType(" :
+            getKind() == Kind::CXXMethodType
               ? "AP::CXXMethodType(" :
             getKind() == Kind::CurriedCXXMethodType
               ? "AP::CurriedCXXMethodType("
@@ -927,6 +993,9 @@ const {
   case Kind::CXXMethodType:
   case Kind::CurriedCXXMethodType:
   case Kind::PartialCurriedCXXMethodType:
+  case Kind::CXXOperatorMethodType:
+  case Kind::CurriedCXXOperatorMethodType:
+  case Kind::PartialCurriedCXXOperatorMethodType:
   case Kind::ClangType:
   case Kind::Type:
   case Kind::Discard:
diff --git a/lib/SIL/IR/OperandOwnership.cpp b/lib/SIL/IR/OperandOwnership.cpp
index 4befbd0596293..0246ff0d18219 100644
--- a/lib/SIL/IR/OperandOwnership.cpp
+++ b/lib/SIL/IR/OperandOwnership.cpp
@@ -123,6 +123,7 @@ SHOULD_NEVER_VISIT_INST(DynamicFunctionRef)
 SHOULD_NEVER_VISIT_INST(PreviousDynamicFunctionRef)
 SHOULD_NEVER_VISIT_INST(GlobalAddr)
 SHOULD_NEVER_VISIT_INST(GlobalValue)
+SHOULD_NEVER_VISIT_INST(BaseAddrForOffset)
 SHOULD_NEVER_VISIT_INST(IntegerLiteral)
 SHOULD_NEVER_VISIT_INST(Metatype)
 SHOULD_NEVER_VISIT_INST(ObjCProtocol)
diff --git a/lib/SIL/IR/SILFunctionType.cpp b/lib/SIL/IR/SILFunctionType.cpp
index 79659d8dcdb1a..b18402a549b7c 100644
--- a/lib/SIL/IR/SILFunctionType.cpp
+++ b/lib/SIL/IR/SILFunctionType.cpp
@@ -18,6 +18,7 @@
 
 #define DEBUG_TYPE "libsil"
 #include "swift/AST/AnyFunctionRef.h"
+#include "swift/AST/CanTypeVisitor.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticsSIL.h"
 #include "swift/AST/ForeignInfo.h"
@@ -315,15 +316,12 @@ getDifferentiabilityParameters(SILFunctionType *originalFnTy,
 /// Collects the semantic results of the given function type in
 /// `originalResults`. The semantic results are formal results followed by
 /// `inout` parameters, in type order.
-// TODO(TF-983): Generalize to support multiple `inout` parameters. The current
-// singular `inoutParam` and `isWrtInoutParameter` are hacky.
 static void
 getSemanticResults(SILFunctionType *functionType, IndexSubset *parameterIndices,
-                   Optional<SILParameterInfo> &inoutParam,
-                   bool &isWrtInoutParameter,
+                   IndexSubset *&inoutParameterIndices,
                    SmallVectorImpl<SILResultInfo> &originalResults) {
-  inoutParam = None;
-  isWrtInoutParameter = false;
+  auto &C = functionType->getASTContext();
+  SmallVector<unsigned, 4> inoutParamIndices;
   // Collect original formal results.
   originalResults.append(functionType->getResults().begin(),
                          functionType->getResults().end());
@@ -332,11 +330,12 @@ getSemanticResults(SILFunctionType *functionType, IndexSubset *parameterIndices,
     auto param = functionType->getParameters()[i];
     if (!param.isIndirectInOut())
       continue;
-    inoutParam = param;
-    isWrtInoutParameter = parameterIndices->contains(i);
+    inoutParamIndices.push_back(i);
     originalResults.push_back(
         SILResultInfo(param.getInterfaceType(), ResultConvention::Indirect));
   }
+  inoutParameterIndices =
+      IndexSubset::get(C, parameterIndices->getCapacity(), inoutParamIndices);
 }
 
 /// Returns the differential type for the given original function type,
@@ -402,11 +401,10 @@ static CanSILFunctionType getAutoDiffDifferentialType(
   SmallVector<Type, 4> substReplacements;
   SmallVector<ProtocolConformanceRef, 4> substConformances;
 
-  Optional<SILParameterInfo> inoutParam = None;
-  bool isWrtInoutParameter = false;
+  IndexSubset *inoutParamIndices;
   SmallVector<SILResultInfo, 2> originalResults;
-  getSemanticResults(originalFnTy, parameterIndices, inoutParam,
-                     isWrtInoutParameter, originalResults);
+  getSemanticResults(originalFnTy, parameterIndices, inoutParamIndices,
+                     originalResults);
 
   SmallVector<SILParameterInfo, 4> diffParams;
   getDifferentiabilityParameters(originalFnTy, parameterIndices, diffParams);
@@ -430,7 +428,7 @@ static CanSILFunctionType getAutoDiffDifferentialType(
     }
   }
   SmallVector<SILResultInfo, 1> differentialResults;
-  if (!inoutParam || !isWrtInoutParameter) {
+  if (inoutParamIndices->isEmpty()) {
     for (auto resultIndex : resultIndices->getIndices()) {
       auto &result = originalResults[resultIndex];
       auto resultTan =
@@ -480,11 +478,10 @@ static CanSILFunctionType getAutoDiffPullbackType(
   SmallVector<Type, 4> substReplacements;
   SmallVector<ProtocolConformanceRef, 4> substConformances;
 
-  Optional<SILParameterInfo> inoutParam = None;
-  bool isWrtInoutParameter = false;
+  IndexSubset *inoutParamIndices;
   SmallVector<SILResultInfo, 2> originalResults;
-  getSemanticResults(originalFnTy, parameterIndices, inoutParam,
-                     isWrtInoutParameter, originalResults);
+  getSemanticResults(originalFnTy, parameterIndices, inoutParamIndices,
+                     originalResults);
 
   // Given a type, returns its formal SIL parameter info.
   auto getTangentParameterConventionForOriginalResult =
@@ -551,27 +548,11 @@ static CanSILFunctionType getAutoDiffPullbackType(
     return conv;
   };
 
+  // Collect pullback parameters.
   SmallVector<SILParameterInfo, 1> pullbackParams;
-  if (inoutParam) {
-    auto paramTan = inoutParam->getInterfaceType()->getAutoDiffTangentSpace(
-        lookupConformance);
-    assert(paramTan && "Parameter type does not have a tangent space?");
-    auto paramTanConvention = isWrtInoutParameter
-                                  ? inoutParam->getConvention()
-                                  : ParameterConvention::Indirect_In_Guaranteed;
-    auto paramTanType = paramTan->getCanonicalType();
-    if (!paramTanType->hasArchetype() && !paramTanType->hasTypeParameter()) {
-      pullbackParams.push_back(
-          SILParameterInfo(paramTanType, paramTanConvention));
-    } else {
-      auto gpIndex = substGenericParams.size();
-      auto gpType = CanGenericTypeParamType::get(0, gpIndex, ctx);
-      substGenericParams.push_back(gpType);
-      substReplacements.push_back(paramTanType);
-      pullbackParams.push_back({gpType, paramTanConvention});
-    }
-  } else {
-    for (auto resultIndex : resultIndices->getIndices()) {
+  for (auto resultIndex : resultIndices->getIndices()) {
+    // Handle formal original result.
+    if (resultIndex < originalFnTy->getNumResults()) {
       auto &origRes = originalResults[resultIndex];
       auto resultTan = origRes.getInterfaceType()->getAutoDiffTangentSpace(
           lookupConformance);
@@ -590,12 +571,46 @@ static CanSILFunctionType getAutoDiffPullbackType(
         substReplacements.push_back(resultTanType);
         pullbackParams.push_back({gpType, paramTanConvention});
       }
+      continue;
+    }
+    // Handle original `inout` parameter.
+    auto inoutParamIndex = resultIndex - originalFnTy->getNumResults();
+    auto inoutParamIt = std::next(
+        originalFnTy->getIndirectMutatingParameters().begin(), inoutParamIndex);
+    auto paramIndex =
+        std::distance(originalFnTy->getParameters().begin(), &*inoutParamIt);
+    auto inoutParam = originalFnTy->getParameters()[paramIndex];
+    auto paramTan = inoutParam.getInterfaceType()->getAutoDiffTangentSpace(
+        lookupConformance);
+    assert(paramTan && "Parameter type does not have a tangent space?");
+    // The pullback parameter convention depends on whether the original `inout`
+    // paramater is a differentiability parameter.
+    // - If yes, the pullback parameter convention is `@inout`.
+    // - If no, the pullback parameter convention is `@in_guaranteed`.
+    bool isWrtInoutParameter = parameterIndices->contains(paramIndex);
+    auto paramTanConvention = isWrtInoutParameter
+                                  ? inoutParam.getConvention()
+                                  : ParameterConvention::Indirect_In_Guaranteed;
+    auto paramTanType = paramTan->getCanonicalType();
+    if (!paramTanType->hasArchetype() && !paramTanType->hasTypeParameter()) {
+      pullbackParams.push_back(
+          SILParameterInfo(paramTanType, paramTanConvention));
+    } else {
+      auto gpIndex = substGenericParams.size();
+      auto gpType = CanGenericTypeParamType::get(0, gpIndex, ctx);
+      substGenericParams.push_back(gpType);
+      substReplacements.push_back(paramTanType);
+      pullbackParams.push_back({gpType, paramTanConvention});
     }
   }
+
+  // Collect pullback results.
   SmallVector<SILParameterInfo, 4> diffParams;
   getDifferentiabilityParameters(originalFnTy, parameterIndices, diffParams);
   SmallVector<SILResultInfo, 8> pullbackResults;
   for (auto &param : diffParams) {
+    // Skip `inout` parameters, which semantically behave as original results
+    // and always appear as pullback parameters.
     if (param.isIndirectInOut())
       continue;
     auto paramTan =
@@ -2769,7 +2784,8 @@ getSILFunctionTypeForClangDecl(TypeConverter &TC, const clang::Decl *clangDecl,
   }
 
   if (auto method = dyn_cast<clang::CXXMethodDecl>(clangDecl)) {
-    AbstractionPattern origPattern =
+    AbstractionPattern origPattern = method->isOverloadedOperator() ?
+        AbstractionPattern::getCXXOperatorMethod(origType, method):
         AbstractionPattern::getCXXMethod(origType, method);
     auto conventions = CXXMethodConventions(method);
     return getSILFunctionType(TC, TypeExpansionContext::minimal(), origPattern,
@@ -4025,7 +4041,10 @@ getAbstractionPatternForConstant(ASTContext &ctx, SILDeclRef constant,
       assert(numParameterLists == 2);
       if (auto method = dyn_cast<clang::CXXMethodDecl>(clangDecl)) {
         // C++ method.
-        return AbstractionPattern::getCurriedCXXMethod(fnType, bridgedFn);
+        return method->isOverloadedOperator()
+                   ? AbstractionPattern::getCurriedCXXOperatorMethod(fnType,
+                                                                     bridgedFn)
+                   : AbstractionPattern::getCurriedCXXMethod(fnType, bridgedFn);
       } else {
         // C function imported as a method.
         return AbstractionPattern::getCurriedCFunctionAsMethod(fnType,
@@ -4109,8 +4128,25 @@ TypeConverter::getLoweredFormalTypes(SILDeclRef constant,
     }
 
     auto partialFnPattern = bridgingFnPattern.getFunctionResultType();
-    getBridgedParams(rep, partialFnPattern, methodParams, bridgedParams,
-                     bridging);
+    for (unsigned i : indices(methodParams)) {
+      // C++ operators that are implemented as non-static member functions get
+      // imported into Swift as static methods that have an additional
+      // parameter for the left-hand-side operand instead of the receiver
+      // object. These are inout parameters and don't get bridged.
+      // TODO: Undo this if we stop using inout.
+      if (auto method = dyn_cast_or_null<clang::CXXMethodDecl>(
+              constant.getDecl()->getClangDecl())) {
+        if (i==0 && method->isOverloadedOperator()) {
+          bridgedParams.push_back(methodParams[0]);
+          continue;
+        }
+      }
+
+      auto paramPattern = partialFnPattern.getFunctionParamType(i);
+      auto bridgedParam =
+          getBridgedParam(rep, paramPattern, methodParams[i], bridging);
+      bridgedParams.push_back(bridgedParam);
+    }
 
     bridgedResultType =
       getBridgedResultType(rep,
diff --git a/lib/SIL/IR/SILPrinter.cpp b/lib/SIL/IR/SILPrinter.cpp
index a0613879a627c..763c0122779b0 100644
--- a/lib/SIL/IR/SILPrinter.cpp
+++ b/lib/SIL/IR/SILPrinter.cpp
@@ -1319,6 +1319,10 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
     *this << " : " << GVI->getType();
   }
 
+  void visitBaseAddrForOffsetInst(BaseAddrForOffsetInst *BAI) {
+    *this << BAI->getType();
+  }
+
   void visitIntegerLiteralInst(IntegerLiteralInst *ILI) {
     const auto &lit = ILI->getValue();
     *this << ILI->getType() << ", " << lit;
@@ -2701,7 +2705,9 @@ void SILGlobalVariable::print(llvm::raw_ostream &OS, bool Verbose) const {
   printClangQualifiedNameCommentIfPresent(OS, getClangDecl());
 
   OS << "sil_global ";
-  printLinkage(OS, getLinkage(), isDefinition());
+  // Passing true for 'isDefinition' lets print the (external) linkage if it's
+  // not a definition.
+  printLinkage(OS, getLinkage(), /*isDefinition*/ true);
 
   if (isSerialized())
     OS << "[serialized] ";
diff --git a/lib/SIL/IR/ValueOwnership.cpp b/lib/SIL/IR/ValueOwnership.cpp
index 88981eddc91f0..4acf9d278c6f5 100644
--- a/lib/SIL/IR/ValueOwnership.cpp
+++ b/lib/SIL/IR/ValueOwnership.cpp
@@ -103,6 +103,7 @@ CONSTANT_OWNERSHIP_INST(None, FunctionRef)
 CONSTANT_OWNERSHIP_INST(None, DynamicFunctionRef)
 CONSTANT_OWNERSHIP_INST(None, PreviousDynamicFunctionRef)
 CONSTANT_OWNERSHIP_INST(None, GlobalAddr)
+CONSTANT_OWNERSHIP_INST(None, BaseAddrForOffset)
 CONSTANT_OWNERSHIP_INST(None, IndexAddr)
 CONSTANT_OWNERSHIP_INST(None, IndexRawPointer)
 CONSTANT_OWNERSHIP_INST(None, InitEnumDataAddr)
diff --git a/lib/SIL/Parser/ParseSIL.cpp b/lib/SIL/Parser/ParseSIL.cpp
index 90a8545a159d5..8a9df9d667734 100644
--- a/lib/SIL/Parser/ParseSIL.cpp
+++ b/lib/SIL/Parser/ParseSIL.cpp
@@ -4583,6 +4583,15 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
       }
       break;
     }
+    case SILInstructionKind::BaseAddrForOffsetInst: {
+      SILType Ty;
+      if (parseSILType(Ty))
+        return true;
+      if (parseSILDebugLocation(InstLoc, B))
+        return true;
+      ResultVal = B.createBaseAddrForOffset(InstLoc, Ty);
+      break;
+    }
     case SILInstructionKind::SelectEnumInst:
     case SILInstructionKind::SelectEnumAddrInst: {
       if (parseTypedValueRef(Val, B))
diff --git a/lib/SIL/Utils/PrettyStackTrace.cpp b/lib/SIL/Utils/PrettyStackTrace.cpp
index 33474dd91a4ab..fa46dc086b9c0 100644
--- a/lib/SIL/Utils/PrettyStackTrace.cpp
+++ b/lib/SIL/Utils/PrettyStackTrace.cpp
@@ -75,8 +75,8 @@ void PrettyStackTraceSILLocation::print(llvm::raw_ostream &out) const {
 }
 
 void PrettyStackTraceSILFunction::print(llvm::raw_ostream &out) const {
-  out << "While " << Action << " SIL function ";
-  if (!TheFn) {
+  out << "While " << action << " SIL function ";
+  if (!func) {
     out << " <<null>>";
     return;
   }
@@ -86,16 +86,16 @@ void PrettyStackTraceSILFunction::print(llvm::raw_ostream &out) const {
 
 void PrettyStackTraceSILFunction::printFunctionInfo(llvm::raw_ostream &out) const {  
   out << "\"";
-  TheFn->printName(out);
+  func->printName(out);
   out << "\".\n";
 
-  if (!TheFn->getLocation().isNull()) {
+  if (!func->getLocation().isNull()) {
     out << " for ";
-    printSILLocationDescription(out, TheFn->getLocation(),
-                                TheFn->getModule().getASTContext());
+    printSILLocationDescription(out, func->getLocation(),
+                                func->getModule().getASTContext());
   }
   if (SILPrintOnError)
-    TheFn->print(out);
+    func->print(out);
 }
 
 void PrettyStackTraceSILNode::print(llvm::raw_ostream &out) const {
diff --git a/lib/SIL/Verifier/LinearLifetimeCheckerPrivate.h b/lib/SIL/Verifier/LinearLifetimeCheckerPrivate.h
index cd98009e32348..bc6f452d65d0a 100644
--- a/lib/SIL/Verifier/LinearLifetimeCheckerPrivate.h
+++ b/lib/SIL/Verifier/LinearLifetimeCheckerPrivate.h
@@ -208,7 +208,7 @@ class LLVM_LIBRARY_VISIBILITY LinearLifetimeChecker::ErrorBuilder {
     }
 
     llvm::errs() << "Found ownership error?!\n";
-    llvm::report_fatal_error("triggering standard assertion failure routine");
+    assert(0 && "triggering standard assertion failure routine");
   }
 };
 
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
index 631dd9f88bbf4..dfd28c4511918 100644
--- a/lib/SILGen/SILGenExpr.cpp
+++ b/lib/SILGen/SILGenExpr.cpp
@@ -28,6 +28,7 @@
 #include "Varargs.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTMangler.h"
+#include "swift/AST/CanTypeVisitor.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticsCommon.h"
 #include "swift/AST/Expr.h"
@@ -2108,7 +2109,8 @@ VarargsInfo Lowering::emitBeginVarargs(SILGenFunction &SGF, SILLocation loc,
 }
 
 ManagedValue Lowering::emitEndVarargs(SILGenFunction &SGF, SILLocation loc,
-                                      VarargsInfo &&varargs) {
+                                      VarargsInfo &&varargs,
+                                      unsigned numElements) {
   // Kill the abort cleanup.
   SGF.Cleanups.setCleanupState(varargs.getAbortCleanup(), CleanupState::Dead);
 
@@ -2117,6 +2119,14 @@ ManagedValue Lowering::emitEndVarargs(SILGenFunction &SGF, SILLocation loc,
   if (array.hasCleanup())
     SGF.Cleanups.setCleanupState(array.getCleanup(), CleanupState::Active);
 
+  // Array literals only need to be finalized, if the array is really allocated.
+  // In case of zero elements, no allocation is done, but the empty-array
+  // singleton is used. "Finalization" means to emit an end_cow_mutation
+  // instruction on the array. As the empty-array singleton is a read-only and
+  // shared object, it's not legal to do a end_cow_mutation on it.
+  if (numElements == 0)
+    return array;
+    
   return SGF.emitUninitializedArrayFinalization(loc, std::move(array));
 }
 
@@ -3869,7 +3879,7 @@ RValue RValueEmitter::visitCollectionExpr(CollectionExpr *E, SGFContext C) {
     SGF.Cleanups.setCleanupState(destCleanup, CleanupState::Dead);
 
   RValue array(SGF, loc, arrayType,
-             emitEndVarargs(SGF, loc, std::move(varargsInfo)));
+        emitEndVarargs(SGF, loc, std::move(varargsInfo), E->getNumElements()));
 
   array = scope.popPreservingValue(std::move(array));
 
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
index 4d3cd693fdd34..d78dacc61df28 100644
--- a/lib/SILGen/SILGenPoly.cpp
+++ b/lib/SILGen/SILGenPoly.cpp
@@ -4604,6 +4604,17 @@ getWitnessFunctionRef(SILGenFunction &SGF,
   }
   case WitnessDispatchKind::Class: {
     SILValue selfPtr = witnessParams.back().getValue();
+    // If `witness` is a derivative function `SILDeclRef`, replace the
+    // derivative function identifier's generic signature with the witness thunk
+    // substitution map's generic signature.
+    if (auto *derivativeId = witness.derivativeFunctionIdentifier) {
+      auto *newDerivativeId = AutoDiffDerivativeFunctionIdentifier::get(
+          derivativeId->getKind(), derivativeId->getParameterIndices(),
+          witnessSubs.getGenericSignature(), SGF.getASTContext());
+      return SGF.emitClassMethodRef(
+          loc, selfPtr, witness.asAutoDiffDerivativeFunction(newDerivativeId),
+          witnessFTy);
+    }
     return SGF.emitClassMethodRef(loc, selfPtr, witness, witnessFTy);
   }
   }
diff --git a/lib/SILGen/SILGenProlog.cpp b/lib/SILGen/SILGenProlog.cpp
index b6b564fa6a9d1..269c301fc3a14 100644
--- a/lib/SILGen/SILGenProlog.cpp
+++ b/lib/SILGen/SILGenProlog.cpp
@@ -15,6 +15,7 @@
 #include "ManagedValue.h"
 #include "Scope.h"
 #include "swift/SIL/SILArgument.h"
+#include "swift/AST/CanTypeVisitor.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/ParameterList.h"
 
diff --git a/lib/SILGen/Varargs.h b/lib/SILGen/Varargs.h
index 334b2baf9587c..0497c632101d2 100644
--- a/lib/SILGen/Varargs.h
+++ b/lib/SILGen/Varargs.h
@@ -68,7 +68,8 @@ VarargsInfo emitBeginVarargs(SILGenFunction &SGF, SILLocation loc,
 
 /// Successfully end a varargs emission sequence.
 ManagedValue emitEndVarargs(SILGenFunction &SGF, SILLocation loc,
-                            VarargsInfo &&varargs); 
+                            VarargsInfo &&varargs,
+                             unsigned numElements); 
 
 } // end namespace Lowering
 } // end namespace swift
diff --git a/lib/SILOptimizer/Analysis/AliasAnalysis.cpp b/lib/SILOptimizer/Analysis/AliasAnalysis.cpp
index d82d49a40a117..f9b28518454ca 100644
--- a/lib/SILOptimizer/Analysis/AliasAnalysis.cpp
+++ b/lib/SILOptimizer/Analysis/AliasAnalysis.cpp
@@ -569,6 +569,15 @@ AliasResult AliasAnalysis::alias(SILValue V1, SILValue V2,
   return Result;
 }
 
+/// Get the underlying object, looking through init_enum_data_addr and
+/// init_existential_addr.
+static SILValue stripInitEnumAndExistentialAddr(SILValue v) {
+  while (isa<InitEnumDataAddrInst>(v) || isa<InitExistentialAddrInst>(v)) {
+    v = getUnderlyingObject(cast<SingleValueInstruction>(v)->getOperand(0));
+  }
+  return v;
+}
+
 /// The main AA entry point. Performs various analyses on V1, V2 in an attempt
 /// to disambiguate the two values.
 AliasResult AliasAnalysis::aliasInner(SILValue V1, SILValue V2,
@@ -614,9 +623,12 @@ AliasResult AliasAnalysis::aliasInner(SILValue V1, SILValue V2,
   LLVM_DEBUG(llvm::dbgs() << "        Underlying V1:" << *O1);
   LLVM_DEBUG(llvm::dbgs() << "        Underlying V2:" << *O2);
 
-  // If O1 and O2 do not equal, see if we can prove that they cannot be the
-  // same object. If we can, return No Alias.
-  if (O1 != O2 && aliasUnequalObjects(O1, O2))
+  // If the underlying objects are not equal, see if we can prove that they
+  // cannot be the same object. If we can, return No Alias.
+  // For this we even look through init_enum_data_addr and init_existential_addr.
+  SILValue StrippedO1 = stripInitEnumAndExistentialAddr(O1);
+  SILValue StrippedO2 = stripInitEnumAndExistentialAddr(O2);
+  if (StrippedO1 != StrippedO2 && aliasUnequalObjects(StrippedO1, StrippedO2))
     return AliasResult::NoAlias;
 
   // Ok, either O1, O2 are the same or we could not prove anything based off of
diff --git a/lib/SILOptimizer/Analysis/MemoryBehavior.cpp b/lib/SILOptimizer/Analysis/MemoryBehavior.cpp
index 5eed0b391ea95..62b15e917b1d3 100644
--- a/lib/SILOptimizer/Analysis/MemoryBehavior.cpp
+++ b/lib/SILOptimizer/Analysis/MemoryBehavior.cpp
@@ -174,6 +174,7 @@ class MemoryBehaviorVisitor
 
   MemBehavior visitLoadInst(LoadInst *LI);
   MemBehavior visitStoreInst(StoreInst *SI);
+  MemBehavior visitCopyAddrInst(CopyAddrInst *CAI);
   MemBehavior visitApplyInst(ApplyInst *AI);
   MemBehavior visitTryApplyInst(TryApplyInst *AI);
   MemBehavior visitBuiltinInst(BuiltinInst *BI);
@@ -245,6 +246,10 @@ MemBehavior MemoryBehaviorVisitor::visitLoadInst(LoadInst *LI) {
   if (!mayAlias(LI->getOperand()))
     return MemBehavior::None;
 
+  // A take is modelled as a write. See MemoryBehavior::MayWrite.
+  if (LI->getOwnershipQualifier() == LoadOwnershipQualifier::Take)
+      return MemBehavior::MayReadWrite;
+
   LLVM_DEBUG(llvm::dbgs() << "  Could not prove that load inst does not alias "
                              "pointer. Returning may read.\n");
   return MemBehavior::MayRead;
@@ -268,6 +273,34 @@ MemBehavior MemoryBehaviorVisitor::visitStoreInst(StoreInst *SI) {
   return MemBehavior::MayWrite;
 }
 
+MemBehavior MemoryBehaviorVisitor::visitCopyAddrInst(CopyAddrInst *CAI) {
+  // If it's an assign to the destination, a destructor might be called on the
+  // old value. This can have any side effects.
+  // We could also check if it's a trivial type (which cannot have any side
+  // effect on destruction), but such copy_addr instructions are optimized to
+  // load/stores anyway, so it's probably not worth it.
+  if (!CAI->isInitializationOfDest())
+    return MemBehavior::MayHaveSideEffects;
+
+  bool mayWrite = mayAlias(CAI->getDest());
+  bool mayRead = mayAlias(CAI->getSrc());
+  
+  if (mayRead) {
+    if (mayWrite)
+      return MemBehavior::MayReadWrite;
+
+    // A take is modelled as a write. See MemoryBehavior::MayWrite.
+    if (CAI->isTakeOfSrc())
+      return MemBehavior::MayReadWrite;
+
+    return MemBehavior::MayRead;
+  }
+  if (mayWrite)
+    return MemBehavior::MayWrite;
+
+  return MemBehavior::None;
+}
+
 MemBehavior MemoryBehaviorVisitor::visitBuiltinInst(BuiltinInst *BI) {
   // If our callee is not a builtin, be conservative and return may have side
   // effects.
diff --git a/lib/SILOptimizer/Differentiation/Common.cpp b/lib/SILOptimizer/Differentiation/Common.cpp
index be3f802c0e7d2..5b507a765bc7d 100644
--- a/lib/SILOptimizer/Differentiation/Common.cpp
+++ b/lib/SILOptimizer/Differentiation/Common.cpp
@@ -17,6 +17,8 @@
 #define DEBUG_TYPE "differentiation"
 
 #include "swift/SILOptimizer/Differentiation/Common.h"
+#include "swift/AST/TypeCheckRequests.h"
+#include "swift/SILOptimizer/Differentiation/ADContext.h"
 
 namespace swift {
 namespace autodiff {
@@ -236,12 +238,106 @@ void collectMinimalIndicesForFunctionCall(
     resultIndices.push_back(inoutParamResultIndex++);
   }
   // Make sure the function call has active results.
+#ifndef NDEBUG
   auto numResults = calleeFnTy->getNumResults() +
                     calleeFnTy->getNumIndirectMutatingParameters();
   assert(results.size() == numResults);
   assert(llvm::any_of(results, [&](SILValue result) {
     return activityInfo.isActive(result, parentIndices);
   }));
+#endif
+}
+
+//===----------------------------------------------------------------------===//
+// Diagnostic utilities
+//===----------------------------------------------------------------------===//
+
+SILLocation getValidLocation(SILValue v) {
+  auto loc = v.getLoc();
+  if (loc.isNull() || loc.getSourceLoc().isInvalid())
+    loc = v->getFunction()->getLocation();
+  return loc;
+}
+
+SILLocation getValidLocation(SILInstruction *inst) {
+  auto loc = inst->getLoc();
+  if (loc.isNull() || loc.getSourceLoc().isInvalid())
+    loc = inst->getFunction()->getLocation();
+  return loc;
+}
+
+//===----------------------------------------------------------------------===//
+// Tangent property lookup utilities
+//===----------------------------------------------------------------------===//
+
+VarDecl *getTangentStoredProperty(ADContext &context, VarDecl *originalField,
+                                  CanType baseType, SILLocation loc,
+                                  DifferentiationInvoker invoker) {
+  auto &astCtx = context.getASTContext();
+  auto tanFieldInfo = evaluateOrDefault(
+      astCtx.evaluator, TangentStoredPropertyRequest{originalField, baseType},
+      TangentPropertyInfo(nullptr));
+  // If no error, return the tangent property.
+  if (tanFieldInfo)
+    return tanFieldInfo.tangentProperty;
+  // Otherwise, diagnose error and return nullptr.
+  assert(tanFieldInfo.error);
+  auto *parentDC = originalField->getDeclContext();
+  assert(parentDC->isTypeContext());
+  auto parentDeclName = parentDC->getSelfNominalTypeDecl()->getNameStr();
+  auto fieldName = originalField->getNameStr();
+  auto sourceLoc = loc.getSourceLoc();
+  switch (tanFieldInfo.error->kind) {
+  case TangentPropertyInfo::Error::Kind::NoDerivativeOriginalProperty:
+    llvm_unreachable(
+        "`@noDerivative` stored property accesses should not be "
+        "differentiated; activity analysis should not mark as varied");
+  case TangentPropertyInfo::Error::Kind::NominalParentNotDifferentiable:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker,
+        diag::autodiff_stored_property_parent_not_differentiable,
+        parentDeclName, fieldName);
+    break;
+  case TangentPropertyInfo::Error::Kind::OriginalPropertyNotDifferentiable:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker, diag::autodiff_stored_property_not_differentiable,
+        parentDeclName, fieldName, originalField->getInterfaceType());
+    break;
+  case TangentPropertyInfo::Error::Kind::ParentTangentVectorNotStruct:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker, diag::autodiff_stored_property_tangent_not_struct,
+        parentDeclName, fieldName);
+    break;
+  case TangentPropertyInfo::Error::Kind::TangentPropertyNotFound:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker,
+        diag::autodiff_stored_property_no_corresponding_tangent, parentDeclName,
+        fieldName);
+    break;
+  case TangentPropertyInfo::Error::Kind::TangentPropertyWrongType:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker, diag::autodiff_tangent_property_wrong_type,
+        parentDeclName, fieldName, tanFieldInfo.error->getType());
+    break;
+  case TangentPropertyInfo::Error::Kind::TangentPropertyNotStored:
+    context.emitNondifferentiabilityError(
+        sourceLoc, invoker, diag::autodiff_tangent_property_not_stored,
+        parentDeclName, fieldName);
+    break;
+  }
+  return nullptr;
+}
+
+VarDecl *getTangentStoredProperty(ADContext &context,
+                                  FieldIndexCacheBase *projectionInst,
+                                  CanType baseType,
+                                  DifferentiationInvoker invoker) {
+  assert(isa<StructExtractInst>(projectionInst) ||
+         isa<StructElementAddrInst>(projectionInst) ||
+         isa<RefElementAddrInst>(projectionInst));
+  auto loc = getValidLocation(projectionInst);
+  return getTangentStoredProperty(context, projectionInst->getField(), baseType,
+                                  loc, invoker);
 }
 
 //===----------------------------------------------------------------------===//
@@ -285,7 +381,7 @@ void emitZeroIntoBuffer(SILBuilder &builder, CanType type,
   auto zeroDeclLookup = additiveArithmeticProto->lookupDirect(astCtx.Id_zero);
   auto *zeroDecl = cast<VarDecl>(zeroDeclLookup.front());
   assert(zeroDecl->isProtocolRequirement());
-  auto *accessorDecl = zeroDecl->getAccessor(AccessorKind::Get);
+  auto *accessorDecl = zeroDecl->getOpaqueAccessor(AccessorKind::Get);
   SILDeclRef accessorDeclRef(accessorDecl, SILDeclRef::Kind::Func);
   auto silFnType = typeConverter.getConstantType(
       TypeExpansionContext::minimal(), accessorDeclRef);
diff --git a/lib/SILOptimizer/Differentiation/JVPEmitter.cpp b/lib/SILOptimizer/Differentiation/JVPEmitter.cpp
index 8f53b37667113..0855d2d57a988 100644
--- a/lib/SILOptimizer/Differentiation/JVPEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/JVPEmitter.cpp
@@ -312,6 +312,7 @@ AdjointValue JVPEmitter::getTangentValue(SILValue originalValue) {
 
 void JVPEmitter::setTangentValue(SILBasicBlock *origBB, SILValue originalValue,
                                  AdjointValue newTangentValue) {
+#ifndef NDEBUG
   if (auto *defInst = originalValue->getDefiningInstruction()) {
     bool isTupleTypedApplyResult =
         isa<ApplyInst>(defInst) && originalValue->getType().is<TupleType>();
@@ -320,6 +321,7 @@ void JVPEmitter::setTangentValue(SILBasicBlock *origBB, SILValue originalValue,
            "instruction; use `destructure_tuple` on `apply` result and set "
            "tangent value for `destructure_tuple` results instead.");
   }
+#endif
   assert(originalValue->getType().isObject());
   assert(newTangentValue.getType().isObject());
   assert(originalValue->getFunction() == original);
@@ -328,8 +330,8 @@ void JVPEmitter::setTangentValue(SILBasicBlock *origBB, SILValue originalValue,
   assert(newTangentValue.getType() ==
          getRemappedTangentType(originalValue->getType()));
   auto insertion = tangentValueMap.try_emplace(originalValue, newTangentValue);
-  auto inserted = insertion.second;
-  assert(inserted && "The tangent value should not already exist.");
+  (void)insertion;
+  assert(insertion.second && "The tangent value should not already exist.");
 }
 
 //--------------------------------------------------------------------------//
@@ -547,35 +549,19 @@ CLONE_AND_EMIT_TANGENT(StructExtract, sei) {
   assert(!sei->getField()->getAttrs().hasAttribute<NoDerivativeAttr>() &&
          "`struct_extract` with `@noDerivative` field should not be "
          "differentiated; activity analysis should not marked as varied.");
-
   auto diffBuilder = getDifferentialBuilder();
-  ;
-  auto tangentVectorTy = getRemappedTangentType(sei->getOperand()->getType());
-  auto *tangentVectorDecl = tangentVectorTy.getStructOrBoundGenericStruct();
-
+  auto loc = getValidLocation(sei);
   // Find the corresponding field in the tangent space.
-  VarDecl *tanField = nullptr;
-  // If the tangent space is the original struct, then field is the same.
-  if (tangentVectorDecl == sei->getStructDecl())
-    tanField = sei->getField();
-  // Otherwise, look up the field by name.
-  else {
-    auto tanFieldLookup =
-        tangentVectorDecl->lookupDirect(sei->getField()->getName());
-    if (tanFieldLookup.empty()) {
-      context.emitNondifferentiabilityError(
-          sei, invoker, diag::autodiff_stored_property_no_corresponding_tangent,
-          sei->getStructDecl()->getNameStr(), sei->getField()->getNameStr());
-      errorOccurred = true;
-      return;
-    }
-    tanField = cast<VarDecl>(tanFieldLookup.front());
+  auto structType =
+      remapSILTypeInDifferential(sei->getOperand()->getType()).getASTType();
+  auto *tanField = getTangentStoredProperty(context, sei, structType, invoker);
+  if (!tanField) {
+    errorOccurred = true;
+    return;
   }
   // Emit tangent `struct_extract`.
-  auto tanStruct =
-      materializeTangent(getTangentValue(sei->getOperand()), sei->getLoc());
-  auto tangentInst =
-      diffBuilder.createStructExtract(sei->getLoc(), tanStruct, tanField);
+  auto tanStruct = materializeTangent(getTangentValue(sei->getOperand()), loc);
+  auto tangentInst = diffBuilder.createStructExtract(loc, tanStruct, tanField);
   // Update tangent value mapping for `struct_extract` result.
   auto tangentResult = makeConcreteTangentValue(tangentInst);
   setTangentValue(sei->getParent(), sei, tangentResult);
@@ -590,36 +576,21 @@ CLONE_AND_EMIT_TANGENT(StructElementAddr, seai) {
   assert(!seai->getField()->getAttrs().hasAttribute<NoDerivativeAttr>() &&
          "`struct_element_addr` with `@noDerivative` field should not be "
          "differentiated; activity analysis should not marked as varied.");
-
   auto diffBuilder = getDifferentialBuilder();
   auto *bb = seai->getParent();
-  auto tangentVectorTy = getRemappedTangentType(seai->getOperand()->getType());
-  auto *tangentVectorDecl = tangentVectorTy.getStructOrBoundGenericStruct();
-
+  auto loc = getValidLocation(seai);
   // Find the corresponding field in the tangent space.
-  VarDecl *tanField = nullptr;
-  // If the tangent space is the original struct, then field is the same.
-  if (tangentVectorDecl == seai->getStructDecl())
-    tanField = seai->getField();
-  // Otherwise, look up the field by name.
-  else {
-    auto tanFieldLookup =
-        tangentVectorDecl->lookupDirect(seai->getField()->getName());
-    if (tanFieldLookup.empty()) {
-      context.emitNondifferentiabilityError(
-          seai, invoker,
-          diag::autodiff_stored_property_no_corresponding_tangent,
-          seai->getStructDecl()->getNameStr(), seai->getField()->getNameStr());
-      errorOccurred = true;
-      return;
-    }
-    tanField = cast<VarDecl>(tanFieldLookup.front());
+  auto structType =
+      remapSILTypeInDifferential(seai->getOperand()->getType()).getASTType();
+  auto *tanField = getTangentStoredProperty(context, seai, structType, invoker);
+  if (!tanField) {
+    errorOccurred = true;
+    return;
   }
-
   // Emit tangent `struct_element_addr`.
   auto tanOperand = getTangentBuffer(bb, seai->getOperand());
   auto tangentInst =
-      diffBuilder.createStructElementAddr(seai->getLoc(), tanOperand, tanField);
+      diffBuilder.createStructElementAddr(loc, tanOperand, tanField);
   // Update tangent buffer map for `struct_element_addr`.
   setTangentBuffer(bb, seai, tangentInst);
 }
@@ -896,20 +867,19 @@ void JVPEmitter::prepareForDifferentialGeneration() {
   for (auto &origBB : *original) {
     auto *diffBB = differential.createBasicBlock();
     diffBBMap.insert({&origBB, diffBB});
-    {
+    // If the BB is the original entry, then the differential block that we
+    // just created must be the differential function's entry. Create
+    // differential entry arguments and continue.
+    if (&origBB == origEntry) {
+      assert(diffBB->isEntry());
+      createEntryArguments(&differential);
+      auto *lastArg = diffBB->getArguments().back();
+#ifndef NDEBUG
       auto diffStructLoweredType = remapSILTypeInDifferential(
           differentialInfo.getLinearMapStructLoweredType(&origBB));
-
-      // If the BB is the original entry, then the differential block that we
-      // just created must be the differential function's entry. Create
-      // differential entry arguments and continue.
-      if (&origBB == origEntry) {
-        assert(diffBB->isEntry());
-        createEntryArguments(&differential);
-        auto *lastArg = diffBB->getArguments().back();
-        assert(lastArg->getType() == diffStructLoweredType);
-        differentialStructArguments[&origBB] = lastArg;
-      }
+      assert(lastArg->getType() == diffStructLoweredType);
+#endif
+      differentialStructArguments[&origBB] = lastArg;
     }
 
     LLVM_DEBUG({
@@ -977,10 +947,12 @@ void JVPEmitter::prepareForDifferentialGeneration() {
   // Initialize tangent mapping for indirect results.
   auto origIndResults = original->getIndirectResults();
   auto diffIndResults = differential.getIndirectResults();
+#ifndef NDEBUG
   unsigned numInoutParameters = llvm::count_if(
       original->getLoweredFunctionType()->getParameters(),
       [](SILParameterInfo paramInfo) { return paramInfo.isIndirectInOut(); });
   assert(origIndResults.size() + numInoutParameters == diffIndResults.size());
+#endif
   for (auto &origBB : *original)
     for (auto i : indices(origIndResults))
       setTangentBuffer(&origBB, origIndResults[i], diffIndResults[i]);
@@ -1136,12 +1108,12 @@ SILBasicBlock *JVPEmitter::remapBasicBlock(SILBasicBlock *bb) {
 }
 
 void JVPEmitter::visit(SILInstruction *inst) {
-  auto diffBuilder = getDifferentialBuilder();
   if (errorOccurred)
     return;
   if (differentialInfo.shouldDifferentiateInstruction(inst)) {
     LLVM_DEBUG(getADDebugStream() << "JVPEmitter visited:\n[ORIG]" << *inst);
 #ifndef NDEBUG
+    auto diffBuilder = getDifferentialBuilder();
     auto beforeInsertion = std::prev(diffBuilder.getInsertionPoint());
 #endif
     TypeSubstCloner::visit(inst);
diff --git a/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp b/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
index f6e2c5be52732..da0da45b261c9 100644
--- a/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/PullbackEmitter.cpp
@@ -24,6 +24,7 @@
 
 #include "swift/AST/Expr.h"
 #include "swift/AST/PropertyWrappers.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/Projection.h"
 #include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
@@ -177,6 +178,38 @@ Optional<TangentSpace> PullbackEmitter::getTangentSpace(CanType type) {
       LookUpConformanceInModule(getModule().getSwiftModule()));
 }
 
+SILValueCategory PullbackEmitter::getTangentValueCategory(SILValue v) {
+  // Tangent value category table:
+  //
+  // Let $L be a loadable type and $*A be an address-only type.
+  //
+  // Original type | Tangent type loadable? | Tangent value category and type
+  // --------------|------------------------|--------------------------------
+  // $L            | loadable               | object, $L' (no mismatch)
+  // $*A           | loadable               | address, $*L' (create a buffer)
+  // $L            | address-only           | address, $*A' (no alternative)
+  // $*A           | address-only           | address, $*A' (no alternative)
+
+  // TODO(SR-13077): Make "tangent value category" depend solely on whether the
+  // tangent type is loadable or address-only.
+  //
+  // For loadable tangent types, using symbolic adjoint values instead of
+  // concrete adjoint buffers is more efficient.
+
+  // Quick check: if the value has an address type, the tangent value category
+  // is currently always "address".
+  if (v->getType().isAddress())
+    return SILValueCategory::Address;
+  // If the value has an object type and the tangent type is not address-only,
+  // then the tangent value category is "object".
+  auto tanSpace = getTangentSpace(remapType(v->getType()).getASTType());
+  auto tanASTType = tanSpace->getCanonicalType();
+  if (v->getType().isObject() && getTypeLowering(tanASTType).isLoadable())
+    return SILValueCategory::Object;
+  // Otherwise, the tangent value category is "address".
+  return SILValueCategory::Address;
+}
+
 SILType PullbackEmitter::getRemappedTangentType(SILType type) {
   return SILType::getPrimitiveType(
       getTangentSpace(remapType(type).getASTType())->getCanonicalType(),
@@ -206,6 +239,7 @@ void PullbackEmitter::setAdjointValue(SILBasicBlock *origBB,
              << "Setting adjoint value for " << originalValue);
   assert(origBB->getParent() == &getOriginal());
   assert(originalValue->getType().isObject());
+  assert(getTangentValueCategory(originalValue) == SILValueCategory::Object);
   assert(adjointValue.getType().isObject());
   assert(originalValue->getFunction() == &getOriginal());
   // The adjoint value must be in the tangent space.
@@ -223,6 +257,7 @@ AdjointValue PullbackEmitter::getAdjointValue(SILBasicBlock *origBB,
                                               SILValue originalValue) {
   assert(origBB->getParent() == &getOriginal());
   assert(originalValue->getType().isObject());
+  assert(getTangentValueCategory(originalValue) == SILValueCategory::Object);
   assert(originalValue->getFunction() == &getOriginal());
   auto insertion = valueMap.try_emplace(
       {origBB, originalValue},
@@ -306,6 +341,7 @@ void PullbackEmitter::accumulateArrayLiteralElementAddressAdjoints(
 SILArgument *
 PullbackEmitter::getActiveValuePullbackBlockArgument(SILBasicBlock *origBB,
                                                      SILValue activeValue) {
+  assert(getTangentValueCategory(activeValue) == SILValueCategory::Object);
   assert(origBB->getParent() == &getOriginal());
   auto pullbackBBArg = activeValuePullbackBBArgumentMap[{origBB, activeValue}];
   assert(pullbackBBArg);
@@ -318,11 +354,11 @@ PullbackEmitter::getActiveValuePullbackBlockArgument(SILBasicBlock *origBB,
 //--------------------------------------------------------------------------//
 
 void PullbackEmitter::setAdjointBuffer(SILBasicBlock *origBB,
-                                       SILValue originalBuffer,
+                                       SILValue originalValue,
                                        SILValue adjointBuffer) {
-  assert(originalBuffer->getType().isAddress());
+  assert(getTangentValueCategory(originalValue) == SILValueCategory::Address);
   auto insertion =
-      bufferMap.try_emplace({origBB, originalBuffer}, adjointBuffer);
+      bufferMap.try_emplace({origBB, originalValue}, adjointBuffer);
   assert(insertion.second);
   (void)insertion;
 }
@@ -335,13 +371,10 @@ SILValue PullbackEmitter::getAdjointProjection(SILBasicBlock *origBB,
     assert(!seai->getField()->getAttrs().hasAttribute<NoDerivativeAttr>() &&
            "`@noDerivative` struct projections should never be active");
     auto adjSource = getAdjointBuffer(origBB, seai->getOperand());
-    auto *tangentVectorDecl =
-        adjSource->getType().getStructOrBoundGenericStruct();
-    // TODO(TF-970): Emit diagnostic when `TangentVector` is not a struct.
-    auto tanFieldLookup =
-        tangentVectorDecl->lookupDirect(seai->getField()->getName());
-    assert(tanFieldLookup.size() == 1);
-    auto *tanField = cast<VarDecl>(tanFieldLookup.front());
+    auto structType = remapType(seai->getOperand()->getType()).getASTType();
+    auto *tanField =
+        getTangentStoredProperty(getContext(), seai, structType, getInvoker());
+    assert(tanField && "Invalid projections should have been diagnosed");
     return builder.createStructElementAddr(seai->getLoc(), adjSource, tanField);
   }
   // Handle `tuple_element_addr`.
@@ -369,34 +402,46 @@ SILValue PullbackEmitter::getAdjointProjection(SILBasicBlock *origBB,
     auto loc = reai->getLoc();
     // Get the class operand, stripping `begin_borrow`.
     auto classOperand = stripBorrow(reai->getOperand());
-    // Get the class operand's adjoint value. Currently, it must be a
-    // `TangentVector` struct.
-    auto adjClass =
-        materializeAdjointDirect(getAdjointValue(origBB, classOperand), loc);
-    auto *tangentVectorDecl =
-        adjClass->getType().getStructOrBoundGenericStruct();
-    // TODO(TF-970): Replace assertions below with diagnostics.
-    assert(tangentVectorDecl && "`TangentVector` of a class must be a struct");
-    auto tanFieldLookup =
-        tangentVectorDecl->lookupDirect(reai->getField()->getName());
-    assert(tanFieldLookup.size() == 1 &&
-           "Class `TangentVector` must have field of the same name");
-    auto *tanField = cast<VarDecl>(tanFieldLookup.front());
+    auto classType = remapType(reai->getOperand()->getType()).getASTType();
+    auto *tanField =
+        getTangentStoredProperty(getContext(), reai->getField(), classType,
+                                 reai->getLoc(), getInvoker());
+    assert(tanField && "Invalid projections should have been diagnosed");
     // Create a local allocation for the element adjoint buffer.
     auto eltTanType = tanField->getValueInterfaceType()->getCanonicalType();
     auto eltTanSILType =
         remapType(SILType::getPrimitiveAddressType(eltTanType));
     auto *eltAdjBuffer = createFunctionLocalAllocation(eltTanSILType, loc);
-    builder.emitScopedBorrowOperation(
-        loc, adjClass, [&](SILValue borrowedAdjClass) {
-          // Initialize the element adjoint buffer with the base adjoint value.
-          auto *adjElt =
-              builder.createStructExtract(loc, borrowedAdjClass, tanField);
-          auto adjEltCopy = builder.emitCopyValueOperation(loc, adjElt);
-          builder.emitStoreValueOperation(loc, adjEltCopy, eltAdjBuffer,
-                                          StoreOwnershipQualifier::Init);
-        });
-    return eltAdjBuffer;
+    // Check the class operand's `TangentVector` value category.
+    switch (getTangentValueCategory(classOperand)) {
+    case SILValueCategory::Object: {
+      // Get the class operand's adjoint value. Currently, it must be a
+      // `TangentVector` struct.
+      auto adjClass =
+          materializeAdjointDirect(getAdjointValue(origBB, classOperand), loc);
+      builder.emitScopedBorrowOperation(
+          loc, adjClass, [&](SILValue borrowedAdjClass) {
+            // Initialize the element adjoint buffer with the base adjoint
+            // value.
+            auto *adjElt =
+                builder.createStructExtract(loc, borrowedAdjClass, tanField);
+            auto adjEltCopy = builder.emitCopyValueOperation(loc, adjElt);
+            builder.emitStoreValueOperation(loc, adjEltCopy, eltAdjBuffer,
+                                            StoreOwnershipQualifier::Init);
+          });
+      return eltAdjBuffer;
+    }
+    case SILValueCategory::Address: {
+      // Get the class operand's adjoint buffer. Currently, it must be a
+      // `TangentVector` struct.
+      auto adjClass = getAdjointBuffer(origBB, classOperand);
+      // Initialize the element adjoint buffer with the base adjoint buffer.
+      auto *adjElt = builder.createStructElementAddr(loc, adjClass, tanField);
+      builder.createCopyAddr(loc, adjElt, eltAdjBuffer, IsNotTake,
+                             IsInitialization);
+      return eltAdjBuffer;
+    }
+    }
   }
   // Handle `begin_access`.
   // Adjoint projection: the base adjoint buffer itself.
@@ -475,7 +520,7 @@ PullbackEmitter::createFunctionLocalAllocation(SILType type, SILLocation loc) {
 
 SILValue &PullbackEmitter::getAdjointBuffer(SILBasicBlock *origBB,
                                             SILValue originalBuffer) {
-  assert(originalBuffer->getType().isAddress());
+  assert(getTangentValueCategory(originalBuffer) == SILValueCategory::Address);
   assert(originalBuffer->getFunction() == &getOriginal());
   auto insertion = bufferMap.try_emplace({origBB, originalBuffer}, SILValue());
   if (!insertion.second) // not inserted
@@ -506,7 +551,7 @@ void PullbackEmitter::addToAdjointBuffer(SILBasicBlock *origBB,
                                          SILValue originalBuffer,
                                          SILValue rhsBufferAccess,
                                          SILLocation loc) {
-  assert(originalBuffer->getType().isAddress() &&
+  assert(getTangentValueCategory(originalBuffer) == SILValueCategory::Address &&
          rhsBufferAccess->getType().isAddress());
   assert(originalBuffer->getFunction() == &getOriginal());
   assert(rhsBufferAccess->getFunction() == &getPullback());
@@ -619,25 +664,20 @@ bool PullbackEmitter::runForSemanticMemberGetter() {
          "Getter should have one semantic result");
   auto origResult = origFormalResults[*getIndices().results->begin()];
 
-  // TODO(TF-970): Emit diagnostic when `TangentVector` is not a struct.
   auto tangentVectorSILTy = pullback.getConventions().getSingleSILResultType(
       TypeExpansionContext::minimal());
   auto tangentVectorTy = tangentVectorSILTy.getASTType();
   auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
 
   // Look up the corresponding field in the tangent space.
-  VarDecl *origField = cast<VarDecl>(accessor->getStorage());
-  VarDecl *tanField = nullptr;
-  auto tanFieldLookup = tangentVectorDecl->lookupDirect(origField->getName());
-  if (tanFieldLookup.empty()) {
-    getContext().emitNondifferentiabilityError(
-        pbLoc.getSourceLoc(), getInvoker(),
-        diag::autodiff_stored_property_no_corresponding_tangent,
-        origSelf->getType().getASTType().getString(), origField->getNameStr());
+  auto *origField = cast<VarDecl>(accessor->getStorage());
+  auto baseType = remapType(origSelf->getType()).getASTType();
+  auto *tanField = getTangentStoredProperty(getContext(), origField, baseType,
+                                            pbLoc, getInvoker());
+  if (!tanField) {
     errorOccurred = true;
     return true;
   }
-  tanField = cast<VarDecl>(tanFieldLookup.front());
 
   // Switch based on the base tangent struct's value category.
   // TODO(TF-1255): Simplify using unified adjoint value data structure.
@@ -736,27 +776,15 @@ bool PullbackEmitter::runForSemanticMemberSetter() {
   SILValue origArg = original.getArgumentsWithoutIndirectResults()[0];
   SILValue origSelf = original.getArgumentsWithoutIndirectResults()[1];
 
-  // TODO(TF-970): Emit diagnostic when `TangentVector` is not a struct.
-  auto tangentVectorSILTy = pullback.getLoweredFunctionType()
-                                ->getParameters()[0]
-                                .getSILStorageInterfaceType();
-  assert(tangentVectorSILTy.getCategory() == SILValueCategory::Address);
-  auto tangentVectorTy = tangentVectorSILTy.getASTType();
-  auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
-
   // Look up the corresponding field in the tangent space.
-  VarDecl *origField = cast<VarDecl>(accessor->getStorage());
-  VarDecl *tanField = nullptr;
-  auto tanFieldLookup = tangentVectorDecl->lookupDirect(origField->getName());
-  if (tanFieldLookup.empty()) {
-    getContext().emitNondifferentiabilityError(
-        pbLoc.getSourceLoc(), getInvoker(),
-        diag::autodiff_stored_property_no_corresponding_tangent,
-        origSelf->getType().getASTType().getString(), origField->getNameStr());
+  auto *origField = cast<VarDecl>(accessor->getStorage());
+  auto baseType = remapType(origSelf->getType()).getASTType();
+  auto *tanField = getTangentStoredProperty(getContext(), origField, baseType,
+                                            pbLoc, getInvoker());
+  if (!tanField) {
     errorOccurred = true;
     return true;
   }
-  tanField = cast<VarDecl>(tanFieldLookup.front());
 
   auto adjSelf = getAdjointBuffer(origEntry, origSelf);
   auto *adjSelfElt = builder.createStructElementAddr(pbLoc, adjSelf, tanField);
@@ -797,6 +825,7 @@ bool PullbackEmitter::run() {
          "Functions without returns must have been diagnosed");
   auto *origExit = &*origExitIt;
 
+  // Collect original formal results.
   SmallVector<SILValue, 8> origFormalResults;
   collectAllFormalResultsInTypeOrder(original, origFormalResults);
   for (auto resultIndex : getIndices().results->getIndices()) {
@@ -815,7 +844,7 @@ bool PullbackEmitter::run() {
     }
   }
 
-  // Get dominated active values in original blocks.
+  // Collect dominated active values in original basic blocks.
   // Adjoint values of dominated active values are passed as pullback block
   // arguments.
   DominanceOrder domOrder(original.getEntryBlock(), domInfo);
@@ -829,78 +858,67 @@ bool PullbackEmitter::run() {
       auto &domBBActiveValues = activeValues[domNode->getBlock()];
       bbActiveValues.append(domBBActiveValues.begin(), domBBActiveValues.end());
     }
-    // Booleans tracking whether active-value-related errors have been emitted.
-    // This prevents duplicate diagnostics for the same active values.
-    bool diagnosedActiveEnumValue = false;
-    bool diagnosedActiveValueTangentValueCategoryIncompatible = false;
-    // Mark the activity of a value if it has not yet been visited.
-    auto markValueActivity = [&](SILValue v) {
+    // If `v` is active and has not been visited, records it as an active value
+    // in the original basic block.
+    // For active values unsupported by differentiation, emits a diagnostic and
+    // returns true. Otherwise, returns false.
+    auto recordValueIfActive = [&](SILValue v) -> bool {
+      // If value is not active, skip.
+      if (!getActivityInfo().isActive(v, getIndices()))
+        return false;
+      // If active value has already been visited, skip.
       if (visited.count(v))
-        return;
+        return false;
+      // Mark active value as visited.
       visited.insert(v);
+
+      // Diagnose unsupported active values.
       auto type = v->getType();
-      // Diagnose active values whose value category is incompatible with their
-      // tangent types's value category.
-      //
-      // Let $L be a loadable type and $*A be an address-only type.
-      // Table of supported combinations:
-      //
-      // Original type | Tangent type | Currently supported?
-      // --------------|--------------|---------------------
-      // $L            | $L           | Yes (no mismatch)
-      // $*A           | $L           | Yes (can create $*L adjoint buffer)
-      // $L            | $*A          | No (cannot create $A adjoint value)
-      // $*A           | $*A          | Yes (no mismatch)
-      if (!diagnosedActiveValueTangentValueCategoryIncompatible) {
-        if (auto tanSpace = getTangentSpace(remapType(type).getASTType())) {
-          auto tanASTType = tanSpace->getCanonicalType();
-          auto &origTL = getTypeLowering(type.getASTType());
-          auto &tanTL = getTypeLowering(tanASTType);
-          if (!origTL.isAddressOnly() && tanTL.isAddressOnly()) {
-            getContext().emitNondifferentiabilityError(
-                v, getInvoker(),
-                diag::autodiff_loadable_value_addressonly_tangent_unsupported,
-                type.getASTType(), tanASTType);
-            diagnosedActiveValueTangentValueCategoryIncompatible = true;
-            errorOccurred = true;
-          }
-        }
-      }
       // Do not emit remaining activity-related diagnostics for semantic member
       // accessors, which have special-case pullback generation.
       if (isSemanticMemberAccessor(&original))
-        return;
+        return false;
       // Diagnose active enum values. Differentiation of enum values requires
       // special adjoint value handling and is not yet supported. Diagnose
       // only the first active enum value to prevent too many diagnostics.
-      if (!diagnosedActiveEnumValue && type.getEnumOrBoundGenericEnum()) {
+      if (type.getEnumOrBoundGenericEnum()) {
         getContext().emitNondifferentiabilityError(
             v, getInvoker(), diag::autodiff_enums_unsupported);
         errorOccurred = true;
-        diagnosedActiveEnumValue = true;
+        return true;
+      }
+      // Diagnose unsupported stored property projections.
+      if (auto *inst = dyn_cast<FieldIndexCacheBase>(v)) {
+        assert(inst->getNumOperands() == 1);
+        auto baseType = remapType(inst->getOperand(0)->getType()).getASTType();
+        if (!getTangentStoredProperty(getContext(), inst, baseType,
+                                      getInvoker())) {
+          errorOccurred = true;
+          return true;
+        }
       }
       // Skip address projections.
       // Address projections do not need their own adjoint buffers; they
       // become projections into their adjoint base buffer.
       if (Projection::isAddressProjection(v))
-        return;
+        return false;
+      // Record active value.
       bbActiveValues.push_back(v);
+      return false;
     };
-    // Visit bb arguments and all instruction operands/results.
+    // Record all active values in the basic block.
     for (auto *arg : bb->getArguments())
-      if (getActivityInfo().isActive(arg, getIndices()))
-        markValueActivity(arg);
+      if (recordValueIfActive(arg))
+        return true;
     for (auto &inst : *bb) {
       for (auto op : inst.getOperandValues())
-        if (getActivityInfo().isActive(op, getIndices()))
-          markValueActivity(op);
+        if (recordValueIfActive(op))
+          return true;
       for (auto result : inst.getResults())
-        if (getActivityInfo().isActive(result, getIndices()))
-          markValueActivity(result);
+        if (recordValueIfActive(result))
+          return true;
     }
     domOrder.pushChildren(bb);
-    if (errorOccurred)
-      return true;
   }
 
   // Create pullback blocks and arguments, visiting original blocks in
@@ -950,18 +968,23 @@ bool PullbackEmitter::run() {
     // - For each active value in the original block, add adjoint value
     //   arguments to the pullback block.
     for (auto activeValue : bbActiveValues) {
-      if (activeValue->getType().isAddress()) {
+      switch (getTangentValueCategory(activeValue)) {
+      case SILValueCategory::Address: {
         // Allocate and zero initialize a new local buffer using
         // `getAdjointBuffer`.
         builder.setInsertionPoint(pullback.getEntryBlock());
         getAdjointBuffer(origBB, activeValue);
-      } else {
+        break;
+      }
+      case SILValueCategory::Object: {
         // Create and register pullback block argument for the active value.
         auto *pullbackArg = pullbackBB->createPhiArgument(
             getRemappedTangentType(activeValue->getType()),
             ValueOwnershipKind::Owned);
         activeValuePullbackBBArgumentMap[{origBB, activeValue}] = pullbackArg;
         recordTemporary(pullbackArg);
+        break;
+      }
       }
     }
     // Add a pullback struct argument.
@@ -994,44 +1017,47 @@ bool PullbackEmitter::run() {
   }
 
   auto *pullbackEntry = pullback.getEntryBlock();
-  // The pullback function has type (seed, exit_pbs) -> ([arg0], ..., [argn]).
+  // The pullback function has type:
+  // `(seed0, seed1, ..., exit_pb_struct) -> (d_arg0, ..., d_argn)`.
   auto pbParamArgs = pullback.getArgumentsWithoutIndirectResults();
-  assert(pbParamArgs.size() == 2);
-  seed = pbParamArgs[0];
-  // TODO(TF-983): Handle multiple original results.
-  assert(getIndices().results->getNumIndices() == 1);
-  auto origResult = origFormalResults[*getIndices().results->begin()];
-
-  // Assign adjoint for original result.
+  assert(getIndices().results->getNumIndices() == pbParamArgs.size() - 1 &&
+         pbParamArgs.size() >= 2);
+  // Assign adjoints for original result.
   builder.setInsertionPoint(pullbackEntry,
                             getNextFunctionLocalAllocationInsertionPoint());
-  if (seed->getType().isAddress()) {
-    // If the pullback `seed` is an `inout` parameter, assign it directly as the
-    // adjoint buffer of the original result.
-    if (pullback.getLoweredFunctionType()
-            ->getParameters()
-            .front()
-            .isIndirectInOut()) {
-      setAdjointBuffer(origExit, origResult, seed);
-    }
-    // Otherwise, assign a copy of `seed` as the adjoint buffer of the original
-    // result.
-    else {
-      auto *seedBufCopy = builder.createAllocStack(pbLoc, seed->getType());
-      builder.createCopyAddr(pbLoc, seed, seedBufCopy, IsNotTake,
-                             IsInitialization);
-      functionLocalAllocations.push_back(seedBufCopy);
-      setAdjointBuffer(origExit, origResult, seedBufCopy);
+  unsigned seedIndex = 0;
+  for (auto resultIndex : getIndices().results->getIndices()) {
+    auto origResult = origFormalResults[resultIndex];
+    auto *seed = pbParamArgs[seedIndex];
+    if (seed->getType().isAddress()) {
+      // If the seed argument is an `inout` parameter, assign it directly as
+      // the adjoint buffer of the original result.
+      auto seedParamInfo =
+          pullback.getLoweredFunctionType()->getParameters()[seedIndex];
+      if (seedParamInfo.isIndirectInOut()) {
+        setAdjointBuffer(origExit, origResult, seed);
+      }
+      // Otherwise, assign a copy of the seed argument as the adjoint buffer of
+      // the original result.
+      else {
+        auto *seedBufCopy =
+            createFunctionLocalAllocation(seed->getType(), pbLoc);
+        builder.createCopyAddr(pbLoc, seed, seedBufCopy, IsNotTake,
+                               IsInitialization);
+        setAdjointBuffer(origExit, origResult, seedBufCopy);
+        LLVM_DEBUG(getADDebugStream()
+                   << "Assigned seed buffer " << *seedBufCopy
+                   << " as the adjoint of original indirect result "
+                   << origResult);
+      }
+    } else {
+      addAdjointValue(origExit, origResult, makeConcreteAdjointValue(seed),
+                      pbLoc);
       LLVM_DEBUG(getADDebugStream()
-                 << "Assigned seed buffer " << seedBufCopy
-                 << " as the adjoint of original indirect result "
-                 << origResult);
+                 << "Assigned seed " << *seed
+                 << " as the adjoint of original result " << origResult);
     }
-  } else {
-    setAdjointValue(origExit, origResult, makeConcreteAdjointValue(seed));
-    LLVM_DEBUG(getADDebugStream()
-               << "Assigned seed " << *seed
-               << " as the adjoint of original result " << origResult);
+    ++seedIndex;
   }
 
   // If the original function is an accessor with special-case pullback
@@ -1068,19 +1094,24 @@ bool PullbackEmitter::run() {
   // `parameterIndex` into the `retElts` vector.
   auto addRetElt = [&](unsigned parameterIndex) -> void {
     auto origParam = origParams[parameterIndex];
-    if (origParam->getType().isObject()) {
+    switch (getTangentValueCategory(origParam)) {
+    case SILValueCategory::Object: {
       auto pbVal = getAdjointValue(origEntry, origParam);
       auto val = materializeAdjointDirect(pbVal, pbLoc);
       auto newVal = builder.emitCopyValueOperation(pbLoc, val);
       retElts.push_back(newVal);
-    } else {
+      break;
+    }
+    case SILValueCategory::Address: {
       auto adjBuf = getAdjointBuffer(origEntry, origParam);
       indParamAdjoints.push_back(adjBuf);
+      break;
+    }
     }
   };
   // Collect differentiation parameter adjoints.
-  // Skip `inout` parameters.
   for (auto i : getIndices().parameters->getIndices()) {
+    // Skip `inout` parameters.
     if (conv.getParameters()[i].isIndirectMutating())
       continue;
     addRetElt(i);
@@ -1208,7 +1239,8 @@ SILBasicBlock *PullbackEmitter::buildPullbackSuccessor(
     LLVM_DEBUG(getADDebugStream()
                << "Propagating adjoint of active value " << activeValue
                << " to predecessors' pullback blocks\n");
-    if (activeValue->getType().isObject()) {
+    switch (getTangentValueCategory(activeValue)) {
+    case SILValueCategory::Object: {
       auto activeValueAdj = getAdjointValue(origBB, activeValue);
       auto concreteActiveValueAdj =
           materializeAdjointDirect(activeValueAdj, loc);
@@ -1236,12 +1268,16 @@ SILBasicBlock *PullbackEmitter::buildPullbackSuccessor(
         auto forwardedArgAdj = makeConcreteAdjointValue(pullbackBBArg);
         setAdjointValue(origPredBB, activeValue, forwardedArgAdj);
       }
-    } else {
+      break;
+    }
+    case SILValueCategory::Address: {
       // Propagate adjoint buffers using `copy_addr`.
       auto adjBuf = getAdjointBuffer(origBB, activeValue);
       auto predAdjBuf = getAdjointBuffer(origPredBB, activeValue);
       builder.createCopyAddr(loc, adjBuf, predAdjBuf, IsNotTake,
                              IsNotInitialization);
+      break;
+    }
     }
   }
   // Propagate pullback struct argument.
@@ -1303,6 +1339,7 @@ void PullbackEmitter::visitSILBasicBlock(SILBasicBlock *bb) {
   // 1. Get the pullback struct pullback block argument.
   // 2. Extract the predecessor enum value from the pullback struct value.
   auto *predEnum = getPullbackInfo().getBranchingTraceDecl(bb);
+  (void)predEnum;
   auto *predEnumField = getPullbackInfo().lookUpLinearMapStructEnumField(bb);
   auto predEnumVal = getPullbackStructElement(bb, predEnumField);
 
@@ -1421,7 +1458,7 @@ PullbackEmitter::getArrayAdjointElementBuffer(SILValue arrayAdjoint,
     }
   }
   assert(subscriptDecl && "No `Array.TangentVector.subscript`");
-  auto *subscriptGetterDecl = subscriptDecl->getAccessor(AccessorKind::Get);
+  auto *subscriptGetterDecl = subscriptDecl->getOpaqueAccessor(AccessorKind::Get);
   assert(subscriptGetterDecl && "No `Array.TangentVector.subscript` getter");
   SILOptFunctionBuilder fb(getContext().getTransform());
   auto *subscriptGetterFn = fb.getOrCreateFunction(
@@ -1550,18 +1587,19 @@ void PullbackEmitter::visitApplyInst(ApplyInst *ai) {
     args.push_back(alloc);
   }
 
-  // Get formal callee pullback arguments.
-  assert(applyInfo.indices.results->getNumIndices() == 1);
+  // Collect callee pullback formal arguments.
   for (auto resultIndex : applyInfo.indices.results->getIndices()) {
     assert(resultIndex < origAllResults.size());
     auto origResult = origAllResults[resultIndex];
     // Get the seed (i.e. adjoint value of the original result).
     SILValue seed;
-    if (origResult->getType().isObject()) {
-      // Otherwise, materialize adjoint value of `ai`.
+    switch (getTangentValueCategory(origResult)) {
+    case SILValueCategory::Object:
       seed = materializeAdjoint(getAdjointValue(bb, origResult), loc);
-    } else {
+      break;
+    case SILValueCategory::Address:
       seed = getAdjointBuffer(bb, origResult);
+      break;
     }
     args.push_back(seed);
   }
@@ -1653,14 +1691,16 @@ void PullbackEmitter::visitStructInst(StructInst *si) {
     break;
   case AdjointValueKind::Concrete: {
     auto adjStruct = materializeAdjointDirect(std::move(av), loc);
+    auto *dti = builder.createDestructureStruct(si->getLoc(), adjStruct);
+
     // Find the struct `TangentVector` type.
     auto structTy = remapType(si->getType()).getASTType();
+#ifndef NDEBUG
     auto tangentVectorTy = getTangentSpace(structTy)->getCanonicalType();
     assert(!getTypeLowering(tangentVectorTy).isAddressOnly());
-    auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
-    assert(tangentVectorDecl);
+    assert(tangentVectorTy->getStructOrBoundGenericStruct());
+#endif
 
-    auto *dti = builder.createDestructureStruct(si->getLoc(), adjStruct);
     // Accumulate adjoints for the fields of the `struct` operand.
     unsigned fieldIndex = 0;
     for (auto it = structDecl->getStoredProperties().begin();
@@ -1669,23 +1709,12 @@ void PullbackEmitter::visitStructInst(StructInst *si) {
       if (field->getAttrs().hasAttribute<NoDerivativeAttr>())
         continue;
       // Find the corresponding field in the tangent space.
-      VarDecl *tanField = nullptr;
-      if (tangentVectorDecl == structDecl)
-        tanField = field;
-      // Otherwise, look up the field by name.
-      else {
-        auto tanFieldLookup = tangentVectorDecl->lookupDirect(field->getName());
-        if (tanFieldLookup.empty()) {
-          getContext().emitNondifferentiabilityError(
-              si, getInvoker(),
-              diag::autodiff_stored_property_no_corresponding_tangent,
-              tangentVectorDecl->getNameStr(), field->getNameStr());
-          errorOccurred = true;
-          return;
-        }
-        tanField = cast<VarDecl>(tanFieldLookup.front());
+      auto *tanField = getTangentStoredProperty(getContext(), field, structTy,
+                                                loc, getInvoker());
+      if (!tanField) {
+        errorOccurred = true;
+        return;
       }
-      assert(tanField);
       auto tanElt = dti->getResult(fieldIndex);
       addAdjointValue(bb, si->getFieldValue(field),
                       makeConcreteAdjointValue(tanElt), si->getLoc());
@@ -1712,42 +1741,24 @@ void PullbackEmitter::visitBeginApplyInst(BeginApplyInst *bai) {
 }
 
 void PullbackEmitter::visitStructExtractInst(StructExtractInst *sei) {
-  assert(!sei->getField()->getAttrs().hasAttribute<NoDerivativeAttr>() &&
-         "`struct_extract` with `@noDerivative` field should not be "
-         "differentiated; activity analysis should not marked as varied");
   auto *bb = sei->getParent();
+  auto loc = getValidLocation(sei);
   auto structTy = remapType(sei->getOperand()->getType()).getASTType();
   auto tangentVectorTy = getTangentSpace(structTy)->getCanonicalType();
   assert(!getTypeLowering(tangentVectorTy).isAddressOnly());
   auto tangentVectorSILTy = SILType::getPrimitiveObjectType(tangentVectorTy);
   auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
-  // TODO(TF-970): Emit diagnostic when `TangentVector` is not a struct.
   assert(tangentVectorDecl);
   // Find the corresponding field in the tangent space.
-  VarDecl *tanField = nullptr;
-  // If the tangent space is the original struct, then field is the same.
-  if (tangentVectorDecl == sei->getStructDecl())
-    tanField = sei->getField();
-  // Otherwise, look up the field by name.
-  else {
-    auto tanFieldLookup =
-        tangentVectorDecl->lookupDirect(sei->getField()->getName());
-    if (tanFieldLookup.empty()) {
-      getContext().emitNondifferentiabilityError(
-          sei, getInvoker(),
-          diag::autodiff_stored_property_no_corresponding_tangent,
-          sei->getStructDecl()->getNameStr(), sei->getField()->getNameStr());
-      errorOccurred = true;
-      return;
-    }
-    tanField = cast<VarDecl>(tanFieldLookup.front());
-  }
+  auto *tanField =
+      getTangentStoredProperty(getContext(), sei, structTy, getInvoker());
+  assert(tanField && "Invalid projections should have been diagnosed");
   // Accumulate adjoint for the `struct_extract` operand.
   auto av = getAdjointValue(bb, sei);
   switch (av.getKind()) {
   case AdjointValueKind::Zero:
     addAdjointValue(bb, sei->getOperand(),
-                    makeZeroAdjointValue(tangentVectorSILTy), sei->getLoc());
+                    makeZeroAdjointValue(tangentVectorSILTy), loc);
     break;
   case AdjointValueKind::Concrete:
   case AdjointValueKind::Aggregate: {
@@ -1766,54 +1777,56 @@ void PullbackEmitter::visitStructExtractInst(StructExtractInst *sei) {
     }
     addAdjointValue(bb, sei->getOperand(),
                     makeAggregateAdjointValue(tangentVectorSILTy, eltVals),
-                    sei->getLoc());
+                    loc);
   }
   }
 }
 
 void PullbackEmitter::visitRefElementAddrInst(RefElementAddrInst *reai) {
   auto *bb = reai->getParent();
+  auto loc = reai->getLoc();
   auto adjBuf = getAdjointBuffer(bb, reai);
-  auto classTy = remapType(reai->getOperand()->getType()).getASTType();
-  auto tangentVectorTy = getTangentSpace(classTy)->getCanonicalType();
-  assert(!getTypeLowering(tangentVectorTy).isAddressOnly());
-  auto tangentVectorSILTy = SILType::getPrimitiveObjectType(tangentVectorTy);
-  auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
-  // TODO(TF-970): Emit diagnostic when `TangentVector` is not a struct.
-  assert(tangentVectorDecl);
-  // Look up the corresponding field in the tangent space by name.
-  VarDecl *tanField = nullptr;
-  auto tanFieldLookup =
-      tangentVectorDecl->lookupDirect(reai->getField()->getName());
-  if (tanFieldLookup.empty()) {
-    getContext().emitNondifferentiabilityError(
-        reai, getInvoker(),
-        diag::autodiff_stored_property_no_corresponding_tangent,
-        reai->getClassDecl()->getNameStr(), reai->getField()->getNameStr());
-    errorOccurred = true;
-    return;
-  }
-  tanField = cast<VarDecl>(tanFieldLookup.front());
-  // Accumulate adjoint for the `ref_element_addr` operand.
-  SmallVector<AdjointValue, 8> eltVals;
-  for (auto *field : tangentVectorDecl->getStoredProperties()) {
-    if (field == tanField) {
-      auto adjElt = builder.emitLoadValueOperation(
-          reai->getLoc(), adjBuf, LoadOwnershipQualifier::Copy);
-      eltVals.push_back(makeConcreteAdjointValue(adjElt));
-      recordTemporary(adjElt);
-    } else {
-      auto substMap = tangentVectorTy->getMemberSubstitutionMap(
-          field->getModuleContext(), field);
-      auto fieldTy = field->getType().subst(substMap);
-      auto fieldSILTy = getTypeLowering(fieldTy).getLoweredType();
-      assert(fieldSILTy.isObject());
-      eltVals.push_back(makeZeroAdjointValue(fieldSILTy));
+  auto classOperand = reai->getOperand();
+  auto classType = remapType(reai->getOperand()->getType()).getASTType();
+  auto *tanField =
+      getTangentStoredProperty(getContext(), reai, classType, getInvoker());
+  assert(tanField && "Invalid projections should have been diagnosed");
+  switch (getTangentValueCategory(classOperand)) {
+  case SILValueCategory::Object: {
+    auto classTy = remapType(classOperand->getType()).getASTType();
+    auto tangentVectorTy = getTangentSpace(classTy)->getCanonicalType();
+    auto tangentVectorSILTy = SILType::getPrimitiveObjectType(tangentVectorTy);
+    auto *tangentVectorDecl = tangentVectorTy->getStructOrBoundGenericStruct();
+    // Accumulate adjoint for the `ref_element_addr` operand.
+    SmallVector<AdjointValue, 8> eltVals;
+    for (auto *field : tangentVectorDecl->getStoredProperties()) {
+      if (field == tanField) {
+        auto adjElt = builder.emitLoadValueOperation(
+            reai->getLoc(), adjBuf, LoadOwnershipQualifier::Copy);
+        eltVals.push_back(makeConcreteAdjointValue(adjElt));
+        recordTemporary(adjElt);
+      } else {
+        auto substMap = tangentVectorTy->getMemberSubstitutionMap(
+            field->getModuleContext(), field);
+        auto fieldTy = field->getType().subst(substMap);
+        auto fieldSILTy = getTypeLowering(fieldTy).getLoweredType();
+        assert(fieldSILTy.isObject());
+        eltVals.push_back(makeZeroAdjointValue(fieldSILTy));
+      }
     }
+    addAdjointValue(bb, classOperand,
+                    makeAggregateAdjointValue(tangentVectorSILTy, eltVals),
+                    loc);
+    break;
+  }
+  case SILValueCategory::Address: {
+    auto adjBufClass = getAdjointBuffer(bb, classOperand);
+    auto adjBufElt =
+        builder.createStructElementAddr(loc, adjBufClass, tanField);
+    accumulateIndirect(adjBufElt, adjBuf, loc);
+    break;
+  }
   }
-  addAdjointValue(bb, reai->getOperand(),
-                  makeAggregateAdjointValue(tangentVectorSILTy, eltVals),
-                  reai->getLoc());
 }
 
 void PullbackEmitter::visitTupleInst(TupleInst *ti) {
@@ -1937,28 +1950,49 @@ void PullbackEmitter::visitDestructureTupleInst(DestructureTupleInst *dti) {
 void PullbackEmitter::visitLoadOperation(SingleValueInstruction *inst) {
   assert(isa<LoadInst>(inst) || isa<LoadBorrowInst>(inst));
   auto *bb = inst->getParent();
-  auto adjVal =
-      materializeAdjointDirect(getAdjointValue(bb, inst), inst->getLoc());
-  // Allocate a local buffer and store the adjoint value. This buffer will be
-  // used for accumulation into the adjoint buffer.
-  auto *localBuf = builder.createAllocStack(inst->getLoc(), adjVal->getType());
-  auto copy = builder.emitCopyValueOperation(inst->getLoc(), adjVal);
-  builder.emitStoreValueOperation(inst->getLoc(), copy, localBuf,
-                                  StoreOwnershipQualifier::Init);
-  // Accumulate the adjoint value in the local buffer into the adjoint buffer.
-  addToAdjointBuffer(bb, inst->getOperand(0), localBuf, inst->getLoc());
-  builder.emitDestroyAddr(inst->getLoc(), localBuf);
-  builder.createDeallocStack(inst->getLoc(), localBuf);
+  auto loc = inst->getLoc();
+  switch (getTangentValueCategory(inst)) {
+  case SILValueCategory::Object: {
+    auto adjVal = materializeAdjointDirect(getAdjointValue(bb, inst), loc);
+    // Allocate a local buffer and store the adjoint value. This buffer will be
+    // used for accumulation into the adjoint buffer.
+    auto adjBuf = builder.createAllocStack(loc, adjVal->getType());
+    auto copy = builder.emitCopyValueOperation(loc, adjVal);
+    builder.emitStoreValueOperation(loc, copy, adjBuf,
+                                    StoreOwnershipQualifier::Init);
+    // Accumulate the adjoint value in the local buffer into the adjoint buffer.
+    addToAdjointBuffer(bb, inst->getOperand(0), adjBuf, loc);
+    builder.emitDestroyAddr(loc, adjBuf);
+    builder.createDeallocStack(loc, adjBuf);
+    break;
+  }
+  case SILValueCategory::Address: {
+    auto adjBuf = getAdjointBuffer(bb, inst);
+    addToAdjointBuffer(bb, inst->getOperand(0), adjBuf, loc);
+    break;
+  }
+  }
 }
 
 void PullbackEmitter::visitStoreOperation(SILBasicBlock *bb, SILLocation loc,
                                           SILValue origSrc, SILValue origDest) {
   auto &adjBuf = getAdjointBuffer(bb, origDest);
-  auto adjVal =
-      builder.emitLoadValueOperation(loc, adjBuf, LoadOwnershipQualifier::Take);
-  recordTemporary(adjVal);
-  addAdjointValue(bb, origSrc, makeConcreteAdjointValue(adjVal), loc);
-  emitZeroIndirect(adjBuf->getType().getASTType(), adjBuf, loc);
+  switch (getTangentValueCategory(origSrc)) {
+  case SILValueCategory::Object: {
+    auto adjVal = builder.emitLoadValueOperation(loc, adjBuf,
+                                                 LoadOwnershipQualifier::Take);
+    recordTemporary(adjVal);
+    addAdjointValue(bb, origSrc, makeConcreteAdjointValue(adjVal), loc);
+    emitZeroIndirect(adjBuf->getType().getASTType(), adjBuf, loc);
+    break;
+  }
+  case SILValueCategory::Address: {
+    addToAdjointBuffer(bb, origSrc, adjBuf, loc);
+    builder.emitDestroyAddr(loc, adjBuf);
+    emitZeroIndirect(adjBuf->getType().getASTType(), adjBuf, loc);
+    break;
+  }
+  }
 }
 
 void PullbackEmitter::visitStoreInst(StoreInst *si) {
@@ -1977,14 +2011,40 @@ void PullbackEmitter::visitCopyAddrInst(CopyAddrInst *cai) {
 
 void PullbackEmitter::visitCopyValueInst(CopyValueInst *cvi) {
   auto *bb = cvi->getParent();
-  auto adj = getAdjointValue(bb, cvi);
-  addAdjointValue(bb, cvi->getOperand(), adj, cvi->getLoc());
+  switch (getTangentValueCategory(cvi)) {
+  case SILValueCategory::Object: {
+    auto adj = getAdjointValue(bb, cvi);
+    addAdjointValue(bb, cvi->getOperand(), adj, cvi->getLoc());
+    break;
+  }
+  case SILValueCategory::Address: {
+    auto &adjDest = getAdjointBuffer(bb, cvi);
+    auto destType = remapType(adjDest->getType());
+    addToAdjointBuffer(bb, cvi->getOperand(), adjDest, cvi->getLoc());
+    builder.emitDestroyAddrAndFold(cvi->getLoc(), adjDest);
+    emitZeroIndirect(destType.getASTType(), adjDest, cvi->getLoc());
+    break;
+  }
+  }
 }
 
 void PullbackEmitter::visitBeginBorrowInst(BeginBorrowInst *bbi) {
   auto *bb = bbi->getParent();
-  auto adj = getAdjointValue(bb, bbi);
-  addAdjointValue(bb, bbi->getOperand(), adj, bbi->getLoc());
+  switch (getTangentValueCategory(bbi)) {
+  case SILValueCategory::Object: {
+    auto adj = getAdjointValue(bb, bbi);
+    addAdjointValue(bb, bbi->getOperand(), adj, bbi->getLoc());
+    break;
+  }
+  case SILValueCategory::Address: {
+    auto &adjDest = getAdjointBuffer(bb, bbi);
+    auto destType = remapType(adjDest->getType());
+    addToAdjointBuffer(bb, bbi->getOperand(), adjDest, bbi->getLoc());
+    builder.emitDestroyAddrAndFold(bbi->getLoc(), adjDest);
+    emitZeroIndirect(destType.getASTType(), adjDest, bbi->getLoc());
+    break;
+  }
+  }
 }
 
 void PullbackEmitter::visitBeginAccessInst(BeginAccessInst *bai) {
diff --git a/lib/SILOptimizer/Differentiation/Thunk.cpp b/lib/SILOptimizer/Differentiation/Thunk.cpp
index 9d56ae56310b5..ce7f3955d1792 100644
--- a/lib/SILOptimizer/Differentiation/Thunk.cpp
+++ b/lib/SILOptimizer/Differentiation/Thunk.cpp
@@ -237,7 +237,6 @@ CanSILFunctionType buildThunkType(SILFunction *fn,
   if (expectedType->hasErrorResult()) {
     auto errorResult = expectedType->getErrorResult();
     interfaceErrorResult = errorResult.map(mapTypeOutOfContext);
-    ;
   }
 
   // The type of the thunk function.
@@ -381,6 +380,23 @@ SILFunction *getOrCreateReabstractionThunk(SILOptFunctionBuilder &fb,
   for (unsigned resIdx : range(toType->getNumResults())) {
     auto fromRes = fromConv.getResults()[resIdx];
     auto toRes = toConv.getResults()[resIdx];
+    // Check function-typed results.
+    if (isa<SILFunctionType>(fromRes.getInterfaceType()) &&
+        isa<SILFunctionType>(toRes.getInterfaceType())) {
+      auto fromFnType = cast<SILFunctionType>(fromRes.getInterfaceType());
+      auto toFnType = cast<SILFunctionType>(toRes.getInterfaceType());
+      auto fromUnsubstFnType = fromFnType->getUnsubstitutedType(module);
+      auto toUnsubstFnType = toFnType->getUnsubstitutedType(module);
+      // If unsubstituted function types are not equal, perform reabstraction.
+      if (fromUnsubstFnType != toUnsubstFnType) {
+        auto fromFn = *fromDirResultsIter++;
+        auto newFromFn = reabstractFunction(
+            builder, fb, loc, fromFn, toFnType,
+            [](SubstitutionMap substMap) { return substMap; });
+        results.push_back(newFromFn);
+        continue;
+      }
+    }
     // No abstraction mismatch.
     if (fromRes.isFormalIndirect() == toRes.isFormalIndirect()) {
       // If result types are direct, add call result as direct thunk result.
@@ -403,9 +419,11 @@ SILFunction *getOrCreateReabstractionThunk(SILOptFunctionBuilder &fb,
     }
     // Store direct results to indirect results.
     assert(toRes.isFormalIndirect());
+#ifndef NDEBUG
     SILType resultTy =
         toConv.getSILType(toRes, builder.getTypeExpansionContext());
     assert(resultTy.isAddress());
+#endif
     auto indRes = *toIndResultsIter++;
     builder.createStore(loc, *fromDirResultsIter++, indRes,
                         StoreOwnershipQualifier::Unqualified);
@@ -821,8 +839,10 @@ getOrCreateSubsetParametersThunkForDerivativeFunction(
                  peerThroughFunctionConversions<ClassMethodInst>(
                      derivativeFn)) {
     auto classOperand = thunk->getArgumentsWithoutIndirectResults().back();
+#ifndef NDEBUG
     auto classOperandType = assocMethodInst->getOperand()->getType();
     assert(classOperand->getType() == classOperandType);
+#endif
     assocRef = builder.createClassMethod(
         loc, classOperand, assocMethodInst->getMember(),
         thunk->mapTypeIntoContext(assocMethodInst->getType()));
diff --git a/lib/SILOptimizer/Differentiation/VJPEmitter.cpp b/lib/SILOptimizer/Differentiation/VJPEmitter.cpp
index a5e2b80348dae..c9eab1f3b39e7 100644
--- a/lib/SILOptimizer/Differentiation/VJPEmitter.cpp
+++ b/lib/SILOptimizer/Differentiation/VJPEmitter.cpp
@@ -155,32 +155,18 @@ SILFunction *VJPEmitter::createEmptyPullback() {
   auto origParams = origTy->getParameters();
   auto indices = witness->getSILAutoDiffIndices();
 
-  // Add pullback parameter for the seed.
-  Optional<SILParameterInfo> inoutParam;
-  bool isWrtInoutParam = false;
+  // Add pullback parameters based on original result indices.
+  SmallVector<unsigned, 4> inoutParamIndices;
   for (auto i : range(origTy->getNumParameters())) {
     auto origParam = origParams[i];
     if (!origParam.isIndirectInOut())
       continue;
-    isWrtInoutParam = indices.parameters->contains(i);
-    inoutParam = origParam;
+    inoutParamIndices.push_back(i);
   }
-  if (inoutParam) {
-    auto origResult = inoutParam->getWithInterfaceType(
-        inoutParam->getInterfaceType()->getCanonicalType(witnessCanGenSig));
-    auto inoutParamTanConvention =
-        isWrtInoutParam ? inoutParam->getConvention()
-                        : ParameterConvention::Indirect_In_Guaranteed;
-    SILParameterInfo inoutParamTanParam(
-        origResult.getInterfaceType()
-            ->getAutoDiffTangentSpace(lookupConformance)
-            ->getType()
-            ->getCanonicalType(witnessCanGenSig),
-        inoutParamTanConvention);
-    pbParams.push_back(inoutParamTanParam);
-  } else {
-    for (auto i : indices.results->getIndices()) {
-      auto origResult = origTy->getResults()[i];
+  for (auto resultIndex : indices.results->getIndices()) {
+    // Handle formal result.
+    if (resultIndex < origTy->getNumResults()) {
+      auto origResult = origTy->getResults()[resultIndex];
       origResult = origResult.getWithInterfaceType(
           origResult.getInterfaceType()->getCanonicalType(witnessCanGenSig));
       pbParams.push_back(getTangentParameterInfoForOriginalResult(
@@ -189,7 +175,36 @@ SILFunction *VJPEmitter::createEmptyPullback() {
               ->getType()
               ->getCanonicalType(witnessCanGenSig),
           origResult.getConvention()));
+      continue;
+    }
+    // Handle `inout` parameter.
+    unsigned paramIndex = 0;
+    unsigned inoutParamIndex = 0;
+    for (auto i : range(origTy->getNumParameters())) {
+      auto origParam = origTy->getParameters()[i];
+      if (!origParam.isIndirectMutating()) {
+        ++paramIndex;
+        continue;
+      }
+      if (inoutParamIndex == resultIndex - origTy->getNumResults())
+        break;
+      ++paramIndex;
+      ++inoutParamIndex;
     }
+    auto inoutParam = origParams[paramIndex];
+    auto origResult = inoutParam.getWithInterfaceType(
+        inoutParam.getInterfaceType()->getCanonicalType(witnessCanGenSig));
+    auto inoutParamTanConvention =
+        indices.isWrtParameter(paramIndex)
+            ? inoutParam.getConvention()
+            : ParameterConvention::Indirect_In_Guaranteed;
+    SILParameterInfo inoutParamTanParam(
+        origResult.getInterfaceType()
+            ->getAutoDiffTangentSpace(lookupConformance)
+            ->getType()
+            ->getCanonicalType(witnessCanGenSig),
+        inoutParamTanConvention);
+    pbParams.push_back(inoutParamTanParam);
   }
 
   // Accept a pullback struct in the pullback parameter list. This is the
@@ -587,15 +602,6 @@ void VJPEmitter::visitApplyInst(ApplyInst *ai) {
                  activeResultIndices.begin(), activeResultIndices.end(),
                  [&s](unsigned i) { s << i; }, [&s] { s << ", "; });
              s << "}\n";);
-  // Diagnose multiple active results.
-  // TODO(TF-983): Support multiple active results.
-  if (activeResultIndices.size() > 1) {
-    context.emitNondifferentiabilityError(
-        ai, invoker,
-        diag::autodiff_cannot_differentiate_through_multiple_results);
-    errorOccurred = true;
-    return;
-  }
 
   // Form expected indices.
   auto numSemanticResults =
diff --git a/lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp b/lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp
index 0296ea0bb0c51..6971002bdfdda 100644
--- a/lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp
+++ b/lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp
@@ -572,7 +572,7 @@ void ExistentialTransform::populateThunkBody() {
     //     copy_addr %valAdr to %temp // <== Temp CopyAddr
     //     apply(%temp)               // <== Temp is consumed by the apply
     //
-    // Destroy the original arument and deallocation the temporary:
+    // Destroy the original argument and deallocation the temporary:
     //     destroy_addr %consumedExistential : $*Protocol
     //     dealloc_stack %temp : $*T
     if (Temp.DestroyValue)
diff --git a/lib/SILOptimizer/IPO/CrossModuleSerializationSetup.cpp b/lib/SILOptimizer/IPO/CrossModuleSerializationSetup.cpp
index a37810ca715f5..ea8429c854876 100644
--- a/lib/SILOptimizer/IPO/CrossModuleSerializationSetup.cpp
+++ b/lib/SILOptimizer/IPO/CrossModuleSerializationSetup.cpp
@@ -23,11 +23,17 @@
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/SILInliner.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 
 using namespace swift;
 
+/// Functions up to this (abstract) size are serialized, even if they are not
+/// generic.
+static llvm::cl::opt<int> CMOFunctionSizeLimit("cmo-function-size-limit",
+                                               llvm::cl::init(20));
+
 namespace {
 
 /// Scans a whole module and marks functions and types as inlinable or usable
@@ -54,6 +60,8 @@ class CrossModuleSerializationSetup {
 
   bool canSerialize(SILFunction *F, bool lookIntoThunks);
 
+  bool canSerialize(SILInstruction *inst, bool lookIntoThunks);
+
   void setUpForSerialization(SILFunction *F);
 
   void prepareInstructionForSerialization(SILInstruction *inst);
@@ -193,11 +201,6 @@ static llvm::cl::opt<bool> SerializeEverything(
 
 /// Decide whether to serialize a function.
 static bool shouldSerialize(SILFunction *F) {
-  // The basic heursitic: serialize all generic functions, because it makes a
-  // huge difference if generic functions can be specialized or not.
-  if (!F->getLoweredFunctionType()->isPolymorphic() && !SerializeEverything)
-    return false;
-
   // Check if we already handled this function before.
   if (F->isSerialized() == IsSerialized)
     return false;
@@ -205,6 +208,24 @@ static bool shouldSerialize(SILFunction *F) {
   if (F->hasSemanticsAttr("optimize.no.crossmodule"))
     return false;
 
+  if (SerializeEverything)
+    return true;
+
+  // The basic heursitic: serialize all generic functions, because it makes a
+  // huge difference if generic functions can be specialized or not.
+  if (F->getLoweredFunctionType()->isPolymorphic())
+    return true;
+
+  // Also serialize "small" non-generic functions.
+  int size = 0;
+  for (SILBasicBlock &block : *F) {
+    for (SILInstruction &inst : block) {
+      size += (int)instructionInlineCost(inst);
+      if (size >= CMOFunctionSizeLimit)
+        return false;
+    }
+  }
+
   return true;
 }
 
@@ -227,6 +248,11 @@ prepareInstructionForSerialization(SILInstruction *inst) {
     handleReferencedFunction(callee);
     return;
   }
+  if (auto *GAI = dyn_cast<GlobalAddrInst>(inst)) {
+    GAI->getReferencedGlobal()->setSerialized(IsSerialized);
+    GAI->getReferencedGlobal()->setLinkage(SILLinkage::Public);
+    return;
+  }
   if (auto *MI = dyn_cast<MethodInst>(inst)) {
     handleReferencedMethod(MI->getMember());
     return;
@@ -285,26 +311,42 @@ bool CrossModuleSerializationSetup::canSerialize(SILFunction *F,
   // First step: check if serializing F is even possible.
   for (SILBasicBlock &block : *F) {
     for (SILInstruction &inst : block) {
-      if (auto *FRI = dyn_cast<FunctionRefBaseInst>(&inst)) {
-        SILFunction *callee = FRI->getReferencedFunctionOrNull();
-        if (!canUseFromInline(callee, lookIntoThunks))
-          return false;
-      } else if (auto *KPI = dyn_cast<KeyPathInst>(&inst)) {
-        bool canUse = true;
-        KPI->getPattern()->visitReferencedFunctionsAndMethods(
-            [&](SILFunction *func) {
-              if (!canUseFromInline(func, lookIntoThunks))
-                canUse = false;
-            },
-            [](SILDeclRef method) { });
-        if (!canUse)
-          return false;
-      }
+      if (!canSerialize(&inst, lookIntoThunks))
+        return false;
     }
   }
   return true;
 }
 
+bool CrossModuleSerializationSetup::canSerialize(SILInstruction *inst,
+                                                 bool lookIntoThunks) {
+  if (auto *FRI = dyn_cast<FunctionRefBaseInst>(inst)) {
+    SILFunction *callee = FRI->getReferencedFunctionOrNull();
+    return canUseFromInline(callee, lookIntoThunks);
+  }
+  if (auto *KPI = dyn_cast<KeyPathInst>(inst)) {
+    bool canUse = true;
+    KPI->getPattern()->visitReferencedFunctionsAndMethods(
+        [&](SILFunction *func) {
+          if (!canUseFromInline(func, lookIntoThunks))
+            canUse = false;
+        },
+        [&](SILDeclRef method) {
+          if (method.isForeign)
+            canUse = false;
+        });
+    return canUse;
+  }
+  if (auto *GAI = dyn_cast<GlobalAddrInst>(inst)) {
+    return !GAI->getReferencedGlobal()->getName().startswith("globalinit_");
+  }
+  if (auto *MI = dyn_cast<MethodInst>(inst)) {
+    return !MI->getMember().isForeign;
+  }
+  
+  return true;
+}
+
 /// Returns true if the function \p func can be used from a serialized function.
 ///
 /// If \p lookIntoThunks is true, serializable shared thunks are also accepted.
@@ -351,12 +393,17 @@ void CrossModuleSerializationSetup::setUpForSerialization(SILFunction *F) {
   }
   F->setSerialized(IsSerialized);
 
-  // As a code size optimization, make serialized functions
-  // @alwaysEmitIntoClient.
-  // Also, for shared thunks it's required to make them @alwaysEmitIntoClient.
-  // SILLinkage::Public would not work for shared functions, because it could
-  // result in duplicate-symbol linker errors.
-  F->setLinkage(SILLinkage::PublicNonABI);
+  if (F->getLoweredFunctionType()->isPolymorphic() ||
+      F->getLinkage() != SILLinkage::Public) {
+    // As a code size optimization, make serialized functions
+    // @alwaysEmitIntoClient.
+    // Also, for shared thunks it's required to make them @alwaysEmitIntoClient.
+    // SILLinkage::Public would not work for shared functions, because it could
+    // result in duplicate-symbol linker errors.
+    F->setLinkage(SILLinkage::PublicNonABI);
+  } else {
+    F->setLinkage(SILLinkage::Public);
+  }
 }
 
 /// Select functions in the module which should be serialized.
diff --git a/lib/SILOptimizer/Mandatory/Differentiation.cpp b/lib/SILOptimizer/Mandatory/Differentiation.cpp
index cd219974ff80c..48b87082aa49d 100644
--- a/lib/SILOptimizer/Mandatory/Differentiation.cpp
+++ b/lib/SILOptimizer/Mandatory/Differentiation.cpp
@@ -1170,6 +1170,23 @@ SILValue DifferentiationTransformer::promoteToDifferentiableFunction(
           loc, derivativeFn,
           SILType::getPrimitiveObjectType(expectedDerivativeFnTy));
     }
+    // If derivative function value's type is not ABI-compatible with the
+    // expected derivative function type (i.e. parameter and result conventions
+    // do not match), perform reabstraction.
+    auto abiCompatibility = expectedDerivativeFnTy->isABICompatibleWith(
+        derivativeFn->getType().castTo<SILFunctionType>(), *dfi->getFunction());
+    if (!abiCompatibility.isCompatible()) {
+      SILOptFunctionBuilder fb(context.getTransform());
+      auto newDerivativeFn = reabstractFunction(
+          builder, fb, loc, derivativeFn, expectedDerivativeFnTy,
+          [](SubstitutionMap substMap) { return substMap; });
+      derivativeFn = newDerivativeFn;
+      assert(expectedDerivativeFnTy
+                 ->isABICompatibleWith(
+                     derivativeFn->getType().castTo<SILFunctionType>(),
+                     *dfi->getFunction())
+                 .isCompatible());
+    }
 
     derivativeFns.push_back(derivativeFn);
   }
diff --git a/lib/SILOptimizer/Mandatory/MandatoryInlining.cpp b/lib/SILOptimizer/Mandatory/MandatoryInlining.cpp
index 6af5002074429..c69f739cf3bb9 100644
--- a/lib/SILOptimizer/Mandatory/MandatoryInlining.cpp
+++ b/lib/SILOptimizer/Mandatory/MandatoryInlining.cpp
@@ -622,7 +622,7 @@ getCalleeFunction(SILFunction *F, FullApplySite AI, bool &IsThick,
   FullArgs.clear();
 
   // First grab our basic arguments from our apply.
-  for (const auto &Arg : AI.getArguments())
+  for (SILValue Arg : AI.getArguments())
     FullArgs.push_back(Arg);
 
   // Then grab a first approximation of our apply by stripping off all copy
diff --git a/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp b/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp
index 9b0ded1b091ed..7f5551a01686c 100644
--- a/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp
+++ b/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp
@@ -540,13 +540,15 @@ static SILValue emitCodeForConstantArray(ArrayRef<SILValue> elements,
   assert(arrayAllocateFun);
 
   SILFunction *arrayFinalizeFun = nullptr;
-  if (FuncDecl *arrayFinalizeDecl = astContext.getFinalizeUninitializedArray()) {
-    std::string finalizeMangledName =
-        SILDeclRef(arrayFinalizeDecl, SILDeclRef::Kind::Func).mangle();
-    arrayFinalizeFun =
-        module.findFunction(finalizeMangledName, SILLinkage::SharedExternal);
-    assert(arrayFinalizeFun);
-    module.linkFunction(arrayFinalizeFun);
+  if (numElements != 0) {
+    if (FuncDecl *arrayFinalizeDecl = astContext.getFinalizeUninitializedArray()) {
+      std::string finalizeMangledName =
+          SILDeclRef(arrayFinalizeDecl, SILDeclRef::Kind::Func).mangle();
+      arrayFinalizeFun =
+          module.findFunction(finalizeMangledName, SILLinkage::SharedExternal);
+      assert(arrayFinalizeFun);
+      module.linkFunction(arrayFinalizeFun);
+    }
   }
 
   // Call the _allocateUninitializedArray function with numElementsSIL. The
diff --git a/lib/SILOptimizer/PassManager/PassManager.cpp b/lib/SILOptimizer/PassManager/PassManager.cpp
index f5f995264ba9c..e6bee2886a953 100644
--- a/lib/SILOptimizer/PassManager/PassManager.cpp
+++ b/lib/SILOptimizer/PassManager/PassManager.cpp
@@ -87,6 +87,9 @@ llvm::cl::list<std::string>
     SILDisablePass("sil-disable-pass", llvm::cl::CommaSeparated,
                      llvm::cl::desc("Disable passes "
                                     "which contain a string from this list"));
+llvm::cl::list<std::string> SILDisablePassOnlyFun(
+    "sil-disable-pass-only-function", llvm::cl::CommaSeparated,
+    llvm::cl::desc("Apply -sil-disable-pass only on this function"));
 
 llvm::cl::list<std::string> SILVerifyBeforePass(
     "sil-verify-before-pass", llvm::cl::CommaSeparated,
@@ -204,7 +207,13 @@ static bool doPrintAfter(SILTransform *T, SILFunction *F, bool Default) {
   return Default;
 }
 
-static bool isDisabled(SILTransform *T) {
+static bool isDisabled(SILTransform *T, SILFunction *F = nullptr) {
+  if (!SILDisablePassOnlyFun.empty() && F &&
+      SILDisablePassOnlyFun.end() == std::find(SILDisablePassOnlyFun.begin(),
+                                               SILDisablePassOnlyFun.end(),
+                                               F->getName()))
+    return false;
+
   for (const std::string &NamePattern : SILDisablePass) {
     if (T->getTag().find(NamePattern) != StringRef::npos
         || T->getID().find(NamePattern) != StringRef::npos) {
@@ -395,7 +404,7 @@ void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {
     return;
   }
 
-  if (isDisabled(SFT)) {
+  if (isDisabled(SFT, F)) {
     if (SILPrintPassName)
       dumpPassInfo("(Disabled)", TransIdx, F);
     return;
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
index 8a5aa59e4d963..d2285a1620244 100644
--- a/lib/SILOptimizer/PassManager/PassPipeline.cpp
+++ b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -124,8 +124,6 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
   if (Options.shouldOptimize()) {
     P.addDestroyHoisting();
   }
-  if (!Options.StripOwnershipAfterSerialization)
-    P.addOwnershipModelEliminator();
   P.addMandatoryInlining();
   P.addMandatorySILLinker();
 
@@ -285,6 +283,9 @@ void addFunctionPasses(SILPassPipelinePlan &P,
   // splits up copy_addr.
   P.addCopyForwarding();
 
+  // Optimize copies from a temporary (an "l-value") to a destination.
+  P.addTempLValueOpt();
+
   // Split up opaque operations (copy_addr, retain_value, etc.).
   P.addLowerAggregateInstrs();
 
@@ -435,9 +436,14 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   // not blocked by any other passes' optimizations, so do it early.
   P.addDifferentiabilityWitnessDevirtualizer();
 
-  // Strip ownership from non-transparent functions.
-  if (P.getOptions().StripOwnershipAfterSerialization)
-    P.addNonTransparentFunctionOwnershipModelEliminator();
+  // Strip ownership from non-transparent functions when we are not compiling
+  // the stdlib module. When compiling the stdlib, we eliminate ownership on
+  // these functions later with a nromal call to
+  // P.addNonTransparentFunctionOwnershipModelEliminator().
+  //
+  // This is done so we can push ownership through the pass pipeline first for
+  // the stdlib and then everything else.
+  P.addNonStdlibNonTransparentFunctionOwnershipModelEliminator();
 
   // Start by linking in referenced functions from other modules.
   P.addPerformanceSILLinker();
@@ -447,6 +453,14 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   // is linked in from the stdlib.
   P.addTempRValueOpt();
 
+  // We earlier eliminated ownership if we are not compiling the stdlib. Now
+  // handle the stdlib functions.
+  P.addNonTransparentFunctionOwnershipModelEliminator();
+
+  // Needed to serialize static initializers of globals for cross-module
+  // optimization.
+  P.addGlobalOpt();
+
   // Add the outliner pass (Osize).
   P.addOutliner();
 
@@ -504,8 +518,7 @@ static void addSerializePipeline(SILPassPipelinePlan &P) {
   P.addSerializeSILPass();
 
   // Strip any transparent functions that still have ownership.
-  if (P.getOptions().StripOwnershipAfterSerialization)
-    P.addOwnershipModelEliminator();
+  P.addOwnershipModelEliminator();
 }
 
 static void addMidLevelFunctionPipeline(SILPassPipelinePlan &P) {
@@ -758,8 +771,7 @@ SILPassPipelinePlan::getOnonePassPipeline(const SILOptions &Options) {
   P.addSerializeSILPass();
 
   // Now strip any transparent functions that still have ownership.
-  if (Options.StripOwnershipAfterSerialization)
-    P.addOwnershipModelEliminator();
+  P.addOwnershipModelEliminator();
 
   // Finally perform some small transforms.
   P.startPipeline("Rest of Onone");
diff --git a/lib/SILOptimizer/SILCombiner/SILCombiner.h b/lib/SILOptimizer/SILCombiner/SILCombiner.h
index cfd8207d089fe..6630010e5b7ae 100644
--- a/lib/SILOptimizer/SILCombiner/SILCombiner.h
+++ b/lib/SILOptimizer/SILCombiner/SILCombiner.h
@@ -246,8 +246,11 @@ class SILCombiner :
   bool tryOptimizeKeypath(ApplyInst *AI);
   bool tryOptimizeInoutKeypath(BeginApplyInst *AI);
   bool tryOptimizeKeypathApplication(ApplyInst *AI, SILFunction *callee);
-  bool tryOptimizeKeypathKVCString(ApplyInst *AI, SILDeclRef callee);
-      
+  bool tryOptimizeKeypathOffsetOf(ApplyInst *AI, FuncDecl *calleeFn,
+                                  KeyPathInst *kp);
+  bool tryOptimizeKeypathKVCString(ApplyInst *AI, FuncDecl *calleeFn,
+                                  KeyPathInst *kp);
+
   // Optimize concatenation of string literals.
   // Constant-fold concatenation of string literals known at compile-time.
   SILInstruction *optimizeConcatenationOfStringLiterals(ApplyInst *AI);
diff --git a/lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp b/lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
index 67090d1886a97..e71bba15b5f6c 100644
--- a/lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
+++ b/lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
@@ -271,6 +271,130 @@ bool SILCombiner::tryOptimizeKeypathApplication(ApplyInst *AI,
   return true;
 }
 
+/// Replaces a call of the getter of AnyKeyPath._storedInlineOffset with a
+/// "constant" offset, in case of a keypath literal.
+///
+/// "Constant" offset means a series of struct_element_addr and
+/// tuple_element_addr instructions with a 0-pointer as base address.
+/// These instructions can then be lowered to "real" constants in IRGen for
+/// concrete types, or to metatype offset lookups for generic or resilient types.
+///
+/// Replaces:
+///   %kp = keypath ...
+///   %offset = apply %_storedInlineOffset_method(%kp)
+/// with:
+///   %zero = integer_literal $Builtin.Word, 0
+///   %null_ptr = unchecked_trivial_bit_cast %zero to $Builtin.RawPointer
+///   %null_addr = pointer_to_address %null_ptr
+///   %projected_addr = struct_element_addr %null_addr
+///    ... // other address projections
+///   %offset_ptr = address_to_pointer %projected_addr
+///   %offset_builtin_int = unchecked_trivial_bit_cast %offset_ptr
+///   %offset_int = struct $Int (%offset_builtin_int)
+///   %offset = enum $Optional<Int>, #Optional.some!enumelt, %offset_int
+bool SILCombiner::tryOptimizeKeypathOffsetOf(ApplyInst *AI,
+                                             FuncDecl *calleeFn,
+                                             KeyPathInst *kp) {
+  auto *accessor = dyn_cast<AccessorDecl>(calleeFn);
+  if (!accessor || !accessor->isGetter())
+    return false;
+
+  AbstractStorageDecl *storage = accessor->getStorage();
+  DeclName name = storage->getName();
+  if (!name.isSimpleName() ||
+      (name.getBaseIdentifier().str() != "_storedInlineOffset"))
+    return false;
+
+  KeyPathPattern *pattern = kp->getPattern();
+  SubstitutionMap patternSubs = kp->getSubstitutions();
+  CanType rootTy = pattern->getRootType().subst(patternSubs)->getCanonicalType();
+  CanType parentTy = rootTy;
+  
+  // First check if _storedInlineOffset would return an offset or nil. Basically
+  // only stored struct and tuple elements produce an offset. Everything else
+  // (e.g. computed properties, class properties) result in nil.
+  bool hasOffset = true;
+  for (const KeyPathPatternComponent &component : pattern->getComponents()) {
+    switch (component.getKind()) {
+    case KeyPathPatternComponent::Kind::StoredProperty: {
+
+      // Handle the special case of C tail-allocated arrays. IRGen would
+      // generate an undef offset for struct_element_addr of C tail-allocated
+      // arrays.
+      VarDecl *propDecl = component.getStoredPropertyDecl();
+      if (propDecl->hasClangNode() && propDecl->getType()->isVoid())
+        return false;
+
+      if (!parentTy.getStructOrBoundGenericStruct())
+        hasOffset = false;
+      break;
+    }
+    case KeyPathPatternComponent::Kind::TupleElement:
+      break;
+    case KeyPathPatternComponent::Kind::GettableProperty:
+    case KeyPathPatternComponent::Kind::SettableProperty:
+      // We cannot predict the offset of fields in resilient types, because it's
+      // unknown if a resilient field is a computed or stored property.
+      if (component.getExternalDecl())
+        return false;
+      hasOffset = false;
+      break;
+    case KeyPathPatternComponent::Kind::OptionalChain:
+    case KeyPathPatternComponent::Kind::OptionalForce:
+    case KeyPathPatternComponent::Kind::OptionalWrap:
+      hasOffset = false;
+      break;
+    }
+    parentTy = component.getComponentType();
+  }
+
+  SILLocation loc = AI->getLoc();
+  SILValue result;
+
+  if (hasOffset) {
+    SILType rootAddrTy = SILType::getPrimitiveAddressType(rootTy);
+    SILValue rootAddr = Builder.createBaseAddrForOffset(loc, rootAddrTy);
+
+    auto projector = KeyPathProjector::create(kp, rootAddr, loc, Builder);
+    if (!projector)
+      return false;
+
+    // Create the address projections of the keypath.
+    SILType ptrType = SILType::getRawPointerType(Builder.getASTContext());
+    SILValue offsetPtr;
+    projector->project(KeyPathProjector::AccessType::Get, [&](SILValue addr) {
+      offsetPtr = Builder.createAddressToPointer(loc, addr, ptrType);
+    });
+
+    // The result of the _storedInlineOffset call should be Optional<Int>. If
+    // not, something is wrong with the stdlib. Anyway, if it's not like we
+    // expect, bail.
+    SILType intType = AI->getType().getOptionalObjectType();
+    if (!intType)
+      return false;
+    StructDecl *intDecl = intType.getStructOrBoundGenericStruct();
+    if (!intDecl || intDecl->getStoredProperties().size() != 1)
+      return false;
+    VarDecl *member = intDecl->getStoredProperties()[0];
+    CanType builtinIntTy = member->getType()->getCanonicalType();
+    if (!isa<BuiltinIntegerType>(builtinIntTy))
+      return false;
+
+    // Convert the projected address back to an optional integer.
+    SILValue offset = Builder.createUncheckedBitCast(loc, offsetPtr,
+                                SILType::getPrimitiveObjectType(builtinIntTy));
+    SILValue offsetInt = Builder.createStruct(loc, intType, { offset });
+    result = Builder.createOptionalSome(loc, offsetInt, AI->getType());
+  } else {
+    // The keypath has no offset.
+    result = Builder.createOptionalNone(loc, AI->getType());
+  }
+  AI->replaceAllUsesWith(result);
+  eraseInstFromFunction(*AI);
+  ++NumOptimizedKeypaths;
+  return true;
+}
+
 /// Try to optimize a keypath KVC string access on a literal key path.
 ///
 /// Replace:
@@ -279,17 +403,8 @@ bool SILCombiner::tryOptimizeKeypathApplication(ApplyInst *AI,
 /// With:
 ///   %string = string_literal "blah"
 bool SILCombiner::tryOptimizeKeypathKVCString(ApplyInst *AI,
-                                              SILDeclRef callee) {
-  if (AI->getNumArguments() != 1) {
-    return false;
-  }
-  if (!callee.hasDecl()) {
-    return false;
-  }
-  auto calleeFn = dyn_cast<FuncDecl>(callee.getDecl());
-  if (!calleeFn)
-    return false;
-  
+                                              FuncDecl *calleeFn,
+                                              KeyPathInst *kp) {
   if (!calleeFn->getAttrs()
         .hasSemanticsAttr(semantics::KEYPATH_KVC_KEY_PATH_STRING))
     return false;
@@ -300,11 +415,6 @@ bool SILCombiner::tryOptimizeKeypathKVCString(ApplyInst *AI,
   if (!objTy || objTy.getStructOrBoundGenericStruct() != C.getStringDecl())
     return false;
   
-  KeyPathInst *kp
-    = KeyPathProjector::getLiteralKeyPath(AI->getArgument(0));
-  if (!kp || !kp->hasPattern())
-    return false;
-  
   auto objcString = kp->getPattern()->getObjCString();
   
   SILValue literalValue;
@@ -357,10 +467,33 @@ bool SILCombiner::tryOptimizeKeypath(ApplyInst *AI) {
     return tryOptimizeKeypathApplication(AI, callee);
   }
   
-  if (auto method = dyn_cast<ClassMethodInst>(AI->getCallee())) {
-    return tryOptimizeKeypathKVCString(AI, method->getMember());
+  // Try optimize keypath method calls.
+  auto *methodInst = dyn_cast<ClassMethodInst>(AI->getCallee());
+  if (!methodInst)
+    return false;
+  
+  if (AI->getNumArguments() != 1) {
+    return false;
+  }
+
+  SILDeclRef callee = methodInst->getMember();
+  if (!callee.hasDecl()) {
+    return false;
   }
+  auto *calleeFn = dyn_cast<FuncDecl>(callee.getDecl());
+  if (!calleeFn)
+    return false;
+
+  KeyPathInst *kp = KeyPathProjector::getLiteralKeyPath(AI->getArgument(0));
+  if (!kp || !kp->hasPattern())
+    return false;
   
+  if (tryOptimizeKeypathOffsetOf(AI, calleeFn, kp))
+    return true;
+
+  if (tryOptimizeKeypathKVCString(AI, calleeFn, kp))
+    return true;
+
   return false;
 }
 
diff --git a/lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp b/lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
index 01c9237526742..e476210f9d48c 100644
--- a/lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
+++ b/lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
@@ -26,6 +26,7 @@
 #include "swift/SILOptimizer/Utils/CFGOptUtils.h"
 #include "swift/SILOptimizer/Utils/Devirtualize.h"
 #include "swift/SILOptimizer/Utils/InstOptUtils.h"
+#include "swift/SILOptimizer/Utils/BasicBlockOptUtils.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
@@ -807,6 +808,31 @@ static bool isZeroLoadFromEmptyCollection(LoadInst *LI) {
   }
 }
 
+static SingleValueInstruction *getValueFromStaticLet(SILValue v) {
+  if (auto *globalAddr = dyn_cast<GlobalAddrInst>(v)) {
+    SILGlobalVariable *global = globalAddr->getReferencedGlobal();
+    if (!global->isLet())
+      return nullptr;
+    return dyn_cast_or_null<SingleValueInstruction>(
+             global->getStaticInitializerValue());
+  }
+  if (auto *seai = dyn_cast<StructElementAddrInst>(v)) {
+    auto *structVal = getValueFromStaticLet(seai->getOperand());
+    if (!structVal)
+      return nullptr;
+    return cast<SingleValueInstruction>(
+      cast<StructInst>(structVal)->getOperandForField(seai->getField())->get());
+  }
+  if (auto *teai = dyn_cast<TupleElementAddrInst>(v)) {
+    auto *tupleVal = getValueFromStaticLet(teai->getOperand());
+    if (!tupleVal)
+      return nullptr;
+    return cast<SingleValueInstruction>(
+      cast<TupleInst>(tupleVal)->getElement(teai->getFieldNo()));
+  }
+  return nullptr;
+}
+
 SILInstruction *SILCombiner::visitLoadInst(LoadInst *LI) {
   if (LI->getFunction()->hasOwnership())
     return nullptr;
@@ -833,6 +859,15 @@ SILInstruction *SILCombiner::visitLoadInst(LoadInst *LI) {
   if (isZeroLoadFromEmptyCollection(LI))
     return Builder.createIntegerLiteral(LI->getLoc(), LI->getType(), 0);
 
+  // Propagate a value from a static "let" global variable.
+  // This optimization is also done by GlobalOpt, but not with de-serialized
+  // globals, which can occur with cross-module optimization.
+  if (SingleValueInstruction *initVal = getValueFromStaticLet(LI->getOperand())) {
+    StaticInitCloner cloner(LI);
+    cloner.add(initVal);
+    return cloner.clone(initVal);
+  }
+
   return nullptr;
 }
 
diff --git a/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp b/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp
index 8b35bfbc95a6d..9cde36a2239f4 100644
--- a/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp
+++ b/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp
@@ -19,6 +19,7 @@
 #include "swift/SIL/SILCloner.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
+#include "swift/SILOptimizer/Utils/InstOptUtils.h"
 #include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
 #include "swift/SILOptimizer/Utils/SpecializationMangler.h"
 #include "swift/SILOptimizer/Utils/StackNesting.h"
@@ -28,12 +29,21 @@
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 using namespace swift;
 
 STATISTIC(NumStackPromoted, "Number of alloc_box's promoted to the stack");
 
-//===----------------------------------------------------------------------===//
+// MaxLocalApplyRecurDepth limits the recursive analysis depth while
+// checking if a box can be promoted to stack. This is currently set to 4, a
+// limit assumed to be sufficient to handle typical call chain of local
+// functions through which a box can be passed.
+static llvm::cl::opt<unsigned> MaxLocalApplyRecurDepth(
+    "max-local-apply-recur-depth", llvm::cl::init(4),
+    llvm::cl::desc("Max recursive depth for analyzing local functions"));
+
+//===-----------------------------------------------------------------------===//
 //                 SIL Utilities for alloc_box Promotion
 //===----------------------------------------------------------------------===//
 
@@ -274,38 +284,76 @@ static bool partialApplyEscapes(SILValue V, bool examineApply) {
   return false;
 }
 
-static SILInstruction *findUnexpectedBoxUse(SILValue Box,
-                                            bool examinePartialApply,
-                                            bool inAppliedFunction,
-                                            SmallVectorImpl<Operand *> &);
+static SILInstruction *recursivelyFindBoxOperandsPromotableToAddress(
+    SILValue Box, bool inAppliedFunction, SmallVectorImpl<Operand *> &,
+    SmallPtrSetImpl<SILFunction *> &, unsigned CurrentRecurDepth);
 
-/// checkPartialApplyBody - Check the body of a partial apply to see
+/// checkLocalApplyBody - Check the body of an apply's callee to see
 /// if the box pointer argument passed to it has uses that would
 /// disqualify it from being promoted to a stack location.  Return
-/// true if this partial apply will not block our promoting the box.
-static bool checkPartialApplyBody(Operand *O) {
+/// true if this apply will not block our promoting the box.
+static bool checkLocalApplyBody(Operand *O,
+                                SmallVectorImpl<Operand *> &PromotedOperands,
+                                SmallPtrSetImpl<SILFunction *> &VisitedCallees,
+                                unsigned CurrentRecurDepth) {
   SILFunction *F = ApplySite(O->getUser()).getReferencedFunctionOrNull();
   // If we cannot examine the function body, assume the worst.
   if (!F || F->empty())
     return false;
 
-  // We don't actually use these because we're not recursively
-  // rewriting the partial applies we find.
-  SmallVector<Operand *, 1> PromotedOperands;
+  // Since this function can be called recursively while analyzing the same box,
+  // mark the callee as visited, so that we don't end up in a recursive cycle.
+  auto iter = VisitedCallees.insert(F);
+  if (!iter.second)
+    return false;
+
   auto calleeArg = F->getArgument(ApplySite(O->getUser()).getCalleeArgIndex(*O));
-  return !findUnexpectedBoxUse(calleeArg, /* examinePartialApply = */ false,
-                               /* inAppliedFunction = */ true,
-                               PromotedOperands);
+  auto res = !recursivelyFindBoxOperandsPromotableToAddress(
+      calleeArg,
+      /* inAppliedFunction = */ true, PromotedOperands, VisitedCallees,
+      CurrentRecurDepth + 1);
+  return res;
+}
+
+// Returns true if a callee is eligible to be cloned and rewritten for
+// AllocBoxToStack opt. We don't want to increase code size, so this is
+// restricted only for private local functions currently.
+static bool isOptimizableApplySite(ApplySite Apply) {
+  auto callee = Apply.getReferencedFunctionOrNull();
+  if (!callee) {
+    return false;
+  }
+
+  // Callee should be optimizable.
+  if (!callee->shouldOptimize())
+    return false;
+
+  // External function definitions.
+  if (!callee->isDefinition())
+    return false;
+
+  // Do not optimize always_inlinable functions.
+  if (callee->getInlineStrategy() == Inline_t::AlwaysInline)
+    return false;
+
+  if (callee->getLinkage() != SILLinkage::Private)
+    return false;
+
+  return true;
 }
 
 /// Validate that the uses of a pointer to a box do not eliminate it from
-/// consideration for promotion to a stack element. Optionally examine the body
-/// of partial_apply to see if there is an unexpected use inside.  Return the
-/// instruction with the unexpected use if we find one.
-static SILInstruction *
-findUnexpectedBoxUse(SILValue Box, bool examinePartialApply,
-                     bool inAppliedFunction,
-                     SmallVectorImpl<Operand *> &PromotedOperands) {
+/// consideration for promotion to a stack element. Return the instruction with
+/// the unexpected use if we find one.
+/// If a box has ApplySite users, we recursively examine the callees to check
+/// for unexpected use of the box argument. If all the callees through which the
+/// box is passed don't have any unexpected uses, `PromotedOperands` will be
+/// populated with the box arguments in DFS order.
+static SILInstruction *recursivelyFindBoxOperandsPromotableToAddress(
+    SILValue Box, bool inAppliedFunction,
+    SmallVectorImpl<Operand *> &PromotedOperands,
+    SmallPtrSetImpl<SILFunction *> &VisitedCallees,
+    unsigned CurrentRecurDepth = 0) {
   assert((Box->getType().is<SILBoxType>()
           || Box->getType()
                  == SILType::getNativeObjectType(Box->getType().getASTContext()))
@@ -337,15 +385,32 @@ findUnexpectedBoxUse(SILValue Box, bool examinePartialApply,
       continue;
     }
 
-    // For partial_apply, if we've been asked to examine the body, the
-    // uses of the argument are okay there, and the partial_apply
-    // itself cannot escape, then everything is fine.
-    if (auto *PAI = dyn_cast<PartialApplyInst>(User))
-      if (examinePartialApply && checkPartialApplyBody(Op) &&
-          !partialApplyEscapes(PAI, /* examineApply = */ true)) {
-        LocalPromotedOperands.push_back(Op);
-        continue;
+    if (auto Apply = ApplySite::isa(User)) {
+      if (CurrentRecurDepth > MaxLocalApplyRecurDepth) {
+        return User;
+      }
+      switch (Apply.getKind()) {
+      case ApplySiteKind::PartialApplyInst: {
+        if (checkLocalApplyBody(Op, LocalPromotedOperands, VisitedCallees,
+                                CurrentRecurDepth) &&
+            !partialApplyEscapes(cast<PartialApplyInst>(User),
+                                 /* examineApply = */ true)) {
+          LocalPromotedOperands.push_back(Op);
+          continue;
+        }
+        break;
       }
+      case ApplySiteKind::ApplyInst:
+      case ApplySiteKind::BeginApplyInst:
+      case ApplySiteKind::TryApplyInst:
+        if (isOptimizableApplySite(Apply) &&
+            checkLocalApplyBody(Op, LocalPromotedOperands, VisitedCallees,
+                                CurrentRecurDepth)) {
+          LocalPromotedOperands.push_back(Op);
+          continue;
+        }
+      }
+    }
 
     return User;
   }
@@ -364,12 +429,13 @@ static InFlightDiagnostic diagnose(ASTContext &Context, SourceLoc loc,
 /// canPromoteAllocBox - Can we promote this alloc_box to an alloc_stack?
 static bool canPromoteAllocBox(AllocBoxInst *ABI,
                                SmallVectorImpl<Operand *> &PromotedOperands) {
+  SmallPtrSet<SILFunction *, 8> VisitedCallees;
   // Scan all of the uses of the address of the box to see if any
   // disqualifies the box from being promoted to the stack.
-  if (auto *User = findUnexpectedBoxUse(ABI,
-                                        /* examinePartialApply = */ true,
-                                        /* inAppliedFunction = */ false,
-                                        PromotedOperands)) {
+  if (auto *User = recursivelyFindBoxOperandsPromotableToAddress(
+          ABI,
+          /* inAppliedFunction = */ false, PromotedOperands, VisitedCallees,
+          /* CurrentRecurDepth = */ 0)) {
     (void)User;
     // Otherwise, we have an unexpected use.
     LLVM_DEBUG(llvm::dbgs() << "*** Failed to promote alloc_box in @"
@@ -557,6 +623,9 @@ class PromotedParamCloner : public SILClonerWithScopes<PromotedParamCloner> {
   void visitStrongRetainInst(StrongRetainInst *Inst);
   void visitCopyValueInst(CopyValueInst *Inst);
   void visitProjectBoxInst(ProjectBoxInst *Inst);
+  void checkNoPromotedBoxInApply(ApplySite Apply);
+#define APPLYSITE_INST(Name, Parent) void visit##Name(Name *Inst);
+#include "swift/SIL/SILNodes.def"
 };
 } // end anonymous namespace
 
@@ -633,11 +702,12 @@ SILFunction *PromotedParamCloner::initCloned(SILOptFunctionBuilder &FuncBuilder,
          && "SILFunction missing DebugScope");
   assert(!Orig->isGlobalInit() && "Global initializer cannot be cloned");
   auto *Fn = FuncBuilder.createFunction(
-      SILLinkage::Shared, ClonedName, ClonedTy, Orig->getGenericEnvironment(),
-      Orig->getLocation(), Orig->isBare(), Orig->isTransparent(), Serialized,
-      IsNotDynamic, Orig->getEntryCount(), Orig->isThunk(),
-      Orig->getClassSubclassScope(), Orig->getInlineStrategy(),
-      Orig->getEffectsKind(), Orig, Orig->getDebugScope());
+      swift::getSpecializedLinkage(Orig, Orig->getLinkage()), ClonedName,
+      ClonedTy, Orig->getGenericEnvironment(), Orig->getLocation(),
+      Orig->isBare(), Orig->isTransparent(), Serialized, IsNotDynamic,
+      Orig->getEntryCount(), Orig->isThunk(), Orig->getClassSubclassScope(),
+      Orig->getInlineStrategy(), Orig->getEffectsKind(), Orig,
+      Orig->getDebugScope());
   for (auto &Attr : Orig->getSemanticsAttrs()) {
     Fn->addSemanticsAttr(Attr);
   }
@@ -678,9 +748,12 @@ PromotedParamCloner::populateCloned() {
       OrigPromotedParameters.insert(*I);
 
       NewPromotedArgs[ArgNo] = promotedArg;
-
-      // All uses of the promoted box should either be projections, which are
-      // folded when visited, or copy/destroy operations which are ignored.
+      // We only promote boxes used in apply or projections or copy/destroy
+      // value operations.
+      // We should never see an apply user of the box, because we rewrite the
+      // applies and specialize the callees in dfs order.
+      // Projection users are folded when visited and copy/destroy operations
+      // are ignored.
       entryArgs.push_back(SILValue());
     } else {
       // Create a new argument which copies the original argument.
@@ -760,34 +833,63 @@ void PromotedParamCloner::visitProjectBoxInst(ProjectBoxInst *Inst) {
   SILCloner<PromotedParamCloner>::visitProjectBoxInst(Inst);
 }
 
-/// Specialize a partial_apply by promoting the parameters indicated by
+// While cloning during specialization, make sure apply instructions do not have
+// box arguments that need to be promoted.
+// This is an assertion in debug builds only. The reason why this should never
+// be true is that we have cloned our callees in DFS order meaning that any of
+// our callees that had a promotable box will have already have been promoted
+// away by the time this runs.
+void PromotedParamCloner::checkNoPromotedBoxInApply(ApplySite Apply) {
+#ifndef NDEBUG
+  for (auto &O : Apply.getArgumentOperands()) {
+    assert(OrigPromotedParameters.count(O.get()) == 0);
+  }
+#endif
+}
+void PromotedParamCloner::visitApplyInst(ApplyInst *Inst) {
+  checkNoPromotedBoxInApply(Inst);
+  SILCloner<PromotedParamCloner>::visitApplyInst(Inst);
+}
+void PromotedParamCloner::visitBeginApplyInst(BeginApplyInst *Inst) {
+  checkNoPromotedBoxInApply(Inst);
+  SILCloner<PromotedParamCloner>::visitBeginApplyInst(Inst);
+}
+void PromotedParamCloner::visitPartialApplyInst(PartialApplyInst *Inst) {
+  checkNoPromotedBoxInApply(Inst);
+  SILCloner<PromotedParamCloner>::visitPartialApplyInst(Inst);
+}
+void PromotedParamCloner::visitTryApplyInst(TryApplyInst *Inst) {
+  checkNoPromotedBoxInApply(Inst);
+  SILCloner<PromotedParamCloner>::visitTryApplyInst(Inst);
+}
+
+/// Specialize ApplySite by promoting the parameters indicated by
 /// indices. We expect these parameters to be replaced by stack address
 /// references.
-static PartialApplyInst *
-specializePartialApply(SILOptFunctionBuilder &FuncBuilder,
-                       PartialApplyInst *PartialApply,
-                       ArgIndexList &PromotedCalleeArgIndices,
-                       AllocBoxToStackState &pass) {
-  auto *FRI = cast<FunctionRefInst>(PartialApply->getCallee());
-  assert(FRI && "Expected a direct partial_apply!");
+static SILInstruction *
+specializeApplySite(SILOptFunctionBuilder &FuncBuilder, ApplySite Apply,
+                    ArgIndexList &PromotedCalleeArgIndices,
+                    AllocBoxToStackState &pass) {
+  auto *FRI = cast<FunctionRefInst>(Apply.getCallee());
+  assert(FRI && "Expected a direct ApplySite");
   auto *F = FRI->getReferencedFunctionOrNull();
   assert(F && "Expected a referenced function!");
 
   IsSerialized_t Serialized = IsNotSerialized;
-  if (PartialApply->getFunction()->isSerialized())
+  if (Apply.getFunction()->isSerialized())
     Serialized = IsSerializable;
 
   std::string ClonedName =
     getClonedName(F, Serialized, PromotedCalleeArgIndices);
 
-  auto &M = PartialApply->getModule();
+  auto &M = Apply.getModule();
 
   SILFunction *ClonedFn;
   if (auto *PrevFn = M.lookUpFunction(ClonedName)) {
     assert(PrevFn->isSerialized() == Serialized);
     ClonedFn = PrevFn;
   } else {
-    // Clone the function the existing partial_apply references.
+    // Clone the function the existing ApplySite references.
     PromotedParamCloner Cloner(FuncBuilder, F, Serialized,
                                PromotedCalleeArgIndices,
                                ClonedName);
@@ -796,95 +898,133 @@ specializePartialApply(SILOptFunctionBuilder &FuncBuilder,
     pass.T->addFunctionToPassManagerWorklist(ClonedFn, F);
   }
 
-  // Now create the new partial_apply using the cloned function.
+  // Now create the new ApplySite using the cloned function.
   SmallVector<SILValue, 16> Args;
 
   ValueLifetimeAnalysis::Frontier PAFrontier;
 
   // Promote the arguments that need promotion.
-  for (auto &O : PartialApply->getArgumentOperands()) {
+  for (auto &O : Apply.getArgumentOperands()) {
     auto CalleeArgIndex = ApplySite(O.getUser()).getCalleeArgIndex(O);
     if (!count(PromotedCalleeArgIndices, CalleeArgIndex)) {
       Args.push_back(O.get());
       continue;
     }
 
-    // If this argument is promoted, it is a box that we're turning into an
-    // address because we've proven we can keep this value on the stack. The
-    // partial_apply had ownership of this box so we must now release it
-    // explicitly when the partial_apply is released.
-    auto *Box = cast<SingleValueInstruction>(O.get());
-    assert((isa<AllocBoxInst>(Box) || isa<CopyValueInst>(Box)) &&
-           "Expected either an alloc box or a copy of an alloc box");
-    SILBuilder B(Box);
-    Args.push_back(B.createProjectBox(Box->getLoc(), Box, 0));
-
-    if (PAFrontier.empty()) {
-      ValueLifetimeAnalysis VLA(PartialApply);
-      pass.CFGChanged |= !VLA.computeFrontier(
-          PAFrontier, ValueLifetimeAnalysis::AllowToModifyCFG);
-      assert(!PAFrontier.empty() && "partial_apply must have at least one use "
-                                    "to release the returned function");
-    }
+    auto Box = O.get();
+    assert(((isa<SingleValueInstruction>(Box) && isa<AllocBoxInst>(Box) ||
+             isa<CopyValueInst>(Box)) ||
+            isa<SILFunctionArgument>(Box)) &&
+           "Expected either an alloc box or a copy of an alloc box or a "
+           "function argument");
+    auto InsertPt = Box->getDefiningInsertionPoint();
+    assert(InsertPt);
+    SILBuilderWithScope B(InsertPt);
+    Args.push_back(B.createProjectBox(Box.getLoc(), Box, 0));
+
+    // For a partial_apply, if this argument is promoted, it is a box that we're
+    // turning into an address because we've proven we can keep this value on
+    // the stack. The partial_apply had ownership of this box so we must now
+    // release it explicitly when the partial_apply is released.
+    if (Apply.getKind() == ApplySiteKind::PartialApplyInst) {
+      if (PAFrontier.empty()) {
+        ValueLifetimeAnalysis VLA(cast<PartialApplyInst>(Apply));
+        pass.CFGChanged |= !VLA.computeFrontier(
+            PAFrontier, ValueLifetimeAnalysis::AllowToModifyCFG);
+        assert(!PAFrontier.empty() &&
+               "partial_apply must have at least one use "
+               "to release the returned function");
+      }
 
-    // Insert destroys of the box at each point where the partial_apply becomes
-    // dead.
-    for (SILInstruction *FrontierInst : PAFrontier) {
-      SILBuilderWithScope Builder(FrontierInst);
-      Builder.createDestroyValue(PartialApply->getLoc(), Box);
+      // Insert destroys of the box at each point where the partial_apply
+      // becomes dead.
+      for (SILInstruction *FrontierInst : PAFrontier) {
+        SILBuilderWithScope Builder(FrontierInst);
+        Builder.createDestroyValue(Apply.getLoc(), Box);
+      }
     }
   }
 
-  SILBuilderWithScope Builder(PartialApply);
-
-  // Build the function_ref and partial_apply.
-  SILValue FunctionRef = Builder.createFunctionRef(PartialApply->getLoc(),
-                                                   ClonedFn);
-  return Builder.createPartialApply(
-      PartialApply->getLoc(), FunctionRef, PartialApply->getSubstitutionMap(),
-      Args,
-      PartialApply->getType().getAs<SILFunctionType>()->getCalleeConvention());
+  auto ApplyInst = Apply.getInstruction();
+  SILBuilderWithScope Builder(ApplyInst);
+
+  // Build the function_ref and ApplySite.
+  SILValue FunctionRef = Builder.createFunctionRef(Apply.getLoc(), ClonedFn);
+  switch (Apply.getKind()) {
+  case ApplySiteKind::PartialApplyInst: {
+    auto *PAI = cast<PartialApplyInst>(ApplyInst);
+    return Builder.createPartialApply(
+        Apply.getLoc(), FunctionRef, Apply.getSubstitutionMap(), Args,
+        PAI->getType().getAs<SILFunctionType>()->getCalleeConvention(),
+        PAI->isOnStack(),
+        GenericSpecializationInformation::create(ApplyInst, Builder));
+  }
+  case ApplySiteKind::ApplyInst:
+    return Builder.createApply(
+        Apply.getLoc(), FunctionRef, Apply.getSubstitutionMap(), Args,
+        GenericSpecializationInformation::create(ApplyInst, Builder));
+  case ApplySiteKind::BeginApplyInst:
+    return Builder.createBeginApply(
+        Apply.getLoc(), FunctionRef, Apply.getSubstitutionMap(), Args,
+        GenericSpecializationInformation::create(ApplyInst, Builder));
+  case ApplySiteKind::TryApplyInst: {
+    auto TAI = cast<TryApplyInst>(Apply);
+    return Builder.createTryApply(
+        Apply.getLoc(), FunctionRef, Apply.getSubstitutionMap(), Args,
+        TAI->getNormalBB(), TAI->getErrorBB(),
+        GenericSpecializationInformation::create(ApplyInst, Builder));
+  }
+  }
 }
 
-static void rewritePartialApplies(AllocBoxToStackState &pass) {
-  llvm::DenseMap<PartialApplyInst *, ArgIndexList> IndexMap;
+static void rewriteApplySites(AllocBoxToStackState &pass) {
+  llvm::DenseMap<ApplySite, ArgIndexList> IndexMap;
+  llvm::SmallVector<ApplySite, 8> AppliesToSpecialize;
   ArgIndexList Indices;
 
-  // Build a map from partial_apply to the indices of the operands
+  // Build a map from the ApplySite to the indices of the operands
   // that will be promoted in our rewritten version.
   for (auto *O : pass.PromotedOperands) {
-    auto CalleeArgIndexNumber = ApplySite(O->getUser()).getCalleeArgIndex(*O);
+    auto User = O->getUser();
+    auto Apply = ApplySite(User);
+
+    auto CalleeArgIndexNumber = Apply.getCalleeArgIndex(*O);
 
     Indices.clear();
     Indices.push_back(CalleeArgIndexNumber);
 
-    auto *PartialApply = cast<PartialApplyInst>(O->getUser());
-    llvm::DenseMap<PartialApplyInst *, ArgIndexList>::iterator It;
-    bool Inserted;
-    std::tie(It, Inserted) = IndexMap.insert(std::make_pair(PartialApply,
-                                                            Indices));
-    if (!Inserted)
-      It->second.push_back(CalleeArgIndexNumber);
+    auto iterAndSuccess = IndexMap.try_emplace(Apply, Indices);
+    // AllocBoxStack opt promotes boxes passed to a chain of applies when it is
+    // safe to do so. All such applies have to be specialized to take pointer
+    // arguments instead of box arguments. This has to be done in dfs order.
+    // Since PromotedOperands is already populated in dfs order by
+    // `recursivelyFindBoxOperandsPromotableToAddress`. Build
+    // `AppliesToSpecialize` in the same order.
+    if (iterAndSuccess.second) {
+      AppliesToSpecialize.push_back(Apply);
+    } else {
+      iterAndSuccess.first->second.push_back(CalleeArgIndexNumber);
+    }
   }
 
-  // Clone the referenced function of each partial_apply, removing the
+  // Clone the referenced function of each ApplySite, removing the
   // operands that we will not need, and remove the existing
-  // partial_apply.
+  // ApplySite.
   SILOptFunctionBuilder FuncBuilder(*pass.T);
-  for (auto &It : IndexMap) {
-    auto *PartialApply = It.first;
-    auto &Indices = It.second;
+  for (auto &Apply : AppliesToSpecialize) {
+    auto It = IndexMap.find(Apply);
+    assert(It != IndexMap.end());
+    auto &Indices = It->second;
 
     // Sort the indices and unique them.
-    std::sort(Indices.begin(), Indices.end());
-    Indices.erase(std::unique(Indices.begin(), Indices.end()), Indices.end());
+    sortUnique(Indices);
 
-    PartialApplyInst *Replacement =
-      specializePartialApply(FuncBuilder, PartialApply, Indices, pass);
-    PartialApply->replaceAllUsesWith(Replacement);
+    auto *Replacement = specializeApplySite(FuncBuilder, Apply, Indices, pass);
+    assert(Apply.getKind() == ApplySite(Replacement).getKind());
+    Apply.getInstruction()->replaceAllUsesPairwiseWith(Replacement);
 
-    auto *FRI = cast<FunctionRefInst>(PartialApply->getCallee());
-    PartialApply->eraseFromParent();
+    auto *FRI = cast<FunctionRefInst>(Apply.getCallee());
+    Apply.getInstruction()->eraseFromParent();
 
     // TODO: Erase from module if there are no more uses.
     if (FRI->use_empty())
@@ -895,9 +1035,9 @@ static void rewritePartialApplies(AllocBoxToStackState &pass) {
 /// Clone closure bodies and rewrite partial applies. Returns the number of
 /// alloc_box allocations promoted.
 static unsigned rewritePromotedBoxes(AllocBoxToStackState &pass) {
-  // First we'll rewrite any partial applies that we can to remove the
-  // box container pointer from the operands.
-  rewritePartialApplies(pass);
+  // First we'll rewrite any ApplySite that we can to remove
+  // the box container pointer from the operands.
+  rewriteApplySites(pass);
 
   unsigned Count = 0;
   auto rend = pass.Promotable.rend();
diff --git a/lib/SILOptimizer/Transforms/CMakeLists.txt b/lib/SILOptimizer/Transforms/CMakeLists.txt
index f1e604be3aeb5..932a2e264e3a5 100644
--- a/lib/SILOptimizer/Transforms/CMakeLists.txt
+++ b/lib/SILOptimizer/Transforms/CMakeLists.txt
@@ -38,5 +38,6 @@ target_sources(swiftSILOptimizer PRIVATE
   Sink.cpp
   SpeculativeDevirtualizer.cpp
   StackPromotion.cpp
+  TempLValueOpt.cpp
   TempRValueElimination.cpp
   UnsafeGuaranteedPeephole.cpp)
diff --git a/lib/SILOptimizer/Transforms/CopyForwarding.cpp b/lib/SILOptimizer/Transforms/CopyForwarding.cpp
index 8d6a43a200bb0..f8f0af4665d40 100644
--- a/lib/SILOptimizer/Transforms/CopyForwarding.cpp
+++ b/lib/SILOptimizer/Transforms/CopyForwarding.cpp
@@ -322,6 +322,9 @@ namespace {
 /// This returns false and sets Oper to a valid operand if the instruction is a
 /// projection of the value at the given address. The assumption is that we
 /// cannot deinitialize memory via projections.
+///
+/// This returns true with Oper == nullptr for trivial stores (without a proper
+/// deinit).
 class AnalyzeForwardUse
     : public SILInstructionVisitor<AnalyzeForwardUse, bool> {
 public:
@@ -352,7 +355,10 @@ class AnalyzeForwardUse
     return true;
   }
   bool visitStoreInst(StoreInst *Store) {
-    llvm_unreachable("illegal reinitialization or store of an address");
+    // Trivial values may be stored prior to the next deinit. A store is an
+    // implicit "deinit" with no operand to replace.
+    assert(Store->getOperand(0)->getType().isTrivial(*Store->getFunction()));
+    return true;
   }
   bool visitDestroyAddrInst(DestroyAddrInst *UserInst) {
     Oper = &UserInst->getOperandRef();
@@ -1011,15 +1017,17 @@ bool CopyForwarding::forwardPropagateCopy() {
       continue;
 
     AnalyzeForwardUse AnalyzeUse(CopyDest);
-    bool seenDeinit = AnalyzeUse.visit(UserInst);
-    // If this use cannot be analyzed, then abort.
+    bool seenDeinitOrStore = AnalyzeUse.visit(UserInst);
+    if (AnalyzeUse.Oper)
+      ValueUses.push_back(AnalyzeUse.Oper);
+
+    // If this is a deinit or store, we're done searching.
+    if (seenDeinitOrStore)
+      break;
+
+    // If this non-deinit instruction wasn't fully analyzed, bail-out.
     if (!AnalyzeUse.Oper)
       return false;
-    // Otherwise record the operand.
-    ValueUses.push_back(AnalyzeUse.Oper);
-    // If this is a deinit, we're done searching.
-    if (seenDeinit)
-      break;
   }
   if (SI == SE)
     return false;
diff --git a/lib/SILOptimizer/Transforms/GenericSpecializer.cpp b/lib/SILOptimizer/Transforms/GenericSpecializer.cpp
index 60bb6377fe69c..cd54f6a7e5efb 100644
--- a/lib/SILOptimizer/Transforms/GenericSpecializer.cpp
+++ b/lib/SILOptimizer/Transforms/GenericSpecializer.cpp
@@ -28,6 +28,10 @@
 
 using namespace swift;
 
+// For testing during bring up.
+static llvm::cl::opt<bool> EnableGenericSpecializerWithOwnership(
+    "sil-generic-specializer-enable-ownership", llvm::cl::init(false));
+
 namespace {
 
 class GenericSpecializer : public SILFunctionTransform {
@@ -39,7 +43,7 @@ class GenericSpecializer : public SILFunctionTransform {
     SILFunction &F = *getFunction();
 
     // TODO: We should be able to handle ownership.
-    if (F.hasOwnership())
+    if (F.hasOwnership() && !EnableGenericSpecializerWithOwnership)
       return;
 
     LLVM_DEBUG(llvm::dbgs() << "***** GenericSpecializer on function:"
diff --git a/lib/SILOptimizer/Transforms/SemanticARCOpts.cpp b/lib/SILOptimizer/Transforms/SemanticARCOpts.cpp
index f9c713fbfd34e..a11f9d6de8653 100644
--- a/lib/SILOptimizer/Transforms/SemanticARCOpts.cpp
+++ b/lib/SILOptimizer/Transforms/SemanticARCOpts.cpp
@@ -505,63 +505,69 @@ void OwnershipLiveRange::insertEndBorrowsAtDestroys(
   }
 }
 
-void OwnershipLiveRange::convertOwnedGeneralForwardingUsesToGuaranteed() && {
-  while (!ownershipForwardingUses.empty()) {
-    auto *i = ownershipForwardingUses.back()->getUser();
-    ownershipForwardingUses = ownershipForwardingUses.drop_back();
-
-    // If this is a term inst, just convert all of its incoming values that are
-    // owned to be guaranteed.
-    if (auto *ti = dyn_cast<TermInst>(i)) {
-      for (auto &succ : ti->getSuccessors()) {
-        auto *succBlock = succ.getBB();
+static void convertInstructionOwnership(SILInstruction *i,
+                                        ValueOwnershipKind oldOwnership,
+                                        ValueOwnershipKind newOwnership) {
+  // If this is a term inst, just convert all of its incoming values that are
+  // owned to be guaranteed.
+  if (auto *ti = dyn_cast<TermInst>(i)) {
+    for (auto &succ : ti->getSuccessors()) {
+      auto *succBlock = succ.getBB();
 
-        // If we do not have any arguments, then continue.
-        if (succBlock->args_empty())
-          continue;
+      // If we do not have any arguments, then continue.
+      if (succBlock->args_empty())
+        continue;
 
-        for (auto *succArg : succBlock->getSILPhiArguments()) {
-          // If we have an any value, just continue.
-          if (succArg->getOwnershipKind() == ValueOwnershipKind::Owned) {
-            succArg->setOwnershipKind(ValueOwnershipKind::Guaranteed);
-          }
+      for (auto *succArg : succBlock->getSILPhiArguments()) {
+        // If we have an any value, just continue.
+        if (succArg->getOwnershipKind() == oldOwnership) {
+          succArg->setOwnershipKind(newOwnership);
         }
       }
-      continue;
     }
+    return;
+  }
 
-    assert(i->hasResults());
-    for (SILValue result : i->getResults()) {
-      if (auto *svi = dyn_cast<OwnershipForwardingSingleValueInst>(result)) {
-        if (svi->getOwnershipKind() == ValueOwnershipKind::Owned) {
-          svi->setOwnershipKind(ValueOwnershipKind::Guaranteed);
-        }
-        continue;
+  assert(i->hasResults());
+  for (SILValue result : i->getResults()) {
+    if (auto *svi = dyn_cast<OwnershipForwardingSingleValueInst>(result)) {
+      if (svi->getOwnershipKind() == oldOwnership) {
+        svi->setOwnershipKind(newOwnership);
       }
+      continue;
+    }
 
-      if (auto *ofci = dyn_cast<OwnershipForwardingConversionInst>(result)) {
-        if (ofci->getOwnershipKind() == ValueOwnershipKind::Owned) {
-          ofci->setOwnershipKind(ValueOwnershipKind::Guaranteed);
-        }
-        continue;
+    if (auto *ofci = dyn_cast<OwnershipForwardingConversionInst>(result)) {
+      if (ofci->getOwnershipKind() == oldOwnership) {
+        ofci->setOwnershipKind(newOwnership);
       }
+      continue;
+    }
 
-      if (auto *sei = dyn_cast<OwnershipForwardingSelectEnumInstBase>(result)) {
-        if (sei->getOwnershipKind() == ValueOwnershipKind::Owned) {
-          sei->setOwnershipKind(ValueOwnershipKind::Guaranteed);
-        }
-        continue;
+    if (auto *sei = dyn_cast<OwnershipForwardingSelectEnumInstBase>(result)) {
+      if (sei->getOwnershipKind() == oldOwnership) {
+        sei->setOwnershipKind(newOwnership);
       }
+      continue;
+    }
 
-      if (auto *mvir = dyn_cast<MultipleValueInstructionResult>(result)) {
-        if (mvir->getOwnershipKind() == ValueOwnershipKind::Owned) {
-          mvir->setOwnershipKind(ValueOwnershipKind::Guaranteed);
-        }
-        continue;
+    if (auto *mvir = dyn_cast<MultipleValueInstructionResult>(result)) {
+      if (mvir->getOwnershipKind() == oldOwnership) {
+        mvir->setOwnershipKind(newOwnership);
       }
-
-      llvm_unreachable("unhandled forwarding instruction?!");
+      continue;
     }
+
+    llvm_unreachable("unhandled forwarding instruction?!");
+  }
+}
+
+void OwnershipLiveRange::convertOwnedGeneralForwardingUsesToGuaranteed() && {
+  while (!ownershipForwardingUses.empty()) {
+    auto *i = ownershipForwardingUses.back()->getUser();
+    ownershipForwardingUses = ownershipForwardingUses.drop_back();
+    convertInstructionOwnership(i, ValueOwnershipKind::Owned,
+                                ValueOwnershipKind::Guaranteed);
   }
 }
 
diff --git a/lib/SILOptimizer/Transforms/TempLValueOpt.cpp b/lib/SILOptimizer/Transforms/TempLValueOpt.cpp
new file mode 100644
index 0000000000000..8511de4452e75
--- /dev/null
+++ b/lib/SILOptimizer/Transforms/TempLValueOpt.cpp
@@ -0,0 +1,299 @@
+//===--- TempLValueOpt.cpp - Optimize temporary l-values ------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This pass optimizes copies from a temporary (an "l-value") to a destination.
+//
+//===----------------------------------------------------------------------===//
+
+#define DEBUG_TYPE "cow-opts"
+#include "swift/SILOptimizer/PassManager/Transforms.h"
+#include "swift/SILOptimizer/Analysis/AliasAnalysis.h"
+#include "swift/SIL/SILFunction.h"
+#include "swift/SIL/SILBasicBlock.h"
+#include "swift/SIL/Projection.h"
+#include "swift/SIL/SILBuilder.h"
+#include "llvm/Support/Debug.h"
+
+using namespace swift;
+
+namespace {
+
+/// Optimizes copies from a temporary (an "l-value") to a destination.
+///
+/// \code
+///   %temp = alloc_stack $Ty
+///   instructions_which_store_to %temp
+///   copy_addr [take] %temp to %destination
+///   dealloc_stack %temp
+/// \endcode
+///
+/// is optimized to
+///
+/// \code
+///   destroy_addr %destination
+///   instructions_which_store_to %destination
+/// \endcode
+///
+/// The name TempLValueOpt refers to the TempRValueOpt pass, which performs
+/// a related transformation, just with the temporary on the "right" side.
+///
+/// Note that TempLValueOpt is similar to CopyForwarding::backwardPropagateCopy.
+/// It's more restricted (e.g. the copy-source must be an alloc_stack).
+/// That enables other patterns to be optimized, which backwardPropagateCopy
+/// cannot handle.
+///
+/// The pass also performs a peephole optimization on copy_addr - destroy
+/// sequences.
+/// It replaces
+///
+/// \code
+///   copy_addr %source to %destination
+///   destroy_addr %source
+/// \endcode
+///
+/// with
+///
+/// \code
+///   copy_addr [take] %source to %destination
+/// \endcode
+///
+/// This peephole optimization is also done by the DestroyHoisting pass. But
+/// DestroyHoisting currently only runs on OSSA.
+/// TODO: when DestroyHoisting can run later in the pipeline, check if we still
+///       need this peephole here.
+class TempLValueOptPass : public SILFunctionTransform {
+public:
+  TempLValueOptPass() {}
+
+  void run() override;
+
+private:
+  AliasAnalysis *AA = nullptr;
+  
+  bool tempLValueOpt(CopyAddrInst *copyInst);
+  bool combineCopyAndDestroy(CopyAddrInst *copyInst);
+};
+
+void TempLValueOptPass::run() {
+  SILFunction *F = getFunction();
+  if (!F->shouldOptimize())
+    return;
+
+  LLVM_DEBUG(llvm::dbgs() << "*** TempLValueOptPass on function: "
+                          << F->getName() << " ***\n");
+
+  AA = PM->getAnalysis<AliasAnalysis>();
+
+  bool changed = false;
+  for (SILBasicBlock &block : *F) {
+    // First collect all copy_addr instructions upfront to avoid iterator
+    // invalidation problems (the optimizations might delete the copy_addr
+    // itself or any following instruction).
+    llvm::SmallVector<CopyAddrInst *, 32> copyInsts;
+    for (SILInstruction &inst : block) {
+      if (auto *copyInst = dyn_cast<CopyAddrInst>(&inst))
+        copyInsts.push_back(copyInst);
+    }
+    // Do the optimizations.
+    for (CopyAddrInst *copyInst : copyInsts) {
+      changed |=combineCopyAndDestroy(copyInst);
+      changed |=tempLValueOpt(copyInst);
+    }
+  }
+
+  if (changed) {
+    invalidateAnalysis(SILAnalysis::InvalidationKind::Instructions);
+  }
+}
+
+static SingleValueInstruction *isMovableProjection(SILValue addr) {
+  if (auto *enumData = dyn_cast<InitEnumDataAddrInst>(addr))
+    return enumData;
+  if (auto *existentialAddr = dyn_cast<InitExistentialAddrInst>(addr))
+    return existentialAddr;
+    
+  if (SingleValueInstruction *svi = Projection::isAddressProjection(addr)) {
+    if (svi->getNumOperands() == 1)
+      return svi;
+  }
+  return nullptr;
+}
+
+bool TempLValueOptPass::tempLValueOpt(CopyAddrInst *copyInst) {
+
+  // An overview of the algorithm:
+  //
+  //   alloc_stack %temp
+  //   ...
+  //   first_use_of %temp // beginOfLiferange
+  //   ... // no reads or writes from/to %destination
+  //   copy_addr [take] %temp to %destination // copyInst
+  //   ... // no further uses of %temp (copyInst is the end of %temp liferange)
+  //   dealloc_stack %temp
+  //
+  // All projections to %destination are hoisted above the first use of %temp.
+  // Then all uses of %temp are replaced by %destination.
+  // In case the copyInst is not initializing %destination, a
+  // 'destroy_addr %destination' is inserted before the first use of %temp.
+
+  if (!copyInst->isTakeOfSrc())
+    return false;
+
+  auto *temporary = dyn_cast<AllocStackInst>(copyInst->getSrc());
+  if (!temporary)
+    return false;
+
+  // Collect all users of the temporary into a set. Also, for simplicity,
+  // require that all users are within a single basic block.
+  SmallPtrSet<SILInstruction *, 8> users;
+  SILBasicBlock *block = temporary->getParent();
+  for (Operand *use : temporary->getUses()) {
+    SILInstruction *user = use->getUser();
+    if (user->getParent() != block)
+      return false;
+    users.insert(user);
+  }
+
+  // Collect all address projections of the destination - in case we need to
+  // hoist them.
+  SmallPtrSet<SILInstruction *, 4> projections;
+  SILValue destination = copyInst->getDest();
+  SILValue destRootAddr = destination;
+  while (SingleValueInstruction *projInst = isMovableProjection(destRootAddr)) {
+    // In theory, users of the temporary and address projections of the
+    // destination should be completely distinct. Otherwise the copyInst would
+    // be an identity copy (source == destination).
+    // Just to be on the safe side, bail if it's not the case (instead of an
+    // assert).
+    if (users.count(projInst))
+      return false;
+    projections.insert(projInst);
+    destRootAddr = projInst->getOperand(0);
+  }
+  // The root address of the destination. It's null if it's not an instruction,
+  // but a block argument.
+  SILInstruction *destRootInst = destRootAddr->getDefiningInstruction();
+
+  // Iterate over the liferange of the temporary and make some validity checks.
+  SILInstruction *beginOfLiferange = nullptr;
+  bool endOfLiferangeReached = false;
+  for (auto iter = temporary->getIterator(); iter != block->end(); ++iter) {
+    SILInstruction *inst = &*iter;
+    // The dealloc_stack is the last user of the temporary.
+    if (isa<DeallocStackInst>(inst) && inst->getOperand(0) == temporary)
+      break;
+
+    if (users.count(inst) != 0) {
+      // Check if the copyInst is the last user of the temporary (beside the
+      // dealloc_stack).
+      if (endOfLiferangeReached)
+        return false;
+
+      // Find the first user of the temporary to get a more precise liferange.
+      // It would be too conservative to treat the alloc_stack itself as the
+      // begin of the liferange.
+      if (!beginOfLiferange)
+        beginOfLiferange = inst;
+
+      if (inst == copyInst)
+        endOfLiferangeReached = true;
+    }
+    if (beginOfLiferange && !endOfLiferangeReached) {
+      // If the root address of the destination is within the liferange of the
+      // temporary, we cannot replace all uses of the temporary with the
+      // destination (it would break the def-use dominance rule).
+      if (inst == destRootInst)
+        return false;
+        
+      // Check if the destination is not accessed within the liferange of
+      // the temporary.
+      // This is unlikely, because the destination is initialized at the
+      // copyInst. But still, the destination could contain an initialized value
+      // which is destroyed before the copyInst.
+      if (AA->mayReadOrWriteMemory(inst, destination) &&
+          // Needed to treat init_existential_addr as not-writing projection.
+          projections.count(inst) == 0)
+        return false;
+    }
+  }
+  assert(endOfLiferangeReached);
+
+  // Move all projections of the destination address before the liferange of
+  // the temporary.
+  for (auto iter = beginOfLiferange->getIterator();
+       iter != copyInst->getIterator();) {
+    SILInstruction *inst = &*iter++;
+    if (projections.count(inst))
+      inst->moveBefore(beginOfLiferange);
+  }
+
+  if (!copyInst->isInitializationOfDest()) {
+    // Make sure the the destination is uninitialized before the liferange of
+    // the temporary.
+    SILBuilderWithScope builder(beginOfLiferange);
+    builder.createDestroyAddr(copyInst->getLoc(), destination);
+  }
+
+  // Replace all uses of the temporary with the destination address.
+  while (!temporary->use_empty()) {
+    Operand *use = *temporary->use_begin();
+    SILInstruction *user = use->getUser();
+    switch (user->getKind()) {
+      case SILInstructionKind::DeallocStackInst:
+        user->eraseFromParent();
+        break;
+      default:
+        use->set(destination);
+    }
+  }
+  temporary->eraseFromParent();
+  copyInst->eraseFromParent();
+  return true;
+}
+
+bool TempLValueOptPass::combineCopyAndDestroy(CopyAddrInst *copyInst) {
+  if (copyInst->isTakeOfSrc())
+    return false;
+
+  // Find a destroy_addr of the copy's source address.
+  DestroyAddrInst *destroy = nullptr;
+  for (Operand *srcUse : copyInst->getSrc()->getUses()) {
+    if ((destroy = dyn_cast<DestroyAddrInst>(srcUse->getUser())))
+      break;
+  }
+  SILBasicBlock *block = copyInst->getParent();
+  if (!destroy || destroy->getParent() != block)
+    return false;
+  assert(destroy->getOperand() == copyInst->getSrc());
+
+  // Check if the destroy_addr is after the copy_addr and if there are no
+  // memory accesses between them.
+  for (auto iter = std::next(copyInst->getIterator());
+       iter != block->end(); ++iter) {
+    SILInstruction *inst = &*iter;
+    if (inst == destroy) {
+      copyInst->setIsTakeOfSrc(IsTake);
+      destroy->eraseFromParent();
+      return true;
+    }
+    if (inst->mayReadOrWriteMemory())
+      return false;
+  }
+  return false;
+}
+
+} // end anonymous namespace
+
+SILTransform *swift::createTempLValueOpt() {
+  return new TempLValueOptPass();
+}
+
diff --git a/lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp b/lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp
index 1965a825175c8..1d17283837cf9 100644
--- a/lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp
+++ b/lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp
@@ -131,7 +131,7 @@ static bool hasOpaqueArchetypeOperand(TypeExpansionContext context,
 static bool hasOpaqueArchetypeResult(TypeExpansionContext context,
                                      SILInstruction &inst) {
   // Check the results for opaque types.
-  for (const auto &res : inst.getResults())
+  for (SILValue res : inst.getResults())
     if (opaqueArchetypeWouldChange(context, res->getType().getASTType()))
       return true;
   return false;
@@ -161,6 +161,7 @@ static bool hasOpaqueArchetype(TypeExpansionContext context,
   case SILInstructionKind::PreviousDynamicFunctionRefInst:
   case SILInstructionKind::GlobalAddrInst:
   case SILInstructionKind::GlobalValueInst:
+  case SILInstructionKind::BaseAddrForOffsetInst:
   case SILInstructionKind::IntegerLiteralInst:
   case SILInstructionKind::FloatLiteralInst:
   case SILInstructionKind::StringLiteralInst:
diff --git a/lib/SILOptimizer/Utils/GenericCloner.cpp b/lib/SILOptimizer/Utils/GenericCloner.cpp
index 438a47ca78e81..e027cdfb3927f 100644
--- a/lib/SILOptimizer/Utils/GenericCloner.cpp
+++ b/lib/SILOptimizer/Utils/GenericCloner.cpp
@@ -79,8 +79,9 @@ void GenericCloner::populateCloned() {
 
     auto createAllocStack = [&]() {
       // We need an alloc_stack as a replacement for the indirect parameter.
-      assert(mappedType.isAddress());
-      mappedType = mappedType.getObjectType();
+      if (mappedType.isAddress()) {
+        mappedType = mappedType.getObjectType();
+      }
       auto AllocStackLoc = RegularLocation::getAutoGeneratedLocation();
       ASI = getBuilder().createAllocStack(AllocStackLoc, mappedType);
       AllocStacks.push_back(ASI);
@@ -106,24 +107,36 @@ void GenericCloner::populateCloned() {
         // Handle arguments for formal parameters.
         unsigned paramIdx = ArgIdx - origConv.getSILArgIndexOfFirstParam();
         if (ReInfo.isParamConverted(paramIdx)) {
-          // Store the new direct parameter to the alloc_stack.
-          createAllocStack();
+          assert(mappedType.isAddress());
+          mappedType = mappedType.getObjectType();
           auto *NewArg = ClonedEntryBB->createFunctionArgument(
               mappedType, OrigArg->getDecl());
-          getBuilder().createStore(Loc, NewArg, ASI,
-                                   StoreOwnershipQualifier::Unqualified);
 
-          // Try to create a new debug_value from an existing debug_value_addr.
+          // Try to create a new debug_value from an existing debug_value_addr
+          // for the argument. We do this before storing to ensure that when we
+          // are cloning code in ossa the argument has not been consumed by the
+          // store below.
           for (Operand *ArgUse : OrigArg->getUses()) {
             if (auto *DVAI = dyn_cast<DebugValueAddrInst>(ArgUse->getUser())) {
+              auto *oldScope = getBuilder().getCurrentDebugScope();
               getBuilder().setCurrentDebugScope(
                   remapScope(DVAI->getDebugScope()));
               getBuilder().createDebugValue(DVAI->getLoc(), NewArg,
                                             *DVAI->getVarInfo());
-              getBuilder().setCurrentDebugScope(nullptr);
+              getBuilder().setCurrentDebugScope(oldScope);
               break;
             }
           }
+
+          // Store the new direct parameter to an alloc_stack.
+          createAllocStack();
+          if (!NewArg->getArgumentConvention().isGuaranteedConvention()) {
+            getBuilder().emitStoreValueOperation(Loc, NewArg, ASI,
+                                                 StoreOwnershipQualifier::Init);
+          } else {
+            getBuilder().emitStoreBorrowOperation(Loc, NewArg, ASI);
+          }
+
           entryArgs.push_back(ASI);
           return true;
         }
@@ -150,9 +163,9 @@ void GenericCloner::visitTerminator(SILBasicBlock *BB) {
     if (ReturnValueAddr) {
       // The result is converted from indirect to direct. We have to load the
       // returned value from the alloc_stack.
-      ReturnValue =
-        getBuilder().createLoad(ReturnValueAddr->getLoc(), ReturnValueAddr,
-                                LoadOwnershipQualifier::Unqualified);
+      ReturnValue = getBuilder().emitLoadValueOperation(
+          ReturnValueAddr->getLoc(), ReturnValueAddr,
+          LoadOwnershipQualifier::Take);
     }
     for (AllocStackInst *ASI : reverse(AllocStacks)) {
       getBuilder().createDeallocStack(ASI->getLoc(), ASI);
diff --git a/lib/SILOptimizer/Utils/Generics.cpp b/lib/SILOptimizer/Utils/Generics.cpp
index 2080755e6d74e..1cfe889d04301 100644
--- a/lib/SILOptimizer/Utils/Generics.cpp
+++ b/lib/SILOptimizer/Utils/Generics.cpp
@@ -13,21 +13,22 @@
 #define DEBUG_TYPE "generic-specializer"
 
 #include "swift/SILOptimizer/Utils/Generics.h"
-#include "swift/AST/GenericEnvironment.h"
-#include "swift/AST/TypeMatcher.h"
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticsSIL.h"
+#include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/SemanticAttrs.h"
-#include "swift/Basic/Statistic.h"
 #include "swift/AST/TypeCheckRequests.h"
-#include "swift/Serialization/SerializedSILLoader.h"
+#include "swift/AST/TypeMatcher.h"
+#include "swift/Basic/Statistic.h"
+#include "swift/Demangling/ManglingMacros.h"
 #include "swift/SIL/DebugUtils.h"
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/OptimizationRemark.h"
-#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
+#include "swift/SIL/PrettyStackTrace.h"
 #include "swift/SILOptimizer/Utils/GenericCloner.h"
+#include "swift/SILOptimizer/Utils/SILOptFunctionBuilder.h"
 #include "swift/SILOptimizer/Utils/SpecializationMangler.h"
-#include "swift/Demangling/ManglingMacros.h"
+#include "swift/Serialization/SerializedSILLoader.h"
 #include "swift/Strings.h"
 
 using namespace swift;
@@ -58,6 +59,12 @@ llvm::cl::opt<bool> PrintGenericSpecializationLoops(
     llvm::cl::desc("Print detected infinite generic specialization loops that "
                    "were prevented"));
 
+llvm::cl::opt<bool> VerifyFunctionsAfterSpecialization(
+    "sil-generic-verify-after-specialization", llvm::cl::init(false),
+    llvm::cl::desc(
+        "Verify functions after they are specialized "
+        "'PrettyStackTraceFunction'-ing the original function if we fail."));
+
 static bool OptimizeGenericSubstitutions = false;
 
 /// Max depth of a type which can be processed by the generic
@@ -1863,7 +1870,6 @@ SILFunction *GenericFuncSpecializer::tryCreateSpecialization() {
           SpecializedF->getGenericEnvironment()) ||
          (!SpecializedF->getLoweredFunctionType()->isPolymorphic() &&
           !SpecializedF->getGenericEnvironment()));
-  assert(!SpecializedF->hasOwnership());
   // Store the meta-information about how this specialization was created.
   auto *Caller = ReInfo.getApply() ? ReInfo.getApply().getFunction() : nullptr;
   SubstitutionMap Subs = Caller ? ReInfo.getApply().getSubstitutionMap()
@@ -1871,6 +1877,15 @@ SILFunction *GenericFuncSpecializer::tryCreateSpecialization() {
   SpecializedF->setClassSubclassScope(SubclassScope::NotApplicable);
   SpecializedF->setSpecializationInfo(
       GenericSpecializationInformation::create(Caller, GenericFunc, Subs));
+
+  if (VerifyFunctionsAfterSpecialization) {
+    PrettyStackTraceSILFunction SILFunctionDumper(
+        llvm::Twine("Generic function: ") + GenericFunc->getName() +
+            ". Specialized Function: " + SpecializedF->getName(),
+        GenericFunc);
+    SpecializedF->verify();
+  }
+
   return SpecializedF;
 }
 
@@ -1891,10 +1906,18 @@ static void fixUsedVoidType(SILValue VoidVal, SILLocation Loc,
 }
 
 /// Prepare call arguments. Perform re-abstraction if required.
-static void prepareCallArguments(ApplySite AI, SILBuilder &Builder,
-                                 const ReabstractionInfo &ReInfo,
-                                 SmallVectorImpl<SILValue> &Arguments,
-                                 SILValue &StoreResultTo) {
+///
+/// \p ArgAtIndexNeedsEndBorrow after return contains indices of arguments that
+/// need end borrow. The reason why we are doing this in a separate array is
+/// that we are going to eventually need to pass off Arguments to SILBuilder
+/// which will want an ArrayRef<SILValue>() so using a composite type here would
+/// force us to do some sort of conversion then.
+static void
+prepareCallArguments(ApplySite AI, SILBuilder &Builder,
+                     const ReabstractionInfo &ReInfo,
+                     SmallVectorImpl<SILValue> &Arguments,
+                     SmallVectorImpl<unsigned> &ArgAtIndexNeedsEndBorrow,
+                     SILValue &StoreResultTo) {
   /// SIL function conventions for the original apply site with substitutions.
   SILLocation Loc = AI.getLoc();
   auto substConv = AI.getSubstCalleeConv();
@@ -1922,8 +1945,16 @@ static void prepareCallArguments(ApplySite AI, SILBuilder &Builder,
         if (ReInfo.isParamConverted(paramIdx)) {
           // An argument is converted from indirect to direct. Instead of the
           // address we pass the loaded value.
-          SILValue Val = Builder.createLoad(
-              Loc, Op.get(), LoadOwnershipQualifier::Unqualified);
+          auto argConv = substConv.getSILArgumentConvention(ArgIdx);
+          SILValue Val;
+          if (!argConv.isGuaranteedConvention() || isa<PartialApplyInst>(AI)) {
+            Val = Builder.emitLoadValueOperation(Loc, Op.get(),
+                                                 LoadOwnershipQualifier::Take);
+          } else {
+            Val = Builder.emitLoadBorrowOperation(Loc, Op.get());
+            if (Val.getOwnershipKind() == ValueOwnershipKind::Guaranteed)
+              ArgAtIndexNeedsEndBorrow.push_back(Arguments.size());
+          }
           Arguments.push_back(Val);
           return true;
         }
@@ -1937,6 +1968,16 @@ static void prepareCallArguments(ApplySite AI, SILBuilder &Builder,
   }
 }
 
+static void
+cleanupCallArguments(SILBuilder &builder, SILLocation loc,
+                     ArrayRef<SILValue> values,
+                     ArrayRef<unsigned> valueIndicesThatNeedEndBorrow) {
+  for (int index : valueIndicesThatNeedEndBorrow) {
+    auto *lbi = cast<LoadBorrowInst>(values[index]);
+    builder.createEndBorrow(loc, lbi);
+  }
+}
+
 /// Create a new apply based on an old one, but with a different
 /// function being applied.
 static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
@@ -1945,14 +1986,20 @@ static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
   SILBuilderWithScope builder(applySite.getInstruction());
   SILLocation loc = applySite.getLoc();
   SmallVector<SILValue, 4> arguments;
+  SmallVector<unsigned, 4> argsNeedingEndBorrow;
   SILValue resultOut;
 
-  prepareCallArguments(applySite, builder, reInfo, arguments, resultOut);
+  prepareCallArguments(applySite, builder, reInfo, arguments,
+                       argsNeedingEndBorrow, resultOut);
 
   // Create a substituted callee type.
+  //
+  // NOTE: We do not perform this substitution if we are promoting a full apply
+  // site callee of a partial apply.
   auto canFnTy = callee->getType().castTo<SILFunctionType>();
   SubstitutionMap subs;
-  if (reInfo.getSpecializedType()->isPolymorphic()) {
+  if (reInfo.getSpecializedType()->isPolymorphic() &&
+      canFnTy->isPolymorphic()) {
     subs = reInfo.getCallerParamSubstitutionMap();
     subs = SubstitutionMap::get(canFnTy->getSubstGenericSignature(), subs);
   }
@@ -1967,6 +2014,13 @@ static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
     auto *tai = cast<TryApplyInst>(applySite);
     SILBasicBlock *resultBlock = tai->getNormalBB();
     assert(resultBlock->getSinglePredecessorBlock() == tai->getParent());
+    // First insert the cleanups for our arguments int he appropriate spot.
+    FullApplySite(tai).insertAfterFullEvaluation(
+        [&](SILBasicBlock::iterator insertPt) {
+          SILBuilderWithScope argBuilder(insertPt);
+          cleanupCallArguments(argBuilder, loc, arguments,
+                               argsNeedingEndBorrow);
+        });
     auto *newTAI = builder.createTryApply(loc, callee, subs, arguments,
                                           resultBlock, tai->getErrorBB());
     if (resultOut) {
@@ -1979,23 +2033,28 @@ static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
       SILArgument *arg = resultBlock->replacePhiArgument(
           0, resultOut->getType().getObjectType(), ValueOwnershipKind::Owned);
       // Store the direct result to the original result address.
-      builder.createStore(loc, arg, resultOut,
-                          StoreOwnershipQualifier::Unqualified);
+      builder.emitStoreValueOperation(loc, arg, resultOut,
+                                      StoreOwnershipQualifier::Init);
     }
     return newTAI;
   }
   case ApplySiteKind::ApplyInst: {
     auto *ai = cast<ApplyInst>(applySite);
+    FullApplySite(ai).insertAfterFullEvaluation(
+        [&](SILBasicBlock::iterator insertPt) {
+          SILBuilderWithScope argBuilder(insertPt);
+          cleanupCallArguments(argBuilder, loc, arguments,
+                               argsNeedingEndBorrow);
+        });
     auto *newAI =
         builder.createApply(loc, callee, subs, arguments, ai->isNonThrowing());
     if (resultOut) {
-      assert(substConv.useLoweredAddresses());
       if (!calleeSILSubstFnTy.isNoReturnFunction(
               builder.getModule(), builder.getTypeExpansionContext())) {
         // Store the direct result to the original result address.
         fixUsedVoidType(ai, loc, builder);
-        builder.createStore(loc, newAI, resultOut,
-                            StoreOwnershipQualifier::Unqualified);
+        builder.emitStoreValueOperation(loc, newAI, resultOut,
+                                        StoreOwnershipQualifier::Init);
       } else {
         builder.createUnreachable(loc);
         // unreachable should be the terminator instruction.
@@ -2011,6 +2070,12 @@ static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
   case ApplySiteKind::BeginApplyInst: {
     auto *bai = cast<BeginApplyInst>(applySite);
     assert(!resultOut);
+    FullApplySite(bai).insertAfterFullEvaluation(
+        [&](SILBasicBlock::iterator insertPt) {
+          SILBuilderWithScope argBuilder(insertPt);
+          cleanupCallArguments(argBuilder, loc, arguments,
+                               argsNeedingEndBorrow);
+        });
     auto *newBAI = builder.createBeginApply(loc, callee, subs, arguments,
                                             bai->isNonThrowing());
     bai->replaceAllUsesPairwiseWith(newBAI);
@@ -2022,7 +2087,11 @@ static ApplySite replaceWithSpecializedCallee(ApplySite applySite,
         loc, callee, subs, arguments,
         pai->getType().getAs<SILFunctionType>()->getCalleeConvention(),
         pai->isOnStack());
+    // When we have a partial apply, we should always perform a load [take].
     pai->replaceAllUsesWith(newPAI);
+    assert(llvm::none_of(arguments,
+                         [](SILValue v) { return isa<LoadBorrowInst>(v); }) &&
+           "Partial apply consumes all of its parameters?!");
     return newPAI;
   }
   }
@@ -2080,8 +2149,9 @@ class ReabstractionThunkGenerator {
   SILFunction *createThunk();
 
 protected:
-  SILValue createReabstractionThunkApply(SILBuilder &Builder);
-  SILArgument *convertReabstractionThunkArguments(SILBuilder &Builder);
+  FullApplySite createReabstractionThunkApply(SILBuilder &Builder);
+  SILArgument *convertReabstractionThunkArguments(
+      SILBuilder &Builder, SmallVectorImpl<unsigned> &ArgsNeedingEndBorrows);
 };
 } // anonymous namespace
 
@@ -2116,30 +2186,46 @@ SILFunction *ReabstractionThunkGenerator::createThunk() {
                                                             SpecArg->getDecl());
       Arguments.push_back(NewArg);
     }
-    SILValue ReturnValue = createReabstractionThunkApply(Builder);
+    FullApplySite ApplySite = createReabstractionThunkApply(Builder);
+    SILValue ReturnValue = ApplySite.getSingleDirectResult();
+    assert(ReturnValue && "getSingleDirectResult out of sync with ApplySite?!");
     Builder.createReturn(Loc, ReturnValue);
+
     return Thunk;
   }
   // Handle lowered addresses.
-  SILArgument *ReturnValueAddr = convertReabstractionThunkArguments(Builder);
+  SmallVector<unsigned, 4> ArgsThatNeedEndBorrow;
+  SILArgument *ReturnValueAddr =
+      convertReabstractionThunkArguments(Builder, ArgsThatNeedEndBorrow);
+
+  FullApplySite ApplySite = createReabstractionThunkApply(Builder);
 
-  SILValue ReturnValue = createReabstractionThunkApply(Builder);
+  SILValue ReturnValue = ApplySite.getSingleDirectResult();
+  assert(ReturnValue && "getSingleDirectResult out of sync with ApplySite?!");
 
   if (ReturnValueAddr) {
     // Need to store the direct results to the original indirect address.
-    Builder.createStore(Loc, ReturnValue, ReturnValueAddr,
-                        StoreOwnershipQualifier::Unqualified);
+    Builder.emitStoreValueOperation(Loc, ReturnValue, ReturnValueAddr,
+                                    StoreOwnershipQualifier::Init);
     SILType VoidTy = OrigPAI->getSubstCalleeType()->getDirectFormalResultsType(
         M, Builder.getTypeExpansionContext());
     assert(VoidTy.isVoid());
     ReturnValue = Builder.createTuple(Loc, VoidTy, {});
   }
   Builder.createReturn(Loc, ReturnValue);
+
+  // Now that we have finished constructing our CFG (note the return above),
+  // insert any compensating end borrows that we need.
+  ApplySite.insertAfterFullEvaluation([&](SILBasicBlock::iterator insertPt) {
+    SILBuilderWithScope argBuilder(insertPt);
+    cleanupCallArguments(argBuilder, Loc, Arguments, ArgsThatNeedEndBorrow);
+  });
+
   return Thunk;
 }
 
 /// Create a call to a reabstraction thunk. Return the call's direct result.
-SILValue ReabstractionThunkGenerator::createReabstractionThunkApply(
+FullApplySite ReabstractionThunkGenerator::createReabstractionThunkApply(
     SILBuilder &Builder) {
   SILFunction *Thunk = &Builder.getFunction();
   auto *FRI = Builder.createFunctionRef(Loc, SpecializedFunc);
@@ -2151,19 +2237,20 @@ SILValue ReabstractionThunkGenerator::createReabstractionThunkApply(
   // Create the logic for calling a throwing function.
   SILBasicBlock *NormalBB = Thunk->createBasicBlock();
   SILBasicBlock *ErrorBB = Thunk->createBasicBlock();
-  Builder.createTryApply(Loc, FRI, Subs, Arguments, NormalBB, ErrorBB);
+  auto *TAI =
+      Builder.createTryApply(Loc, FRI, Subs, Arguments, NormalBB, ErrorBB);
   auto *ErrorVal = ErrorBB->createPhiArgument(
       SpecializedFunc->mapTypeIntoContext(
           specConv.getSILErrorType(Builder.getTypeExpansionContext())),
       ValueOwnershipKind::Owned);
   Builder.setInsertionPoint(ErrorBB);
   Builder.createThrow(Loc, ErrorVal);
-  SILValue ReturnValue = NormalBB->createPhiArgument(
+  NormalBB->createPhiArgument(
       SpecializedFunc->mapTypeIntoContext(
           specConv.getSILResultType(Builder.getTypeExpansionContext())),
       ValueOwnershipKind::Owned);
   Builder.setInsertionPoint(NormalBB);
-  return ReturnValue;
+  return FullApplySite(TAI);
 }
 
 /// Create SIL arguments for a reabstraction thunk with lowered addresses. This
@@ -2173,7 +2260,7 @@ SILValue ReabstractionThunkGenerator::createReabstractionThunkApply(
 /// FIXME: Remove this if we don't need to create reabstraction thunks after
 /// address lowering.
 SILArgument *ReabstractionThunkGenerator::convertReabstractionThunkArguments(
-    SILBuilder &Builder) {
+    SILBuilder &Builder, SmallVectorImpl<unsigned> &ArgsThatNeedEndBorrow) {
   SILFunction *Thunk = &Builder.getFunction();
   CanSILFunctionType SpecType = SpecializedFunc->getLoweredFunctionType();
   CanSILFunctionType SubstType = ReInfo.getSubstitutedType();
@@ -2235,11 +2322,18 @@ SILArgument *ReabstractionThunkGenerator::convertReabstractionThunkArguments(
                                Builder.getTypeExpansionContext()));
       assert(ParamTy.isAddress());
       SILArgument *SpecArg = *SpecArgIter++;
-      SILArgument *NewArg =
+      SILFunctionArgument *NewArg =
           EntryBB->createFunctionArgument(ParamTy, SpecArg->getDecl());
-      auto *ArgVal =
-          Builder.createLoad(Loc, NewArg, LoadOwnershipQualifier::Unqualified);
-      Arguments.push_back(ArgVal);
+      if (!NewArg->getArgumentConvention().isGuaranteedConvention()) {
+        SILValue argVal = Builder.emitLoadValueOperation(
+            Loc, NewArg, LoadOwnershipQualifier::Take);
+        Arguments.push_back(argVal);
+      } else {
+        SILValue argVal = Builder.emitLoadBorrowOperation(Loc, NewArg);
+        if (argVal.getOwnershipKind() == ValueOwnershipKind::Guaranteed)
+          ArgsThatNeedEndBorrow.push_back(Arguments.size());
+        Arguments.push_back(argVal);
+      }
       continue;
     }
     // Simply clone unconverted direct or indirect parameters.
@@ -2342,15 +2436,6 @@ void swift::trySpecializeApplyOfGeneric(
   if (shouldNotSpecialize(RefF, F))
     return;
 
-  // If our callee has ownership, do not specialize for now. This should only
-  // occur with transparent referenced functions.
-  //
-  // FIXME: Support this.
-  if (RefF->hasOwnership()) {
-    assert(RefF->isTransparent());
-    return;
-  }
-
   // If the caller and callee are both fragile, preserve the fragility when
   // cloning the callee. Otherwise, strip it off so that we can optimize
   // the body more.
@@ -2392,11 +2477,24 @@ void swift::trySpecializeApplyOfGeneric(
     //    this case we can just skip the existing re-abstraction.
     // 3) For all other cases we need to create a new re-abstraction thunk.
     needAdaptUsers = true;
-    for (Operand *Use : PAI->getUses()) {
+    SmallVector<Operand *, 4> worklist(PAI->getUses());
+    while (!worklist.empty()) {
+      auto *Use = worklist.pop_back_val();
+
       SILInstruction *User = Use->getUser();
+
+      // Look through copy_value.
+      if (auto *cvi = dyn_cast<CopyValueInst>(User)) {
+        llvm::copy(cvi->getUses(), std::back_inserter(worklist));
+        continue;
+      }
+      // Ignore destroy_value.
+      if (isa<DestroyValueInst>(User))
+        continue;
+      // Ignore older ref count instructions.
       if (isa<RefCountingInst>(User))
         continue;
-      if (User->isDebugInstruction())
+      if (isIncidentalUse(User))
         continue;
 
       auto FAS = FullApplySite::isa(User);
@@ -2427,7 +2525,6 @@ void swift::trySpecializeApplyOfGeneric(
                             << SpecializedF->getName() << "\n"
                             << "Specialized function type: "
                             << SpecializedF->getLoweredFunctionType() << "\n");
-    assert(!SpecializedF->hasOwnership());
     NewFunctions.push_back(SpecializedF);
   }
 
@@ -2443,6 +2540,20 @@ void swift::trySpecializeApplyOfGeneric(
            << NV("FuncType", OS.str());
   });
 
+  // Verify our function after we have finished fixing up call sites/etc. Dump
+  // the generic function if there is an assertion failure (or a crash) to make
+  // it easier to debug such problems since the original generic function is
+  // easily at hand.
+  SWIFT_DEFER {
+    if (VerifyFunctionsAfterSpecialization) {
+      PrettyStackTraceSILFunction SILFunctionDumper(
+          llvm::Twine("Generic function: ") + RefF->getName() +
+              ". Specialized Function: " + SpecializedF->getName(),
+          RefF);
+      SpecializedF->verify();
+    }
+  };
+
   assert(ReInfo.getSpecializedType()
          == SpecializedF->getLoweredFunctionType() &&
          "Previously specialized function does not match expected type.");
@@ -2457,6 +2568,13 @@ void swift::trySpecializeApplyOfGeneric(
     SILFunction *Thunk =
       ReabstractionThunkGenerator(FuncBuilder, ReInfo, PAI, SpecializedF)
         .createThunk();
+    if (VerifyFunctionsAfterSpecialization) {
+      PrettyStackTraceSILFunction SILFunctionDumper(
+          llvm::Twine("Thunk For Generic function: ") + RefF->getName() +
+              ". Specialized Function: " + SpecializedF->getName(),
+          RefF);
+      Thunk->verify();
+    }
     NewFunctions.push_back(Thunk);
     SILBuilderWithScope Builder(PAI);
     auto *FRI = Builder.createFunctionRef(PAI->getLoc(), Thunk);
diff --git a/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp b/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
index d30d9b4ca6691..21f4bc6f5a24c 100644
--- a/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
+++ b/lib/SILOptimizer/Utils/PerformanceInlinerUtils.cpp
@@ -19,6 +19,10 @@ llvm::cl::opt<std::string>
     SILInlineNeverFuns("sil-inline-never-functions", llvm::cl::init(""),
                        llvm::cl::desc("Never inline functions whose name "
                                       "includes this string."));
+llvm::cl::list<std::string>
+    SILInlineNeverFun("sil-inline-never-function", llvm::cl::CommaSeparated,
+                       llvm::cl::desc("Never inline functions whose name "
+                                      "is this string"));
 
 //===----------------------------------------------------------------------===//
 //                               ConstantTracker
@@ -697,6 +701,13 @@ SILFunction *swift::getEligibleFunction(FullApplySite AI,
       && Callee->getName().find(SILInlineNeverFuns, 0) != StringRef::npos)
     return nullptr;
 
+  if (!SILInlineNeverFun.empty() &&
+      SILInlineNeverFun.end() != std::find(SILInlineNeverFun.begin(),
+                                           SILInlineNeverFun.end(),
+                                           Callee->getName())) {
+    return nullptr;
+  }
+
   if (!Callee->shouldOptimize()) {
     return nullptr;
   }
diff --git a/lib/SILOptimizer/Utils/SILInliner.cpp b/lib/SILOptimizer/Utils/SILInliner.cpp
index ded5b22a009b0..c8fc5e583298e 100644
--- a/lib/SILOptimizer/Utils/SILInliner.cpp
+++ b/lib/SILOptimizer/Utils/SILInliner.cpp
@@ -685,6 +685,7 @@ InlineCost swift::instructionInlineCost(SILInstruction &I) {
   case SILInstructionKind::FunctionRefInst:
   case SILInstructionKind::AllocGlobalInst:
   case SILInstructionKind::GlobalAddrInst:
+  case SILInstructionKind::BaseAddrForOffsetInst:
   case SILInstructionKind::EndLifetimeInst:
   case SILInstructionKind::UncheckedOwnershipConversionInst:
     return InlineCost::Free;
diff --git a/lib/Sema/BuilderTransform.cpp b/lib/Sema/BuilderTransform.cpp
index 64a49bb512871..f0bfb34c3e621 100644
--- a/lib/Sema/BuilderTransform.cpp
+++ b/lib/Sema/BuilderTransform.cpp
@@ -1387,6 +1387,64 @@ BraceStmt *swift::applyFunctionBuilderTransform(
         captured.first, captured.second)));
 }
 
+/// Produce any additional syntactic diagnostics for the body of a function
+/// that had a function builder applied.
+static void performAddOnDiagnostics(BraceStmt *stmt, DeclContext *dc) {
+  class AddOnDiagnosticWalker : public ASTWalker {
+    SmallVector<DeclContext *, 4> dcStack;
+
+  public:
+    AddOnDiagnosticWalker(DeclContext *dc) {
+      dcStack.push_back(dc);
+    }
+
+    std::pair<bool, Expr *> walkToExprPre(Expr *expr) override {
+      performSyntacticExprDiagnostics(
+          expr, dcStack.back(), /*isExprStmt=*/false);
+
+      if (auto closure = dyn_cast<ClosureExpr>(expr)) {
+        if (closure->wasSeparatelyTypeChecked()) {
+          dcStack.push_back(closure);
+          return { true, expr };
+        }
+      }
+
+      return { false, expr };
+    }
+
+    Expr *walkToExprPost(Expr *expr) override {
+      if (auto closure = dyn_cast<ClosureExpr>(expr)) {
+        if (closure->wasSeparatelyTypeChecked()) {
+          assert(dcStack.back() == closure);
+          dcStack.pop_back();
+        }
+      }
+
+      return expr;
+    }
+
+    std::pair<bool, Stmt *> walkToStmtPre(Stmt *stmt) override {
+      performStmtDiagnostics(dcStack.back()->getASTContext(), stmt);
+      return { true, stmt };
+    }
+
+    std::pair<bool, Pattern*> walkToPatternPre(Pattern *pattern) override {
+      return { false, pattern };
+    }
+
+    bool walkToTypeLocPre(TypeLoc &typeLoc) override { return false; }
+
+    bool walkToTypeReprPre(TypeRepr *typeRepr) override { return false; }
+
+    bool walkToParameterListPre(ParameterList *params) override {
+      return false;
+    }
+  };
+
+  AddOnDiagnosticWalker walker(dc);
+  stmt->walk(walker);
+}
+
 Optional<BraceStmt *> TypeChecker::applyFunctionBuilderBodyTransform(
     FuncDecl *func, Type builderType) {
   // Pre-check the body: pre-check any expressions in it and look
@@ -1505,6 +1563,7 @@ Optional<BraceStmt *> TypeChecker::applyFunctionBuilderBodyTransform(
   if (auto result = cs.applySolution(
           solutions.front(),
           SolutionApplicationTarget(func))) {
+    performAddOnDiagnostics(result->getFunctionBody(), func);
     return result->getFunctionBody();
   }
 
diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
index f9bedcbee6a0b..3c0e373e81c6b 100644
--- a/lib/Sema/CMakeLists.txt
+++ b/lib/Sema/CMakeLists.txt
@@ -40,6 +40,7 @@ add_swift_host_library(swiftSema STATIC
   TypeCheckAvailability.cpp
   TypeCheckCaptures.cpp
   TypeCheckCircularity.cpp
+  TypeCheckCodeCompletion.cpp
   TypeCheckConstraints.cpp
   TypeCheckDecl.cpp
   TypeCheckDeclObjC.cpp
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
index 766c57bc496f1..43bac6311dfda 100644
--- a/lib/Sema/CSApply.cpp
+++ b/lib/Sema/CSApply.cpp
@@ -2533,14 +2533,15 @@ namespace {
       if (cs.getType(expr) && !cs.getType(expr)->hasTypeVariable())
         return expr;
 
-      auto &ctx = cs.getASTContext();
-
       // Figure out the type we're converting to.
       auto openedType = cs.getType(expr);
       auto type = simplifyType(openedType);
       cs.setType(expr, type);
 
-      if (type->is<UnresolvedType>()) return expr;
+      if (type->is<UnresolvedType>())
+        return expr;
+
+      auto &ctx = cs.getASTContext();
 
       Type conformingType = type;
       if (auto baseType = conformingType->getOptionalObjectType()) {
@@ -2550,7 +2551,7 @@ namespace {
       }
 
       // Find the appropriate object literal protocol.
-      auto proto = TypeChecker::getLiteralProtocol(cs.getASTContext(), expr);
+      auto proto = TypeChecker::getLiteralProtocol(ctx, expr);
       assert(proto && "Missing object literal protocol?");
       auto conformance =
         TypeChecker::conformsToProtocol(conformingType, proto, cs.DC);
@@ -2560,9 +2561,24 @@ namespace {
 
       ConcreteDeclRef witness = conformance.getWitnessByName(
           conformingType->getRValueType(), constrName);
-      if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
+
+      auto selectedOverload = solution.getOverloadChoiceIfAvailable(
+          cs.getConstraintLocator(expr, ConstraintLocator::ConstructorMember));
+
+      if (!selectedOverload)
         return nullptr;
+
+      auto fnType =
+          simplifyType(selectedOverload->openedType)->castTo<FunctionType>();
+
+      auto newArg = coerceCallArguments(
+          expr->getArg(), fnType, witness,
+          /*applyExpr=*/nullptr, expr->getArgumentLabels(),
+          expr->hasTrailingClosure(),
+          cs.getConstraintLocator(expr, ConstraintLocator::ApplyArgument));
+
       expr->setInitializer(witness);
+      expr->setArg(newArg);
       return expr;
     }
 
@@ -5761,16 +5777,9 @@ Expr *ExprRewriter::coerceCallArguments(Expr *arg, AnyFunctionType *funcType,
   return cs.cacheType(arg);
 }
 
-static ClosureExpr *getClosureLiteralExpr(Expr *expr) {
+static bool isClosureLiteralExpr(Expr *expr) {
   expr = expr->getSemanticsProvidingExpr();
-
-  if (auto *captureList = dyn_cast<CaptureListExpr>(expr))
-    return captureList->getClosureBody();
-
-  if (auto *closure = dyn_cast<ClosureExpr>(expr))
-    return closure;
-
-  return nullptr;
+  return (isa<CaptureListExpr>(expr) || isa<ClosureExpr>(expr));
 }
 
 /// If the expression is an explicit closure expression (potentially wrapped in
@@ -7313,7 +7322,7 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType,
   }
 
   // An immediate application of a closure literal is always noescape.
-  if (getClosureLiteralExpr(fn)) {
+  if (isClosureLiteralExpr(fn)) {
     if (auto fnTy = cs.getType(fn)->getAs<FunctionType>()) {
       fnTy = cast<FunctionType>(
         fnTy->withExtInfo(fnTy->getExtInfo().withNoEscape()));
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
index 9b6891c7452e2..a3e7ce416b79e 100644
--- a/lib/Sema/CSBindings.cpp
+++ b/lib/Sema/CSBindings.cpp
@@ -69,6 +69,9 @@ void ConstraintSystem::inferTransitiveSupertypeBindings(
 
       auto type = binding.BindingType;
 
+      if (type->isHole())
+        continue;
+
       if (!existingTypes.insert(type->getCanonicalType()).second)
         continue;
 
@@ -1032,7 +1035,7 @@ bool TypeVarBindingProducer::computeNext() {
     auto srcLocator = binding.getLocator();
     if (srcLocator &&
         srcLocator->isLastElement<LocatorPathElt::ApplyArgToParam>() &&
-        !type->hasTypeVariable() && CS.isCollectionType(type)) {
+        !type->hasTypeVariable() && type->isKnownStdlibCollectionType()) {
       // If the type binding comes from the argument conversion, let's
       // instead of binding collection types directly, try to bind
       // using temporary type variables substituted for element
@@ -1107,8 +1110,7 @@ bool TypeVariableBinding::attempt(ConstraintSystem &cs) const {
         fix = SpecifyClosureParameterType::create(cs, dstLocator);
       } else if (TypeVar->getImpl().isClosureResultType()) {
         fix = SpecifyClosureReturnType::create(cs, dstLocator);
-      } else if (srcLocator->getAnchor() &&
-                 isExpr<ObjectLiteralExpr>(srcLocator->getAnchor())) {
+      } else if (srcLocator->directlyAt<ObjectLiteralExpr>()) {
         fix = SpecifyObjectLiteralTypeImport::create(cs, dstLocator);
       } else if (srcLocator->isKeyPathRoot()) {
         fix = SpecifyKeyPathRootType::create(cs, dstLocator);
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
index 1e455b9a25dc6..33551376f2312 100644
--- a/lib/Sema/CSDiagnostics.cpp
+++ b/lib/Sema/CSDiagnostics.cpp
@@ -446,6 +446,32 @@ bool MissingConformanceFailure::diagnoseAsError() {
     }
   }
 
+  // If the problem has been (unambiguously) determined to be related
+  // to one of of the standard comparison operators and argument is
+  // enum with associated values, let's produce a tailored note which
+  // says that conformances for enums with associated values can't be
+  // synthesized.
+  if (isStandardComparisonOperator(anchor)) {
+    auto isEnumWithAssociatedValues = [](Type type) -> bool {
+      if (auto *enumType = type->getAs<EnumType>())
+        return !enumType->getDecl()->hasOnlyCasesWithoutAssociatedValues();
+      return false;
+    };
+
+    // Limit this to `Equatable` and `Comparable` protocols for now.
+    auto *protocol = getRHS()->castTo<ProtocolType>()->getDecl();
+    if (isEnumWithAssociatedValues(getLHS()) &&
+        (protocol->isSpecificProtocol(KnownProtocolKind::Equatable) ||
+         protocol->isSpecificProtocol(KnownProtocolKind::Comparable))) {
+      if (RequirementFailure::diagnoseAsError()) {
+        auto opName = getOperatorName(anchor);
+        emitDiagnostic(diag::no_binary_op_overload_for_enum_with_payload,
+                       opName->str());
+        return true;
+      }
+    }
+  }
+
   if (diagnoseAsAmbiguousOperatorRef())
     return true;
 
@@ -474,7 +500,9 @@ bool MissingConformanceFailure::diagnoseTypeCannotConform(
   }
 
   emitDiagnostic(diag::type_cannot_conform,
-                 nonConformingType->isExistentialType(), nonConformingType,
+                 nonConformingType->isExistentialType(), 
+                 nonConformingType, 
+                 nonConformingType->isEqual(protocolType),
                  protocolType);
 
   if (auto *OTD = dyn_cast<OpaqueTypeDecl>(AffectedDecl)) {
@@ -984,37 +1012,72 @@ bool MissingExplicitConversionFailure::diagnoseAsError() {
   return true;
 }
 
+SourceRange MemberAccessOnOptionalBaseFailure::getSourceRange() const {
+  if (auto componentPathElt =
+          getLocator()->getLastElementAs<LocatorPathElt::KeyPathComponent>()) {
+    auto anchor = getAnchor();
+    auto keyPathExpr = castToExpr<KeyPathExpr>(anchor);
+    if (componentPathElt->getIndex() == 0) {
+      if (auto rootType = keyPathExpr->getRootType()) {
+        return rootType->getSourceRange();
+      }
+    } else {
+      auto componentIdx = componentPathElt->getIndex() - 1;
+      auto component = keyPathExpr->getComponents()[componentIdx];
+      return component.getSourceRange();
+    }
+  }
+  return FailureDiagnostic::getSourceRange();
+}
+
 bool MemberAccessOnOptionalBaseFailure::diagnoseAsError() {
-  auto anchor = getAnchor();
-  auto baseType = getType(anchor);
+  auto baseType = getMemberBaseType();
+  auto locator = getLocator();
+  
   bool resultIsOptional = ResultTypeIsOptional;
 
   // If we've resolved the member overload to one that returns an optional
   // type, then the result of the expression is optional (and we want to offer
   // only a '?' fixit) even though the constraint system didn't need to add any
   // additional optionality.
-  auto overload = getOverloadChoiceIfAvailable(getLocator());
+  auto overload = getOverloadChoiceIfAvailable(locator);
   if (overload && overload->openedType->getOptionalObjectType())
     resultIsOptional = true;
 
   auto unwrappedBaseType = baseType->getOptionalObjectType();
   if (!unwrappedBaseType)
     return false;
+  
+  auto sourceRange = getSourceRange();
+  
+  emitDiagnostic(diag::optional_base_not_unwrapped,
+                 baseType, Member, unwrappedBaseType);
+
+  auto componentPathElt =
+      locator->getLastElementAs<LocatorPathElt::KeyPathComponent>();
+  if (componentPathElt && componentPathElt->getIndex() == 0) {
+    // For members where the base type is an optional key path root
+    // let's emit a tailored note suggesting to use its unwrapped type.
+    auto *keyPathExpr = castToExpr<KeyPathExpr>(getAnchor());
+    if (auto rootType = keyPathExpr->getRootType()) {
+      emitDiagnostic(diag::optional_base_remove_optional_for_keypath_root,
+                     unwrappedBaseType)
+          .fixItReplace(rootType->getSourceRange(),
+                        unwrappedBaseType.getString());
+    }
+  } else {
+    // FIXME: It would be nice to immediately offer "base?.member ?? defaultValue"
+    // for non-optional results where that would be appropriate. For the moment
+    // always offering "?" means that if the user chooses chaining, we'll end up
+    // in MissingOptionalUnwrapFailure:diagnose() to offer a default value during
+    // the next compile.
+    emitDiagnostic(diag::optional_base_chain, Member)
+        .fixItInsertAfter(sourceRange.End, "?");
 
-  emitDiagnostic(diag::optional_base_not_unwrapped, baseType, Member,
-                 unwrappedBaseType);
-
-  // FIXME: It would be nice to immediately offer "base?.member ?? defaultValue"
-  // for non-optional results where that would be appropriate. For the moment
-  // always offering "?" means that if the user chooses chaining, we'll end up
-  // in MissingOptionalUnwrapFailure:diagnose() to offer a default value during
-  // the next compile.
-  emitDiagnostic(diag::optional_base_chain, Member)
-      .fixItInsertAfter(getSourceRange().End, "?");
-
-  if (!resultIsOptional) {
-    emitDiagnostic(diag::unwrap_with_force_value)
-        .fixItInsertAfter(getSourceRange().End, "!");
+    if (!resultIsOptional) {
+      emitDiagnostic(diag::unwrap_with_force_value)
+          .fixItInsertAfter(sourceRange.End, "!");
+    }
   }
 
   return true;
@@ -2026,7 +2089,8 @@ bool ContextualFailure::diagnoseAsError() {
     if (CTP == CTP_ForEachStmt) {
       if (fromType->isAnyExistentialType()) {
         emitDiagnostic(diag::type_cannot_conform,
-                       /*isExistentialType=*/true, fromType, toType);
+                       /*isExistentialType=*/true, fromType, 
+                       fromType->isEqual(toType), toType);
         return true;
       }
 
@@ -3312,7 +3376,7 @@ bool MissingMemberFailure::diagnoseInLiteralCollectionContext() const {
 
   auto parentType = getType(parentExpr);
 
-  if (!isCollectionType(parentType) && !parentType->is<TupleType>())
+  if (!parentType->isKnownStdlibCollectionType() && !parentType->is<TupleType>())
     return false;
 
   if (isa<TupleExpr>(parentExpr)) {
diff --git a/lib/Sema/CSDiagnostics.h b/lib/Sema/CSDiagnostics.h
index 43306c0f08137..16fa57735e282 100644
--- a/lib/Sema/CSDiagnostics.h
+++ b/lib/Sema/CSDiagnostics.h
@@ -208,11 +208,6 @@ class FailureDiagnostic {
       llvm::function_ref<void(GenericTypeParamType *, Type)> substitution =
           [](GenericTypeParamType *, Type) {});
 
-  bool isCollectionType(Type type) const {
-    auto &cs = getConstraintSystem();
-    return cs.isCollectionType(type);
-  }
-
   bool isArrayType(Type type) const {
     auto &cs = getConstraintSystem();
     return bool(cs.isArrayType(type));
@@ -479,16 +474,32 @@ class LabelingFailure final : public FailureDiagnostic {
 /// type without optional chaining or force-unwrapping it first.
 class MemberAccessOnOptionalBaseFailure final : public FailureDiagnostic {
   DeclNameRef Member;
+  Type MemberBaseType;
   bool ResultTypeIsOptional;
 
 public:
   MemberAccessOnOptionalBaseFailure(const Solution &solution,
                                     ConstraintLocator *locator,
-                                    DeclNameRef memberName, bool resultOptional)
+                                    DeclNameRef memberName,
+                                    Type memberBaseType,
+                                    bool resultOptional)
       : FailureDiagnostic(solution, locator), Member(memberName),
+        MemberBaseType(resolveType(memberBaseType)),
         ResultTypeIsOptional(resultOptional) {}
 
   bool diagnoseAsError() override;
+  
+  Type getMemberBaseType() const {
+    return MemberBaseType;
+  }
+  
+  SourceLoc getLoc() const override {
+    // The end location points to the dot in the member access.
+    return getSourceRange().End;
+  }
+  
+  SourceRange getSourceRange() const override;
+
 };
 
 /// Diagnose errors associated with rvalues in positions
diff --git a/lib/Sema/CSFix.cpp b/lib/Sema/CSFix.cpp
index d638fb8c9e10d..f81e5cf78726d 100644
--- a/lib/Sema/CSFix.cpp
+++ b/lib/Sema/CSFix.cpp
@@ -83,21 +83,24 @@ bool UnwrapOptionalBase::diagnose(const Solution &solution, bool asNote) const {
   bool resultIsOptional =
       getKind() == FixKind::UnwrapOptionalBaseWithOptionalResult;
   MemberAccessOnOptionalBaseFailure failure(solution, getLocator(), MemberName,
-                                            resultIsOptional);
+                                            MemberBaseType, resultIsOptional);
   return failure.diagnose(asNote);
 }
 
 UnwrapOptionalBase *UnwrapOptionalBase::create(ConstraintSystem &cs,
                                                DeclNameRef member,
+                                               Type memberBaseType,
                                                ConstraintLocator *locator) {
-  return new (cs.getAllocator())
-      UnwrapOptionalBase(cs, FixKind::UnwrapOptionalBase, member, locator);
+  return new (cs.getAllocator()) UnwrapOptionalBase(
+      cs, FixKind::UnwrapOptionalBase, member, memberBaseType, locator);
 }
 
 UnwrapOptionalBase *UnwrapOptionalBase::createWithOptionalResult(
-    ConstraintSystem &cs, DeclNameRef member, ConstraintLocator *locator) {
-  return new (cs.getAllocator()) UnwrapOptionalBase(
-      cs, FixKind::UnwrapOptionalBaseWithOptionalResult, member, locator);
+    ConstraintSystem &cs, DeclNameRef member, Type memberBaseType,
+    ConstraintLocator *locator) {
+  return new (cs.getAllocator())
+      UnwrapOptionalBase(cs, FixKind::UnwrapOptionalBaseWithOptionalResult,
+                         member, memberBaseType, locator);
 }
 
 bool AddAddressOf::diagnose(const Solution &solution, bool asNote) const {
@@ -252,6 +255,33 @@ bool ContextualMismatch::diagnose(const Solution &solution, bool asNote) const {
   return failure.diagnose(asNote);
 }
 
+bool ContextualMismatch::diagnoseForAmbiguity(
+    CommonFixesArray commonFixes) const {
+  auto getTypes =
+      [&](const std::pair<const Solution *, const ConstraintFix *> &entry)
+      -> std::pair<Type, Type> {
+    auto &solution = *entry.first;
+    auto *fix = static_cast<const ContextualMismatch *>(entry.second);
+
+    return {solution.simplifyType(fix->getFromType()),
+            solution.simplifyType(fix->getToType())};
+  };
+
+  auto etalonTypes = getTypes(commonFixes.front());
+  if (llvm::all_of(
+          commonFixes,
+          [&](const std::pair<const Solution *, const ConstraintFix *> &entry) {
+            auto types = getTypes(entry);
+            return etalonTypes.first->isEqual(types.first) &&
+                   etalonTypes.second->isEqual(types.second);
+          })) {
+    const auto &primary = commonFixes.front();
+    return primary.second->diagnose(*primary.first, /*asNote=*/false);
+  }
+
+  return false;
+}
+
 ContextualMismatch *ContextualMismatch::create(ConstraintSystem &cs, Type lhs,
                                                Type rhs,
                                                ConstraintLocator *locator) {
@@ -381,6 +411,57 @@ bool AllowFunctionTypeMismatch::diagnose(const Solution &solution,
   return coalesceAndDiagnose(solution, {}, asNote);
 }
 
+bool AllowFunctionTypeMismatch::diagnoseForAmbiguity(
+    CommonFixesArray commonFixes) const {
+  if (ContextualMismatch::diagnoseForAmbiguity(commonFixes))
+    return true;
+
+  auto *locator = getLocator();
+  // If this is a mismatch between two function types at argument
+  // position, there is a tailored diagnostic for that.
+  if (auto argConv =
+          locator->getLastElementAs<LocatorPathElt::ApplyArgToParam>()) {
+    auto &cs = getConstraintSystem();
+    auto &DE = cs.getASTContext().Diags;
+    auto &solution = *commonFixes[0].first;
+
+    auto info = getStructuralTypeContext(solution, locator);
+    if (!info)
+      return false;
+
+    auto *argLoc = cs.getConstraintLocator(simplifyLocatorToAnchor(locator));
+
+    auto overload = solution.getOverloadChoiceIfAvailable(
+        solution.getCalleeLocator(argLoc));
+    if (!overload)
+      return false;
+
+    auto name = overload->choice.getName().getBaseName();
+    DE.diagnose(getLoc(getAnchor()), diag::no_candidates_match_argument_type,
+                name.userFacingName(), std::get<2>(*info),
+                argConv->getParamIdx());
+
+    for (auto &entry : commonFixes) {
+      auto &solution = *entry.first;
+      auto overload = solution.getOverloadChoiceIfAvailable(
+          solution.getCalleeLocator(argLoc));
+
+      if (!(overload && overload->choice.isDecl()))
+        continue;
+
+      auto *decl = overload->choice.getDecl();
+      if (decl->getLoc().isValid()) {
+        DE.diagnose(decl, diag::found_candidate_type,
+                    solution.simplifyType(overload->openedType));
+      }
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
 AllowFunctionTypeMismatch *
 AllowFunctionTypeMismatch::create(ConstraintSystem &cs, Type lhs, Type rhs,
                                   ConstraintLocator *locator, unsigned index) {
@@ -867,14 +948,19 @@ RemoveAddressOf *RemoveAddressOf::create(ConstraintSystem &cs, Type lhs, Type rh
   return new (cs.getAllocator()) RemoveAddressOf(cs, lhs, rhs, locator);
 }
 
+RemoveReturn::RemoveReturn(ConstraintSystem &cs, Type resultTy,
+                           ConstraintLocator *locator)
+    : ContextualMismatch(cs, FixKind::RemoveReturn, resultTy,
+                         cs.getASTContext().TheEmptyTupleType, locator) {}
+
 bool RemoveReturn::diagnose(const Solution &solution, bool asNote) const {
   ExtraneousReturnFailure failure(solution, getLocator());
   return failure.diagnose(asNote);
 }
 
-RemoveReturn *RemoveReturn::create(ConstraintSystem &cs,
+RemoveReturn *RemoveReturn::create(ConstraintSystem &cs, Type resultTy,
                                    ConstraintLocator *locator) {
-  return new (cs.getAllocator()) RemoveReturn(cs, locator);
+  return new (cs.getAllocator()) RemoveReturn(cs, resultTy, locator);
 }
 
 bool CollectionElementContextualMismatch::diagnose(const Solution &solution,
@@ -1079,6 +1165,43 @@ bool IgnoreAssignmentDestinationType::diagnose(const Solution &solution,
   return failure.diagnose(asNote);
 }
 
+bool IgnoreAssignmentDestinationType::diagnoseForAmbiguity(
+    CommonFixesArray commonFixes) const {
+  auto &cs = getConstraintSystem();
+
+  // If all of the types are the same let's try to diagnose
+  // this as if there is no ambiguity.
+  if (ContextualMismatch::diagnoseForAmbiguity(commonFixes))
+    return true;
+
+  auto *commonLocator = getLocator();
+  auto *assignment = castToExpr<AssignExpr>(commonLocator->getAnchor());
+
+  auto &solution = *commonFixes.front().first;
+  auto *calleeLocator = solution.getCalleeLocator(
+      solution.getConstraintLocator(assignment->getSrc()));
+  auto overload = solution.getOverloadChoiceIfAvailable(calleeLocator);
+  if (!overload)
+    return false;
+
+  auto memberName = overload->choice.getName().getBaseName();
+  auto destType = solution.getType(assignment->getDest());
+
+  auto &DE = cs.getASTContext().Diags;
+  // TODO(diagnostics): It might be good to add a tailored diagnostic
+  // for cases like this instead of using "contextual" one.
+  DE.diagnose(assignment->getSrc()->getLoc(),
+              diag::no_candidates_match_result_type,
+              memberName.userFacingName(),
+              solution.simplifyType(destType)->getRValueType());
+
+  for (auto &entry : commonFixes) {
+    entry.second->diagnose(*entry.first, /*asNote=*/true);
+  }
+
+  return true;
+}
+
 IgnoreAssignmentDestinationType *
 IgnoreAssignmentDestinationType::create(ConstraintSystem &cs, Type sourceTy,
                                         Type destTy,
diff --git a/lib/Sema/CSFix.h b/lib/Sema/CSFix.h
index 191bfd7170dcf..18192acad8ad3 100644
--- a/lib/Sema/CSFix.h
+++ b/lib/Sema/CSFix.h
@@ -336,10 +336,12 @@ class ConstraintFix {
 /// Unwrap an optional base when we have a member access.
 class UnwrapOptionalBase final : public ConstraintFix {
   DeclNameRef MemberName;
+  Type MemberBaseType;
 
   UnwrapOptionalBase(ConstraintSystem &cs, FixKind kind, DeclNameRef member,
-                     ConstraintLocator *locator)
-      : ConstraintFix(cs, kind, locator), MemberName(member) {
+                     Type memberBaseType, ConstraintLocator *locator)
+      : ConstraintFix(cs, kind, locator), MemberName(member),
+        MemberBaseType(memberBaseType) {
     assert(kind == FixKind::UnwrapOptionalBase ||
            kind == FixKind::UnwrapOptionalBaseWithOptionalResult);
   }
@@ -352,11 +354,12 @@ class UnwrapOptionalBase final : public ConstraintFix {
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
   static UnwrapOptionalBase *create(ConstraintSystem &cs, DeclNameRef member,
+                                    Type memberBaseType,
                                     ConstraintLocator *locator);
 
   static UnwrapOptionalBase *
   createWithOptionalResult(ConstraintSystem &cs, DeclNameRef member,
-                           ConstraintLocator *locator);
+                           Type memberBaseType, ConstraintLocator *locator);
 };
 
 // Treat rvalue as if it was an lvalue
@@ -369,6 +372,10 @@ class TreatRValueAsLValue final : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
+    return diagnose(*commonFixes.front().first);
+  }
+
   static TreatRValueAsLValue *create(ConstraintSystem &cs,
                                      ConstraintLocator *locator);
 };
@@ -522,6 +529,8 @@ class ContextualMismatch : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override;
+
   static ContextualMismatch *create(ConstraintSystem &cs, Type lhs, Type rhs,
                                     ConstraintLocator *locator);
 };
@@ -798,6 +807,10 @@ class UsePropertyWrapper final : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
+    return diagnose(*commonFixes.front().first);
+  }
+
   static UsePropertyWrapper *create(ConstraintSystem &cs, VarDecl *wrapped,
                                     bool usingStorageWrapper, Type base,
                                     Type wrapper, ConstraintLocator *locator);
@@ -825,6 +838,10 @@ class UseWrappedValue final : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
+    return diagnose(*commonFixes.front().first);
+  }
+
   static UseWrappedValue *create(ConstraintSystem &cs, VarDecl *propertyWrapper,
                                  Type base, Type wrapper,
                                  ConstraintLocator *locator);
@@ -1103,6 +1120,8 @@ class AllowFunctionTypeMismatch final : public ContextualMismatch {
                            bool asNote = false) const override;
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
+
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override;
 };
 
 
@@ -1399,16 +1418,16 @@ class AllowInvalidRefInKeyPath final : public ConstraintFix {
                                           ConstraintLocator *locator);
 };
 
-class RemoveReturn final : public ConstraintFix {
-  RemoveReturn(ConstraintSystem &cs, ConstraintLocator *locator)
-      : ConstraintFix(cs, FixKind::RemoveReturn, locator) {}
+class RemoveReturn final : public ContextualMismatch {
+  RemoveReturn(ConstraintSystem &cs, Type resultTy, ConstraintLocator *locator);
 
 public:
   std::string getName() const override { return "remove or omit return type"; }
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
-  static RemoveReturn *create(ConstraintSystem &cs, ConstraintLocator *locator);
+  static RemoveReturn *create(ConstraintSystem &cs, Type resultTy,
+                              ConstraintLocator *locator);
 };
 
 class CollectionElementContextualMismatch final : public ContextualMismatch {
@@ -1527,10 +1546,6 @@ class IgnoreContextualType : public ContextualMismatch {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
-  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
-    return diagnose(*commonFixes.front().first);
-  }
-
   static IgnoreContextualType *create(ConstraintSystem &cs, Type resultTy,
                                       Type specifiedTy,
                                       ConstraintLocator *locator);
@@ -1548,6 +1563,8 @@ class IgnoreAssignmentDestinationType final : public ContextualMismatch {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override;
+
   static IgnoreAssignmentDestinationType *create(ConstraintSystem &cs,
                                                  Type sourceTy, Type destTy,
                                                  ConstraintLocator *locator);
diff --git a/lib/Sema/CSGen.cpp b/lib/Sema/CSGen.cpp
index 6da376c1ff850..4af283a10d048 100644
--- a/lib/Sema/CSGen.cpp
+++ b/lib/Sema/CSGen.cpp
@@ -36,26 +36,6 @@
 using namespace swift;
 using namespace swift::constraints;
 
-/// Find the declaration directly referenced by this expression.
-static std::pair<ValueDecl *, FunctionRefKind>
-findReferencedDecl(Expr *expr, DeclNameLoc &loc) {
-  do {
-    expr = expr->getSemanticsProvidingExpr();
-
-    if (auto ice = dyn_cast<ImplicitConversionExpr>(expr)) {
-      expr = ice->getSubExpr();
-      continue;
-    }
-
-    if (auto dre = dyn_cast<DeclRefExpr>(expr)) {
-      loc = dre->getNameLoc();
-      return { dre->getDecl(), dre->getFunctionRefKind() };
-    }
-
-    return { nullptr, FunctionRefKind::Unapplied };
-  } while (true);
-}
-
 static bool isArithmeticOperatorDecl(ValueDecl *vd) {
   return vd && 
   (vd->getBaseName() == "+" ||
@@ -915,35 +895,6 @@ namespace {
   };
 } // end anonymous namespace
 
-namespace {
-// Check if \p E is a call expression to curried thunk of "KeyPath as function".
-// i.e. '{ `$kp$` in { $0[keyPath: $kp$] } }(keypath)'
-static bool isKeyPathCurriedThunkCallExpr(Expr *E) {
-  auto CE = dyn_cast<CallExpr>(E);
-  if (!CE)
-    return false;
-  auto thunk = dyn_cast<AutoClosureExpr>(CE->getFn());
-  if (!thunk)
-    return false;
-  if (thunk->getParameters()->size() != 1 ||
-      thunk->getParameters()->get(0)->getParameterName().str() != "$kp$")
-    return false;
-
-  auto PE = dyn_cast<ParenExpr>(CE->getArg());
-  if (!PE)
-    return false;
-  return isa<KeyPathExpr>(PE->getSubExpr());
-}
-
-// Extract the keypath expression from the curried thunk expression.
-static Expr *extractKeyPathFromCurryThunkCall(Expr *E) {
-  assert(isKeyPathCurriedThunkCallExpr(E));
-  auto call = cast<CallExpr>(E);
-  auto arg = cast<ParenExpr>(call->getArg());
-  return arg->getSubExpr();
-}
-} // end anonymous namespace
-
 namespace {
 
   class ConstraintGenerator : public ExprVisitor<ConstraintGenerator, Type> {
@@ -1357,22 +1308,21 @@ namespace {
       if (expr->getType())
         return expr->getType();
 
-      auto &de = CS.getASTContext().Diags;
-      auto protocol = TypeChecker::getLiteralProtocol(CS.getASTContext(), expr);
+      auto &ctx = CS.getASTContext();
+      auto &de = ctx.Diags;
+      auto protocol = TypeChecker::getLiteralProtocol(ctx, expr);
       if (!protocol) {
         de.diagnose(expr->getLoc(), diag::use_unknown_object_literal_protocol,
                     expr->getLiteralKindPlainName());
         return nullptr;
       }
 
-      auto tv = CS.createTypeVariable(exprLoc,
-                                      TVO_PrefersSubtypeBinding |
-                                      TVO_CanBindToNoEscape |
-                                      TVO_CanBindToHole);
-      
-      CS.addConstraint(ConstraintKind::LiteralConformsTo, tv,
-                       protocol->getDeclaredType(),
-                       exprLoc);
+      auto witnessType = CS.createTypeVariable(
+          exprLoc, TVO_PrefersSubtypeBinding | TVO_CanBindToNoEscape |
+                       TVO_CanBindToHole);
+
+      CS.addConstraint(ConstraintKind::LiteralConformsTo, witnessType,
+                       protocol->getDeclaredType(), exprLoc);
 
       // The arguments are required to be argument-convertible to the
       // idealized parameter type of the initializer, which generally
@@ -1380,9 +1330,7 @@ namespace {
       // all the redundant stuff about literals (leaving e.g. "red:").
       // Constraint application will quietly rewrite the type of 'args' to
       // use the right labels before forming the call to the initializer.
-      auto constrName =
-          TypeChecker::getObjectLiteralConstructorName(CS.getASTContext(),
-                                                       expr);
+      auto constrName = TypeChecker::getObjectLiteralConstructorName(ctx, expr);
       assert(constrName);
       auto *constr = dyn_cast_or_null<ConstructorDecl>(
           protocol->getSingleRequirement(constrName));
@@ -1390,27 +1338,33 @@ namespace {
         de.diagnose(protocol, diag::object_literal_broken_proto);
         return nullptr;
       }
-      auto constrParamType =
-          TypeChecker::getObjectLiteralParameterType(expr, constr);
 
-      // Extract the arguments.
+      auto *memberLoc =
+          CS.getConstraintLocator(expr, ConstraintLocator::ConstructorMember);
+
+      auto *memberType =
+          CS.createTypeVariable(memberLoc, TVO_CanBindToNoEscape);
+
+      CS.addValueMemberConstraint(MetatypeType::get(witnessType, ctx),
+                                  DeclNameRef(constrName), memberType, CurDC,
+                                  FunctionRefKind::DoubleApply, {}, memberLoc);
+
       SmallVector<AnyFunctionType::Param, 8> args;
       AnyFunctionType::decomposeInput(CS.getType(expr->getArg()), args);
 
-      // Extract the parameters.
-      SmallVector<AnyFunctionType::Param, 8> params;
-      AnyFunctionType::decomposeInput(constrParamType, params);
+      auto resultType = CS.createTypeVariable(
+          CS.getConstraintLocator(expr, ConstraintLocator::FunctionResult),
+          TVO_CanBindToNoEscape);
 
-      auto funcType = constr->getMethodInterfaceType()->castTo<FunctionType>();
-      ::matchCallArguments(
-          CS, funcType, args, params, ConstraintKind::ArgumentConversion,
-          CS.getConstraintLocator(expr, ConstraintLocator::ApplyArgument));
+      CS.addConstraint(
+          ConstraintKind::ApplicableFunction,
+          FunctionType::get(args, resultType), memberType,
+          CS.getConstraintLocator(expr, ConstraintLocator::ApplyFunction));
 
-      Type result = tv;
       if (constr->isFailable())
-        result = OptionalType::get(result);
+        return OptionalType::get(witnessType);
 
-      return result;
+      return witnessType;
     }
 
     Type visitDeclRefExpr(DeclRefExpr *E) {
@@ -2328,12 +2282,17 @@ namespace {
 
         return setType(ParenType::get(CS.getASTContext(), underlyingType));
       }
-      case PatternKind::Var:
+      case PatternKind::Var: {
+        auto *subPattern = cast<VarPattern>(pattern)->getSubPattern();
+        auto type = getTypeForPattern(subPattern, locator, externalPatternType,
+                                      bindPatternVarsOneWay);
+
+        if (!type)
+          return Type();
+
         // Var doesn't affect the type.
-        return setType(
-            getTypeForPattern(
-              cast<VarPattern>(pattern)->getSubPattern(), locator,
-              externalPatternType, bindPatternVarsOneWay));
+        return setType(type);
+      }
 
       case PatternKind::Any: {
         return setType(
@@ -3773,290 +3732,6 @@ namespace {
     }
   };
 
-  /// AST walker that "sanitizes" an expression for the
-  /// constraint-based type checker.
-  ///
-  /// This is necessary because Sema fills in too much type information before
-  /// the type-checker runs, causing redundant work, and for expression that
-  /// have already been typechecked and may contain unhandled AST nodes.
-  ///
-  /// FIXME: Remove this one we no longer re-type check expressions during
-  /// diagnostics and code completion.
-  class SanitizeExpr : public ASTWalker {
-    ConstraintSystem &CS;
-    llvm::SmallDenseMap<OpaqueValueExpr *, Expr *, 4> OpenExistentials;
-
-  public:
-    SanitizeExpr(ConstraintSystem &cs) : CS(cs){ }
-
-    ASTContext &getASTContext() const { return CS.getASTContext(); }
-
-    std::pair<bool, Expr *> walkToExprPre(Expr *expr) override {
-      while (true) {
-
-        // If we should reuse pre-checked types, don't sanitize the expression
-        // if it's already type-checked.
-        if (CS.shouldReusePrecheckedType() && expr->getType())
-          return { false, expr };
-
-        // OpenExistentialExpr contains OpaqueValueExpr in its sub expression.
-        if (auto OOE = dyn_cast<OpenExistentialExpr>(expr)) {
-          auto archetypeVal = OOE->getOpaqueValue();
-          auto base = OOE->getExistentialValue();
-
-          bool inserted = OpenExistentials.insert({archetypeVal, base}).second;
-          assert(inserted && "OpaqueValue appears multiple times?");
-          (void)inserted;
-          SWIFT_DEFER { OpenExistentials.erase(archetypeVal); };
-
-          // Walk to and return the base expression to erase any existentials
-          // within it.
-          return { false, OOE->getSubExpr()->walk(*this) };
-        }
-
-        // Hacky, this behaves just like an OpenedExistential in that it changes
-        // the expr tree.
-        if (auto ISLE = dyn_cast<InterpolatedStringLiteralExpr>(expr)) {
-          if (auto subExpr = ISLE->getAppendingExpr()->getSubExpr()) {
-            if (auto opaqueValue = dyn_cast<OpaqueValueExpr>(subExpr)) {
-              ISLE->getAppendingExpr()->setSubExpr(nullptr);
-            }
-          }
-        }
-
-        // Substitute OpaqueValue with its representing existental.
-        if (auto OVE = dyn_cast<OpaqueValueExpr>(expr)) {
-          auto value = OpenExistentials.find(OVE);
-
-          if (value != OpenExistentials.end()) {
-            expr = value->second;
-            continue;
-          } else {
-            assert(OVE->isPlaceholder() &&
-                   "Didn't see this OVE in a containing OpenExistentialExpr?");
-          }
-        }
-
-        // Skip any implicit conversions applied to this expression.
-        if (auto ICE = dyn_cast<ImplicitConversionExpr>(expr)) {
-          expr = ICE->getSubExpr();
-          continue;
-        }
-
-        // MakeTemporarilyEscapableExpr is typechecked expression.
-        if (auto MTEE = dyn_cast<MakeTemporarilyEscapableExpr>(expr)) {
-          expr = MTEE->getOriginalExpr();
-          continue;
-        }
-
-        // Extract keypath from '{ `$kp$` in { $0[keyPath: $kp$] } }(keypath)'
-        if (isKeyPathCurriedThunkCallExpr(expr)) {
-          expr = extractKeyPathFromCurryThunkCall(expr);
-          continue;
-        }
-
-        // Restore '@autoclosure'd value.
-        if (auto ACE = dyn_cast<AutoClosureExpr>(expr)) {
-          // This is only valid if the closure doesn't have parameters.
-          if (ACE->getParameters()->size() == 0) {
-            expr = ACE->getSingleExpressionBody();
-            continue;
-          }
-          llvm_unreachable("other AutoClosureExpr must be handled specially");
-        }
-
-        // Remove any semantic expression injected by typechecking.
-        if (auto EPE = dyn_cast<EditorPlaceholderExpr>(expr)) {
-          EPE->setSemanticExpr(nullptr);
-        }
-
-        // Strip default arguments and varargs from type-checked call
-        // argument lists.
-        if (isa<ParenExpr>(expr) || isa<TupleExpr>(expr)) {
-          if (shouldSanitizeArgumentList(expr))
-            expr = sanitizeArgumentList(expr);
-        }
-
-        // If this expression represents keypath based dynamic member
-        // lookup, let's convert it back to the original form of
-        // member or subscript reference.
-        if (auto *SE = dyn_cast<SubscriptExpr>(expr)) {
-          if (auto *TE = dyn_cast<TupleExpr>(SE->getIndex())) {
-            auto isImplicitKeyPathExpr = [](Expr *argExpr) -> bool {
-              if (auto *KP = dyn_cast<KeyPathExpr>(argExpr))
-                return KP->isImplicit();
-              return false;
-            };
-
-            if (TE->isImplicit() && TE->getNumElements() == 1 &&
-                TE->getElementName(0) == getASTContext().Id_dynamicMember &&
-                isImplicitKeyPathExpr(TE->getElement(0))) {
-              auto *keyPathExpr = cast<KeyPathExpr>(TE->getElement(0));
-              auto *componentExpr = keyPathExpr->getParsedPath();
-
-              if (auto *UDE = dyn_cast<UnresolvedDotExpr>(componentExpr)) {
-                UDE->setBase(SE->getBase());
-                return {true, UDE};
-              }
-
-              if (auto *subscript = dyn_cast<SubscriptExpr>(componentExpr)) {
-                subscript->setBase(SE->getBase());
-                return {true, subscript};
-              }
-
-              llvm_unreachable("unknown keypath component type");
-            }
-          }
-        }
-
-        // If this is a closure, only walk into its children if they
-        // are type-checked in the context of the enclosing expression.
-        if (auto closure = dyn_cast<ClosureExpr>(expr)) {
-          if (!shouldTypeCheckInEnclosingExpression(closure))
-            return { false, expr };
-        }
-
-        // Now, we're ready to walk into sub expressions.
-        return {true, expr};
-      }
-    }
-
-    bool isSyntheticArgumentExpr(const Expr *expr) {
-      if (isa<DefaultArgumentExpr>(expr))
-        return true;
-
-      if (auto *varargExpr = dyn_cast<VarargExpansionExpr>(expr))
-        if (isa<ArrayExpr>(varargExpr->getSubExpr()))
-          return true;
-
-      return false;
-    }
-
-    bool shouldSanitizeArgumentList(const Expr *expr) {
-      if (auto *parenExpr = dyn_cast<ParenExpr>(expr)) {
-        return isSyntheticArgumentExpr(parenExpr->getSubExpr());
-      } else if (auto *tupleExpr = dyn_cast<TupleExpr>(expr)) {
-        for (auto *arg : tupleExpr->getElements()) {
-          if (isSyntheticArgumentExpr(arg))
-            return true;
-        }
-
-        return false;
-      } else {
-        return isSyntheticArgumentExpr(expr);
-      }
-    }
-
-    Expr *sanitizeArgumentList(Expr *original) {
-      auto argList = getOriginalArgumentList(original);
-
-      if (argList.args.size() == 1 &&
-          argList.labels[0].empty() &&
-          !isa<VarargExpansionExpr>(argList.args[0])) {
-        auto *result =
-          new (getASTContext()) ParenExpr(argList.lParenLoc,
-                                          argList.args[0],
-                                          argList.rParenLoc,
-                                          argList.hasTrailingClosure);
-        result->setImplicit();
-        return result;
-      }
-
-      return TupleExpr::create(getASTContext(),
-                               argList.lParenLoc,
-                               argList.args,
-                               argList.labels,
-                               argList.labelLocs,
-                               argList.rParenLoc,
-                               argList.hasTrailingClosure,
-                               /*implicit=*/true);
-    }
-
-    Expr *walkToExprPost(Expr *expr) override {
-      if (CS.hasType(expr)) {
-        Type type = CS.getType(expr);
-        if (type->hasOpenedExistential()) {
-          type = type.transform([&](Type type) -> Type {
-            if (auto archetype = type->getAs<OpenedArchetypeType>())
-              return archetype->getOpenedExistentialType();
-            return type;
-          });
-          CS.setType(expr, type);
-          // Set new type to the expression directly.
-          expr->setType(type);
-        }
-      }
-
-      assert(!isa<ImplicitConversionExpr>(expr) &&
-             "ImplicitConversionExpr should be eliminated in walkToExprPre");
-
-      auto buildMemberRef = [&](Type memberType, Expr *base, SourceLoc dotLoc,
-                                ConcreteDeclRef member, DeclNameLoc memberLoc,
-                                bool implicit) -> Expr * {
-        auto *memberRef = new (getASTContext())
-            MemberRefExpr(base, dotLoc, member, memberLoc, implicit);
-
-        if (memberType) {
-          memberRef->setType(memberType);
-          return CS.cacheType(memberRef);
-        }
-
-        return memberRef;
-      };
-
-      // A DotSyntaxCallExpr is a member reference that has already been
-      // type-checked down to a call; turn it back into an overloaded
-      // member reference expression.
-      if (auto dotCall = dyn_cast<DotSyntaxCallExpr>(expr)) {
-        DeclNameLoc memberLoc;
-        auto memberAndFunctionRef = findReferencedDecl(dotCall->getFn(),
-                                                       memberLoc);
-        if (memberAndFunctionRef.first) {
-          assert(!isa<ImplicitConversionExpr>(dotCall->getBase()));
-          return buildMemberRef(dotCall->getType(),
-                                dotCall->getBase(),
-                                dotCall->getDotLoc(),
-                                memberAndFunctionRef.first,
-                                memberLoc, expr->isImplicit());
-        }
-      }
-
-      if (auto *dynamicMember = dyn_cast<DynamicMemberRefExpr>(expr)) {
-        if (auto memberRef = dynamicMember->getMember()) {
-          assert(!isa<ImplicitConversionExpr>(dynamicMember->getBase()));
-          return buildMemberRef(dynamicMember->getType(),
-                                dynamicMember->getBase(),
-                                dynamicMember->getDotLoc(),
-                                memberRef,
-                                dynamicMember->getNameLoc(),
-                                expr->isImplicit());
-        }
-      }
-
-      // A DotSyntaxBaseIgnoredExpr is a static member reference that has
-      // already been type-checked down to a call where the argument doesn't
-      // actually matter; turn it back into an overloaded member reference
-      // expression.
-      if (auto dotIgnored = dyn_cast<DotSyntaxBaseIgnoredExpr>(expr)) {
-        DeclNameLoc memberLoc;
-        auto memberAndFunctionRef = findReferencedDecl(dotIgnored->getRHS(),
-                                                       memberLoc);
-        if (memberAndFunctionRef.first) {
-          assert(!isa<ImplicitConversionExpr>(dotIgnored->getLHS()));
-          return buildMemberRef(dotIgnored->getType(),
-                                dotIgnored->getLHS(),
-                                dotIgnored->getDotLoc(),
-                                memberAndFunctionRef.first,
-                                memberLoc, expr->isImplicit());
-        }
-      }
-      return expr;
-    }
-
-    /// Ignore declarations.
-    bool walkToDeclPre(Decl *decl) override { return false; }
-  };
-
   class ConstraintWalker : public ASTWalker {
     ConstraintGenerator &CG;
 
@@ -4184,9 +3859,6 @@ namespace {
 
 static Expr *generateConstraintsFor(ConstraintSystem &cs, Expr *expr,
                                     DeclContext *DC) {
-  // Remove implicit conversions from the expression.
-  expr = expr->walk(SanitizeExpr(cs));
-
   // Walk the expression, generating constraints.
   ConstraintGenerator cg(cs, DC);
   ConstraintWalker cw(cg);
@@ -4209,26 +3881,35 @@ static Expr *generateConstraintsFor(ConstraintSystem &cs, Expr *expr,
 static Type generateWrappedPropertyTypeConstraints(
    ConstraintSystem &cs, Type initializerType,
    VarDecl *wrappedVar, ConstraintLocator *locator) {
-  Type valueType = LValueType::get(initializerType);
   auto dc = wrappedVar->getInnermostDeclContext();
 
+  Type wrapperType = LValueType::get(initializerType);
+  Type wrappedValueType;
+
   for (unsigned i : indices(wrappedVar->getAttachedPropertyWrappers())) {
+    Type rawWrapperType = wrappedVar->getAttachedPropertyWrapperType(i);
+    if (!rawWrapperType || rawWrapperType->hasError())
+      return Type();
+
+    // The former wrappedValue type must be equal to the current wrapper type
+    if (wrappedValueType) {
+      wrapperType = cs.openUnboundGenericTypes(rawWrapperType, locator);
+      cs.addConstraint(ConstraintKind::Equal, wrappedValueType, wrapperType,
+                       locator);
+    }
+
     auto wrapperInfo = wrappedVar->getAttachedPropertyWrapperTypeInfo(i);
     if (!wrapperInfo)
-      break;
-
-    locator = cs.getConstraintLocator(locator, ConstraintLocator::Member);
-    Type memberType = cs.createTypeVariable(locator, TVO_CanBindToLValue);
-    cs.addValueMemberConstraint(
-        valueType, wrapperInfo.valueVar->createNameRef(),
-        memberType, dc, FunctionRefKind::Unapplied, { }, locator);
-    valueType = memberType;
+      return Type();
+
+    wrappedValueType = wrapperType->getTypeOfMember(
+        dc->getParentModule(), wrapperInfo.valueVar);
   }
 
   // Set up an equality constraint to drop the lvalue-ness of the value
   // type we produced.
   Type propertyType = cs.createTypeVariable(locator, 0);
-  cs.addConstraint(ConstraintKind::Equal, propertyType, valueType, locator);
+  cs.addConstraint(ConstraintKind::Equal, propertyType, wrappedValueType, locator);
   return propertyType;
 }
 
@@ -4242,13 +3923,18 @@ static bool generateInitPatternConstraints(
       pattern, locator, target.shouldBindPatternVarsOneWay(),
       target.getInitializationPatternBindingDecl(),
       target.getInitializationPatternBindingIndex());
-  assert(patternType && "All patterns have a type");
+
+  if (!patternType)
+    return true;
 
   if (auto wrappedVar = target.getInitializationWrappedVar()) {
-    // Add an equal constraint between the pattern type and the
-    // property wrapper's "value" type.
     Type propertyType = generateWrappedPropertyTypeConstraints(
         cs, cs.getType(target.getAsExpr()), wrappedVar, locator);
+    if (!propertyType)
+      return true;
+
+    // Add an equal constraint between the pattern type and the
+    // property wrapper's "value" type.
     cs.addConstraint(ConstraintKind::Equal, patternType,
                      propertyType, locator, /*isFavored*/ true);
   } else if (!patternType->is<OpaqueTypeArchetypeType>()) {
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
index 8330741968c3e..e8a6e7091d2ca 100644
--- a/lib/Sema/CSSimplify.cpp
+++ b/lib/Sema/CSSimplify.cpp
@@ -1482,6 +1482,20 @@ assessRequirementFailureImpact(ConstraintSystem &cs, Type requirementType,
   if (!anchor)
     return impact;
 
+  // If this is a conditional requirement failure associated with a
+  // call, let's increase impact of the fix to show that such failure
+  // makes member/function unreachable in current context or with
+  // given arguments.
+  if (auto last = locator.last()) {
+    if (last->isConditionalRequirement()) {
+      if (auto *expr = getAsExpr(anchor)) {
+        auto *parent = cs.getParentExpr(expr);
+        if (parent && isa<ApplyExpr>(parent))
+          return 5;
+      }
+    }
+  }
+
   // If this requirement is associated with a member reference and it
   // was possible to check it before overload choice is bound, that means
   // types came from the context (most likely Self, or associated type(s))
@@ -1508,9 +1522,12 @@ assessRequirementFailureImpact(ConstraintSystem &cs, Type requirementType,
       return 10;
   }
 
-  // Increase the impact of a conformance fix for a standard library type,
-  // as it's unlikely to be a good suggestion. Also do the same for the builtin
-  // compiler types Any and AnyObject, which cannot conform to protocols.
+  // Increase the impact of a conformance fix for a standard library
+  // or foundation type, as it's unlikely to be a good suggestion.
+  //
+  // Also do the same for the builtin compiler types Any and AnyObject,
+  // which cannot conform to protocols.
+  //
   // FIXME: We ought not to have the is<TypeVariableType>() condition here, but
   // removing it currently regresses the diagnostic for the test case for
   // rdar://60727310. Once we better handle the separation of conformance fixes
@@ -1518,7 +1535,8 @@ assessRequirementFailureImpact(ConstraintSystem &cs, Type requirementType,
   // remove it from the condition.
   auto resolvedTy = cs.simplifyType(requirementType);
   if ((requirementType->is<TypeVariableType>() && resolvedTy->isStdlibType()) ||
-      resolvedTy->isAny() || resolvedTy->isAnyObject()) {
+      resolvedTy->isAny() || resolvedTy->isAnyObject() ||
+      getKnownFoundationEntity(resolvedTy->getString())) {
     if (auto last = locator.last()) {
       if (auto requirement = last->getAs<LocatorPathElt::AnyRequirement>()) {
         auto kind = requirement->getRequirementKind();
@@ -2321,7 +2339,7 @@ ConstraintSystem::matchExistentialTypes(Type type1, Type type2,
 
               auto *fix = fixRequirementFailure(*this, type1, type2, locator);
               if (fix && !recordFix(fix)) {
-                recordFixedRequirement(type1, RequirementKind::Layout, type2);
+                recordFixedRequirement(getConstraintLocator(locator), type2);
                 return getTypeMatchSuccess();
               }
             }
@@ -3690,7 +3708,7 @@ bool ConstraintSystem::repairFailures(
     // func foo<T>(_: [T]) {}
     // foo(1) // expected '[Int]', got 'Int'
     // ```
-    if (isCollectionType(rhs)) {
+    if (rhs->isKnownStdlibCollectionType()) {
       std::function<Type(Type)> getArrayOrSetType = [&](Type type) -> Type {
         if (auto eltTy = isArrayType(type))
           return getArrayOrSetType(*eltTy);
@@ -3857,14 +3875,13 @@ bool ConstraintSystem::repairFailures(
     if (hasConversionOrRestriction(ConversionRestrictionKind::DeepEquality))
       break;
 
-    auto reqElt = elt.castTo<LocatorPathElt::AnyRequirement>();
-    auto reqKind = reqElt.getRequirementKind();
+    auto *reqLoc = getConstraintLocator(locator);
 
-    if (hasFixedRequirement(lhs, reqKind, rhs))
+    if (isFixedRequirement(reqLoc, rhs))
       return true;
 
     if (auto *fix = fixRequirementFailure(*this, lhs, rhs, anchor, path)) {
-      recordFixedRequirement(lhs, reqKind, rhs);
+      recordFixedRequirement(reqLoc, rhs);
       conversionsOrFixes.push_back(fix);
     }
     break;
@@ -3896,11 +3913,16 @@ bool ConstraintSystem::repairFailures(
     if (lhs->isTypeVariableOrMember() || rhs->isTypeVariableOrMember())
       break;
 
+    // If there is already a fix for contextual failure, let's not
+    // record a duplicate one.
+    if (hasFixFor(getConstraintLocator(locator)))
+      return true;
+
     auto purpose = getContextualTypePurpose(anchor);
     if (rhs->isVoid() &&
         (purpose == CTP_ReturnStmt || purpose == CTP_ReturnSingleExpr)) {
       conversionsOrFixes.push_back(
-          RemoveReturn::create(*this, getConstraintLocator(locator)));
+          RemoveReturn::create(*this, lhs, getConstraintLocator(locator)));
       return true;
     }
 
@@ -5381,7 +5403,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
   auto protocolTy = protocol->getDeclaredType();
 
   // If this conformance has been fixed already, let's just consider this done.
-  if (hasFixedRequirement(type, RequirementKind::Conformance, protocolTy))
+  if (isFixedRequirement(getConstraintLocator(locator), protocolTy))
     return SolutionKind::Solved;
 
   // If this is a generic requirement let's try to record that
@@ -5468,7 +5490,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
         auto impact = assessRequirementFailureImpact(*this, rawType, locator);
         if (!recordFix(fix, impact)) {
           // Record this conformance requirement as "fixed".
-          recordFixedRequirement(type, RequirementKind::Conformance,
+          recordFixedRequirement(getConstraintLocator(anchor, path),
                                  protocolTy);
           return SolutionKind::Solved;
         }
@@ -5674,26 +5696,41 @@ ConstraintSystem::simplifyOptionalObjectConstraint(
   // If the base type is not optional, let's attempt a fix (if possible)
   // and assume that `!` is just not there.
   if (!objectTy) {
+    if (!shouldAttemptFixes())
+      return SolutionKind::Error;
+    
     // Let's see if we can apply a specific fix here.
-    if (shouldAttemptFixes()) {
-      if (optTy->isHole())
-        return SolutionKind::Solved;
-
-      auto *fix =
-          RemoveUnwrap::create(*this, optTy, getConstraintLocator(locator));
+    if (optTy->isHole())
+      return SolutionKind::Solved;
+    
+    auto fnType = optTy->getAs<FunctionType>();
+    if (fnType && fnType->getNumParams() == 0) {
+      // For function types with no parameters, let's try to
+      // offer a "make it a call" fix if possible.
+      auto optionalResultType = fnType->getResult()->getOptionalObjectType();
+      if (optionalResultType) {
+        if (matchTypes(optionalResultType, second, ConstraintKind::Bind,
+                       flags | TMF_ApplyingFix, locator)
+                .isSuccess()) {
+          auto *fix =
+              InsertExplicitCall::create(*this, getConstraintLocator(locator));
+
+          return recordFix(fix) ? SolutionKind::Error : SolutionKind::Solved;
+        }
+      }
+    }
 
-      if (recordFix(fix))
-        return SolutionKind::Error;
+    auto *fix =
+        RemoveUnwrap::create(*this, optTy, getConstraintLocator(locator));
 
-      // If the fix was successful let's record
-      // "fixed" object type and continue.
-      objectTy = optTy;
-    } else {
-      // If fixes are not allowed, no choice but to fail.
+    if (recordFix(fix))
       return SolutionKind::Error;
-    }
+
+    // If the fix was successful let's record
+    // "fixed" object type and continue.
+    objectTy = optTy;
   }
-  
+
   // The object type is an lvalue if the optional was.
   if (optLValueTy->is<LValueType>())
     objectTy = LValueType::get(objectTy);
@@ -6731,7 +6768,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
       return SolutionKind::Solved;
     } else if ((kind == ConstraintKind::ValueMember ||
                 kind == ConstraintKind::ValueWitness) &&
-               baseObjTy->isHole()) {
+               baseObjTy->getMetatypeInstanceType()->isHole()) {
       // If base type is a "hole" there is no reason to record any
       // more "member not found" fixes for chained member references.
       markMemberTypeAsPotentialHole(memberTy);
@@ -6927,11 +6964,12 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
       SmallVector<Constraint *, 2> optionalities;
       auto nonoptionalResult = Constraint::createFixed(
           *this, ConstraintKind::Bind,
-          UnwrapOptionalBase::create(*this, member, locator), memberTy, innerTV,
-          locator);
+          UnwrapOptionalBase::create(*this, member, baseObjTy, locator),
+          memberTy, innerTV, locator);
       auto optionalResult = Constraint::createFixed(
           *this, ConstraintKind::Bind,
-          UnwrapOptionalBase::createWithOptionalResult(*this, member, locator),
+          UnwrapOptionalBase::createWithOptionalResult(*this, member,
+                                                       baseObjTy, locator),
           optTy, memberTy, locator);
       optionalities.push_back(nonoptionalResult);
       optionalities.push_back(optionalResult);
diff --git a/lib/Sema/CSSolver.cpp b/lib/Sema/CSSolver.cpp
index d78f40af18fba..295400c49eb62 100644
--- a/lib/Sema/CSSolver.cpp
+++ b/lib/Sema/CSSolver.cpp
@@ -800,6 +800,12 @@ void ConstraintSystem::shrink(Expr *expr) {
         return {false, expr};
       }
 
+      // Similar to 'ClosureExpr', 'TapExpr' has a 'VarDecl' the type of which
+      // is determined by type checking the parent interpolated string literal.
+      if (isa<TapExpr>(expr)) {
+        return {false, expr};
+      }
+
       if (auto coerceExpr = dyn_cast<CoerceExpr>(expr)) {
         if (coerceExpr->isLiteralInit())
           ApplyExprs.push_back({coerceExpr, 1});
@@ -1406,8 +1412,8 @@ void ConstraintSystem::solveForCodeCompletion(
     SolverState state(cs, FreeTypeVariableBinding::Disallow);
 
     // Enable "diagnostic mode" by default, this means that
-    // solver would produce "fixed" solutions along side of
-    // valid ones, which helps code completion to rank choices.
+    // solver would produce "fixed" solutions alongside valid
+    // ones, which helps code completion to rank choices.
     state.recordFixes = true;
 
     cs.solveImpl(solutions);
diff --git a/lib/Sema/CodeSynthesis.cpp b/lib/Sema/CodeSynthesis.cpp
index 325132ea9fbaa..225de9b9751f8 100644
--- a/lib/Sema/CodeSynthesis.cpp
+++ b/lib/Sema/CodeSynthesis.cpp
@@ -1414,22 +1414,3 @@ void swift::addFixedLayoutAttr(NominalTypeDecl *nominal) {
   // Add `@_fixed_layout` to the nominal.
   nominal->getAttrs().add(new (C) FixedLayoutAttr(/*Implicit*/ true));
 }
-
-Expr *DiscriminatorFinder::walkToExprPost(Expr *E) {
-  auto *ACE = dyn_cast<AbstractClosureExpr>(E);
-  if (!ACE)
-    return E;
-
-  unsigned Discriminator = ACE->getDiscriminator();
-  assert(Discriminator != AbstractClosureExpr::InvalidDiscriminator &&
-         "Existing closures should have valid discriminators");
-  if (Discriminator >= NextDiscriminator)
-    NextDiscriminator = Discriminator + 1;
-  return E;
-}
-
-unsigned DiscriminatorFinder::getNextDiscriminator() {
-  if (NextDiscriminator == AbstractClosureExpr::InvalidDiscriminator)
-    llvm::report_fatal_error("Out of valid closure discriminators");
-  return NextDiscriminator++;
-}
diff --git a/lib/Sema/CodeSynthesis.h b/lib/Sema/CodeSynthesis.h
index 95db8aab697f0..feea6be614104 100644
--- a/lib/Sema/CodeSynthesis.h
+++ b/lib/Sema/CodeSynthesis.h
@@ -76,20 +76,6 @@ bool hasLetStoredPropertyWithInitialValue(NominalTypeDecl *nominal);
 /// Add `@_fixed_layout` attribute to the nominal type, if possible.
 void addFixedLayoutAttr(NominalTypeDecl *nominal);
 
-/// Find available closure discriminators.
-///
-/// The parser typically takes care of assigning unique discriminators to
-/// closures, but the parser is unavailable during semantic analysis.
-class DiscriminatorFinder : public ASTWalker {
-  unsigned NextDiscriminator = 0;
-
-public:
-  Expr *walkToExprPost(Expr *E) override;
-
-  // Get the next available closure discriminator.
-  unsigned getNextDiscriminator();
-};
-
 } // end namespace swift
 
 #endif
diff --git a/lib/Sema/ConstraintGraph.cpp b/lib/Sema/ConstraintGraph.cpp
index 7037e3b9c32c7..b85048cf9d255 100644
--- a/lib/Sema/ConstraintGraph.cpp
+++ b/lib/Sema/ConstraintGraph.cpp
@@ -442,24 +442,15 @@ llvm::TinyPtrVector<Constraint *> ConstraintGraph::gatherConstraints(
     llvm::function_ref<bool(Constraint *)> acceptConstraintFn) {
   llvm::TinyPtrVector<Constraint *> constraints;
   // Whether we should consider this constraint at all.
-  auto rep = CS.getRepresentative(typeVar);
   auto shouldConsiderConstraint = [&](Constraint *constraint) {
-    // For a one-way constraint, only consider it when the type variable
-    // is on the right-hand side of the the binding, and the left-hand side of
-    // the binding is one of the type variables currently under consideration.
+    // For a one-way constraint, only consider it when the left-hand side of
+    // the binding is one of the type variables currently under consideration,
+    // as only such constraints need solving for this component. Note that we
+    // don't perform any other filtering, as the constraint system should be
+    // responsible for checking any other conditions.
     if (constraint->isOneWayConstraint()) {
-      auto lhsTypeVar =
-          constraint->getFirstType()->castTo<TypeVariableType>();
-      if (!CS.isActiveTypeVariable(lhsTypeVar))
-        return false;
-
-      SmallVector<TypeVariableType *, 2> rhsTypeVars;
-      constraint->getSecondType()->getTypeVariables(rhsTypeVars);
-      for (auto rhsTypeVar : rhsTypeVars) {
-        if (CS.getRepresentative(rhsTypeVar) == rep)
-          return true;
-      }
-      return false;
+      auto lhsTypeVar = constraint->getFirstType()->castTo<TypeVariableType>();
+      return CS.isActiveTypeVariable(lhsTypeVar);
     }
 
     return true;
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
index 1333ed4d09e3a..701aeac560264 100644
--- a/lib/Sema/ConstraintSystem.cpp
+++ b/lib/Sema/ConstraintSystem.cpp
@@ -581,6 +581,9 @@ ConstraintLocator *ConstraintSystem::getCalleeLocator(
   if (isExpr<MemberRefExpr>(anchor))
     return getConstraintLocator(anchor, ConstraintLocator::Member);
 
+  if (isExpr<ObjectLiteralExpr>(anchor))
+    return getConstraintLocator(anchor, ConstraintLocator::ConstructorMember);
+
   return getConstraintLocator(anchor);
 }
 
@@ -666,6 +669,8 @@ Type ConstraintSystem::openUnboundGenericType(
   openGeneric(decl->getDeclContext(), decl->getGenericSignature(), locator,
               replacements);
 
+  recordOpenedTypes(locator, replacements);
+
   if (parentTy) {
     auto subs = parentTy->getContextSubstitutions(decl->getDeclContext());
     for (auto pair : subs) {
@@ -873,18 +878,6 @@ Optional<Type> ConstraintSystem::isSetType(Type type) {
   return None;
 }
 
-bool ConstraintSystem::isCollectionType(Type type) {
-  if (auto *structType = type->getAs<BoundGenericStructType>()) {
-    auto &ctx = type->getASTContext();
-    auto *decl = structType->getDecl();
-    if (decl == ctx.getArrayDecl() || decl == ctx.getDictionaryDecl() ||
-        decl == ctx.getSetDecl())
-      return true;
-  }
-
-  return false;
-}
-
 bool ConstraintSystem::isAnyHashableType(Type type) {
   if (auto st = type->getAs<StructType>()) {
     auto &ctx = type->getASTContext();
@@ -1666,6 +1659,34 @@ ConstraintSystem::getTypeOfMemberReference(
     });
   }
 
+  // Construct an idealized parameter type of the initializer associated
+  // with object literal, which generally simplifies the first label
+  // (e.g. "colorLiteralRed:") by stripping all the redundant stuff about
+  // literals (leaving e.g. "red:").
+  {
+    auto anchor = locator.getAnchor();
+    if (auto *OLE = getAsExpr<ObjectLiteralExpr>(anchor)) {
+      auto fnType = type->castTo<FunctionType>();
+
+      SmallVector<AnyFunctionType::Param, 4> params(fnType->getParams().begin(),
+                                                    fnType->getParams().end());
+
+      switch (OLE->getLiteralKind()) {
+      case ObjectLiteralExpr::colorLiteral:
+        params[0] = params[0].withLabel(Context.getIdentifier("red"));
+        break;
+
+      case ObjectLiteralExpr::fileLiteral:
+      case ObjectLiteralExpr::imageLiteral:
+        params[0] = params[0].withLabel(Context.getIdentifier("resourceName"));
+        break;
+      }
+
+      type =
+          FunctionType::get(params, fnType->getResult(), fnType->getExtInfo());
+    }
+  }
+
   // If we opened up any type variables, record the replacements.
   recordOpenedTypes(locator, replacements);
 
@@ -2714,6 +2735,11 @@ SolutionResult ConstraintSystem::salvage() {
     // Solve the system.
     solveImpl(viable);
 
+    // Before removing any "fixed" solutions, let's check
+    // if ambiguity is caused by fixes and diagnose if possible.
+    if (diagnoseAmbiguityWithFixes(viable))
+      return SolutionResult::forAmbiguous(viable);
+
     // Check whether we have a best solution; this can happen if we found
     // a series of fixes that worked.
     if (auto best = findBestSolution(viable, /*minimize=*/true)) {
@@ -2723,11 +2749,6 @@ SolutionResult ConstraintSystem::salvage() {
       return SolutionResult::forSolved(std::move(viable[0]));
     }
 
-    // Before removing any "fixed" solutions, let's check
-    // if ambiguity is caused by fixes and diagnose if possible.
-    if (diagnoseAmbiguityWithFixes(viable))
-      return SolutionResult::forAmbiguous(viable);
-
     // FIXME: If we were able to actually fix things along the way,
     // we may have to hunt for the best solution. For now, we don't care.
 
@@ -2770,16 +2791,11 @@ static void diagnoseOperatorAmbiguity(ConstraintSystem &cs,
                                       Identifier operatorName,
                                       ArrayRef<Solution> solutions,
                                       ConstraintLocator *locator) {
-  auto &DE = cs.getASTContext().Diags;
+  auto &ctx = cs.getASTContext();
+  auto &DE = ctx.Diags;
   auto *anchor = castToExpr(locator->getAnchor());
   auto *applyExpr = cast<ApplyExpr>(cs.getParentExpr(anchor));
 
-  auto isNameOfStandardComparisonOperator = [](Identifier opName) -> bool {
-    return opName.is("==") || opName.is("!=") || opName.is("===") ||
-           opName.is("!==") || opName.is("<") || opName.is(">") ||
-           opName.is("<=") || opName.is(">=");
-  };
-
   auto isEnumWithAssociatedValues = [](Type type) -> bool {
     if (auto *enumType = type->getAs<EnumType>())
       return !enumType->getDecl()->hasOnlyCasesWithoutAssociatedValues();
@@ -2802,13 +2818,16 @@ static void diagnoseOperatorAmbiguity(ConstraintSystem &cs,
           .highlight(lhs->getSourceRange())
           .highlight(rhs->getSourceRange());
 
-      if (isNameOfStandardComparisonOperator(operatorName) &&
+      if (isStandardComparisonOperator(binaryOp->getFn()) &&
           isEnumWithAssociatedValues(lhsType)) {
         DE.diagnose(applyExpr->getLoc(),
                     diag::no_binary_op_overload_for_enum_with_payload,
                     operatorName.str());
         return;
       }
+    } else if (operatorName == ctx.Id_MatchOperator) {
+      DE.diagnose(anchor->getLoc(), diag::cannot_match_expr_pattern_with_value,
+                  lhsType, rhsType);
     } else {
       DE.diagnose(anchor->getLoc(), diag::cannot_apply_binop_to_args,
                   operatorName.str(), lhsType, rhsType)
@@ -3057,104 +3076,129 @@ diagnoseAmbiguityWithEphemeralPointers(ConstraintSystem &cs,
   return cs.diagnoseAmbiguity(solutions);
 }
 
-bool ConstraintSystem::diagnoseAmbiguityWithFixes(
-    SmallVectorImpl<Solution> &solutions) {
-  if (solutions.empty())
+static bool diagnoseAmbiguityWithContextualType(
+    ConstraintSystem &cs, SolutionDiff &solutionDiff,
+    ArrayRef<std::pair<const Solution *, const ConstraintFix *>> aggregateFix,
+    ArrayRef<Solution> solutions) {
+  // Diagnose only if contextual failure is associated with every solution.
+  if (aggregateFix.size() < solutions.size())
     return false;
 
-  SolutionDiff solutionDiff(solutions);
+  auto getResultType =
+      [](const std::pair<const Solution *, const ConstraintFix *> &entry)
+      -> Type {
+    auto &solution = *entry.first;
+    auto anchor = entry.second->getLocator()->getAnchor();
+    return solution.simplifyType(solution.getType(anchor));
+  };
 
-  if (diagnoseConflictingGenericArguments(*this, solutionDiff, solutions))
-    return true;
-  
-  if (auto bestScore = solverState->BestScore) {
-    solutions.erase(llvm::remove_if(solutions,
-                                    [&](const Solution &solution) {
-                                      return solution.getFixedScore() >
-                                             *bestScore;
-                                    }),
-                    solutions.end());
+  auto resultType = getResultType(aggregateFix.front());
+  // If right-hand side of the conversion (result of the the AST node)
+  // is the same across all of the solutions let's diagnose it as if
+  // it it as a single failure.
+  if (llvm::all_of(
+          aggregateFix,
+          [&](const std::pair<const Solution *, const ConstraintFix *> &entry) {
+            return resultType->isEqual(getResultType(entry));
+          })) {
+    auto &fix = aggregateFix.front();
+    return fix.second->diagnose(*fix.first, /*asNote=*/false);
+  }
+
+  // If result types are different it could only mean that this is an attempt
+  // to convert a reference to, or call of overloaded declaration to a
+  // particular type.
+
+  auto &solution = *aggregateFix.front().first;
+  auto *locator = aggregateFix.front().second->getLocator();
+  auto *calleeLocator = solution.getCalleeLocator(locator);
+
+  auto result =
+      llvm::find_if(solutionDiff.overloads,
+                    [&calleeLocator](const SolutionDiff::OverloadDiff &entry) {
+                      return entry.locator == calleeLocator;
+                    });
+
+  if (result == solutionDiff.overloads.end())
+    return false;
 
-    if (llvm::all_of(solutions, [&](const Solution &solution) {
-          auto score = solution.getFixedScore();
-          return score.Data[SK_Fix] == 0 && solution.Fixes.empty();
-        }))
-      return false;
-  }
+  auto &DE = cs.getASTContext().Diags;
 
-  if (diagnoseAmbiguityWithEphemeralPointers(*this, solutions))
-    return true;
+  auto anchor = locator->getAnchor();
+  auto name = result->choices.front().getName();
+  DE.diagnose(getLoc(anchor), diag::no_candidates_match_result_type,
+              name.getBaseName().userFacingName(),
+              cs.getContextualType(anchor));
 
-  // Collect aggregated fixes from all solutions
-  using LocatorAndKind = std::pair<ConstraintLocator *, FixKind>;
-  using SolutionAndFix = std::pair<const Solution *, const ConstraintFix *>;
-  llvm::SmallMapVector<LocatorAndKind, llvm::SmallVector<SolutionAndFix, 4>, 4>
-      aggregatedFixes;
   for (const auto &solution : solutions) {
-    for (const auto *fix : solution.Fixes) {
-      LocatorAndKind key(fix->getLocator(), fix->getKind());
-      aggregatedFixes[key].emplace_back(&solution, fix);
+    auto overload = solution.getOverloadChoice(calleeLocator);
+    if (auto *decl = overload.choice.getDeclOrNull()) {
+      auto loc = decl->getLoc();
+      if (loc.isInvalid())
+        continue;
+
+      auto type = solution.simplifyType(overload.boundType);
+
+      if (isExpr<ApplyExpr>(anchor) || isExpr<SubscriptExpr>(anchor) ||
+          (isExpr<UnresolvedMemberExpr>(anchor) &&
+           castToExpr<UnresolvedMemberExpr>(anchor)->hasArguments())) {
+        auto fnType = type->castTo<FunctionType>();
+        DE.diagnose(
+            loc, diag::cannot_convert_candidate_result_to_contextual_type,
+            decl->getName(), fnType->getResult(), cs.getContextualType(anchor));
+      } else {
+        DE.diagnose(loc, diag::found_candidate_type, type);
+      }
     }
   }
 
-  // If there is an overload difference, let's see if there's a common callee
-  // locator for all of the fixes.
-  auto ambiguousOverload = llvm::find_if(solutionDiff.overloads,
-      [&](const auto &overloadDiff) {
-        return llvm::all_of(aggregatedFixes, [&](const auto &aggregatedFix) {
-          auto *locator = aggregatedFix.first.first;
-          auto anchor = locator->getAnchor();
-          // Assignment failures are all about the source expression, because
-          // they treat destination as a contextual type.
-          if (auto *assignExpr = getAsExpr<AssignExpr>(anchor))
-            anchor = assignExpr->getSrc();
-
-          if (auto *callExpr = getAsExpr<CallExpr>(anchor)) {
-            if (!isa<TypeExpr>(callExpr->getDirectCallee()))
-              anchor = callExpr->getDirectCallee();
-          } else if (auto *applyExpr = getAsExpr<ApplyExpr>(anchor)) {
-            anchor = applyExpr->getFn();
-          }
+  return true;
+}
 
-          return overloadDiff.locator->getAnchor() == anchor;
-        });
-      });
+static bool diagnoseAmbiguity(
+    ConstraintSystem &cs, const SolutionDiff::OverloadDiff &ambiguity,
+    ArrayRef<std::pair<const Solution *, const ConstraintFix *>> aggregateFix,
+    ArrayRef<Solution> solutions) {
+  auto *locator = aggregateFix.front().second->getLocator();
+  auto anchor = aggregateFix.front().second->getAnchor();
 
-  // If we didn't find an ambiguous overload, diagnose the common fixes.
-  if (ambiguousOverload == solutionDiff.overloads.end()) {
-    bool diagnosed = false;
-    for (auto fixes: aggregatedFixes) {
-      // A common fix must appear in all solutions
-      auto &commonFixes = fixes.second;
-      if (commonFixes.size() != solutions.size()) continue;
+  auto &DE = cs.getASTContext().Diags;
 
-      auto *firstFix = commonFixes.front().second;
-      diagnosed |= firstFix->diagnoseForAmbiguity(commonFixes);
+  {
+    auto fixKind = aggregateFix.front().second->getKind();
+    if (llvm::all_of(
+            aggregateFix, [&](const std::pair<const Solution *,
+                                              const ConstraintFix *> &entry) {
+              auto &fix = entry.second;
+              return fix->getKind() == fixKind && fix->getLocator() == locator;
+            })) {
+      auto *primaryFix = aggregateFix.front().second;
+      if (primaryFix->diagnoseForAmbiguity(aggregateFix))
+        return true;
     }
-    return diagnosed;
   }
 
-  auto *commonCalleeLocator = ambiguousOverload->locator;
-  auto *decl = ambiguousOverload->choices.front().getDecl();
-  assert(solverState);
+  auto *decl = ambiguity.choices.front().getDeclOrNull();
+  if (!decl)
+    return false;
+
+  auto *commonCalleeLocator = ambiguity.locator;
 
   bool diagnosed = true;
   {
-    DiagnosticTransaction transaction(getASTContext().Diags);
+    DiagnosticTransaction transaction(DE);
 
     auto commonAnchor = commonCalleeLocator->getAnchor();
     if (auto *callExpr = getAsExpr<CallExpr>(commonAnchor))
       commonAnchor = callExpr->getDirectCallee();
-    auto &DE = getASTContext().Diags;
+
     const auto name = decl->getName();
 
     // Emit an error message for the ambiguity.
-    if (aggregatedFixes.size() == 1 &&
-        aggregatedFixes.front().first.first->isForContextualType()) {
-      auto anchor = aggregatedFixes.front().first.first->getAnchor();
+    if (locator->isForContextualType()) {
       auto baseName = name.getBaseName();
       DE.diagnose(getLoc(commonAnchor), diag::no_candidates_match_result_type,
-                  baseName.userFacingName(), getContextualType(anchor));
+                  baseName.userFacingName(), cs.getContextualType(anchor));
     } else if (name.isOperator()) {
       auto *anchor = castToExpr(commonCalleeLocator->getAnchor());
 
@@ -3162,9 +3206,9 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
       // diagnostics in case of ambiguity, but if it's referenced
       // e.g. `arr.sort(by: <)` it's better to produce generic error
       // and a note per candidate.
-      if (auto *parentExpr = getParentExpr(anchor)) {
+      if (auto *parentExpr = cs.getParentExpr(anchor)) {
         if (isa<ApplyExpr>(parentExpr)) {
-          diagnoseOperatorAmbiguity(*this, name.getBaseIdentifier(), solutions,
+          diagnoseOperatorAmbiguity(cs, name.getBaseIdentifier(), solutions,
                                     commonCalleeLocator);
           return true;
         }
@@ -3175,7 +3219,7 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
                   name.isSpecial(), name.getBaseName());
     } else {
       bool isApplication =
-          llvm::any_of(ArgumentInfos, [&](const auto &argInfo) {
+          llvm::any_of(cs.ArgumentInfos, [&](const auto &argInfo) {
             return argInfo.first->getAnchor() == commonAnchor;
           });
 
@@ -3188,7 +3232,7 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
     // Produce candidate notes
     SmallPtrSet<ValueDecl *, 4> distinctChoices;
     llvm::SmallSet<CanType, 4> candidateTypes;
-    for (const auto &solution: solutions) {
+    for (const auto &solution : solutions) {
       auto overload = solution.getOverloadChoice(commonCalleeLocator);
       auto *decl = overload.choice.getDecl();
       auto type = solution.simplifyType(overload.openedType);
@@ -3196,27 +3240,38 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
       if (!distinctChoices.insert(decl).second)
         continue;
 
+      auto noteLoc =
+          decl->getLoc().isInvalid() ? getLoc(commonAnchor) : decl->getLoc();
+
       if (solution.Fixes.size() == 1) {
         diagnosed &=
             solution.Fixes.front()->diagnose(solution, /*asNote*/ true);
-      } else if (llvm::all_of(solution.Fixes,
-                              [&](ConstraintFix *fix) {
-                                return fix->getLocator()
-                                  ->findLast<LocatorPathElt::ApplyArgument>().hasValue();
-                              })) {
-        // All fixes have to do with arguments, so let's show the parameter lists.
+      } else if (llvm::all_of(solution.Fixes, [&](ConstraintFix *fix) {
+                   return fix->getLocator()
+                       ->findLast<LocatorPathElt::ApplyArgument>()
+                       .hasValue();
+                 })) {
+        // All fixes have to do with arguments, so let's show the parameter
+        // lists.
         auto *fn = type->getAs<AnyFunctionType>();
         assert(fn);
-        DE.diagnose(decl->getLoc(),
-                    diag::candidate_partial_match,
-                    fn->getParamListAsString(fn->getParams()));
+
+        if (fn->getNumParams() == 1) {
+          const auto &param = fn->getParams()[0];
+          DE.diagnose(noteLoc, diag::candidate_has_invalid_argument_at_position,
+                      solution.simplifyType(param.getPlainType()),
+                      /*position=*/1, param.isInOut());
+        } else {
+          DE.diagnose(noteLoc, diag::candidate_partial_match,
+                      fn->getParamListAsString(fn->getParams()));
+        }
       } else {
         // Emit a general "found candidate" note
         if (decl->getLoc().isInvalid()) {
           if (candidateTypes.insert(type->getCanonicalType()).second)
             DE.diagnose(getLoc(commonAnchor), diag::found_candidate_type, type);
         } else {
-          DE.diagnose(decl->getLoc(), diag::found_candidate);
+          DE.diagnose(noteLoc, diag::found_candidate);
         }
       }
     }
@@ -3229,6 +3284,135 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
   return diagnosed;
 }
 
+bool ConstraintSystem::diagnoseAmbiguityWithFixes(
+    SmallVectorImpl<Solution> &solutions) {
+  if (solutions.empty())
+    return false;
+
+  SolutionDiff solutionDiff(solutions);
+
+  if (diagnoseConflictingGenericArguments(*this, solutionDiff, solutions))
+    return true;
+
+  if (auto bestScore = solverState->BestScore) {
+    solutions.erase(llvm::remove_if(solutions,
+                                    [&](const Solution &solution) {
+                                      return solution.getFixedScore() >
+                                             *bestScore;
+                                    }),
+                    solutions.end());
+
+    if (llvm::all_of(solutions, [&](const Solution &solution) {
+          auto score = solution.getFixedScore();
+          return score.Data[SK_Fix] == 0 && solution.Fixes.empty();
+        }))
+      return false;
+  }
+
+  if (solutions.size() < 2)
+    return false;
+
+  if (diagnoseAmbiguityWithEphemeralPointers(*this, solutions))
+    return true;
+
+  if (isDebugMode()) {
+    auto &log = llvm::errs();
+    log << "--- Ambiguity: Considering #" << solutions.size()
+        << " solutions with fixes ---\n";
+    int i = 0;
+    for (auto &solution : solutions) {
+      log << "--- Solution #" << i++ << "---\n";
+      solution.dump(log);
+      log << "\n";
+    }
+  }
+
+  // Algorithm is as follows:
+  //
+  // a. Aggregate all of the available fixes based on callee locator;
+  // b. For each ambiguous overload match aggregated fixes and diagnose;
+  // c. Discard all of the fixes which have been already considered
+  //    as part of overload diagnostics;
+  // d. Diagnose remaining (uniqued based on kind + locator) fixes
+  //    iff they appear in all of the solutions.
+
+  using Fix = std::pair<const Solution *, const ConstraintFix *>;
+
+  llvm::SmallSetVector<Fix, 4> fixes;
+  for (auto &solution : solutions) {
+    for (auto *fix : solution.Fixes)
+      fixes.insert({&solution, fix});
+  }
+
+  llvm::MapVector<ConstraintLocator *, SmallVector<Fix, 4>> fixesByCallee;
+  llvm::SmallVector<Fix, 4> contextualFixes;
+
+  for (const auto &entry : fixes) {
+    const auto &solution = *entry.first;
+    const auto *fix = entry.second;
+
+    if (fix->getLocator()->isForContextualType()) {
+      contextualFixes.push_back({&solution, fix});
+      continue;
+    }
+
+    auto *calleeLocator = solution.getCalleeLocator(fix->getLocator());
+    fixesByCallee[calleeLocator].push_back({&solution, fix});
+  }
+
+  bool diagnosed = false;
+
+  // All of the fixes which have been considered already.
+  llvm::SmallSetVector<Fix, 4> consideredFixes;
+
+  for (const auto &ambiguity : solutionDiff.overloads) {
+    auto fixes = fixesByCallee.find(ambiguity.locator);
+    if (fixes == fixesByCallee.end())
+      continue;
+
+    auto aggregate = fixes->second;
+    diagnosed |= ::diagnoseAmbiguity(*this, ambiguity, aggregate, solutions);
+
+    consideredFixes.insert(aggregate.begin(), aggregate.end());
+  }
+
+  if (diagnoseAmbiguityWithContextualType(*this, solutionDiff, contextualFixes,
+                                          solutions)) {
+    consideredFixes.insert(contextualFixes.begin(), contextualFixes.end());
+    diagnosed |= true;
+  }
+
+  // Remove all of the fixes which have been attached to ambiguous
+  // overload choices.
+  fixes.set_subtract(consideredFixes);
+
+  llvm::MapVector<std::pair<FixKind, ConstraintLocator *>, SmallVector<Fix, 4>>
+      fixesByKind;
+
+  for (const auto &entry : fixes) {
+    const auto *fix = entry.second;
+    fixesByKind[{fix->getKind(), fix->getLocator()}].push_back(
+        {entry.first, fix});
+  }
+
+  // If leftover fix is contained in all of the solutions let's
+  // diagnose it as ambiguity.
+  for (const auto &entry : fixesByKind) {
+    if (llvm::all_of(solutions, [&](const Solution &solution) -> bool {
+          return llvm::any_of(
+              solution.Fixes, [&](const ConstraintFix *fix) -> bool {
+                return std::make_pair(fix->getKind(), fix->getLocator()) ==
+                       entry.first;
+              });
+        })) {
+      auto &aggregate = entry.second;
+      diagnosed |= aggregate.front().second->diagnoseForAmbiguity(aggregate);
+    }
+  }
+
+  return diagnosed;
+}
+
 /// Determine the number of distinct overload choices in the
 /// provided set.
 static unsigned countDistinctOverloads(ArrayRef<OverloadChoice> choices) {
@@ -4057,6 +4241,15 @@ bool constraints::isPatternMatchingOperator(Expr *expr) {
   return isOperator(expr, "~=");
 }
 
+bool constraints::isStandardComparisonOperator(Expr *expr) {
+  if (auto opName = getOperatorName(expr)) {
+    return opName->is("==") || opName->is("!=") || opName->is("===") ||
+           opName->is("!==") || opName->is("<") || opName->is(">") ||
+           opName->is("<=") || opName->is(">=");
+  }
+  return false;
+}
+
 bool constraints::isOperatorArgument(ConstraintLocator *locator,
                                      StringRef expectedOperator) {
   if (!locator->findLast<LocatorPathElt::ApplyArgToParam>())
@@ -4639,3 +4832,103 @@ SourceLoc constraints::getLoc(ASTNode anchor) {
 SourceRange constraints::getSourceRange(ASTNode anchor) {
   return anchor.getSourceRange();
 }
+
+static Optional<Requirement> getRequirement(ConstraintSystem &cs,
+                                            ConstraintLocator *reqLocator) {
+  auto reqLoc = reqLocator->getLastElementAs<LocatorPathElt::AnyRequirement>();
+  if (!reqLoc)
+    return None;
+
+  if (reqLoc->isConditionalRequirement()) {
+    auto path = reqLocator->getPath();
+    auto *typeReqLoc =
+        cs.getConstraintLocator(reqLocator->getAnchor(), path.drop_back());
+
+    auto conformances = cs.getCheckedConformances();
+    auto result = llvm::find_if(
+        conformances,
+        [&typeReqLoc](
+            const std::pair<ConstraintLocator *, ProtocolConformanceRef>
+                &conformance) { return conformance.first == typeReqLoc; });
+    assert(result != conformances.end());
+
+    auto conformance = result->second;
+    assert(conformance.isConcrete());
+
+    return conformance.getConditionalRequirements()[reqLoc->getIndex()];
+  }
+
+  if (auto openedGeneric =
+          reqLocator->findLast<LocatorPathElt::OpenedGeneric>()) {
+    auto signature = openedGeneric->getSignature();
+    return signature->getRequirements()[reqLoc->getIndex()];
+  }
+
+  return None;
+}
+
+static Optional<std::pair<GenericTypeParamType *, RequirementKind>>
+getRequirementInfo(ConstraintSystem &cs, ConstraintLocator *reqLocator) {
+  auto requirement = getRequirement(cs, reqLocator);
+  if (!requirement)
+    return None;
+
+  auto *GP = requirement->getFirstType()->getAs<GenericTypeParamType>();
+  if (!GP)
+    return None;
+
+  auto path = reqLocator->getPath();
+  auto iter = path.rbegin();
+  auto openedGeneric =
+      reqLocator->findLast<LocatorPathElt::OpenedGeneric>(iter);
+  assert(openedGeneric);
+
+  auto newPath = path.drop_back(iter - path.rbegin() + 1);
+  auto *baseLoc = cs.getConstraintLocator(reqLocator->getAnchor(), newPath);
+
+  auto openedTypes = cs.getOpenedTypes();
+  auto substitutions = llvm::find_if(
+      openedTypes,
+      [&baseLoc](
+          const std::pair<ConstraintLocator *, ArrayRef<OpenedType>> &entry) {
+        return entry.first == baseLoc;
+      });
+
+  if (substitutions == openedTypes.end())
+    return None;
+
+  auto replacement =
+      llvm::find_if(substitutions->second, [&GP](const OpenedType &entry) {
+        auto *typeVar = entry.second;
+        return typeVar->getImpl().getGenericParameter() == GP;
+      });
+
+  if (replacement == substitutions->second.end())
+    return None;
+
+  auto *repr = cs.getRepresentative(replacement->second);
+  return std::make_pair(repr->getImpl().getGenericParameter(),
+                        requirement->getKind());
+}
+
+bool ConstraintSystem::isFixedRequirement(ConstraintLocator *reqLocator,
+                                          Type requirementTy) {
+  if (auto reqInfo = getRequirementInfo(*this, reqLocator)) {
+    auto *GP = reqInfo->first;
+    auto reqKind = static_cast<unsigned>(reqInfo->second);
+    return FixedRequirements.count(
+        std::make_tuple(GP, reqKind, requirementTy.getPointer()));
+  }
+
+  return false;
+}
+
+void ConstraintSystem::recordFixedRequirement(ConstraintLocator *reqLocator,
+                                              Type requirementTy) {
+  if (auto reqInfo = getRequirementInfo(*this, reqLocator)) {
+    auto *GP = reqInfo->first;
+    auto reqKind = static_cast<unsigned>(reqInfo->second);
+    FixedRequirements.insert(
+        std::make_tuple(GP, reqKind, requirementTy.getPointer()));
+  }
+}
diff --git a/lib/Sema/ConstraintSystem.h b/lib/Sema/ConstraintSystem.h
index 526f998ba70ad..e6370f4b260ca 100644
--- a/lib/Sema/ConstraintSystem.h
+++ b/lib/Sema/ConstraintSystem.h
@@ -917,6 +917,7 @@ class SolutionApplicationTargetsKey {
           (lhs.storage.patternBindingEntry.index
              == rhs.storage.patternBindingEntry.index);
     }
+    llvm_unreachable("invalid SolutionApplicationTargetsKey kind");
   }
 
   friend bool operator!=(
@@ -951,6 +952,7 @@ class SolutionApplicationTargetsKey {
           DenseMapInfo<unsigned>::getHashValue(
               storage.patternBindingEntry.index));
     }
+    llvm_unreachable("invalid statement kind");
   }
 };
 
@@ -1947,20 +1949,13 @@ class ConstraintSystem {
 
   /// The list of all generic requirements fixed along the current
   /// solver path.
-  using FixedRequirement = std::tuple<TypeBase *, RequirementKind, TypeBase *>;
-  SmallVector<FixedRequirement, 4> FixedRequirements;
-
-  bool hasFixedRequirement(Type lhs, RequirementKind kind, Type rhs) {
-    auto reqInfo = std::make_tuple(lhs.getPointer(), kind, rhs.getPointer());
-    return llvm::any_of(
-        FixedRequirements,
-        [&reqInfo](const FixedRequirement &entry) { return entry == reqInfo; });
-  }
+  using FixedRequirement =
+      std::tuple<GenericTypeParamType *, unsigned, TypeBase *>;
+  llvm::SmallSetVector<FixedRequirement, 4> FixedRequirements;
 
-  void recordFixedRequirement(Type lhs, RequirementKind kind, Type rhs) {
-    FixedRequirements.push_back(
-        std::make_tuple(lhs.getPointer(), kind, rhs.getPointer()));
-  }
+  bool isFixedRequirement(ConstraintLocator *reqLocator, Type requirementTy);
+  void recordFixedRequirement(ConstraintLocator *reqLocator,
+                              Type requirementTy);
 
   /// A mapping from constraint locators to the opened existential archetype
   /// used for the 'self' of an existential type.
@@ -3353,9 +3348,6 @@ class ConstraintSystem {
   /// element type of the set.
   static Optional<Type> isSetType(Type t);
 
-  /// Determine if the type in question is one of the known collection types.
-  static bool isCollectionType(Type t);
-
   /// Determine if the type in question is AnyHashable.
   static bool isAnyHashableType(Type t);
 
@@ -3546,6 +3538,19 @@ class ConstraintSystem {
                           const DeclRefExpr *base = nullptr,
                           OpenedTypeMap *replacements = nullptr);
 
+  /// Retrieve a list of conformances established along the current solver path.
+  ArrayRef<std::pair<ConstraintLocator *, ProtocolConformanceRef>>
+  getCheckedConformances() const {
+    return CheckedConformances;
+  }
+
+  /// Retrieve a list of generic parameter types solver has "opened" (replaced
+  /// with a type variable) along the current path.
+  ArrayRef<std::pair<ConstraintLocator *, ArrayRef<OpenedType>>>
+  getOpenedTypes() const {
+    return OpenedTypes;
+  }
+
 private:
   /// Adjust the constraint system to accomodate the given selected overload, and
   /// recompute the type of the referenced declaration.
@@ -4731,17 +4736,16 @@ class ConstraintSystem {
   /// Construct and solve a system of constraints based on the given expression
   /// and its contextual information.
   ///
-  /// This menthod is designed to be used for code completion which means that
+  /// This method is designed to be used for code completion which means that
   /// it doesn't mutate given expression, even if there is a single valid
   /// solution, and constraint solver is allowed to produce partially correct
-  /// solutions, such solutions can have any number of holes in them, alongside
-  /// with valid ones.
+  /// solutions. Such solutions can have any number of holes in them.
   ///
   /// \param expr The expression involved in code completion.
   ///
   /// \param DC The declaration context this expression is found in.
   ///
-  /// \param contextualType The type expression is being converted to.
+  /// \param contextualType The type \p expr is being converted to.
   ///
   /// \param CTP When contextualType is specified, this indicates what
   /// the conversion is doing.
@@ -5164,6 +5168,10 @@ bool isArgumentOfReferenceEqualityOperator(ConstraintLocator *locator);
 /// pattern-matching operator `~=`
 bool isPatternMatchingOperator(Expr *expr);
 
+/// Determine whether given expression is a reference to a
+/// "standard" comparison operator such as "==", "!=", ">" etc.
+bool isStandardComparisonOperator(Expr *expr);
+
 /// If given expression references operator overlaod(s)
 /// extract and produce name of the operator.
 Optional<Identifier> getOperatorName(Expr *expr);
diff --git a/lib/Sema/DebuggerTestingTransform.cpp b/lib/Sema/DebuggerTestingTransform.cpp
index 6f9e1c2ed073e..082c9b6190b52 100644
--- a/lib/Sema/DebuggerTestingTransform.cpp
+++ b/lib/Sema/DebuggerTestingTransform.cpp
@@ -34,6 +34,35 @@ using namespace swift;
 
 namespace {
 
+/// Find available closure discriminators.
+///
+/// The parser typically takes care of assigning unique discriminators to
+/// closures, but the parser is unavailable during semantic analysis.
+class DiscriminatorFinder : public ASTWalker {
+  unsigned NextDiscriminator = 0;
+
+public:
+  Expr *walkToExprPost(Expr *E) override {
+    auto *ACE = dyn_cast<AbstractClosureExpr>(E);
+    if (!ACE)
+      return E;
+
+    unsigned Discriminator = ACE->getDiscriminator();
+    assert(Discriminator != AbstractClosureExpr::InvalidDiscriminator &&
+           "Existing closures should have valid discriminators");
+    if (Discriminator >= NextDiscriminator)
+      NextDiscriminator = Discriminator + 1;
+    return E;
+  }
+
+  // Get the next available closure discriminator.
+  unsigned getNextDiscriminator() {
+    if (NextDiscriminator == AbstractClosureExpr::InvalidDiscriminator)
+      llvm::report_fatal_error("Out of valid closure discriminators");
+    return NextDiscriminator++;
+  }
+};
+
 /// Instrument decls with sanity-checks which the debugger can evaluate.
 class DebuggerTestingTransform : public ASTWalker {
   ASTContext &Ctx;
diff --git a/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp b/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp
index 8f38f6e6b144d..4f0d38ba6c16d 100644
--- a/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp
+++ b/lib/Sema/DerivedConformanceAdditiveArithmetic.cpp
@@ -126,11 +126,10 @@ deriveBodyMathOperator(AbstractFunctionDecl *funcDecl, MathOperator op) {
               confRef.getConcrete()->getWitnessDecl(operatorReq))
         memberOpDecl = concreteMemberMethodDecl;
     assert(memberOpDecl && "Member operator declaration must exist");
-    auto memberOpDRE =
-        new (C) DeclRefExpr(memberOpDecl, DeclNameLoc(), /*Implicit*/ true);
     auto *memberTypeExpr = TypeExpr::createImplicit(memberType, C);
     auto memberOpExpr =
-        new (C) DotSyntaxCallExpr(memberOpDRE, SourceLoc(), memberTypeExpr);
+        new (C) MemberRefExpr(memberTypeExpr, SourceLoc(), memberOpDecl,
+                              DeclNameLoc(), /*Implicit*/ true);
 
     // Create expression `lhs.member <op> rhs.member`.
     // NOTE(TF-1054): create new `DeclRefExpr`s per loop iteration to avoid
diff --git a/lib/Sema/DerivedConformanceCaseIterable.cpp b/lib/Sema/DerivedConformanceCaseIterable.cpp
index a1c445efe3257..19dee6674aa28 100644
--- a/lib/Sema/DerivedConformanceCaseIterable.cpp
+++ b/lib/Sema/DerivedConformanceCaseIterable.cpp
@@ -48,9 +48,9 @@ deriveCaseIterable_enum_getter(AbstractFunctionDecl *funcDecl, void *) {
 
   SmallVector<Expr *, 8> elExprs;
   for (EnumElementDecl *elt : parentEnum->getAllElements()) {
-    auto *ref = new (C) DeclRefExpr(elt, DeclNameLoc(), /*implicit*/true);
     auto *base = TypeExpr::createImplicit(enumTy, C);
-    auto *apply = new (C) DotSyntaxCallExpr(ref, SourceLoc(), base);
+    auto *apply = new (C) MemberRefExpr(base, SourceLoc(),
+                                        elt, DeclNameLoc(), /*implicit*/true);
     elExprs.push_back(apply);
   }
   auto *arrayExpr = ArrayExpr::create(C, SourceLoc(), elExprs, {}, SourceLoc());
diff --git a/lib/Sema/DerivedConformanceCodable.cpp b/lib/Sema/DerivedConformanceCodable.cpp
index ae8f1d7b1ea94..843049dea1a4d 100644
--- a/lib/Sema/DerivedConformanceCodable.cpp
+++ b/lib/Sema/DerivedConformanceCodable.cpp
@@ -82,11 +82,8 @@ static CodableConformanceType typeConformsToCodable(DeclContext *context,
                                                     ProtocolDecl *proto) {
   target = context->mapTypeIntoContext(target);
 
-  if (isIUO) {
-    return typeConformsToCodable(context,
-                                 target->lookThroughSingleOptionalType(),
-                                 false, proto);
-  }
+  if (isIUO)
+    target = target->lookThroughSingleOptionalType();
 
   auto conf = TypeChecker::conformsToProtocol(target, proto, context);
   return conf.isInvalid() ? DoesNotConform : Conforms;
@@ -619,9 +616,9 @@ deriveBodyEncodable_encode(AbstractFunctionDecl *encodeDecl, void *) {
                                           DeclNameLoc(), /*Implicit=*/true);
 
     // CodingKeys.x
-    auto *eltRef = new (C) DeclRefExpr(elt, DeclNameLoc(), /*implicit=*/true);
     auto *metaTyRef = TypeExpr::createImplicit(codingKeysType, C);
-    auto *keyExpr = new (C) DotSyntaxCallExpr(eltRef, SourceLoc(), metaTyRef);
+    auto *keyExpr = new (C) MemberRefExpr(metaTyRef, SourceLoc(), elt,
+                                          DeclNameLoc(), /*Implicit=*/true);
 
     // encode(_:forKey:)/encodeIfPresent(_:forKey:)
     auto methodName = useIfPresentVariant ? C.Id_encodeIfPresent : C.Id_encode;
@@ -901,9 +898,9 @@ deriveBodyDecodable_init(AbstractFunctionDecl *initDecl, void *) {
                                              SourceLoc(), varType);
 
       // CodingKeys.x
-      auto *eltRef = new (C) DeclRefExpr(elt, DeclNameLoc(), /*implicit=*/true);
       metaTyRef = TypeExpr::createImplicit(codingKeysType, C);
-      auto *keyExpr = new (C) DotSyntaxCallExpr(eltRef, SourceLoc(), metaTyRef);
+      auto *keyExpr = new (C) MemberRefExpr(metaTyRef, SourceLoc(),
+                                            elt, DeclNameLoc(), /*Implicit=*/true);
 
       // decode(_:forKey:)/decodeIfPresent(_:forKey:)
       SmallVector<Identifier, 2> argNames{Identifier(), C.Id_forKey};
diff --git a/lib/Sema/DerivedConformanceCodingKey.cpp b/lib/Sema/DerivedConformanceCodingKey.cpp
index 03a5a47335c59..e233a7a47f9e6 100644
--- a/lib/Sema/DerivedConformanceCodingKey.cpp
+++ b/lib/Sema/DerivedConformanceCodingKey.cpp
@@ -284,9 +284,9 @@ deriveBodyCodingKey_init_stringValue(AbstractFunctionDecl *initDecl, void *) {
 
     auto labelItem = CaseLabelItem(litPat);
 
-    auto *eltRef = new (C) DeclRefExpr(elt, DeclNameLoc(), /*Implicit=*/true);
     auto *metaTyRef = TypeExpr::createImplicit(enumType, C);
-    auto *valueExpr = new (C) DotSyntaxCallExpr(eltRef, SourceLoc(), metaTyRef);
+    auto *valueExpr = new (C) MemberRefExpr(metaTyRef, SourceLoc(), elt,
+                                            DeclNameLoc(), /*Implicit=*/true);
 
     auto *assignment = new (C) AssignExpr(selfRef, SourceLoc(), valueExpr,
                                           /*Implicit=*/true);
diff --git a/lib/Sema/DerivedConformanceComparable.cpp b/lib/Sema/DerivedConformanceComparable.cpp
index 216db050d320b..3e7325ede4b06 100644
--- a/lib/Sema/DerivedConformanceComparable.cpp
+++ b/lib/Sema/DerivedConformanceComparable.cpp
@@ -74,39 +74,21 @@ deriveBodyComparable_enum_noAssociatedValues_lt(AbstractFunctionDecl *ltDecl,
   FuncDecl *cmpFunc = C.getLessThanIntDecl();
   assert(cmpFunc && "should have a < for int as we already checked for it");
 
-  auto fnType = cmpFunc->getInterfaceType()->castTo<FunctionType>();
-
-  Expr *cmpFuncExpr;
-  if (cmpFunc->getDeclContext()->isTypeContext()) {
-    auto contextTy = cmpFunc->getDeclContext()->getSelfInterfaceType();
-    Expr *base = TypeExpr::createImplicitHack(SourceLoc(), contextTy, C);
-    Expr *ref = new (C) DeclRefExpr(cmpFunc, DeclNameLoc(), /*Implicit*/ true,
-                                    AccessSemantics::Ordinary, fnType);
-
-    fnType = fnType->getResult()->castTo<FunctionType>();
-    cmpFuncExpr = new (C) DotSyntaxCallExpr(ref, SourceLoc(), base, fnType);
-    cmpFuncExpr->setImplicit();
-  } else {
-    cmpFuncExpr = new (C) DeclRefExpr(cmpFunc, DeclNameLoc(),
-                                      /*implicit*/ true,
-                                      AccessSemantics::Ordinary,
-                                      fnType);
-  }
+  Expr *cmpFuncExpr = new (C) DeclRefExpr(cmpFunc, DeclNameLoc(),
+                                          /*implicit*/ true,
+                                          AccessSemantics::Ordinary);
 
-  TupleTypeElt abTupleElts[2] = { aIndex->getType(), bIndex->getType() };
   TupleExpr *abTuple = TupleExpr::create(C, SourceLoc(), { aIndex, bIndex },
                                          { }, { }, SourceLoc(),
                                          /*HasTrailingClosure*/ false,
-                                         /*Implicit*/ true,
-                                         TupleType::get(abTupleElts, C));
+                                         /*Implicit*/ true);
 
   auto *cmpExpr = new (C) BinaryExpr(
-      cmpFuncExpr, abTuple, /*implicit*/ true,
-      fnType->castTo<FunctionType>()->getResult());
+      cmpFuncExpr, abTuple, /*implicit*/ true);
   statements.push_back(new (C) ReturnStmt(SourceLoc(), cmpExpr));
 
   BraceStmt *body = BraceStmt::create(C, SourceLoc(), statements, SourceLoc());
-  return { body, /*isTypeChecked=*/true };
+  return { body, /*isTypeChecked=*/false };
 }
 
 /// Derive the body for an '==' operator for an enum where at least one of the
diff --git a/lib/Sema/DerivedConformanceDifferentiable.cpp b/lib/Sema/DerivedConformanceDifferentiable.cpp
index 78312f6779e86..afa901b6185d5 100644
--- a/lib/Sema/DerivedConformanceDifferentiable.cpp
+++ b/lib/Sema/DerivedConformanceDifferentiable.cpp
@@ -26,6 +26,7 @@
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/Stmt.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "swift/AST/Types.h"
 #include "DerivedConformances.h"
 
@@ -44,7 +45,7 @@ getStoredPropertiesForDifferentiation(NominalTypeDecl *nominal, DeclContext *DC,
     if (auto *originalProperty = vd->getOriginalWrappedProperty()) {
       // Skip immutable wrapped properties. `mutating func move(along:)` cannot
       // be synthesized to update these properties.
-      if (!originalProperty->getAccessor(AccessorKind::Set))
+      if (!originalProperty->isSettable(DC))
         continue;
       // Use the original wrapped property.
       vd = originalProperty;
@@ -267,16 +268,14 @@ deriveBodyDifferentiable_move(AbstractFunctionDecl *funcDecl, void *) {
       if (auto *witness = confRef.getConcrete()->getWitnessDecl(requirement))
         memberWitnessDecl = witness;
     assert(memberWitnessDecl && "Member witness declaration must exist");
-    auto *memberMethodDRE = new (C)
-        DeclRefExpr(memberWitnessDecl, DeclNameLoc(), /*Implicit*/ true);
-    memberMethodDRE->setFunctionRefKind(FunctionRefKind::SingleApply);
 
     // Create reference to member method: `self.<member>.move(along:)`.
     Expr *memberExpr =
         new (C) MemberRefExpr(selfDRE, SourceLoc(), member, DeclNameLoc(),
                               /*Implicit*/ true);
     auto *memberMethodExpr =
-        new (C) DotSyntaxCallExpr(memberMethodDRE, SourceLoc(), memberExpr);
+        new (C) MemberRefExpr(memberExpr, SourceLoc(), memberWitnessDecl,
+                              DeclNameLoc(), /*Implicit*/ true);
 
     // Create reference to parameter member: `direction.<member>`.
     VarDecl *paramMember = nullptr;
@@ -387,10 +386,7 @@ deriveBodyDifferentiable_zeroTangentVectorInitializer(
                               DeclNameLoc(), /*Implicit*/ true);
 
     // Create closure expression.
-    DiscriminatorFinder DF;
-    for (Decl *D : parentDC->getParentSourceFile()->getTopLevelDecls())
-      D->walk(DF);
-    auto discriminator = DF.getNextDiscriminator();
+    unsigned discriminator = 0;
     auto resultTy = funcDecl->getMethodInterfaceType()
                         ->castTo<AnyFunctionType>()
                         ->getResult();
@@ -501,10 +497,7 @@ deriveBodyDifferentiable_zeroTangentVectorInitializer(
 
   // Create closure expression:
   // `{ TangentVector(x: x_zeroTangentVectorInitializer(), ...) }`.
-  DiscriminatorFinder DF;
-  for (Decl *D : parentDC->getParentSourceFile()->getTopLevelDecls())
-    D->walk(DF);
-  auto discriminator = DF.getNextDiscriminator();
+  unsigned discriminator = 0;
   auto resultTy = funcDecl->getMethodInterfaceType()
                       ->castTo<AnyFunctionType>()
                       ->getResult();
@@ -646,22 +639,21 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
   structDecl->setImplicit();
   structDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
 
-  // Add members to `TangentVector` struct.
+  // Add stored properties to the `TangentVector` struct.
   for (auto *member : diffProperties) {
-    // Add this member's corresponding `TangentVector` type to the parent's
-    // `TangentVector` struct.
-    // Note: `newMember` is not marked as implicit here, because that
-    // incorrectly affects memberwise initializer synthesis.
-    auto *newMember = new (C) VarDecl(
+    // Add a tangent stored property to the `TangentVector` struct, with the
+    // name and `TangentVector` type of the original property.
+    auto *tangentProperty = new (C) VarDecl(
         member->isStatic(), member->getIntroducer(), member->isCaptureList(),
         /*NameLoc*/ SourceLoc(), member->getName(), structDecl);
-
+    // Note: `tangentProperty` is not marked as implicit here, because that
+    // incorrectly affects memberwise initializer synthesis.
     auto memberContextualType =
         parentDC->mapTypeIntoContext(member->getValueInterfaceType());
     auto memberTanType =
         getTangentVectorInterfaceType(memberContextualType, parentDC);
-    newMember->setInterfaceType(memberTanType);
-    Pattern *memberPattern = NamedPattern::createImplicit(C, newMember);
+    tangentProperty->setInterfaceType(memberTanType);
+    Pattern *memberPattern = NamedPattern::createImplicit(C, tangentProperty);
     memberPattern->setType(memberTanType);
     memberPattern =
         TypedPattern::createImplicit(C, memberPattern, memberTanType);
@@ -669,16 +661,21 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
     auto *memberBinding = PatternBindingDecl::createImplicit(
         C, StaticSpellingKind::None, memberPattern, /*initExpr*/ nullptr,
         structDecl);
-    structDecl->addMember(newMember);
+    structDecl->addMember(tangentProperty);
     structDecl->addMember(memberBinding);
-    newMember->copyFormalAccessFrom(member, /*sourceIsParentContext*/ true);
-    newMember->setSetterAccess(member->getFormalAccess());
-
-    // Now that this member is in the `TangentVector` type, it should be marked
-    // `@differentiable` so that the differentiation transform will synthesize
-    // derivative functions for it. We only add this to public stored
-    // properties, because their access outside the module will go through a
-    // call to the getter.
+    tangentProperty->copyFormalAccessFrom(member,
+                                          /*sourceIsParentContext*/ true);
+    tangentProperty->setSetterAccess(member->getFormalAccess());
+
+    // Cache the tangent property.
+    C.evaluator.cacheOutput(TangentStoredPropertyRequest{member, CanType()},
+                            TangentPropertyInfo(tangentProperty));
+
+    // Now that the original property has a corresponding tangent property, it
+    // should be marked `@differentiable` so that the differentiation transform
+    // will synthesize derivative functions for its accessors. We only add this
+    // to public stored properties, because their access outside the module will
+    // go through accessor declarations.
     if (member->getEffectiveAccess() > AccessLevel::Internal &&
         !member->getAttrs().hasAttribute<DifferentiableAttr>()) {
       auto *getter = member->getSynthesizedAccessor(AccessorKind::Get);
@@ -732,34 +729,6 @@ getOrSynthesizeTangentVectorStruct(DerivedConformance &derived, Identifier id) {
   return structDecl;
 }
 
-/// Add a typealias declaration with the given name and underlying target
-/// struct type to the given source nominal declaration context.
-static void addAssociatedTypeAliasDecl(Identifier name, DeclContext *sourceDC,
-                                       StructDecl *target,
-                                       ASTContext &Context) {
-  auto *nominal = sourceDC->getSelfNominalTypeDecl();
-  assert(nominal && "Expected `DeclContext` to be a nominal type");
-  auto lookup = nominal->lookupDirect(name);
-  assert(lookup.size() < 2 &&
-         "Expected at most one associated type named member");
-  // If implicit type declaration with the given name already exists in source
-  // struct, return it.
-  if (lookup.size() == 1) {
-    auto existingTypeDecl = dyn_cast<TypeDecl>(lookup.front());
-    assert(existingTypeDecl && existingTypeDecl->isImplicit() &&
-           "Expected lookup result to be an implicit type declaration");
-    return;
-  }
-  // Otherwise, create a new typealias.
-  auto *aliasDecl = new (Context)
-      TypeAliasDecl(SourceLoc(), SourceLoc(), name, SourceLoc(), {}, sourceDC);
-  aliasDecl->setUnderlyingType(target->getDeclaredInterfaceType());
-  aliasDecl->setImplicit();
-  aliasDecl->setGenericSignature(sourceDC->getGenericSignatureOfContext());
-  cast<IterableDeclContext>(sourceDC->getAsDecl())->addMember(aliasDecl);
-  aliasDecl->copyFormalAccessFrom(nominal, /*sourceIsParentContext*/ true);
-};
-
 /// Diagnose stored properties in the nominal that do not have an explicit
 /// `@noDerivative` attribute, but either:
 /// - Do not conform to `Differentiable`.
@@ -786,7 +755,7 @@ static void checkAndDiagnoseImplicitNoDerivative(ASTContext &Context,
       // Diagnose wrapped properties whose property wrappers do not define
       // `wrappedValue.set`. `mutating func move(along:)` cannot be synthesized
       // to update these properties.
-      if (!originalProperty->getAccessor(AccessorKind::Set)) {
+      if (!originalProperty->isSettable(DC)) {
         auto *wrapperDecl =
             vd->getInterfaceType()->getNominalOrBoundGenericNominal();
         auto loc =
@@ -845,7 +814,7 @@ static void checkAndDiagnoseImplicitNoDerivative(ASTContext &Context,
 }
 
 /// Get or synthesize `TangentVector` struct type.
-static Type
+static std::pair<Type, TypeDecl *>
 getOrSynthesizeTangentVectorStructType(DerivedConformance &derived) {
   auto *parentDC = derived.getConformanceContext();
   auto *nominal = derived.Nominal;
@@ -855,20 +824,20 @@ getOrSynthesizeTangentVectorStructType(DerivedConformance &derived) {
   auto *tangentStruct =
       getOrSynthesizeTangentVectorStruct(derived, C.Id_TangentVector);
   if (!tangentStruct)
-    return nullptr;
+    return std::make_pair(nullptr, nullptr);
+
   // Check and emit warnings for implicit `@noDerivative` members.
   checkAndDiagnoseImplicitNoDerivative(C, nominal, parentDC);
-  // Add `TangentVector` typealias for `TangentVector` struct.
-  addAssociatedTypeAliasDecl(C.Id_TangentVector, tangentStruct, tangentStruct,
-                             C);
 
   // Return the `TangentVector` struct type.
-  return parentDC->mapTypeIntoContext(
-      tangentStruct->getDeclaredInterfaceType());
+  return std::make_pair(
+    parentDC->mapTypeIntoContext(
+      tangentStruct->getDeclaredInterfaceType()),
+    tangentStruct);
 }
 
 /// Synthesize the `TangentVector` struct type.
-static Type
+static std::pair<Type, TypeDecl *>
 deriveDifferentiable_TangentVectorStruct(DerivedConformance &derived) {
   auto *parentDC = derived.getConformanceContext();
   auto *nominal = derived.Nominal;
@@ -876,7 +845,7 @@ deriveDifferentiable_TangentVectorStruct(DerivedConformance &derived) {
   // If nominal type can derive `TangentVector` as the contextual `Self` type,
   // return it.
   if (canDeriveTangentVectorAsSelf(nominal, parentDC))
-    return parentDC->getSelfTypeInContext();
+    return std::make_pair(parentDC->getSelfTypeInContext(), nullptr);
 
   // Otherwise, get or synthesize `TangentVector` struct type.
   return getOrSynthesizeTangentVectorStructType(derived);
@@ -917,16 +886,17 @@ ValueDecl *DerivedConformance::deriveDifferentiable(ValueDecl *requirement) {
   return nullptr;
 }
 
-Type DerivedConformance::deriveDifferentiable(AssociatedTypeDecl *requirement) {
+std::pair<Type, TypeDecl *>
+DerivedConformance::deriveDifferentiable(AssociatedTypeDecl *requirement) {
   // Diagnose unknown requirements.
   if (requirement->getBaseName() != Context.Id_TangentVector) {
     Context.Diags.diagnose(requirement->getLoc(),
                            diag::broken_differentiable_requirement);
-    return nullptr;
+    return std::make_pair(nullptr, nullptr);
   }
   // Diagnose conformances in disallowed contexts.
   if (checkAndDiagnoseDisallowedContext(requirement))
-    return nullptr;
+    return std::make_pair(nullptr, nullptr);
 
   // Start an error diagnostic before attempting derivation.
   // If derivation succeeds, cancel the diagnostic.
@@ -942,5 +912,5 @@ Type DerivedConformance::deriveDifferentiable(AssociatedTypeDecl *requirement) {
   }
 
   // Otherwise, return nullptr.
-  return nullptr;
+  return std::make_pair(nullptr, nullptr);
 }
diff --git a/lib/Sema/DerivedConformanceEquatableHashable.cpp b/lib/Sema/DerivedConformanceEquatableHashable.cpp
index 589c61b447d6e..fee4e9012b313 100644
--- a/lib/Sema/DerivedConformanceEquatableHashable.cpp
+++ b/lib/Sema/DerivedConformanceEquatableHashable.cpp
@@ -386,19 +386,17 @@ deriveBodyEquatable_struct_eq(AbstractFunctionDecl *eqDecl, void *) {
     if (!propertyDecl->isUserAccessible())
       continue;
 
-    auto aPropertyRef = new (C) DeclRefExpr(propertyDecl, DeclNameLoc(),
-                                            /*implicit*/ true);
     auto aParamRef = new (C) DeclRefExpr(aParam, DeclNameLoc(),
                                          /*implicit*/ true);
-    auto aPropertyExpr = new (C) DotSyntaxCallExpr(aPropertyRef, SourceLoc(),
-                                                   aParamRef);
+    auto aPropertyExpr = new (C) MemberRefExpr(aParamRef, SourceLoc(),
+                                               propertyDecl, DeclNameLoc(),
+                                               /*implicit*/ true);
 
-    auto bPropertyRef = new (C) DeclRefExpr(propertyDecl, DeclNameLoc(),
-                                            /*implicit*/ true);
     auto bParamRef = new (C) DeclRefExpr(bParam, DeclNameLoc(),
                                          /*implicit*/ true);
-    auto bPropertyExpr = new (C) DotSyntaxCallExpr(bPropertyRef, SourceLoc(),
-                                                   bParamRef);
+    auto bPropertyExpr = new (C) MemberRefExpr(bParamRef, SourceLoc(),
+                                               propertyDecl, DeclNameLoc(),
+                                               /*implicit*/ true);
 
     auto guardStmt = DerivedConformance::returnFalseIfNotEqualGuard(C,
       aPropertyExpr, bPropertyExpr);
@@ -873,12 +871,12 @@ deriveBodyHashable_struct_hashInto(AbstractFunctionDecl *hashIntoDecl, void *) {
     if (!propertyDecl->isUserAccessible())
       continue;
 
-    auto propertyRef = new (C) DeclRefExpr(propertyDecl, DeclNameLoc(),
-                                           /*implicit*/ true);
     auto selfRef = new (C) DeclRefExpr(selfDecl, DeclNameLoc(),
                                        /*implicit*/ true);
-    auto selfPropertyExpr = new (C) DotSyntaxCallExpr(propertyRef, SourceLoc(),
-                                                      selfRef);
+    auto selfPropertyExpr = new (C) MemberRefExpr(selfRef, SourceLoc(),
+                                                  propertyDecl, DeclNameLoc(),
+                                                  /*implicit*/ true);
+
     // Generate: hasher.combine(self.<property>)
     auto combineExpr = createHasherCombineCall(C, hasherParam, selfPropertyExpr);
     statements.emplace_back(ASTNode(combineExpr));
diff --git a/lib/Sema/DerivedConformanceRawRepresentable.cpp b/lib/Sema/DerivedConformanceRawRepresentable.cpp
index beb22f6af4145..b8ecb3e61c3fa 100644
--- a/lib/Sema/DerivedConformanceRawRepresentable.cpp
+++ b/lib/Sema/DerivedConformanceRawRepresentable.cpp
@@ -198,7 +198,7 @@ struct RuntimeVersionCheck {
     // platformSpec = "\(attr.platform) \(attr.introduced)"
     auto platformSpec = new (C) PlatformVersionConstraintAvailabilitySpec(
                             Platform, SourceLoc(),
-                            Version, SourceLoc()
+                            Version, Version, SourceLoc()
                         );
 
     // otherSpec = "*"
@@ -332,9 +332,9 @@ deriveBodyRawRepresentable_init(AbstractFunctionDecl *initDecl, void *) {
     // Create a statement which assigns the case to self.
 
     // valueExpr = "\(enumType).\(elt)"
-    auto eltRef = new (C) DeclRefExpr(elt, DeclNameLoc(), /*implicit*/true);
     auto metaTyRef = TypeExpr::createImplicit(enumType, C);
-    auto valueExpr = new (C) DotSyntaxCallExpr(eltRef, SourceLoc(), metaTyRef);
+    auto valueExpr = new (C) MemberRefExpr(metaTyRef, SourceLoc(),
+                                           elt, DeclNameLoc(), /*implicit*/true);
     
     // assignment = "self = \(valueExpr)"
     auto selfRef = new (C) DeclRefExpr(selfDecl, DeclNameLoc(),
diff --git a/lib/Sema/DerivedConformances.h b/lib/Sema/DerivedConformances.h
index 1f6296ee84fcb..678c9fc208b3f 100644
--- a/lib/Sema/DerivedConformances.h
+++ b/lib/Sema/DerivedConformances.h
@@ -122,7 +122,8 @@ class DerivedConformance {
   /// Derive a Differentiable type witness for a nominal type.
   ///
   /// \returns the derived member, which will also be added to the type.
-  Type deriveDifferentiable(AssociatedTypeDecl *assocType);
+  std::pair<Type, TypeDecl *>
+  deriveDifferentiable(AssociatedTypeDecl *assocType);
 
   /// Derive a CaseIterable requirement for an enum if it has no associated
   /// values for any of its cases.
diff --git a/lib/Sema/SourceLoader.cpp b/lib/Sema/SourceLoader.cpp
index af59251f5e824..11ec00eeb62cd 100644
--- a/lib/Sema/SourceLoader.cpp
+++ b/lib/Sema/SourceLoader.cpp
@@ -118,7 +118,7 @@ ModuleDecl *SourceLoader::loadModule(SourceLoc importLoc,
   auto *importMod = ModuleDecl::create(moduleID.Item, Ctx, importInfo);
   if (EnableLibraryEvolution)
     importMod->setResilienceStrategy(ResilienceStrategy::Resilient);
-  Ctx.LoadedModules[moduleID.Item] = importMod;
+  Ctx.addLoadedModule(importMod);
 
   auto *importFile =
       new (Ctx) SourceFile(*importMod, SourceFileKind::Library, bufferID,
diff --git a/lib/Sema/TypeCheckAccess.cpp b/lib/Sema/TypeCheckAccess.cpp
index a3720d157e27f..475e8c41d3794 100644
--- a/lib/Sema/TypeCheckAccess.cpp
+++ b/lib/Sema/TypeCheckAccess.cpp
@@ -235,13 +235,7 @@ void AccessControlCheckerBase::checkTypeAccessImpl(
         contextAccessScope.isChildOf(*typeReprAccessScope)) {
       // Only if both the Type and the TypeRepr follow the access rules can
       // we exit; otherwise we have to emit a diagnostic.
-
-      if (typeReprAccessScope->isPublic() != contextAccessScope.isPublic() ||
-          !typeReprAccessScope->isSPI() ||
-          contextAccessScope.isSPI()) {
-        // And we exit only if there is no SPI violation.
-        return;
-      }
+      return;
     }
     problematicAccessScope = *typeReprAccessScope;
 
@@ -349,8 +343,7 @@ void AccessControlCheckerBase::checkGenericParamAccess(
         (thisDowngrade == DowngradeToWarning::No &&
          downgradeToWarning == DowngradeToWarning::Yes) ||
         (!complainRepr &&
-         typeAccessScope.hasEqualDeclContextWith(minAccessScope)) ||
-         typeAccessScope.isSPI()) {
+         typeAccessScope.hasEqualDeclContextWith(minAccessScope))) {
       minAccessScope = typeAccessScope;
       complainRepr = thisComplainRepr;
       accessControlErrorKind = callbackACEK;
@@ -375,7 +368,7 @@ void AccessControlCheckerBase::checkGenericParamAccess(
                            const_cast<GenericContext *>(ownerCtx)),
                          accessScope, DC, callback);
 
-  if (minAccessScope.isPublic() && !minAccessScope.isSPI())
+  if (minAccessScope.isPublic())
     return;
 
   // FIXME: Promote these to an error in the next -swift-version break.
@@ -958,7 +951,7 @@ class AccessControlChecker : public AccessControlCheckerBase,
       });
     }
 
-    if (!minAccessScope.isPublic() || minAccessScope.isSPI()) {
+    if (!minAccessScope.isPublic()) {
       auto minAccess = minAccessScope.accessLevelForDiagnostics();
       auto functionKind = isa<ConstructorDecl>(fn)
         ? FK_Initializer
@@ -970,24 +963,13 @@ class AccessControlChecker : public AccessControlCheckerBase,
         ? fn->getFormalAccess()
         : minAccessScope.requiredAccessForDiagnostics();
 
-      // Report as an SPI problem if the type is at least as public as the decl.
-      AccessScope contextAccessScope =
-        fn->getFormalAccessScope(fn->getDeclContext(), checkUsableFromInline);
-
-      if (contextAccessScope.isSPI()) {
-        auto diag = fn->diagnose(diag::function_type_spi, functionKind,
-                                 problemIsResult, minAccess,
-                                 minAccess >= AccessLevel::Public);
-        highlightOffendingType(diag, complainRepr);
-      } else {
-        auto diagID = diag::function_type_access;
-        if (downgradeToWarning == DowngradeToWarning::Yes)
-          diagID = diag::function_type_access_warn;
-        auto diag = fn->diagnose(diagID, isExplicit, fnAccess,
-                                 isa<FileUnit>(fn->getDeclContext()), minAccess,
-                                 functionKind, problemIsResult);
-        highlightOffendingType(diag, complainRepr);
-      }
+      auto diagID = diag::function_type_access;
+      if (downgradeToWarning == DowngradeToWarning::Yes)
+        diagID = diag::function_type_access_warn;
+      auto diag = fn->diagnose(diagID, isExplicit, fnAccess,
+                               isa<FileUnit>(fn->getDeclContext()), minAccess,
+                               functionKind, problemIsResult);
+      highlightOffendingType(diag, complainRepr);
     }
   }
 
@@ -1471,6 +1453,31 @@ class UsableFromInlineChecker : public AccessControlCheckerBase,
 class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
   class Diagnoser;
 
+  // Problematic origin of an exported type.
+  //
+  // This enum must be kept in sync with
+  // diag::decl_from_hidden_module and
+  // diag::conformance_from_implementation_only_module.
+  enum class DisallowedOriginKind : uint8_t {
+    ImplementationOnly,
+    SPIImported,
+    SPILocal,
+    None
+  };
+
+  // If there's an exportability problem with \p typeDecl, get its origin kind.
+  static DisallowedOriginKind getDisallowedOriginKind(
+      const TypeDecl *typeDecl, const SourceFile &SF, const Decl *context) {
+    ModuleDecl *M = typeDecl->getModuleContext();
+    if (SF.isImportedImplementationOnly(M))
+      return DisallowedOriginKind::ImplementationOnly;
+    else if (typeDecl->isSPI() && !context->isSPI())
+      return context->getModuleContext() == M ?
+        DisallowedOriginKind::SPILocal :
+        DisallowedOriginKind::SPIImported;
+    return DisallowedOriginKind::None;
+  };
+
   void checkTypeImpl(
       Type type, const TypeRepr *typeRepr, const SourceFile &SF,
       const Decl *context,
@@ -1487,11 +1494,9 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
       const_cast<TypeRepr *>(typeRepr)->walk(TypeReprIdentFinder(
           [&](const ComponentIdentTypeRepr *component) {
         TypeDecl *typeDecl = component->getBoundDecl();
-        ModuleDecl *M = typeDecl->getModuleContext();
-        bool isImplementationOnly = SF.isImportedImplementationOnly(M);
-        if (isImplementationOnly ||
-            (SF.isImportedAsSPI(typeDecl) && !context->isSPI())) {
-          diagnoser.diagnoseType(typeDecl, component, isImplementationOnly);
+        auto originKind = getDisallowedOriginKind(typeDecl, SF, context);
+        if (originKind != DisallowedOriginKind::None) {
+          diagnoser.diagnoseType(typeDecl, component, originKind);
           foundAnyIssues = true;
         }
 
@@ -1519,12 +1524,9 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
         : SF(SF), context(context), diagnoser(diagnoser) {}
 
       void visitTypeDecl(const TypeDecl *typeDecl) {
-        ModuleDecl *M = typeDecl->getModuleContext();
-        bool isImplementationOnly = SF.isImportedImplementationOnly(M);
-        if (isImplementationOnly ||
-            (SF.isImportedAsSPI(typeDecl) && !context->isSPI()))
-          diagnoser.diagnoseType(typeDecl, /*typeRepr*/nullptr,
-                                 isImplementationOnly);
+        auto originKind = getDisallowedOriginKind(typeDecl, SF, context);
+        if (originKind != DisallowedOriginKind::None)
+          diagnoser.diagnoseType(typeDecl, /*typeRepr*/nullptr, originKind);
       }
 
       void visitSubstitutionMap(SubstitutionMap subs) {
@@ -1621,7 +1623,7 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
     });
   }
 
-  // These enums must be kept in sync with
+  // This enum must be kept in sync with
   // diag::decl_from_hidden_module and
   // diag::conformance_from_implementation_only_module.
   enum class Reason : unsigned {
@@ -1630,10 +1632,6 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
     ExtensionWithPublicMembers,
     ExtensionWithConditionalConformances
   };
-  enum class HiddenImportKind : uint8_t {
-    ImplementationOnly,
-    SPI
-  };
 
   class Diagnoser {
     const Decl *D;
@@ -1643,16 +1641,13 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
 
     void diagnoseType(const TypeDecl *offendingType,
                       const TypeRepr *complainRepr,
-                      bool isImplementationOnly) const {
+                      DisallowedOriginKind originKind) const {
       ModuleDecl *M = offendingType->getModuleContext();
-      HiddenImportKind importKind = isImplementationOnly?
-                                HiddenImportKind::ImplementationOnly:
-                                HiddenImportKind::SPI;
       auto diag = D->diagnose(diag::decl_from_hidden_module,
                               offendingType->getDescriptiveKind(),
                               offendingType->getName(),
                               static_cast<unsigned>(reason), M->getName(),
-                              static_cast<unsigned>(importKind));
+                              static_cast<unsigned>(originKind));
       highlightOffendingType(diag, complainRepr);
     }
 
@@ -1981,7 +1976,7 @@ class ExportabilityChecker : public DeclVisitor<ExportabilityChecker> {
         DE.diagnose(diagLoc, diag::decl_from_hidden_module,
                     PGD->getDescriptiveKind(), PGD->getName(),
                     static_cast<unsigned>(Reason::General), M->getName(),
-                    static_cast<unsigned>(HiddenImportKind::ImplementationOnly)
+                    static_cast<unsigned>(DisallowedOriginKind::ImplementationOnly)
                     );
     if (refRange.isValid())
       diag.highlight(refRange);
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
index 77bdb991f794d..e29d1dc17952f 100644
--- a/lib/Sema/TypeCheckAttr.cpp
+++ b/lib/Sema/TypeCheckAttr.cpp
@@ -30,6 +30,7 @@
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/SourceFile.h"
+#include "swift/AST/StorageImpl.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/AST/Types.h"
 #include "swift/Parse/Lexer.h"
@@ -897,8 +898,8 @@ void AttributeChecker::visitSPIAccessControlAttr(SPIAccessControlAttr *attr) {
           // implementation defines `set` if the protocol declares it.
           if (auto protoStorage = dyn_cast<AbstractStorageDecl>(VD))
             if (auto entryStorage = dyn_cast<AbstractStorageDecl>(entryDecl))
-              if (protoStorage->getAccessor(AccessorKind::Set) &&
-                  !entryStorage->getAccessor(AccessorKind::Set))
+              if (protoStorage->supportsMutation() &&
+                  !entryStorage->supportsMutation())
                 return false;
 
           return true;
@@ -1900,17 +1901,13 @@ void AttributeChecker::visitMainTypeAttr(MainTypeAttr *attr) {
   }
 
   auto funcDeclRef = ConcreteDeclRef(mainFunction, substitutionMap);
-  auto *funcDeclRefExpr = new (context) DeclRefExpr(
-      funcDeclRef, DeclNameLoc(location), /*Implicit*/ true);
-  funcDeclRefExpr->setImplicit(true);
-  funcDeclRefExpr->setType(mainFunction->getInterfaceType());
 
-  auto *dotSyntaxCallExpr = new (context) DotSyntaxCallExpr(
-      funcDeclRefExpr, /*DotLoc*/ SourceLoc(), typeExpr, voidToVoidFunctionType);
-  dotSyntaxCallExpr->setImplicit(true);
-  dotSyntaxCallExpr->setThrows(mainFunctionThrows);
+  auto *memberRefExpr = new (context) MemberRefExpr(
+      typeExpr, SourceLoc(), funcDeclRef, DeclNameLoc(location),
+      /*Implicit*/ true);
+  memberRefExpr->setImplicit(true);
 
-  auto *callExpr = CallExpr::createImplicit(context, dotSyntaxCallExpr, {}, {});
+  auto *callExpr = CallExpr::createImplicit(context, memberRefExpr, {}, {});
   callExpr->setImplicit(true);
   callExpr->setThrows(mainFunctionThrows);
   callExpr->setType(context.TheEmptyTupleType);
@@ -3607,24 +3604,71 @@ static IndexSubset *computeDifferentiabilityParameters(
   return IndexSubset::get(ctx, parameterBits);
 }
 
-// Returns the function declaration corresponding to the given function name and
-// lookup context. If the base type of the function is specified, member lookup
-// is performed. Otherwise, unqualified lookup is performed.
+/// Returns the `DescriptiveDeclKind` corresponding to the given `AccessorKind`.
+/// Used for diagnostics.
+static DescriptiveDeclKind getAccessorDescriptiveDeclKind(AccessorKind kind) {
+  switch (kind) {
+  case AccessorKind::Get:
+    return DescriptiveDeclKind::Getter;
+  case AccessorKind::Set:
+    return DescriptiveDeclKind::Setter;
+  case AccessorKind::Read:
+    return DescriptiveDeclKind::ReadAccessor;
+  case AccessorKind::Modify:
+    return DescriptiveDeclKind::ModifyAccessor;
+  case AccessorKind::WillSet:
+    return DescriptiveDeclKind::WillSet;
+  case AccessorKind::DidSet:
+    return DescriptiveDeclKind::DidSet;
+  case AccessorKind::Address:
+    return DescriptiveDeclKind::Addressor;
+  case AccessorKind::MutableAddress:
+    return DescriptiveDeclKind::MutableAddressor;
+  }
+}
+
+/// An abstract function declaration lookup error.
+enum class AbstractFunctionDeclLookupErrorKind {
+  /// No lookup candidates could be found.
+  NoCandidatesFound,
+  /// There are multiple valid lookup candidates.
+  CandidatesAmbiguous,
+  /// Lookup candidate does not have the expected type.
+  CandidateTypeMismatch,
+  /// Lookup candidate is in the wrong type context.
+  CandidateWrongTypeContext,
+  /// Lookup candidate does not have the requested accessor.
+  CandidateMissingAccessor,
+  /// Lookup candidate is a protocol requirement.
+  CandidateProtocolRequirement,
+  /// Lookup candidate could be resolved to an `AbstractFunctionDecl`.
+  CandidateNotFunctionDeclaration
+};
+
+// Returns the function declaration corresponding to the given base type
+// (optional), function name, and lookup context.
+//
+// If the base type of the function is specified, member lookup is performed.
+// Otherwise, unqualified lookup is performed.
+//
 // If the function declaration cannot be resolved, emits a diagnostic and
 // returns nullptr.
+//
+// Used for resolving the referenced declaration in `@derivative` and
+// `@transpose` attributes.
 static AbstractFunctionDecl *findAbstractFunctionDecl(
-    DeclNameRef funcName, SourceLoc funcNameLoc, Type baseType,
-    DeclContext *lookupContext,
-    const std::function<bool(AbstractFunctionDecl *)> &isValidCandidate,
-    const std::function<void()> &noneValidDiagnostic,
-    const std::function<void()> &ambiguousDiagnostic,
-    const std::function<void()> &notFunctionDiagnostic,
-    NameLookupOptions lookupOptions,
-    const Optional<std::function<bool(AbstractFunctionDecl *)>>
-        &hasValidTypeCtx,
-    const Optional<std::function<void()>> &invalidTypeCtxDiagnostic) {
+    DeclAttribute *attr, Type baseType, DeclNameRefWithLoc funcNameWithLoc,
+    DeclContext *lookupContext, NameLookupOptions lookupOptions,
+    const llvm::function_ref<Optional<AbstractFunctionDeclLookupErrorKind>(
+        AbstractFunctionDecl *)> &isValidCandidate,
+    AnyFunctionType *expectedOriginalFnType) {
+  assert(lookupContext);
   auto &ctx = lookupContext->getASTContext();
-  AbstractFunctionDecl *resolvedCandidate = nullptr;
+  auto &diags = ctx.Diags;
+
+  auto funcName = funcNameWithLoc.Name;
+  auto funcNameLoc = funcNameWithLoc.Loc;
+  auto maybeAccessorKind = funcNameWithLoc.AccessorKind;
 
   // Perform lookup.
   LookupResult results;
@@ -3635,73 +3679,143 @@ static AbstractFunctionDecl *findAbstractFunctionDecl(
   if (baseType) {
     results = TypeChecker::lookupMember(lookupContext, baseType, funcName);
   } else {
-    results = TypeChecker::lookupUnqualified(lookupContext, funcName,
-                                             funcNameLoc, lookupOptions);
+    results = TypeChecker::lookupUnqualified(
+        lookupContext, funcName, funcNameLoc.getBaseNameLoc(), lookupOptions);
+  }
+
+  // Error if no candidates were found.
+  if (results.empty()) {
+    diags.diagnose(funcNameLoc, diag::cannot_find_in_scope, funcName,
+                   funcName.isOperator());
+    return nullptr;
   }
 
-  // Initialize error flags.
-  bool notFunction = false;
-  bool wrongTypeContext = false;
-  bool ambiguousFuncDecl = false;
-  bool foundInvalid = false;
+  // Track invalid and valid candidates.
+  using LookupErrorKind = AbstractFunctionDeclLookupErrorKind;
+  SmallVector<std::pair<ValueDecl *, LookupErrorKind>, 2> invalidCandidates;
+  SmallVector<AbstractFunctionDecl *, 2> validCandidates;
 
   // Filter lookup results.
   for (auto choice : results) {
-    auto decl = choice.getValueDecl();
-    if (!decl)
-      continue;
+    auto *decl = choice.getValueDecl();
     // Cast the candidate to an `AbstractFunctionDecl`.
     auto *candidate = dyn_cast<AbstractFunctionDecl>(decl);
-    // If the candidate is an `AbstractStorageDecl`, use its getter as the
-    // candidate.
-    if (auto *asd = dyn_cast<AbstractStorageDecl>(decl))
-      candidate = asd->getAccessor(AccessorKind::Get);
-    if (!candidate) {
-      notFunction = true;
-      continue;
+    // If the candidate is an `AbstractStorageDecl`, use one of its accessors as
+    // the candidate.
+    if (auto *asd = dyn_cast<AbstractStorageDecl>(decl)) {
+      // If accessor kind is specified, use corresponding accessor from the
+      // candidate. Otherwise, use the getter by default.
+      auto accessorKind = maybeAccessorKind.getValueOr(AccessorKind::Get);
+      candidate = asd->getOpaqueAccessor(accessorKind);
+      // Error if candidate is missing the requested accessor.
+      if (!candidate) {
+        invalidCandidates.push_back(
+            {decl, LookupErrorKind::CandidateMissingAccessor});
+        continue;
+      }
     }
-    if (hasValidTypeCtx && !(*hasValidTypeCtx)(candidate)) {
-      wrongTypeContext = true;
+    // Error if the candidate is not an `AbstractStorageDecl` but an accessor is
+    // requested.
+    else if (maybeAccessorKind.hasValue()) {
+      invalidCandidates.push_back(
+          {decl, LookupErrorKind::CandidateMissingAccessor});
       continue;
     }
-    if (!isValidCandidate(candidate)) {
-      foundInvalid = true;
+    // Error if candidate is not a `AbstractFunctionDecl`.
+    if (!candidate) {
+      invalidCandidates.push_back(
+          {decl, LookupErrorKind::CandidateNotFunctionDeclaration});
       continue;
     }
-    if (resolvedCandidate) {
-      ambiguousFuncDecl = true;
-      resolvedCandidate = nullptr;
-      break;
+    // Error if candidate is not valid.
+    auto invalidCandidateKind = isValidCandidate(candidate);
+    if (invalidCandidateKind.hasValue()) {
+      invalidCandidates.push_back({candidate, *invalidCandidateKind});
+      continue;
     }
-    resolvedCandidate = candidate;
-  }
-  // If function declaration was resolved, return it.
-  if (resolvedCandidate)
-    return resolvedCandidate;
-
-  // Otherwise, emit the appropriate diagnostic and return nullptr.
-  if (results.empty()) {
-    ctx.Diags.diagnose(funcNameLoc, diag::cannot_find_in_scope, funcName,
+    // Otherwise, record valid candidate.
+    validCandidates.push_back(candidate);
+  }
+  // If there are no valid candidates, emit diagnostics for invalid candidates.
+  if (validCandidates.empty()) {
+    assert(!invalidCandidates.empty());
+    diags.diagnose(funcNameLoc, diag::autodiff_attr_original_decl_none_valid,
+                   funcName);
+    for (auto invalidCandidatePair : invalidCandidates) {
+      auto *invalidCandidate = invalidCandidatePair.first;
+      auto invalidCandidateKind = invalidCandidatePair.second;
+      auto declKind = invalidCandidate->getDescriptiveKind();
+      switch (invalidCandidateKind) {
+      case AbstractFunctionDeclLookupErrorKind::NoCandidatesFound:
+        diags.diagnose(invalidCandidate, diag::cannot_find_in_scope, funcName,
                        funcName.isOperator());
+        break;
+      case AbstractFunctionDeclLookupErrorKind::CandidatesAmbiguous:
+        diags.diagnose(invalidCandidate, diag::attr_ambiguous_reference_to_decl,
+                       funcName, attr->getAttrName());
+        break;
+      case AbstractFunctionDeclLookupErrorKind::CandidateTypeMismatch: {
+        // If the expected original function type has a generic signature, emit
+        // "candidate does not have type equal to or less constrained than ..."
+        // diagnostic.
+        //
+        // This is significant because derivative/transpose functions may have
+        // more constrained generic signatures than their referenced original
+        // declarations.
+        if (auto genSig = expectedOriginalFnType->getOptGenericSignature()) {
+          diags.diagnose(invalidCandidate,
+                         diag::autodiff_attr_original_decl_type_mismatch,
+                         declKind, expectedOriginalFnType,
+                         /*hasGenericSignature*/ true);
+          break;
+        }
+        // Otherwise, emit a "candidate does not have expected type ..." error.
+        diags.diagnose(invalidCandidate,
+                       diag::autodiff_attr_original_decl_type_mismatch,
+                       declKind, expectedOriginalFnType,
+                       /*hasGenericSignature*/ false);
+        break;
+      }
+      case AbstractFunctionDeclLookupErrorKind::CandidateWrongTypeContext:
+        diags.diagnose(invalidCandidate,
+                       diag::autodiff_attr_original_decl_not_same_type_context,
+                       declKind);
+        break;
+      case AbstractFunctionDeclLookupErrorKind::CandidateMissingAccessor: {
+        auto accessorKind = maybeAccessorKind.getValueOr(AccessorKind::Get);
+        auto accessorDeclKind = getAccessorDescriptiveDeclKind(accessorKind);
+        diags.diagnose(invalidCandidate,
+                       diag::autodiff_attr_original_decl_missing_accessor,
+                       declKind, accessorDeclKind);
+        break;
+      }
+      case AbstractFunctionDeclLookupErrorKind::CandidateProtocolRequirement:
+        diags.diagnose(invalidCandidate,
+                       diag::derivative_attr_protocol_requirement_unsupported);
+        break;
+      case AbstractFunctionDeclLookupErrorKind::CandidateNotFunctionDeclaration:
+        diags.diagnose(invalidCandidate,
+                       diag::autodiff_attr_original_decl_invalid_kind,
+                       declKind);
+        break;
+      }
+    }
     return nullptr;
   }
-  if (ambiguousFuncDecl) {
-    ambiguousDiagnostic();
-    return nullptr;
-  }
-  if (wrongTypeContext) {
-    assert(invalidTypeCtxDiagnostic &&
-           "Type context diagnostic should've been specified");
-    (*invalidTypeCtxDiagnostic)();
-    return nullptr;
-  }
-  if (foundInvalid) {
-    noneValidDiagnostic();
+  // Error if there are multiple valid candidates.
+  if (validCandidates.size() > 1) {
+    diags.diagnose(funcNameLoc, diag::autodiff_attr_original_decl_ambiguous,
+                   funcName);
+    for (auto *validCandidate : validCandidates) {
+      auto declKind = validCandidate->getDescriptiveKind();
+      diags.diagnose(validCandidate,
+                     diag::autodiff_attr_original_decl_ambiguous_candidate,
+                     declKind);
+    }
     return nullptr;
   }
-  assert(notFunction && "Expected 'not a function' error");
-  notFunctionDiagnostic();
-  return nullptr;
+  // Success if there is one unambiguous valid candidate.
+  return validCandidates.front();
 }
 
 // Checks that the `candidate` function type equals the `required` function
@@ -4224,6 +4338,15 @@ IndexSubset *DifferentiableAttributeTypeCheckRequest::evaluate(
 
   auto *originalFnTy = original->getInterfaceType()->castTo<AnyFunctionType>();
 
+  // Diagnose if original function has opaque result types.
+  if (auto *opaqueResultTypeDecl = original->getOpaqueResultTypeDecl()) {
+    diags.diagnose(
+        attr->getLocation(),
+        diag::autodiff_attr_opaque_result_type_unsupported);
+    attr->setInvalid();
+    return nullptr;
+  }
+
   // Diagnose if original function is an invalid class member.
   bool isOriginalClassMember = original->getDeclContext() &&
                                original->getDeclContext()->getSelfClassDecl();
@@ -4288,7 +4411,7 @@ IndexSubset *DifferentiableAttributeTypeCheckRequest::evaluate(
     D->getAttrs().removeAttribute(attr);
     // Transfer `@differentiable` attribute from storage declaration to
     // getter accessor.
-    auto *getterDecl = asd->getAccessor(AccessorKind::Get);
+    auto *getterDecl = asd->getOpaqueAccessor(AccessorKind::Get);
     auto *newAttr = DifferentiableAttr::create(
         getterDecl, /*implicit*/ true, attr->AtLoc, attr->getRange(),
         attr->isLinear(), resolvedDiffParamIndices,
@@ -4409,53 +4532,43 @@ static bool typeCheckDerivativeAttr(ASTContext &Ctx, Decl *D,
         return target->requirementsNotSatisfiedBy(source).empty();
       };
 
-  auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {
-    // TODO(TF-982): Allow derivatives on protocol requirements.
-    if (isa<ProtocolDecl>(originalCandidate->getDeclContext()))
-      return false;
-    return checkFunctionSignature(
-        cast<AnyFunctionType>(originalFnType->getCanonicalType()),
-        originalCandidate->getInterfaceType()->getCanonicalType(),
-        checkGenericSignatureSatisfied);
-  };
-
-  auto noneValidDiagnostic = [&]() {
-    diags.diagnose(originalName.Loc,
-                   diag::autodiff_attr_original_decl_none_valid_found,
-                   originalName.Name, originalFnType);
-  };
-  auto ambiguousDiagnostic = [&]() {
-    diags.diagnose(originalName.Loc, diag::attr_ambiguous_reference_to_decl,
-                   originalName.Name, attr->getAttrName());
-  };
-  auto notFunctionDiagnostic = [&]() {
-    diags.diagnose(originalName.Loc,
-                   diag::autodiff_attr_original_decl_invalid_kind,
-                   originalName.Name);
-  };
-  std::function<void()> invalidTypeContextDiagnostic = [&]() {
-    diags.diagnose(originalName.Loc,
-                   diag::autodiff_attr_original_decl_not_same_type_context,
-                   originalName.Name);
-  };
-
   // Returns true if the derivative function and original function candidate are
   // defined in compatible type contexts. If the derivative function and the
   // original function candidate have different parents, return false.
-  std::function<bool(AbstractFunctionDecl *)> hasValidTypeContext =
-      [&](AbstractFunctionDecl *func) {
-        // Check if both functions are top-level.
-        if (!derivative->getInnermostTypeContext() &&
-            !func->getInnermostTypeContext())
-          return true;
-        // Check if both functions are defined in the same type context.
-        if (auto typeCtx1 = derivative->getInnermostTypeContext())
-          if (auto typeCtx2 = func->getInnermostTypeContext()) {
-            return typeCtx1->getSelfNominalTypeDecl() ==
-                   typeCtx2->getSelfNominalTypeDecl();
-          }
-        return derivative->getParent() == func->getParent();
-      };
+  auto hasValidTypeContext = [&](AbstractFunctionDecl *originalCandidate) {
+    // Check if both functions are top-level.
+    if (!derivative->getInnermostTypeContext() &&
+        !originalCandidate->getInnermostTypeContext())
+      return true;
+    // Check if both functions are defined in the same type context.
+    if (auto typeCtx1 = derivative->getInnermostTypeContext())
+      if (auto typeCtx2 = originalCandidate->getInnermostTypeContext()) {
+        return typeCtx1->getSelfNominalTypeDecl() ==
+               typeCtx2->getSelfNominalTypeDecl();
+      }
+    return derivative->getParent() == originalCandidate->getParent();
+  };
+
+  auto isValidOriginalCandidate = [&](AbstractFunctionDecl *originalCandidate)
+      -> Optional<AbstractFunctionDeclLookupErrorKind> {
+    // Error if the original candidate is a protocol requirement. Derivative
+    // registration does not yet support protocol requirements.
+    // TODO(TF-982): Allow default derivative implementations for protocol
+    // requirements.
+    if (isa<ProtocolDecl>(originalCandidate->getDeclContext()))
+      return AbstractFunctionDeclLookupErrorKind::CandidateProtocolRequirement;
+    // Error if the original candidate is not defined in a type context
+    // compatible with the derivative function.
+    if (!hasValidTypeContext(originalCandidate))
+      return AbstractFunctionDeclLookupErrorKind::CandidateWrongTypeContext;
+    // Error if the original candidate does not have the expected type.
+    if (!checkFunctionSignature(
+            cast<AnyFunctionType>(originalFnType->getCanonicalType()),
+            originalCandidate->getInterfaceType()->getCanonicalType(),
+            checkGenericSignatureSatisfied))
+      return AbstractFunctionDeclLookupErrorKind::CandidateTypeMismatch;
+    return None;
+  };
 
   Type baseType;
   if (auto *baseTypeRepr = attr->getBaseTypeRepr()) {
@@ -4475,17 +4588,33 @@ static bool typeCheckDerivativeAttr(ASTContext &Ctx, Decl *D,
     derivativeTypeCtx = derivative->getParent();
   assert(derivativeTypeCtx);
 
+  // Diagnose unsupported original accessor kinds.
+  // Currently, only getters and setters are supported.
+  if (originalName.AccessorKind.hasValue()) {
+    if (*originalName.AccessorKind != AccessorKind::Get &&
+        *originalName.AccessorKind != AccessorKind::Set) {
+      attr->setInvalid();
+      diags.diagnose(
+          originalName.Loc, diag::derivative_attr_unsupported_accessor_kind,
+          getAccessorDescriptiveDeclKind(*originalName.AccessorKind));
+      return true;
+    }
+  }
+
   // Look up original function.
   auto *originalAFD = findAbstractFunctionDecl(
-      originalName.Name, originalName.Loc.getBaseNameLoc(), baseType,
-      derivativeTypeCtx, isValidOriginal, noneValidDiagnostic,
-      ambiguousDiagnostic, notFunctionDiagnostic, lookupOptions,
-      hasValidTypeContext, invalidTypeContextDiagnostic);
-  if (!originalAFD)
+      attr, baseType, originalName, derivativeTypeCtx, lookupOptions,
+      isValidOriginalCandidate, originalFnType);
+  if (!originalAFD) {
+    attr->setInvalid();
     return true;
+  }
+
   // Diagnose original stored properties. Stored properties cannot have custom
   // registered derivatives.
   if (auto *accessorDecl = dyn_cast<AccessorDecl>(originalAFD)) {
+    // Diagnose original stored properties. Stored properties cannot have custom
+    // registered derivatives.
     auto *asd = accessorDecl->getStorage();
     if (asd->hasStorage()) {
       diags.diagnose(originalName.Loc,
@@ -4495,7 +4624,28 @@ static bool typeCheckDerivativeAttr(ASTContext &Ctx, Decl *D,
                      asd->getName());
       return true;
     }
+    // Diagnose original class property and subscript setters.
+    // TODO(SR-13096): Fix derivative function typing results regarding
+    // class-typed function parameters.
+    if (asd->getDeclContext()->getSelfClassDecl() &&
+        accessorDecl->getAccessorKind() == AccessorKind::Set) {
+      diags.diagnose(originalName.Loc,
+                     diag::derivative_attr_class_setter_unsupported);
+      diags.diagnose(originalAFD->getLoc(), diag::decl_declared_here,
+                     asd->getName());
+      return true;
+    }
   }
+
+  // Diagnose if original function has opaque result types.
+  if (auto *opaqueResultTypeDecl = originalAFD->getOpaqueResultTypeDecl()) {
+    diags.diagnose(
+        attr->getLocation(),
+        diag::autodiff_attr_opaque_result_type_unsupported);
+    attr->setInvalid();
+    return true;
+  }
+
   // Diagnose if original function is an invalid class member.
   bool isOriginalClassMember =
       originalAFD->getDeclContext() &&
@@ -4981,39 +5131,17 @@ void AttributeChecker::visitTransposeAttr(TransposeAttr *attr) {
         return target->requirementsNotSatisfiedBy(source).empty();
       };
 
-  auto isValidOriginal = [&](AbstractFunctionDecl *originalCandidate) {
-    return checkFunctionSignature(
-        cast<AnyFunctionType>(expectedOriginalFnType->getCanonicalType()),
-        originalCandidate->getInterfaceType()->getCanonicalType(),
-        checkGenericSignatureSatisfied);
-  };
-
-  auto noneValidDiagnostic = [&]() {
-    diagnose(originalName.Loc,
-             diag::autodiff_attr_original_decl_none_valid_found,
-             originalName.Name, expectedOriginalFnType);
-  };
-  auto ambiguousDiagnostic = [&]() {
-    diagnose(originalName.Loc, diag::attr_ambiguous_reference_to_decl,
-             originalName.Name, attr->getAttrName());
-  };
-  auto notFunctionDiagnostic = [&]() {
-    diagnose(originalName.Loc,
-             diag::autodiff_attr_original_decl_invalid_kind,
-             originalName.Name);
-  };
-  std::function<void()> invalidTypeContextDiagnostic = [&]() {
-    diagnose(originalName.Loc,
-             diag::autodiff_attr_original_decl_not_same_type_context,
-             originalName.Name);
+  auto isValidOriginalCandidate = [&](AbstractFunctionDecl *originalCandidate)
+      -> Optional<AbstractFunctionDeclLookupErrorKind> {
+    // Error if the original candidate does not have the expected type.
+    if (!checkFunctionSignature(
+            cast<AnyFunctionType>(expectedOriginalFnType->getCanonicalType()),
+            originalCandidate->getInterfaceType()->getCanonicalType(),
+            checkGenericSignatureSatisfied))
+      return AbstractFunctionDeclLookupErrorKind::CandidateTypeMismatch;
+    return None;
   };
 
-  // Returns true if the transpose function and original function candidate are
-  // defined in compatible type contexts. If the transpose function and the
-  // original function candidate have different parents, return false.
-  std::function<bool(AbstractFunctionDecl *)> hasValidTypeContext =
-      [&](AbstractFunctionDecl *decl) { return true; };
-
   auto resolution =
       TypeResolution::forContextual(transpose->getDeclContext(), None);
   Type baseType;
@@ -5032,16 +5160,21 @@ void AttributeChecker::visitTransposeAttr(TransposeAttr *attr) {
   if (attr->getBaseTypeRepr())
     funcLoc = attr->getBaseTypeRepr()->getLoc();
   auto *originalAFD = findAbstractFunctionDecl(
-      originalName.Name, funcLoc, baseType, transposeTypeCtx, isValidOriginal,
-      noneValidDiagnostic, ambiguousDiagnostic, notFunctionDiagnostic,
-      lookupOptions, hasValidTypeContext, invalidTypeContextDiagnostic);
+      attr, baseType, originalName, transposeTypeCtx, lookupOptions,
+      isValidOriginalCandidate, expectedOriginalFnType);
   if (!originalAFD) {
     attr->setInvalid();
     return;
   }
-
   attr->setOriginalFunction(originalAFD);
 
+  // Diagnose if original function has opaque result types.
+  if (auto *opaqueResultTypeDecl = originalAFD->getOpaqueResultTypeDecl()) {
+    diagnose(attr->getLocation(), diag::autodiff_attr_opaque_result_type_unsupported);
+    attr->setInvalid();
+    return;
+  }
+
   // Get the linearity parameter types.
   SmallVector<AnyFunctionType::Param, 4> linearParams;
   expectedOriginalFnType->getSubsetParameters(linearParamIndices, linearParams,
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
index be05a54427f8a..a62d73c95ff83 100644
--- a/lib/Sema/TypeCheckAvailability.cpp
+++ b/lib/Sema/TypeCheckAvailability.cpp
@@ -453,8 +453,8 @@ class TypeRefinementContextBuilder : private ASTWalker {
         continue;
       }
 
-      AvailabilityContext NewConstraint = contextForSpec(Spec);
-      Query->setAvailableRange(NewConstraint.getOSVersion());
+      AvailabilityContext NewConstraint = contextForSpec(Spec, false);
+      Query->setAvailableRange(contextForSpec(Spec, true).getOSVersion());
 
       // When compiling zippered for macCatalyst, we need to collect both
       // a macOS version (the target version) and an iOS/macCatalyst version
@@ -464,7 +464,8 @@ class TypeRefinementContextBuilder : private ASTWalker {
       if (Context.LangOpts.TargetVariant) {
         AvailabilitySpec *VariantSpec =
             bestActiveSpecForQuery(Query, /*ForTargetVariant*/ true);
-        VersionRange VariantRange = contextForSpec(VariantSpec).getOSVersion();
+        VersionRange VariantRange =
+            contextForSpec(VariantSpec, true).getOSVersion();
         Query->setVariantAvailableRange(VariantRange);
       }
 
@@ -594,13 +595,19 @@ class TypeRefinementContextBuilder : private ASTWalker {
   }
 
   /// Return the availability context for the given spec.
-  AvailabilityContext contextForSpec(AvailabilitySpec *Spec) {
+  AvailabilityContext contextForSpec(AvailabilitySpec *Spec,
+                                    bool GetRuntimeContext) {
     if (isa<OtherPlatformAvailabilitySpec>(Spec)) {
       return AvailabilityContext::alwaysAvailable();
     }
 
     auto *VersionSpec = cast<PlatformVersionConstraintAvailabilitySpec>(Spec);
-    return AvailabilityContext(VersionRange::allGTE(VersionSpec->getVersion()));
+
+    llvm::VersionTuple Version = (GetRuntimeContext ?
+                                    VersionSpec->getRuntimeVersion() :
+                                    VersionSpec->getVersion());
+
+    return AvailabilityContext(VersionRange::allGTE(Version));
   }
 
   Expr *walkToExprPost(Expr *E) override {
diff --git a/lib/Sema/TypeCheckCodeCompletion.cpp b/lib/Sema/TypeCheckCodeCompletion.cpp
new file mode 100644
index 0000000000000..64a10e79ccacf
--- /dev/null
+++ b/lib/Sema/TypeCheckCodeCompletion.cpp
@@ -0,0 +1,691 @@
+//===--- TypeCheckCodeCompletion.cpp - Type Checking for Code Completion --===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements various entry points for use by lib/IDE/.
+//
+//===----------------------------------------------------------------------===//
+
+#include "swift/Subsystems.h"
+#include "ConstraintSystem.h"
+#include "TypeChecker.h"
+#include "TypeCheckObjC.h"
+#include "TypeCheckType.h"
+#include "CodeSynthesis.h"
+#include "MiscDiagnostics.h"
+#include "swift/AST/ASTWalker.h"
+#include "swift/AST/ASTVisitor.h"
+#include "swift/AST/Attr.h"
+#include "swift/AST/DiagnosticSuppression.h"
+#include "swift/AST/ExistentialLayout.h"
+#include "swift/AST/Identifier.h"
+#include "swift/AST/ImportCache.h"
+#include "swift/AST/Initializer.h"
+#include "swift/AST/ModuleLoader.h"
+#include "swift/AST/NameLookup.h"
+#include "swift/AST/ParameterList.h"
+#include "swift/AST/PrettyStackTrace.h"
+#include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SourceFile.h"
+#include "swift/AST/Type.h"
+#include "swift/AST/TypeCheckRequests.h"
+#include "swift/Basic/Statistic.h"
+#include "swift/Basic/STLExtras.h"
+#include "swift/Basic/Timer.h"
+#include "swift/Parse/Lexer.h"
+#include "swift/Sema/IDETypeChecking.h"
+#include "swift/Strings.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/PointerUnion.h"
+#include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/ADT/TinyPtrVector.h"
+#include "llvm/ADT/Twine.h"
+#include <algorithm>
+
+using namespace swift;
+using namespace constraints;
+
+/// Find the declaration directly referenced by this expression.
+static std::pair<ValueDecl *, FunctionRefKind>
+findReferencedDecl(Expr *expr, DeclNameLoc &loc) {
+  do {
+    expr = expr->getSemanticsProvidingExpr();
+
+    if (auto ice = dyn_cast<ImplicitConversionExpr>(expr)) {
+      expr = ice->getSubExpr();
+      continue;
+    }
+
+    if (auto dre = dyn_cast<DeclRefExpr>(expr)) {
+      loc = dre->getNameLoc();
+      return { dre->getDecl(), dre->getFunctionRefKind() };
+    }
+
+    return { nullptr, FunctionRefKind::Unapplied };
+  } while (true);
+}
+
+// Check if \p E is a call expression to curried thunk of "KeyPath as function".
+// i.e. '{ `$kp$` in { $0[keyPath: $kp$] } }(keypath)'
+static bool isKeyPathCurriedThunkCallExpr(Expr *E) {
+  auto CE = dyn_cast<CallExpr>(E);
+  if (!CE)
+    return false;
+  auto thunk = dyn_cast<AutoClosureExpr>(CE->getFn());
+  if (!thunk)
+    return false;
+  if (thunk->getParameters()->size() != 1 ||
+      thunk->getParameters()->get(0)->getParameterName().str() != "$kp$")
+    return false;
+
+  auto PE = dyn_cast<ParenExpr>(CE->getArg());
+  if (!PE)
+    return false;
+  return isa<KeyPathExpr>(PE->getSubExpr());
+}
+
+// Extract the keypath expression from the curried thunk expression.
+static Expr *extractKeyPathFromCurryThunkCall(Expr *E) {
+  assert(isKeyPathCurriedThunkCallExpr(E));
+  auto call = cast<CallExpr>(E);
+  auto arg = cast<ParenExpr>(call->getArg());
+  return arg->getSubExpr();
+}
+
+namespace {
+
+/// AST walker that "sanitizes" an expression for re-typechecking during
+/// code completion.
+///
+/// FIXME: Remove this.
+class SanitizeExpr : public ASTWalker {
+  ASTContext &C;
+  bool ShouldReusePrecheckedType;
+  llvm::SmallDenseMap<OpaqueValueExpr *, Expr *, 4> OpenExistentials;
+
+public:
+  SanitizeExpr(ASTContext &C,
+               bool shouldReusePrecheckedType)
+    : C(C), ShouldReusePrecheckedType(shouldReusePrecheckedType) { }
+
+  std::pair<bool, Expr *> walkToExprPre(Expr *expr) override {
+    while (true) {
+
+      // If we should reuse pre-checked types, don't sanitize the expression
+      // if it's already type-checked.
+      if (ShouldReusePrecheckedType && expr->getType())
+        return { false, expr };
+
+      // OpenExistentialExpr contains OpaqueValueExpr in its sub expression.
+      if (auto OOE = dyn_cast<OpenExistentialExpr>(expr)) {
+        auto archetypeVal = OOE->getOpaqueValue();
+        auto base = OOE->getExistentialValue();
+
+        bool inserted = OpenExistentials.insert({archetypeVal, base}).second;
+        assert(inserted && "OpaqueValue appears multiple times?");
+        (void)inserted;
+        SWIFT_DEFER { OpenExistentials.erase(archetypeVal); };
+
+        // Walk to and return the base expression to erase any existentials
+        // within it.
+        return { false, OOE->getSubExpr()->walk(*this) };
+      }
+
+      // Hacky, this behaves just like an OpenedExistential in that it changes
+      // the expr tree.
+      if (auto ISLE = dyn_cast<InterpolatedStringLiteralExpr>(expr)) {
+        if (auto subExpr = ISLE->getAppendingExpr()->getSubExpr()) {
+          if (auto opaqueValue = dyn_cast<OpaqueValueExpr>(subExpr)) {
+            ISLE->getAppendingExpr()->setSubExpr(nullptr);
+          }
+        }
+      }
+
+      // Substitute OpaqueValue with its representing existental.
+      if (auto OVE = dyn_cast<OpaqueValueExpr>(expr)) {
+        auto value = OpenExistentials.find(OVE);
+
+        if (value != OpenExistentials.end()) {
+          expr = value->second;
+          continue;
+        } else {
+          assert(OVE->isPlaceholder() &&
+                 "Didn't see this OVE in a containing OpenExistentialExpr?");
+        }
+      }
+
+      // Skip any implicit conversions applied to this expression.
+      if (auto ICE = dyn_cast<ImplicitConversionExpr>(expr)) {
+        expr = ICE->getSubExpr();
+        continue;
+      }
+
+      // MakeTemporarilyEscapableExpr is typechecked expression.
+      if (auto MTEE = dyn_cast<MakeTemporarilyEscapableExpr>(expr)) {
+        expr = MTEE->getOriginalExpr();
+        continue;
+      }
+
+      // Extract keypath from '{ `$kp$` in { $0[keyPath: $kp$] } }(keypath)'
+      if (isKeyPathCurriedThunkCallExpr(expr)) {
+        expr = extractKeyPathFromCurryThunkCall(expr);
+        continue;
+      }
+
+      // Restore '@autoclosure'd value.
+      if (auto ACE = dyn_cast<AutoClosureExpr>(expr)) {
+        // This is only valid if the closure doesn't have parameters.
+        if (ACE->getParameters()->size() == 0) {
+          expr = ACE->getSingleExpressionBody();
+          continue;
+        }
+        llvm_unreachable("other AutoClosureExpr must be handled specially");
+      }
+
+      // Remove any semantic expression injected by typechecking.
+      if (auto EPE = dyn_cast<EditorPlaceholderExpr>(expr)) {
+        EPE->setSemanticExpr(nullptr);
+      }
+
+      // Strip default arguments and varargs from type-checked call
+      // argument lists.
+      if (isa<ParenExpr>(expr) || isa<TupleExpr>(expr)) {
+        if (shouldSanitizeArgumentList(expr))
+          expr = sanitizeArgumentList(expr);
+      }
+
+      // If this expression represents keypath based dynamic member
+      // lookup, let's convert it back to the original form of
+      // member or subscript reference.
+      if (auto *SE = dyn_cast<SubscriptExpr>(expr)) {
+        if (auto *TE = dyn_cast<TupleExpr>(SE->getIndex())) {
+          auto isImplicitKeyPathExpr = [](Expr *argExpr) -> bool {
+            if (auto *KP = dyn_cast<KeyPathExpr>(argExpr))
+              return KP->isImplicit();
+            return false;
+          };
+
+          if (TE->isImplicit() && TE->getNumElements() == 1 &&
+              TE->getElementName(0) == C.Id_dynamicMember &&
+              isImplicitKeyPathExpr(TE->getElement(0))) {
+            auto *keyPathExpr = cast<KeyPathExpr>(TE->getElement(0));
+            auto *componentExpr = keyPathExpr->getParsedPath();
+
+            if (auto *UDE = dyn_cast<UnresolvedDotExpr>(componentExpr)) {
+              UDE->setBase(SE->getBase());
+              return {true, UDE};
+            }
+
+            if (auto *subscript = dyn_cast<SubscriptExpr>(componentExpr)) {
+              subscript->setBase(SE->getBase());
+              return {true, subscript};
+            }
+
+            llvm_unreachable("unknown keypath component type");
+          }
+        }
+      }
+
+      // If this is a closure, only walk into its children if they
+      // are type-checked in the context of the enclosing expression.
+      if (auto closure = dyn_cast<ClosureExpr>(expr)) {
+        if (!shouldTypeCheckInEnclosingExpression(closure))
+          return { false, expr };
+      }
+
+      // Now, we're ready to walk into sub expressions.
+      return {true, expr};
+    }
+  }
+
+  bool isSyntheticArgumentExpr(const Expr *expr) {
+    if (isa<DefaultArgumentExpr>(expr))
+      return true;
+
+    if (auto *varargExpr = dyn_cast<VarargExpansionExpr>(expr))
+      if (isa<ArrayExpr>(varargExpr->getSubExpr()))
+        return true;
+
+    return false;
+  }
+
+  bool shouldSanitizeArgumentList(const Expr *expr) {
+    if (auto *parenExpr = dyn_cast<ParenExpr>(expr)) {
+      return isSyntheticArgumentExpr(parenExpr->getSubExpr());
+    } else if (auto *tupleExpr = dyn_cast<TupleExpr>(expr)) {
+      for (auto *arg : tupleExpr->getElements()) {
+        if (isSyntheticArgumentExpr(arg))
+          return true;
+      }
+
+      return false;
+    } else {
+      return isSyntheticArgumentExpr(expr);
+    }
+  }
+
+  Expr *sanitizeArgumentList(Expr *original) {
+    auto argList = getOriginalArgumentList(original);
+
+    if (argList.args.size() == 1 &&
+        argList.labels[0].empty() &&
+        !isa<VarargExpansionExpr>(argList.args[0])) {
+      auto *result =
+        new (C) ParenExpr(argList.lParenLoc,
+                          argList.args[0],
+                          argList.rParenLoc,
+                          argList.hasTrailingClosure);
+      result->setImplicit();
+      return result;
+    }
+
+    return TupleExpr::create(C,
+                             argList.lParenLoc,
+                             argList.args,
+                             argList.labels,
+                             argList.labelLocs,
+                             argList.rParenLoc,
+                             argList.hasTrailingClosure,
+                             /*implicit=*/true);
+  }
+
+  Expr *walkToExprPost(Expr *expr) override {
+    assert(!isa<ImplicitConversionExpr>(expr) &&
+           "ImplicitConversionExpr should be eliminated in walkToExprPre");
+
+    auto buildMemberRef = [&](Type memberType, Expr *base, SourceLoc dotLoc,
+                              ConcreteDeclRef member, DeclNameLoc memberLoc,
+                              bool implicit) -> Expr * {
+      auto *memberRef = new (C)
+          MemberRefExpr(base, dotLoc, member, memberLoc, implicit);
+
+      if (memberType) {
+        memberRef->setType(memberType);
+        return memberRef;
+      }
+
+      return memberRef;
+    };
+
+    // A DotSyntaxCallExpr is a member reference that has already been
+    // type-checked down to a call; turn it back into an overloaded
+    // member reference expression.
+    if (auto dotCall = dyn_cast<DotSyntaxCallExpr>(expr)) {
+      DeclNameLoc memberLoc;
+      auto memberAndFunctionRef = findReferencedDecl(dotCall->getFn(),
+                                                     memberLoc);
+      if (memberAndFunctionRef.first) {
+        assert(!isa<ImplicitConversionExpr>(dotCall->getBase()));
+        return buildMemberRef(dotCall->getType(),
+                              dotCall->getBase(),
+                              dotCall->getDotLoc(),
+                              memberAndFunctionRef.first,
+                              memberLoc, expr->isImplicit());
+      }
+    }
+
+    if (auto *dynamicMember = dyn_cast<DynamicMemberRefExpr>(expr)) {
+      if (auto memberRef = dynamicMember->getMember()) {
+        assert(!isa<ImplicitConversionExpr>(dynamicMember->getBase()));
+        return buildMemberRef(dynamicMember->getType(),
+                              dynamicMember->getBase(),
+                              dynamicMember->getDotLoc(),
+                              memberRef,
+                              dynamicMember->getNameLoc(),
+                              expr->isImplicit());
+      }
+    }
+
+    // A DotSyntaxBaseIgnoredExpr is a static member reference that has
+    // already been type-checked down to a call where the argument doesn't
+    // actually matter; turn it back into an overloaded member reference
+    // expression.
+    if (auto dotIgnored = dyn_cast<DotSyntaxBaseIgnoredExpr>(expr)) {
+      DeclNameLoc memberLoc;
+      auto memberAndFunctionRef = findReferencedDecl(dotIgnored->getRHS(),
+                                                     memberLoc);
+      if (memberAndFunctionRef.first) {
+        assert(!isa<ImplicitConversionExpr>(dotIgnored->getLHS()));
+        return buildMemberRef(dotIgnored->getType(),
+                              dotIgnored->getLHS(),
+                              dotIgnored->getDotLoc(),
+                              memberAndFunctionRef.first,
+                              memberLoc, expr->isImplicit());
+      }
+    }
+    return expr;
+  }
+
+  /// Ignore declarations.
+  bool walkToDeclPre(Decl *decl) override { return false; }
+};
+
+}  // end namespace
+
+static Type
+getTypeOfExpressionWithoutApplying(Expr *&expr, DeclContext *dc,
+                                   ConcreteDeclRef &referencedDecl,
+                                 FreeTypeVariableBinding allowFreeTypeVariables) {
+  auto &Context = dc->getASTContext();
+
+  expr = expr->walk(SanitizeExpr(Context,
+                                 /*shouldReusePrecheckedType=*/false));
+
+  FrontendStatsTracer StatsTracer(Context.Stats,
+                                  "typecheck-expr-no-apply", expr);
+  PrettyStackTraceExpr stackTrace(Context, "type-checking", expr);
+  referencedDecl = nullptr;
+
+  // Construct a constraint system from this expression.
+  ConstraintSystem cs(dc, ConstraintSystemFlags::SuppressDiagnostics);
+
+  // Attempt to solve the constraint system.
+  const Type originalType = expr->getType();
+  const bool needClearType = originalType && originalType->hasError();
+  const auto recoverOriginalType = [&] () {
+    if (needClearType)
+      expr->setType(originalType);
+  };
+
+  // If the previous checking gives the expr error type, clear the result and
+  // re-check.
+  if (needClearType)
+    expr->setType(Type());
+  SolutionApplicationTarget target(
+      expr, dc, CTP_Unused, Type(), /*isDiscarded=*/false);
+  auto viable = cs.solve(target, allowFreeTypeVariables);
+  if (!viable) {
+    recoverOriginalType();
+    return Type();
+  }
+
+  // Get the expression's simplified type.
+  expr = target.getAsExpr();
+  auto &solution = (*viable)[0];
+  auto &solutionCS = solution.getConstraintSystem();
+  Type exprType = solution.simplifyType(solutionCS.getType(expr));
+
+  assert(exprType && !exprType->hasTypeVariable() &&
+         "free type variable with FreeTypeVariableBinding::GenericParameters?");
+
+  if (exprType->hasError()) {
+    recoverOriginalType();
+    return Type();
+  }
+
+  // Dig the declaration out of the solution.
+  auto semanticExpr = expr->getSemanticsProvidingExpr();
+  auto topLocator = cs.getConstraintLocator(semanticExpr);
+  referencedDecl = solution.resolveLocatorToDecl(topLocator);
+
+  if (!referencedDecl.getDecl()) {
+    // Do another check in case we have a curried call from binding a function
+    // reference to a variable, for example:
+    //
+    //   class C {
+    //     func instanceFunc(p1: Int, p2: Int) {}
+    //   }
+    //   func t(c: C) {
+    //     C.instanceFunc(c)#^COMPLETE^#
+    //   }
+    //
+    // We need to get the referenced function so we can complete the argument
+    // labels. (Note that the requirement to have labels in the curried call
+    // seems inconsistent with the removal of labels from function types.
+    // If this changes the following code could be removed).
+    if (auto *CE = dyn_cast<CallExpr>(semanticExpr)) {
+      if (auto *UDE = dyn_cast<UnresolvedDotExpr>(CE->getFn())) {
+        if (isa<TypeExpr>(UDE->getBase())) {
+          auto udeLocator = cs.getConstraintLocator(UDE);
+          auto udeRefDecl = solution.resolveLocatorToDecl(udeLocator);
+          if (auto *FD = dyn_cast_or_null<FuncDecl>(udeRefDecl.getDecl())) {
+            if (FD->isInstanceMember())
+              referencedDecl = udeRefDecl;
+          }
+        }
+      }
+    }
+  }
+
+  // Recover the original type if needed.
+  recoverOriginalType();
+  return exprType;
+}
+
+static FunctionType *
+getTypeOfCompletionOperatorImpl(DeclContext *DC, Expr *expr,
+                                ConcreteDeclRef &referencedDecl) {
+  auto &Context = DC->getASTContext();
+
+  FrontendStatsTracer StatsTracer(Context.Stats,
+                                  "typecheck-completion-operator", expr);
+  PrettyStackTraceExpr stackTrace(Context, "type-checking", expr);
+
+  expr = expr->walk(SanitizeExpr(Context,
+                                 /*shouldReusePrecheckedType=*/true));
+
+  ConstraintSystemOptions options;
+  options |= ConstraintSystemFlags::SuppressDiagnostics;
+  options |= ConstraintSystemFlags::ReusePrecheckedType;
+
+  // Construct a constraint system from this expression.
+  ConstraintSystem CS(DC, options);
+  expr = CS.generateConstraints(expr, DC);
+  if (!expr)
+    return nullptr;
+
+  if (CS.isDebugMode()) {
+    auto &log = llvm::errs();
+    log << "---Initial constraints for the given expression---\n";
+    expr->dump(log);
+    log << "\n";
+    CS.print(log);
+  }
+
+  // Attempt to solve the constraint system.
+  SmallVector<Solution, 4> viable;
+  if (CS.solve(viable, FreeTypeVariableBinding::Disallow))
+    return nullptr;
+
+  auto &solution = viable[0];
+  if (CS.isDebugMode()) {
+    auto &log = llvm::errs();
+    log << "---Solution---\n";
+    solution.dump(log);
+  }
+
+  // Fill the results.
+  Expr *opExpr = cast<ApplyExpr>(expr)->getFn();
+  referencedDecl =
+      solution.resolveLocatorToDecl(CS.getConstraintLocator(opExpr));
+
+  // Return '(ArgType[, ArgType]) -> ResultType' as a function type.
+  // We don't use the type of the operator expression because we want the types
+  // of the *arguments* instead of the types of the parameters.
+  Expr *argsExpr = cast<ApplyExpr>(expr)->getArg();
+  SmallVector<FunctionType::Param, 2> argTypes;
+  if (auto *PE = dyn_cast<ParenExpr>(argsExpr)) {
+    argTypes.emplace_back(solution.simplifyType(CS.getType(PE->getSubExpr())));
+  } else if (auto *TE = dyn_cast<TupleExpr>(argsExpr)) {
+    for (auto arg : TE->getElements())
+      argTypes.emplace_back(solution.simplifyType(CS.getType(arg)));
+  }
+
+  return FunctionType::get(argTypes, solution.simplifyType(CS.getType(expr)));
+}
+
+/// Return the type of operator function for specified LHS, or a null
+/// \c Type on error.
+FunctionType *
+TypeChecker::getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
+                                         Identifier opName, DeclRefKind refKind,
+                                         ConcreteDeclRef &referencedDecl) {
+
+  // For the infix operator, find the actual LHS from pre-folded LHS.
+  if (refKind == DeclRefKind::BinaryOperator)
+    LHS = TypeChecker::findLHS(DC, LHS, opName);
+
+  if (!LHS)
+    return nullptr;
+
+  auto LHSTy = LHS->getType();
+
+  // FIXME: 'UnresolvedType' still might be typechecked by an operator.
+  if (!LHSTy || LHSTy->is<UnresolvedType>())
+    return nullptr;
+
+  // Meta types and function types cannot be a operand of operator expressions.
+  if (LHSTy->is<MetatypeType>() || LHSTy->is<AnyFunctionType>())
+    return nullptr;
+
+  auto Loc = LHS->getEndLoc();
+
+  // Build temporary expression to typecheck.
+  // We allocate these expressions on the stack because we know they can't
+  // escape and there isn't a better way to allocate scratch Expr nodes.
+  UnresolvedDeclRefExpr UDRE(DeclNameRef(opName), refKind, DeclNameLoc(Loc));
+  auto *opExpr = TypeChecker::resolveDeclRefExpr(&UDRE, DC);
+
+  switch (refKind) {
+
+  case DeclRefKind::PostfixOperator: {
+    // (postfix_unary_expr
+    //   (declref_expr name=<opName>)
+    //   (paren_expr
+    //     (<LHS>)))
+    ParenExpr Args(SourceLoc(), LHS, SourceLoc(),
+                   /*hasTrailingClosure=*/false);
+    PostfixUnaryExpr postfixExpr(opExpr, &Args);
+    return getTypeOfCompletionOperatorImpl(DC, &postfixExpr,
+                                           referencedDecl);
+  }
+
+  case DeclRefKind::BinaryOperator: {
+    // (binary_expr
+    //   (declref_expr name=<opName>)
+    //   (tuple_expr
+    //     (<LHS>)
+    //     (code_completion_expr)))
+    CodeCompletionExpr dummyRHS(Loc);
+    auto Args = TupleExpr::create(
+        DC->getASTContext(), SourceLoc(), {LHS, &dummyRHS}, {}, {}, SourceLoc(),
+        /*hasTrailingClosure=*/false, /*isImplicit=*/true);
+    BinaryExpr binaryExpr(opExpr, Args, /*isImplicit=*/true);
+
+    return getTypeOfCompletionOperatorImpl(DC, &binaryExpr,
+                                           referencedDecl);
+  }
+
+  default:
+    llvm_unreachable("Invalid DeclRefKind for operator completion");
+  }
+}
+
+void TypeChecker::typeCheckForCodeCompletion(
+    Expr *expr, DeclContext *DC, Type contextualType, ContextualTypePurpose CTP,
+    llvm::function_ref<void(const Solution &)> callback) {
+  auto &Context = DC->getASTContext();
+
+  FrontendStatsTracer StatsTracer(Context.Stats,
+                                  "typecheck-for-code-completion", expr);
+  PrettyStackTraceExpr stackTrace(Context, "code-completion", expr);
+
+  expr = expr->walk(SanitizeExpr(Context,
+                                 /*shouldReusePrecheckedType=*/false));
+
+  ConstraintSystem::solveForCodeCompletion(expr, DC, contextualType, CTP,
+                                           callback);
+}
+
+static Optional<Type> getTypeOfCompletionContextExpr(
+                        DeclContext *DC,
+                        CompletionTypeCheckKind kind,
+                        Expr *&parsedExpr,
+                        ConcreteDeclRef &referencedDecl) {
+  if (constraints::ConstraintSystem::preCheckExpression(parsedExpr, DC))
+    return None;
+
+  switch (kind) {
+  case CompletionTypeCheckKind::Normal:
+    // Handle below.
+    break;
+
+  case CompletionTypeCheckKind::KeyPath:
+    referencedDecl = nullptr;
+    if (auto keyPath = dyn_cast<KeyPathExpr>(parsedExpr))
+      return TypeChecker::checkObjCKeyPathExpr(DC, keyPath,
+                                               /*requireResultType=*/true);
+
+    return None;
+  }
+
+  Type originalType = parsedExpr->getType();
+  if (auto T = getTypeOfExpressionWithoutApplying(parsedExpr, DC,
+                 referencedDecl, FreeTypeVariableBinding::UnresolvedType))
+    return T;
+
+  // Try to recover if we've made any progress.
+  if (parsedExpr &&
+      !isa<ErrorExpr>(parsedExpr) &&
+      parsedExpr->getType() &&
+      !parsedExpr->getType()->hasError() &&
+      (originalType.isNull() ||
+       !parsedExpr->getType()->isEqual(originalType))) {
+    return parsedExpr->getType();
+  }
+
+  return None;
+}
+
+/// Return the type of an expression parsed during code completion, or
+/// a null \c Type on error.
+Optional<Type> swift::getTypeOfCompletionContextExpr(
+                        ASTContext &Ctx,
+                        DeclContext *DC,
+                        CompletionTypeCheckKind kind,
+                        Expr *&parsedExpr,
+                        ConcreteDeclRef &referencedDecl) {
+  DiagnosticSuppression suppression(Ctx.Diags);
+
+  // Try to solve for the actual type of the expression.
+  return ::getTypeOfCompletionContextExpr(DC, kind, parsedExpr,
+                                          referencedDecl);
+}
+
+/// Return the type of operator function for specified LHS, or a null
+/// \c Type on error.
+FunctionType *
+swift::getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
+                                   Identifier opName, DeclRefKind refKind,
+                                   ConcreteDeclRef &referencedDecl) {
+  auto &ctx = DC->getASTContext();
+  DiagnosticSuppression suppression(ctx.Diags);
+  return TypeChecker::getTypeOfCompletionOperator(DC, LHS, opName, refKind,
+                                                  referencedDecl);
+}
+
+bool swift::typeCheckExpression(DeclContext *DC, Expr *&parsedExpr) {
+  auto &ctx = DC->getASTContext();
+
+  parsedExpr = parsedExpr->walk(SanitizeExpr(ctx, /*shouldReusePrecheckedType=*/false));
+
+  DiagnosticSuppression suppression(ctx.Diags);
+  auto resultTy = TypeChecker::typeCheckExpression(parsedExpr, DC, Type(),
+                                                   CTP_Unused);
+  return !resultTy;
+}
+
+LookupResult
+swift::lookupSemanticMember(DeclContext *DC, Type ty, DeclName name) {
+  return TypeChecker::lookupMember(DC, ty, DeclNameRef(name), None);
+}
diff --git a/lib/Sema/TypeCheckConstraints.cpp b/lib/Sema/TypeCheckConstraints.cpp
index ad161a406815b..5152ff23e24c8 100644
--- a/lib/Sema/TypeCheckConstraints.cpp
+++ b/lib/Sema/TypeCheckConstraints.cpp
@@ -2116,231 +2116,6 @@ Type TypeChecker::typeCheckParameterDefault(Expr *&defaultValue,
       isAutoClosure ? CTP_AutoclosureDefaultParameter : CTP_DefaultParameter);
 }
 
-Type TypeChecker::
-getTypeOfExpressionWithoutApplying(Expr *&expr, DeclContext *dc,
-                                   ConcreteDeclRef &referencedDecl,
-                                 FreeTypeVariableBinding allowFreeTypeVariables) {
-  auto &Context = dc->getASTContext();
-  FrontendStatsTracer StatsTracer(Context.Stats,
-                                  "typecheck-expr-no-apply", expr);
-  PrettyStackTraceExpr stackTrace(Context, "type-checking", expr);
-  referencedDecl = nullptr;
-
-  // Construct a constraint system from this expression.
-  ConstraintSystem cs(dc, ConstraintSystemFlags::SuppressDiagnostics);
-
-  // Attempt to solve the constraint system.
-  const Type originalType = expr->getType();
-  const bool needClearType = originalType && originalType->hasError();
-  const auto recoverOriginalType = [&] () {
-    if (needClearType)
-      expr->setType(originalType);
-  };
-
-  // If the previous checking gives the expr error type, clear the result and
-  // re-check.
-  if (needClearType)
-    expr->setType(Type());
-  SolutionApplicationTarget target(
-      expr, dc, CTP_Unused, Type(), /*isDiscarded=*/false);
-  auto viable = cs.solve(target, allowFreeTypeVariables);
-  if (!viable) {
-    recoverOriginalType();
-    return Type();
-  }
-
-  // Get the expression's simplified type.
-  expr = target.getAsExpr();
-  auto &solution = (*viable)[0];
-  auto &solutionCS = solution.getConstraintSystem();
-  Type exprType = solution.simplifyType(solutionCS.getType(expr));
-
-  assert(exprType && !exprType->hasTypeVariable() &&
-         "free type variable with FreeTypeVariableBinding::GenericParameters?");
-
-  if (exprType->hasError()) {
-    recoverOriginalType();
-    return Type();
-  }
-
-  // Dig the declaration out of the solution.
-  auto semanticExpr = expr->getSemanticsProvidingExpr();
-  auto topLocator = cs.getConstraintLocator(semanticExpr);
-  referencedDecl = solution.resolveLocatorToDecl(topLocator);
-
-  if (!referencedDecl.getDecl()) {
-    // Do another check in case we have a curried call from binding a function
-    // reference to a variable, for example:
-    //
-    //   class C {
-    //     func instanceFunc(p1: Int, p2: Int) {}
-    //   }
-    //   func t(c: C) {
-    //     C.instanceFunc(c)#^COMPLETE^#
-    //   }
-    //
-    // We need to get the referenced function so we can complete the argument
-    // labels. (Note that the requirement to have labels in the curried call
-    // seems inconsistent with the removal of labels from function types.
-    // If this changes the following code could be removed).
-    if (auto *CE = dyn_cast<CallExpr>(semanticExpr)) {
-      if (auto *UDE = dyn_cast<UnresolvedDotExpr>(CE->getFn())) {
-        if (isa<TypeExpr>(UDE->getBase())) {
-          auto udeLocator = cs.getConstraintLocator(UDE);
-          auto udeRefDecl = solution.resolveLocatorToDecl(udeLocator);
-          if (auto *FD = dyn_cast_or_null<FuncDecl>(udeRefDecl.getDecl())) {
-            if (FD->isInstanceMember())
-              referencedDecl = udeRefDecl;
-          }
-        }
-      }
-    }
-  }
-
-  // Recover the original type if needed.
-  recoverOriginalType();
-  return exprType;
-}
-
-static FunctionType *
-getTypeOfCompletionOperatorImpl(DeclContext *DC, Expr *expr,
-                                ConcreteDeclRef &referencedDecl) {
-  auto &Context = DC->getASTContext();
-
-  FrontendStatsTracer StatsTracer(Context.Stats,
-                                  "typecheck-completion-operator", expr);
-  PrettyStackTraceExpr stackTrace(Context, "type-checking", expr);
-
-  ConstraintSystemOptions options;
-  options |= ConstraintSystemFlags::SuppressDiagnostics;
-  options |= ConstraintSystemFlags::ReusePrecheckedType;
-
-  // Construct a constraint system from this expression.
-  ConstraintSystem CS(DC, options);
-  expr = CS.generateConstraints(expr, DC);
-  if (!expr)
-    return nullptr;
-
-  if (CS.isDebugMode()) {
-    auto &log = llvm::errs();
-    log << "---Initial constraints for the given expression---\n";
-    expr->dump(log);
-    log << "\n";
-    CS.print(log);
-  }
-
-  // Attempt to solve the constraint system.
-  SmallVector<Solution, 4> viable;
-  if (CS.solve(viable, FreeTypeVariableBinding::Disallow))
-    return nullptr;
-
-  auto &solution = viable[0];
-  if (CS.isDebugMode()) {
-    auto &log = llvm::errs();
-    log << "---Solution---\n";
-    solution.dump(log);
-  }
-
-  // Fill the results.
-  Expr *opExpr = cast<ApplyExpr>(expr)->getFn();
-  referencedDecl =
-      solution.resolveLocatorToDecl(CS.getConstraintLocator(opExpr));
-
-  // Return '(ArgType[, ArgType]) -> ResultType' as a function type.
-  // We don't use the type of the operator expression because we want the types
-  // of the *arguments* instead of the types of the parameters.
-  Expr *argsExpr = cast<ApplyExpr>(expr)->getArg();
-  SmallVector<FunctionType::Param, 2> argTypes;
-  if (auto *PE = dyn_cast<ParenExpr>(argsExpr)) {
-    argTypes.emplace_back(solution.simplifyType(CS.getType(PE->getSubExpr())));
-  } else if (auto *TE = dyn_cast<TupleExpr>(argsExpr)) {
-    for (auto arg : TE->getElements())
-      argTypes.emplace_back(solution.simplifyType(CS.getType(arg)));
-  }
-
-  return FunctionType::get(argTypes, solution.simplifyType(CS.getType(expr)));
-}
-
-/// Return the type of operator function for specified LHS, or a null
-/// \c Type on error.
-FunctionType *
-TypeChecker::getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
-                                         Identifier opName, DeclRefKind refKind,
-                                         ConcreteDeclRef &referencedDecl) {
-
-  // For the infix operator, find the actual LHS from pre-folded LHS.
-  if (refKind == DeclRefKind::BinaryOperator)
-    LHS = TypeChecker::findLHS(DC, LHS, opName);
-
-  if (!LHS)
-    return nullptr;
-
-  auto LHSTy = LHS->getType();
-
-  // FIXME: 'UnresolvedType' still might be typechecked by an operator.
-  if (!LHSTy || LHSTy->is<UnresolvedType>())
-    return nullptr;
-
-  // Meta types and function types cannot be a operand of operator expressions.
-  if (LHSTy->is<MetatypeType>() || LHSTy->is<AnyFunctionType>())
-    return nullptr;
-
-  auto Loc = LHS->getEndLoc();
-
-  // Build temporary expression to typecheck.
-  // We allocate these expressions on the stack because we know they can't
-  // escape and there isn't a better way to allocate scratch Expr nodes.
-  UnresolvedDeclRefExpr UDRE(DeclNameRef(opName), refKind, DeclNameLoc(Loc));
-  auto *opExpr = TypeChecker::resolveDeclRefExpr(&UDRE, DC);
-
-  switch (refKind) {
-
-  case DeclRefKind::PostfixOperator: {
-    // (postfix_unary_expr
-    //   (declref_expr name=<opName>)
-    //   (paren_expr
-    //     (<LHS>)))
-    ParenExpr Args(SourceLoc(), LHS, SourceLoc(),
-                   /*hasTrailingClosure=*/false);
-    PostfixUnaryExpr postfixExpr(opExpr, &Args);
-    return getTypeOfCompletionOperatorImpl(DC, &postfixExpr,
-                                           referencedDecl);
-  }
-
-  case DeclRefKind::BinaryOperator: {
-    // (binary_expr
-    //   (declref_expr name=<opName>)
-    //   (tuple_expr
-    //     (<LHS>)
-    //     (code_completion_expr)))
-    CodeCompletionExpr dummyRHS(Loc);
-    auto Args = TupleExpr::create(
-        DC->getASTContext(), SourceLoc(), {LHS, &dummyRHS}, {}, {}, SourceLoc(),
-        /*hasTrailingClosure=*/false, /*isImplicit=*/true);
-    BinaryExpr binaryExpr(opExpr, Args, /*isImplicit=*/true);
-
-    return getTypeOfCompletionOperatorImpl(DC, &binaryExpr,
-                                           referencedDecl);
-  }
-
-  default:
-    llvm_unreachable("Invalid DeclRefKind for operator completion");
-  }
-}
-
-void TypeChecker::typeCheckForCodeCompletion(
-    Expr *expr, DeclContext *DC, Type contextualType, ContextualTypePurpose CTP,
-    llvm::function_ref<void(const Solution &)> callback) {
-  auto &Context = DC->getASTContext();
-
-  FrontendStatsTracer StatsTracer(Context.Stats,
-                                  "typecheck-for-code-completion", expr);
-  PrettyStackTraceExpr stackTrace(Context, "code-completion", expr);
-
-  ConstraintSystem::solveForCodeCompletion(expr, DC, contextualType, CTP,
-                                           callback);
-}
-
 bool TypeChecker::typeCheckBinding(
     Pattern *&pattern, Expr *&initializer, DeclContext *DC,
     Type patternType, PatternBindingDecl *PBD, unsigned patternNumber) {
@@ -3582,7 +3357,14 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
         const auto &fromElt = fromTuple->getElement(i);
         const auto &toElt = toTuple->getElement(i);
 
-        if (fromElt.getName() != toElt.getName())
+        // We should only perform name validation if both element have a label,
+        // because unlabeled tuple elements can be converted to labeled ones
+        // e.g.
+        // 
+        // let tup: (Any, Any) = (1, 1)
+        // _ = tup as! (a: Int, Int)
+        if ((!fromElt.getName().empty() && !toElt.getName().empty()) &&
+            fromElt.getName() != toElt.getName())
           return failed();
 
         auto result = checkElementCast(fromElt.getType(), toElt.getType(),
@@ -3752,8 +3534,9 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
         (toType->isAnyObject() || fromType->isAnyObject()))
       return CheckedCastKind::ValueCast;
 
-    // A cast from an existential type to a concrete type does not succeed. For
-    // example:
+    // If we have a cast from an existential type to a concrete type that we
+    // statically know doesn't conform to the protocol, mark the cast as always
+    // failing. For example:
     //
     // struct S {}
     // enum FooError: Error { case bar }
@@ -3766,19 +3549,10 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
     //   }
     // }
     //
-    // Note: we relax the restriction if the type we're casting to is a
-    // non-final class because it's possible that we might have a subclass
-    // that conforms to the protocol.
-    if (fromExistential && !toExistential) {
-      if (auto NTD = toType->getAnyNominal()) {
-        if (!toType->is<ClassType>() || NTD->isFinal()) {
-          auto protocolDecl =
-              dyn_cast_or_null<ProtocolDecl>(fromType->getAnyNominal());
-          if (protocolDecl &&
-              !conformsToProtocol(toType, protocolDecl, dc)) {
-            return failed();
-          }
-        }
+    if (auto *protocolDecl =
+          dyn_cast_or_null<ProtocolDecl>(fromType->getAnyNominal())) {
+      if (!couldDynamicallyConformToProtocol(toType, protocolDecl, dc)) {
+        return failed();
       }
     }
 
@@ -3841,10 +3615,12 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
     return CheckedCastKind::ValueCast;
   }
 
-  // If the destination type can be a supertype of the source type, we are
-  // performing what looks like an upcast except it rebinds generic
-  // parameters.
-  if (fromType->isBindableTo(toType))
+  // We perform an upcast while rebinding generic parameters if it's possible
+  // to substitute the generic arguments of the source type with the generic
+  // archetypes of the destination type. Or, if it's possible to substitute
+  // the generic arguments of the destination type with the generic archetypes
+  // of the source type, we perform a downcast instead.
+  if (toType->isBindableTo(fromType) || fromType->isBindableTo(toType))
     return CheckedCastKind::ValueCast;
   
   // Objective-C metaclasses are subclasses of NSObject in the ObjC runtime,
@@ -3861,8 +3637,8 @@ CheckedCastKind TypeChecker::typeCheckCheckedCast(Type fromType,
     }
   }
 
-  // We can conditionally cast from NSError to an Error-conforming
-  // type.  This is handled in the runtime, so it doesn't need a special cast
+  // We can conditionally cast from NSError to an Error-conforming type.
+  // This is handled in the runtime, so it doesn't need a special cast
   // kind.
   if (Context.LangOpts.EnableObjCInterop) {
     auto nsObject = Context.getNSObjectType();
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
index f94d7a08bc4e2..145de572b43c3 100644
--- a/lib/Sema/TypeCheckDecl.cpp
+++ b/lib/Sema/TypeCheckDecl.cpp
@@ -25,6 +25,7 @@
 #include "TypeCheckType.h"
 #include "MiscDiagnostics.h"
 #include "swift/AST/AccessScope.h"
+#include "swift/AST/ASTMangler.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/ASTVisitor.h"
 #include "swift/AST/ASTWalker.h"
@@ -1168,6 +1169,10 @@ bool SimpleDidSetRequest::evaluate(Evaluator &evaluator,
     return false;
   }
 
+  // Always assume non-simple 'didSet' in code completion mode.
+  if (decl->getASTContext().SourceMgr.hasCodeCompletionBuffer())
+    return false;
+
   // didSet must have a single parameter.
   if (decl->getParameters()->size() != 1) {
     return false;
@@ -2413,13 +2418,64 @@ NamingPatternRequest::evaluate(Evaluator &evaluator, VarDecl *VD) const {
   return namingPattern;
 }
 
-DeclRange
+namespace {
+
+// Utility class for deterministically ordering vtable entries for
+// synthesized methods.
+struct SortedFuncList {
+  using Entry = std::pair<std::string, AbstractFunctionDecl *>;
+  SmallVector<Entry, 2> elts;
+  bool sorted = false;
+
+  void add(AbstractFunctionDecl *afd) {
+    Mangle::ASTMangler mangler;
+    std::string mangledName;
+    if (auto *cd = dyn_cast<ConstructorDecl>(afd))
+      mangledName = mangler.mangleConstructorEntity(cd, /*allocator=*/false);
+    else if (auto *dd = dyn_cast<DestructorDecl>(afd))
+      mangledName = mangler.mangleDestructorEntity(dd, /*deallocating=*/false);
+    else
+      mangledName = mangler.mangleEntity(afd);
+
+    elts.push_back(std::make_pair(mangledName, afd));
+  }
+
+  bool empty() { return elts.empty(); }
+
+  void sort() {
+    assert(!sorted);
+    sorted = true;
+    std::sort(elts.begin(),
+              elts.end(),
+              [](const Entry &lhs, const Entry &rhs) -> bool {
+                return lhs.first < rhs.first;
+              });
+  }
+
+  decltype(elts)::const_iterator begin() const {
+    assert(sorted);
+    return elts.begin();
+  }
+
+  decltype(elts)::const_iterator end() const {
+    assert(sorted);
+    return elts.end();
+  }
+};
+
+} // end namespace
+
+ArrayRef<Decl *>
 EmittedMembersRequest::evaluate(Evaluator &evaluator,
                                 ClassDecl *CD) const {
-  if (!CD->getParentSourceFile())
-    return CD->getMembers();
-
   auto &Context = CD->getASTContext();
+  SmallVector<Decl *, 8> result;
+
+  if (!CD->getParentSourceFile()) {
+    auto members = CD->getMembers();
+    result.append(members.begin(), members.end());
+    return Context.AllocateCopy(result);
+  }
 
   // We need to add implicit initializers because they
   // affect vtable layout.
@@ -2447,16 +2503,40 @@ EmittedMembersRequest::evaluate(Evaluator &evaluator,
   forceConformance(Context.getProtocol(KnownProtocolKind::Decodable));
   forceConformance(Context.getProtocol(KnownProtocolKind::Encodable));
   forceConformance(Context.getProtocol(KnownProtocolKind::Hashable));
+  forceConformance(Context.getProtocol(KnownProtocolKind::Differentiable));
 
-  // The projected storage wrapper ($foo) might have dynamically-dispatched
-  // accessors, so force them to be synthesized.
   for (auto *member : CD->getMembers()) {
-    if (auto *var = dyn_cast<VarDecl>(member))
+    if (auto *var = dyn_cast<VarDecl>(member)) {
+      // The projected storage wrapper ($foo) might have dynamically-dispatched
+      // accessors, so force them to be synthesized.
       if (var->hasAttachedPropertyWrapper())
         (void) var->getPropertyWrapperBackingProperty();
+    }
+  }
+
+  SortedFuncList synthesizedMembers;
+
+  for (auto *member : CD->getMembers()) {
+    if (auto *afd = dyn_cast<AbstractFunctionDecl>(member)) {
+      // Add synthesized members to a side table and sort them by their mangled
+      // name, since they could have been added to the class in any order.
+      if (afd->isSynthesized()) {
+        synthesizedMembers.add(afd);
+        continue;
+      }
+    }
+
+    result.push_back(member);
+  }
+
+  if (!synthesizedMembers.empty()) {
+    synthesizedMembers.sort();
+
+    for (const auto &pair : synthesizedMembers)
+      result.push_back(pair.second);
   }
 
-  return CD->getMembers();
+  return Context.AllocateCopy(result);
 }
 
 bool TypeChecker::isPassThroughTypealias(TypeAliasDecl *typealias,
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
index f28617e430ebd..30ef739271870 100644
--- a/lib/Sema/TypeCheckDeclPrimary.cpp
+++ b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -1730,7 +1730,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       auto mentionsItself =
         defaultType.findIf([&](Type defaultType) {
           if (auto DMT = defaultType->getAs<DependentMemberType>()) {
-            return DMT->getAssocType() == AT;
+            return (DMT->getAssocType() == AT &&
+                    DMT->getBase()->isEqual(proto->getSelfInterfaceType()));
           }
           return false;
         });
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
index b674225c27244..f955e19b4d7a7 100644
--- a/lib/Sema/TypeCheckProtocol.cpp
+++ b/lib/Sema/TypeCheckProtocol.cpp
@@ -331,7 +331,7 @@ matchWitnessDifferentiableAttr(DeclContext *dc, ValueDecl *req,
   ASTContext &ctx = witness->getASTContext();
   auto *witnessAFD = dyn_cast<AbstractFunctionDecl>(witness);
   if (auto *witnessASD = dyn_cast<AbstractStorageDecl>(witness))
-    witnessAFD = witnessASD->getAccessor(AccessorKind::Get);
+    witnessAFD = witnessASD->getOpaqueAccessor(AccessorKind::Get);
   // NOTE: Validate `@differentiable` attributes by calling
   // `getParameterIndices`. This is important for type-checking
   // `@differentiable` attributes in non-primary files to skip invalid
@@ -2935,7 +2935,7 @@ printRequirementStub(ValueDecl *Requirement, DeclContext *Adopter,
       // wondering why a conformance fails.
       if (!AdopterIsClass)
         if (const auto VD = dyn_cast<VarDecl>(Requirement))
-          if (const auto Set = VD->getAccessor(AccessorKind::Set))
+          if (const auto Set = VD->getOpaqueAccessor(AccessorKind::Set))
             if (Set->getAttrs().hasAttribute<NonMutatingAttr>())
               Options.PrintPropertyAccessors = true;
     }
@@ -2963,6 +2963,59 @@ printProtocolStubFixitString(SourceLoc TypeLoc, ProtocolConformance *Conf,
     });
 }
 
+/// Filter the given array of protocol requirements and produce a new vector
+/// containing the non-conflicting requirements to be implemented by the given
+/// \c Adoptee type.
+static llvm::SmallVector<ValueDecl *, 4>
+filterProtocolRequirements(ArrayRef<ValueDecl *> Reqs, Type Adoptee) {
+  llvm::SmallVector<ValueDecl *, 4> Filtered;
+  if (Reqs.empty()) {
+    return Filtered;
+  }
+
+  const auto getProtocolSubstitutionMap = [&](ValueDecl *Req) {
+    auto *const PD = cast<ProtocolDecl>(Req->getDeclContext());
+    return SubstitutionMap::getProtocolSubstitutions(
+        PD, Adoptee, ProtocolConformanceRef(PD));
+  };
+
+  llvm::SmallDenseMap<DeclName, llvm::SmallVector<ValueDecl *, 2>, 4>
+      DeclsByName;
+  for (auto *const Req : Reqs) {
+    if (DeclsByName.find(Req->getName()) == DeclsByName.end()) {
+      DeclsByName[Req->getName()] = {Req};
+      Filtered.push_back(Req);
+      continue;
+    }
+
+    auto OverloadTy = Req->getOverloadSignatureType();
+    if (OverloadTy) {
+      OverloadTy =
+          OverloadTy.subst(getProtocolSubstitutionMap(Req))->getCanonicalType();
+    }
+    if (llvm::any_of(DeclsByName[Req->getName()], [&](ValueDecl *OtherReq) {
+          auto OtherOverloadTy = OtherReq->getOverloadSignatureType();
+          if (OtherOverloadTy) {
+            OtherOverloadTy =
+                OtherOverloadTy.subst(getProtocolSubstitutionMap(OtherReq))
+                    ->getCanonicalType();
+          }
+          return conflicting(Req->getASTContext(), Req->getOverloadSignature(),
+                             OverloadTy, OtherReq->getOverloadSignature(),
+                             OtherOverloadTy,
+                             /*wouldConflictInSwift5*/ nullptr,
+                             /*skipProtocolExtensionCheck*/ true);
+        })) {
+      continue;
+    }
+
+    DeclsByName[Req->getName()].push_back(Req);
+    Filtered.push_back(Req);
+  }
+
+  return Filtered;
+}
+
 void ConformanceChecker::
 diagnoseMissingWitnesses(MissingWitnessDiagnosisKind Kind) {
   auto LocalMissing = getLocalMissingWitness();
@@ -2971,12 +3024,10 @@ diagnoseMissingWitnesses(MissingWitnessDiagnosisKind Kind) {
   if (LocalMissing.empty())
     return;
 
-  SourceLoc ComplainLoc = Loc;
-  bool EditorMode = getASTContext().LangOpts.DiagnosticsEditorMode;
-  llvm::SetVector<ValueDecl*> MissingWitnesses(GlobalMissingWitnesses.begin(),
-                                               GlobalMissingWitnesses.end());
-  auto InsertFixitCallback = [ComplainLoc, EditorMode, MissingWitnesses]
-      (NormalProtocolConformance *Conf) {
+  const auto InsertFixit = [](NormalProtocolConformance *Conf,
+                              SourceLoc ComplainLoc, bool EditorMode,
+                              llvm::SmallVector<ValueDecl *, 4>
+                                  MissingWitnesses) {
     DeclContext *DC = Conf->getDeclContext();
     // The location where to insert stubs.
     SourceLoc FixitLocation;
@@ -2996,9 +3047,8 @@ diagnoseMissingWitnesses(MissingWitnessDiagnosisKind Kind) {
     llvm::SetVector<ValueDecl*> NoStubRequirements;
 
     // Print stubs for all known missing witnesses.
-    printProtocolStubFixitString(TypeLoc, Conf,
-                                 MissingWitnesses.getArrayRef(),
-                                 FixIt, NoStubRequirements);
+    printProtocolStubFixitString(TypeLoc, Conf, MissingWitnesses, FixIt,
+                                 NoStubRequirements);
     auto &Diags = DC->getASTContext().Diags;
 
     // If we are in editor mode, squash all notes into a single fixit.
@@ -3072,27 +3122,33 @@ diagnoseMissingWitnesses(MissingWitnessDiagnosisKind Kind) {
     }
   };
 
+  const bool IsEditorMode = Context.LangOpts.DiagnosticsEditorMode;
   switch (Kind) {
   case MissingWitnessDiagnosisKind::ErrorFixIt: {
+    const auto MissingWitnesses = filterProtocolRequirements(
+        GlobalMissingWitnesses.getArrayRef(), Adoptee);
     if (SuppressDiagnostics) {
       // If the diagnostics are suppressed, we register these missing witnesses
       // for later revisiting.
       Conformance->setInvalid();
-      getASTContext().addDelayedMissingWitnesses(
-          Conformance, MissingWitnesses.getArrayRef());
+      getASTContext().addDelayedMissingWitnesses(Conformance, MissingWitnesses);
     } else {
-      diagnoseOrDefer(LocalMissing[0], true, InsertFixitCallback);
+      diagnoseOrDefer(
+          LocalMissing[0], true, [&](NormalProtocolConformance *Conf) {
+            InsertFixit(Conf, Loc, IsEditorMode, std::move(MissingWitnesses));
+          });
     }
     clearGlobalMissingWitnesses();
     return;
   }
   case MissingWitnessDiagnosisKind::ErrorOnly: {
-    diagnoseOrDefer(LocalMissing[0], true,
-                    [](NormalProtocolConformance *Conf) {});
+    diagnoseOrDefer(LocalMissing[0], true, [](NormalProtocolConformance *) {});
     return;
   }
   case MissingWitnessDiagnosisKind::FixItOnly:
-    InsertFixitCallback(Conformance);
+    InsertFixit(Conformance, Loc, IsEditorMode,
+                filterProtocolRequirements(GlobalMissingWitnesses.getArrayRef(),
+                                           Adoptee));
     clearGlobalMissingWitnesses();
     return;
   }
@@ -4256,7 +4312,8 @@ void swift::diagnoseConformanceFailure(Type T,
 
     if (!T->isObjCExistentialType()) {
       diags.diagnose(ComplainLoc, diag::type_cannot_conform, true,
-                     T, Proto->getDeclaredType());
+                     T, T->isEqual(Proto->getDeclaredType()), 
+                     Proto->getDeclaredType());
       return;
     }
 
@@ -4470,6 +4527,40 @@ TypeChecker::conformsToProtocol(Type T, ProtocolDecl *Proto, DeclContext *DC,
   return lookupResult;
 }
 
+bool
+TypeChecker::couldDynamicallyConformToProtocol(Type type, ProtocolDecl *Proto,
+                                               DeclContext *DC) {
+  // An existential may have a concrete underlying type with protocol conformances
+  // we cannot know statically.
+  if (type->isExistentialType())
+    return true;
+  
+  // A generic archetype may have protocol conformances we cannot know
+  // statically.
+  if (type->is<ArchetypeType>())
+    return true;
+  
+  // A non-final class might have a subclass that conforms to the protocol.
+  if (auto *classDecl = type->getClassOrBoundGenericClass()) {
+    if (!classDecl->isFinal())
+      return true;
+  }
+
+  ModuleDecl *M = DC->getParentModule();
+  // For standard library collection types such as Array, Set or Dictionary
+  // which have custom casting machinery implemented in situations like:
+  //
+  //  func encodable(_ value: Encodable) {
+  //    _ = value as! [String : Encodable]
+  //  }
+  // we are skipping checking conditional requirements using lookupConformance,
+  // as an intermediate collection cast can dynamically change if the conditions
+  // are met or not.
+  if (type->isKnownStdlibCollectionType())
+    return !M->lookupConformance(type, Proto).isInvalid();
+  return !conformsToProtocol(type, Proto, DC).isInvalid();
+}
+
 /// Exposes TypeChecker functionality for querying protocol conformance.
 /// Returns a valid ProtocolConformanceRef only if all conditional
 /// requirements are successfully resolved.
@@ -5579,15 +5670,16 @@ ValueDecl *TypeChecker::deriveProtocolRequirement(DeclContext *DC,
   llvm_unreachable("unknown derivable protocol kind");
 }
 
-Type TypeChecker::deriveTypeWitness(DeclContext *DC,
-                                    NominalTypeDecl *TypeDecl,
-                                    AssociatedTypeDecl *AssocType) {
+std::pair<Type, TypeDecl *>
+TypeChecker::deriveTypeWitness(DeclContext *DC,
+                               NominalTypeDecl *TypeDecl,
+                               AssociatedTypeDecl *AssocType) {
   auto *protocol = cast<ProtocolDecl>(AssocType->getDeclContext());
 
   auto knownKind = protocol->getKnownProtocolKind();
   
   if (!knownKind)
-    return nullptr;
+    return std::make_pair(nullptr, nullptr);
 
   auto Decl = DC->getInnermostDeclarationDeclContext();
 
@@ -5595,13 +5687,13 @@ Type TypeChecker::deriveTypeWitness(DeclContext *DC,
                              protocol);
   switch (*knownKind) {
   case KnownProtocolKind::RawRepresentable:
-    return derived.deriveRawRepresentable(AssocType);
+    return std::make_pair(derived.deriveRawRepresentable(AssocType), nullptr);
   case KnownProtocolKind::CaseIterable:
-    return derived.deriveCaseIterable(AssocType);
+    return std::make_pair(derived.deriveCaseIterable(AssocType), nullptr);
   case KnownProtocolKind::Differentiable:
     return derived.deriveDifferentiable(AssocType);
   default:
-    return nullptr;
+    return std::make_pair(nullptr, nullptr);
   }
 }
 
diff --git a/lib/Sema/TypeCheckProtocol.h b/lib/Sema/TypeCheckProtocol.h
index 5149fbf6c5a8f..297fb90ec37f9 100644
--- a/lib/Sema/TypeCheckProtocol.h
+++ b/lib/Sema/TypeCheckProtocol.h
@@ -822,15 +822,13 @@ class AssociatedTypeInference {
 
   /// Compute the "derived" type witness for an associated type that is
   /// known to the compiler.
-  Type computeDerivedTypeWitness(AssociatedTypeDecl *assocType);
+  std::pair<Type, TypeDecl *>
+  computeDerivedTypeWitness(AssociatedTypeDecl *assocType);
 
   /// Compute a type witness without using a specific potential witness,
   /// e.g., using a fixed type (from a refined protocol), default type
   /// on an associated type, or deriving the type.
-  ///
-  /// \param allowDerived Whether to allow "derived" type witnesses.
-  Type computeAbstractTypeWitness(AssociatedTypeDecl *assocType,
-                                  bool allowDerived);
+  Type computeAbstractTypeWitness(AssociatedTypeDecl *assocType);
 
   /// Substitute the current type witnesses into the given interface type.
   Type substCurrentTypeWitnesses(Type type);
diff --git a/lib/Sema/TypeCheckProtocolInference.cpp b/lib/Sema/TypeCheckProtocolInference.cpp
index 9e4a214187f22..81b4aad879314 100644
--- a/lib/Sema/TypeCheckProtocolInference.cpp
+++ b/lib/Sema/TypeCheckProtocolInference.cpp
@@ -868,38 +868,37 @@ Type AssociatedTypeInference::computeDefaultTypeWitness(
   return defaultType;
 }
 
-Type AssociatedTypeInference::computeDerivedTypeWitness(
+std::pair<Type, TypeDecl *>
+AssociatedTypeInference::computeDerivedTypeWitness(
                                               AssociatedTypeDecl *assocType) {
   if (adoptee->hasError())
-    return Type();
+    return std::make_pair(Type(), nullptr);
 
   // Can we derive conformances for this protocol and adoptee?
   NominalTypeDecl *derivingTypeDecl = adoptee->getAnyNominal();
   if (!DerivedConformance::derivesProtocolConformance(dc, derivingTypeDecl,
                                                       proto))
-    return Type();
+    return std::make_pair(Type(), nullptr);
 
   // Try to derive the type witness.
-  Type derivedType =
-      TypeChecker::deriveTypeWitness(dc, derivingTypeDecl, assocType);
-  if (!derivedType)
-    return Type();
+  auto result = TypeChecker::deriveTypeWitness(dc, derivingTypeDecl, assocType);
+  if (!result.first)
+    return std::make_pair(Type(), nullptr);
 
-  // Make sure that the derived type is sane.
-  if (checkTypeWitness(derivedType, assocType, conformance)) {
+  // Make sure that the derived type satisfies requirements.
+  if (checkTypeWitness(result.first, assocType, conformance)) {
     /// FIXME: Diagnose based on this.
     failedDerivedAssocType = assocType;
-    failedDerivedWitness = derivedType;
-    return Type();
+    failedDerivedWitness = result.first;
+    return std::make_pair(Type(), nullptr);
   }
 
-  return derivedType;
+  return result;
 }
 
 Type
 AssociatedTypeInference::computeAbstractTypeWitness(
-                                              AssociatedTypeDecl *assocType,
-                                              bool allowDerived) {
+                                              AssociatedTypeDecl *assocType) {
   // We don't have a type witness for this associated type, so go
   // looking for more options.
   if (Type concreteType = computeFixedTypeWitness(assocType))
@@ -909,12 +908,6 @@ AssociatedTypeInference::computeAbstractTypeWitness(
   if (Type defaultType = computeDefaultTypeWitness(assocType))
     return defaultType;
 
-  // If we can derive a type witness, do so.
-  if (allowDerived) {
-    if (Type derivedType = computeDerivedTypeWitness(assocType))
-      return derivedType;
-  }
-
   // If there is a generic parameter of the named type, use that.
   if (auto genericSig = dc->getGenericSignatureOfContext()) {
     for (auto gp : genericSig->getInnermostGenericParams()) {
@@ -1197,8 +1190,7 @@ void AssociatedTypeInference::findSolutionsRec(
 
       // Try to compute the type without the aid of a specific potential
       // witness.
-      if (Type type = computeAbstractTypeWitness(assocType,
-                                                 /*allowDerived=*/true)) {
+      if (Type type = computeAbstractTypeWitness(assocType)) {
         if (type->hasError()) {
           recordMissing();
           return;
@@ -1880,10 +1872,23 @@ auto AssociatedTypeInference::solve(ConformanceChecker &checker)
       continue;
 
     case ResolveWitnessResult::Missing:
-      // Note that we haven't resolved this associated type yet.
-      unresolvedAssocTypes.insert(assocType);
+      // We did not find the witness via name lookup. Try to derive
+      // it below.
       break;
     }
+
+    // Finally, try to derive the witness if we know how.
+    auto derivedType = computeDerivedTypeWitness(assocType);
+    if (derivedType.first) {
+      checker.recordTypeWitness(assocType,
+                                derivedType.first->mapTypeOutOfContext(),
+                                derivedType.second);
+      continue;
+    }
+
+    // We failed to derive the witness. We're going to go on to try
+    // to infer it from potential value witnesses next.
+    unresolvedAssocTypes.insert(assocType);
   }
 
   // Result variable to use for returns so that we get NRVO.
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
index 6702c3b463c3d..c3f88e324c88d 100644
--- a/lib/Sema/TypeCheckType.cpp
+++ b/lib/Sema/TypeCheckType.cpp
@@ -33,6 +33,7 @@
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/PrettyStackTrace.h"
 #include "swift/AST/ProtocolConformance.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/AST/TypeLoc.h"
@@ -3364,7 +3365,6 @@ Type TypeResolver::resolveImplicitlyUnwrappedOptionalType(
     doDiag = !isDirect;
     break;
   case TypeResolverContext::VariadicFunctionInput:
-  case TypeResolverContext::ProtocolWhereClause:
   case TypeResolverContext::ForEachStmt:
   case TypeResolverContext::ExtensionBinding:
   case TypeResolverContext::ExplicitCastExpr:
diff --git a/lib/Sema/TypeCheckType.h b/lib/Sema/TypeCheckType.h
index e32632d877330..2736f76d13e43 100644
--- a/lib/Sema/TypeCheckType.h
+++ b/lib/Sema/TypeCheckType.h
@@ -97,9 +97,6 @@ enum class TypeResolverContext : uint8_t {
   /// tuple return values. See also: TypeResolutionFlags::Direct
   FunctionResult,
 
-  /// Whether we are in a protocol's where clause
-  ProtocolWhereClause,
-
   /// Whether this is a pattern binding entry.
   PatternBindingDecl,
 
@@ -210,7 +207,6 @@ class TypeResolutionOptions {
     case Context::FunctionInput:
     case Context::VariadicFunctionInput:
     case Context::FunctionResult:
-    case Context::ProtocolWhereClause:
     case Context::ExtensionBinding:
     case Context::SubscriptDecl:
     case Context::EnumElementDecl:
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
index c8df3ebd2425a..8a4e64efc8d22 100644
--- a/lib/Sema/TypeChecker.cpp
+++ b/lib/Sema/TypeChecker.cpp
@@ -174,42 +174,6 @@ DeclName TypeChecker::getObjectLiteralConstructorName(ASTContext &Context,
   llvm_unreachable("unknown literal constructor");
 }
 
-/// Return an idealized form of the parameter type of the given
-/// object-literal initializer.  This removes references to the protocol
-/// name from the first argument label, which would be otherwise be
-/// redundant when writing out the object-literal syntax:
-///
-///   #fileLiteral(fileReferenceLiteralResourceName: "hello.jpg")
-///
-/// Doing this allows us to preserve a nicer (and source-compatible)
-/// literal syntax while still giving the initializer a semantically
-/// unambiguous name.
-Type TypeChecker::getObjectLiteralParameterType(ObjectLiteralExpr *expr,
-                                                ConstructorDecl *ctor) {
-  auto params = ctor->getMethodInterfaceType()
-                    ->castTo<FunctionType>()->getParams();
-  SmallVector<AnyFunctionType::Param, 8> newParams;
-  newParams.append(params.begin(), params.end());
-
-  auto replace = [&](StringRef replacement) -> Type {
-    auto &Context = ctor->getASTContext();
-    newParams[0] = AnyFunctionType::Param(newParams[0].getPlainType(),
-                                          Context.getIdentifier(replacement),
-                                          newParams[0].getParameterFlags());
-    return AnyFunctionType::composeInput(Context, newParams,
-                                         /*canonicalVararg=*/false);
-  };
-
-  switch (expr->getLiteralKind()) {
-  case ObjectLiteralExpr::colorLiteral:
-    return replace("red");
-  case ObjectLiteralExpr::fileLiteral:
-  case ObjectLiteralExpr::imageLiteral:
-    return replace("resourceName");
-  }
-  llvm_unreachable("unknown literal constructor");
-}
-
 ModuleDecl *TypeChecker::getStdlibModule(const DeclContext *dc) {
   if (auto *stdlib = dc->getASTContext().getStdlibModule()) {
     return stdlib;
@@ -473,81 +437,6 @@ void swift::typeCheckPatternBinding(PatternBindingDecl *PBD,
   TypeChecker::typeCheckPatternBinding(PBD, bindingIndex);
 }
 
-static Optional<Type> getTypeOfCompletionContextExpr(
-                        DeclContext *DC,
-                        CompletionTypeCheckKind kind,
-                        Expr *&parsedExpr,
-                        ConcreteDeclRef &referencedDecl) {
-  if (constraints::ConstraintSystem::preCheckExpression(parsedExpr, DC))
-    return None;
-
-  switch (kind) {
-  case CompletionTypeCheckKind::Normal:
-    // Handle below.
-    break;
-
-  case CompletionTypeCheckKind::KeyPath:
-    referencedDecl = nullptr;
-    if (auto keyPath = dyn_cast<KeyPathExpr>(parsedExpr))
-      return TypeChecker::checkObjCKeyPathExpr(DC, keyPath,
-                                               /*requireResultType=*/true);
-
-    return None;
-  }
-
-  Type originalType = parsedExpr->getType();
-  if (auto T = TypeChecker::getTypeOfExpressionWithoutApplying(parsedExpr, DC,
-                 referencedDecl, FreeTypeVariableBinding::UnresolvedType))
-    return T;
-
-  // Try to recover if we've made any progress.
-  if (parsedExpr &&
-      !isa<ErrorExpr>(parsedExpr) &&
-      parsedExpr->getType() &&
-      !parsedExpr->getType()->hasError() &&
-      (originalType.isNull() ||
-       !parsedExpr->getType()->isEqual(originalType))) {
-    return parsedExpr->getType();
-  }
-
-  return None;
-}
-
-/// Return the type of an expression parsed during code completion, or
-/// a null \c Type on error.
-Optional<Type> swift::getTypeOfCompletionContextExpr(
-                        ASTContext &Ctx,
-                        DeclContext *DC,
-                        CompletionTypeCheckKind kind,
-                        Expr *&parsedExpr,
-                        ConcreteDeclRef &referencedDecl) {
-  DiagnosticSuppression suppression(Ctx.Diags);
-
-  // Try to solve for the actual type of the expression.
-  return ::getTypeOfCompletionContextExpr(DC, kind, parsedExpr,
-                                          referencedDecl);
-}
-
-/// Return the type of operator function for specified LHS, or a null
-/// \c Type on error.
-FunctionType *
-swift::getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
-                                   Identifier opName, DeclRefKind refKind,
-                                   ConcreteDeclRef &referencedDecl) {
-  auto &ctx = DC->getASTContext();
-  DiagnosticSuppression suppression(ctx.Diags);
-  return TypeChecker::getTypeOfCompletionOperator(DC, LHS, opName, refKind,
-                                                  referencedDecl);
-}
-
-bool swift::typeCheckExpression(DeclContext *DC, Expr *&parsedExpr) {
-  auto &ctx = DC->getASTContext();
-  DiagnosticSuppression suppression(ctx.Diags);
-  auto resultTy = TypeChecker::typeCheckExpression(parsedExpr, DC, Type(),
-                                                   CTP_Unused);
-  return !resultTy;
-}
-
 bool swift::typeCheckAbstractFunctionBodyAtLoc(AbstractFunctionDecl *AFD,
                                                SourceLoc TargetLoc) {
   auto &Ctx = AFD->getASTContext();
@@ -593,8 +482,3 @@ TypeChecker::getDeclTypeCheckingSemantics(ValueDecl *decl) {
   }
   return DeclTypeCheckingSemantics::Normal;
 }
-
-LookupResult
-swift::lookupSemanticMember(DeclContext *DC, Type ty, DeclName name) {
-  return TypeChecker::lookupMember(DC, ty, DeclNameRef(name), None);
-}
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
index 56216cb3a8ebc..bfe306236c17d 100644
--- a/lib/Sema/TypeChecker.h
+++ b/lib/Sema/TypeChecker.h
@@ -675,24 +675,6 @@ typeCheckExpression(constraints::SolutionApplicationTarget &target,
                     bool &unresolvedTypeExprs,
                     TypeCheckExprOptions options = TypeCheckExprOptions());
 
-/// Type check the given expression and return its type without
-/// applying the solution.
-///
-/// \param expr The expression to type-check.
-///
-/// \param referencedDecl Will be set to the declaration that is referenced by
-/// the expression.
-///
-/// \param allowFreeTypeVariables Whether free type variables are allowed in
-/// the solution, and what to do with them.
-///
-/// \returns the type of \p expr on success, Type() otherwise.
-/// FIXME: expr may still be modified...
-Type getTypeOfExpressionWithoutApplying(
-    Expr *&expr, DeclContext *dc, ConcreteDeclRef &referencedDecl,
-    FreeTypeVariableBinding allowFreeTypeVariables =
-        FreeTypeVariableBinding::Disallow);
-
 /// Return the type of operator function for specified LHS, or a null
 /// \c Type on error.
 FunctionType *getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
@@ -703,10 +685,10 @@ FunctionType *getTypeOfCompletionOperator(DeclContext *DC, Expr *LHS,
 /// Type check the given expression and provide results back to code completion
 /// via specified callback.
 ///
-/// This menthod is designed to be used for code completion which means that
-/// it doesn't mutate AST and constraint solver is allowed to produce partially
-/// correct solutions, such solutions can have any number of holes in them,
-/// alongside with valid ones.
+/// This method is designed to be used for code completion which means that
+/// it doesn't mutate given expression, even if there is a single valid
+/// solution, and constraint solver is allowed to produce partially correct
+/// solutions. Such solutions can have any number of holes in them.
 void typeCheckForCodeCompletion(
     Expr *expr, DeclContext *DC, Type contextualType, ContextualTypePurpose CTP,
     llvm::function_ref<void(const constraints::Solution &)> callback);
@@ -902,6 +884,17 @@ ProtocolConformanceRef conformsToProtocol(Type T, ProtocolDecl *Proto,
                                           DeclContext *DC,
                                           SourceLoc ComplainLoc = SourceLoc());
 
+/// This is similar to \c conformsToProtocol, but returns \c true for cases where
+/// the type \p T could be dynamically cast to \p Proto protocol, such as a non-final
+/// class where a subclass conforms to \p Proto.
+///
+/// \param DC The context in which to check conformance. This affects, for
+/// example, extension visibility.
+///
+///
+/// \returns True if \p T conforms to the protocol \p Proto, false otherwise.
+bool couldDynamicallyConformToProtocol(Type T, ProtocolDecl *Proto,
+                                       DeclContext *DC);
 /// Completely check the given conformance.
 void checkConformance(NormalProtocolConformance *conformance);
 
@@ -929,8 +922,9 @@ ValueDecl *deriveProtocolRequirement(DeclContext *DC,
 /// Derive an implicit type witness for the given associated type in
 /// the conformance of the given nominal type to some known
 /// protocol.
-Type deriveTypeWitness(DeclContext *DC, NominalTypeDecl *nominal,
-                       AssociatedTypeDecl *assocType);
+std::pair<Type, TypeDecl *>
+deriveTypeWitness(DeclContext *DC, NominalTypeDecl *nominal,
+                  AssociatedTypeDecl *assocType);
 
 /// \name Name lookup
 ///
@@ -1057,9 +1051,6 @@ ProtocolDecl *getLiteralProtocol(ASTContext &ctx, Expr *expr);
 DeclName getObjectLiteralConstructorName(ASTContext &ctx,
                                          ObjectLiteralExpr *expr);
 
-Type getObjectLiteralParameterType(ObjectLiteralExpr *expr,
-                                   ConstructorDecl *ctor);
-
 /// Get the module appropriate for looking up standard library types.
 ///
 /// This is "Swift", if that module is imported, or the current module if
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
index 67b5d043a4242..baebdbba93bd4 100644
--- a/lib/Serialization/Deserialization.cpp
+++ b/lib/Serialization/Deserialization.cpp
@@ -4388,8 +4388,8 @@ llvm::Error DeclDeserializer::deserializeDeclAttributes() {
             scratch, isImplicit, origNameId, origDeclId, rawDerivativeKind,
             parameters);
 
-        DeclNameRefWithLoc origName{
-            DeclNameRef(MF.getDeclBaseName(origNameId)), DeclNameLoc()};
+        DeclNameRefWithLoc origName{DeclNameRef(MF.getDeclBaseName(origNameId)),
+                                    DeclNameLoc(), None};
         auto derivativeKind =
             getActualAutoDiffDerivativeFunctionKind(rawDerivativeKind);
         if (!derivativeKind)
@@ -4418,7 +4418,7 @@ llvm::Error DeclDeserializer::deserializeDeclAttributes() {
             scratch, isImplicit, origNameId, origDeclId, parameters);
 
         DeclNameRefWithLoc origName{
-            DeclNameRef(MF.getDeclBaseName(origNameId)), DeclNameLoc()};
+            DeclNameRef(MF.getDeclBaseName(origNameId)), DeclNameLoc(), None};
         auto *origDecl = cast<AbstractFunctionDecl>(MF.getDecl(origDeclId));
         llvm::SmallBitVector parametersBitVector(parameters.size());
         for (unsigned i : indices(parameters))
diff --git a/lib/Serialization/DeserializeSIL.cpp b/lib/Serialization/DeserializeSIL.cpp
index 7e9dfeb71a698..6cc6d6f7e8a15 100644
--- a/lib/Serialization/DeserializeSIL.cpp
+++ b/lib/Serialization/DeserializeSIL.cpp
@@ -799,9 +799,10 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
       // occurred and this is a declaration. Work around that for now.
       if (!CurrentBB)
         return fn;
+      Builder.setInsertionPoint(CurrentBB);
 
       // Handle a SILInstruction record.
-      if (readSILInstruction(fn, CurrentBB, Builder, kind, scratch)) {
+      if (readSILInstruction(fn, Builder, kind, scratch)) {
         LLVM_DEBUG(llvm::dbgs() << "readSILInstruction returns error.\n");
         MF->fatal();
       }
@@ -1031,16 +1032,12 @@ SILDeserializer::readKeyPathComponent(ArrayRef<uint64_t> ListOfValues,
   llvm_unreachable("invalid key path component kind encoding");
 }
 
-bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
+bool SILDeserializer::readSILInstruction(SILFunction *Fn,
                                          SILBuilder &Builder,
                                          unsigned RecordKind,
                                          SmallVectorImpl<uint64_t> &scratch) {
-  // Return error if Basic Block is null.
-  if (!BB)
-    return true;
-
-  Builder.setInsertionPoint(BB);
-  Builder.setCurrentDebugScope(Fn->getDebugScope());
+  if (Fn)
+    Builder.setCurrentDebugScope(Fn->getDebugScope());
   unsigned RawOpCode = 0, TyCategory = 0, TyCategory2 = 0, TyCategory3 = 0,
            Attr = 0, Attr2 = 0, Attr3 = 0, Attr4 = 0, NumSubs = 0,
            NumConformances = 0, IsNonThrowingApply = 0;
@@ -1595,6 +1592,11 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
     }
     break;
   }
+  case SILInstructionKind::BaseAddrForOffsetInst:
+    assert(RecordKind == SIL_ONE_TYPE && "Layout should be OneType.");
+    ResultVal = Builder.createBaseAddrForOffset(Loc,
+              getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn));
+    break;
   case SILInstructionKind::DeallocStackInst: {
     auto Ty = MF->getType(TyID);
     ResultVal = Builder.createDeallocStack(
@@ -2096,7 +2098,22 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
     break;
   }
   case SILInstructionKind::ObjectInst: {
-    llvm_unreachable("Serialization of global initializers not supported");
+    assert(RecordKind == SIL_ONE_TYPE_VALUES &&
+           "Layout should be OneTypeValues.");
+    unsigned NumVals = ListOfValues.size();
+    assert(NumVals >= 1 && "Not enough values");
+    unsigned numBaseElements = ListOfValues[0];
+    SILType ClassTy =
+        getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn);
+    SmallVector<SILValue, 4> elements;
+    for (unsigned i = 1; i < NumVals; i += 2) {
+      SILType elementType = getSILType(MF->getType(ListOfValues[i + 1]),
+                                       SILValueCategory::Object, Fn);
+      SILValue elementVal = getLocalValue(ListOfValues[i], elementType);
+      elements.push_back(elementVal);
+    }
+    ResultVal = Builder.createObject(Loc, ClassTy, elements, numBaseElements);
+    break;
   }
   case SILInstructionKind::BranchInst: {
     SmallVector<SILValue, 4> Args;
@@ -2927,7 +2944,60 @@ SILGlobalVariable *SILDeserializer::readGlobalVar(StringRef Name) {
   globalVarOrOffset = v;
   v->setDeclaration(IsDeclaration);
 
-  if (Callback) Callback->didDeserialize(MF->getAssociatedModule(), v);
+  if (Callback)
+    Callback->didDeserialize(MF->getAssociatedModule(), v);
+
+  scratch.clear();
+  maybeEntry = SILCursor.advance(AF_DontPopBlockAtEnd);
+  if (!maybeEntry)
+    MF->fatal(maybeEntry.takeError());
+  entry = maybeEntry.get();
+  if (entry.Kind == llvm::BitstreamEntry::EndBlock)
+    return v;
+
+  maybeKind = SILCursor.readRecord(entry.ID, scratch, &blobData);
+  if (!maybeKind)
+    MF->fatal(maybeKind.takeError());
+  kind = maybeKind.get();
+
+  SILBuilder Builder(v);
+  
+  llvm::DenseMap<uint32_t, ValueBase*> SavedLocalValues;
+  llvm::DenseMap<uint32_t, ValueBase*> SavedForwardLocalValues;
+  serialization::ValueID SavedLastValueID = 1;
+  
+  SavedLocalValues.swap(LocalValues);
+  SavedForwardLocalValues.swap(ForwardLocalValues);
+  std::swap(SavedLastValueID, LastValueID);
+
+  while (kind != SIL_FUNCTION && kind != SIL_VTABLE && kind != SIL_GLOBALVAR &&
+         kind != SIL_WITNESS_TABLE && kind != SIL_DIFFERENTIABILITY_WITNESS) {
+    if (readSILInstruction(nullptr, Builder, kind, scratch)) {
+      LLVM_DEBUG(llvm::dbgs() << "readSILInstruction returns error.\n");
+      MF->fatal();
+    }
+
+    // Fetch the next record.
+    scratch.clear();
+    llvm::Expected<llvm::BitstreamEntry> maybeEntry =
+        SILCursor.advance(AF_DontPopBlockAtEnd);
+    if (!maybeEntry)
+      MF->fatal(maybeEntry.takeError());
+    llvm::BitstreamEntry entry = maybeEntry.get();
+
+    // EndBlock means the end of this SILFunction.
+    if (entry.Kind == llvm::BitstreamEntry::EndBlock)
+      break;
+    maybeKind = SILCursor.readRecord(entry.ID, scratch);
+    if (!maybeKind)
+      MF->fatal(maybeKind.takeError());
+    kind = maybeKind.get();
+  }
+
+  SavedLocalValues.swap(LocalValues);
+  SavedForwardLocalValues.swap(ForwardLocalValues);
+  std::swap(SavedLastValueID, LastValueID);
+
   return v;
 }
 
diff --git a/lib/Serialization/DeserializeSIL.h b/lib/Serialization/DeserializeSIL.h
index 368b26740a468..df35889d1290c 100644
--- a/lib/Serialization/DeserializeSIL.h
+++ b/lib/Serialization/DeserializeSIL.h
@@ -98,8 +98,8 @@ namespace swift {
     SILBasicBlock *readSILBasicBlock(SILFunction *Fn,
                                      SILBasicBlock *Prev,
                                      SmallVectorImpl<uint64_t> &scratch);
-    /// Read a SIL instruction within a given SIL basic block.
-    bool readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
+    /// Read a SIL instruction.
+    bool readSILInstruction(SILFunction *Fn,
                             SILBuilder &Builder,
                             unsigned RecordKind,
                             SmallVectorImpl<uint64_t> &scratch);
diff --git a/lib/Serialization/ModuleDependencyScanner.cpp b/lib/Serialization/ModuleDependencyScanner.cpp
index 12669f8bf5a22..3ef8b1ba8ef84 100644
--- a/lib/Serialization/ModuleDependencyScanner.cpp
+++ b/lib/Serialization/ModuleDependencyScanner.cpp
@@ -44,6 +44,16 @@ class ModuleDependencyScanner : public SerializedModuleLoaderBase {
                                    /*IgnoreSwiftSourceInfoFile=*/true),
         moduleName(moduleName), astDelegate(astDelegate) { }
 
+  std::string getCompiledModulePath(const SerializedModuleBaseName &BaseName) {
+    if (LoadMode == ModuleLoadingMode::OnlySerialized) {
+      return BaseName.getName(file_types::TY_SwiftModuleFile);
+    }
+    return static_cast<SerializedModuleLoaderBase*>(Ctx
+      .getModuleInterfaceLoader())->getUpToDateCompiledModuleForInterface(
+         moduleName.str(),
+         BaseName.getName(file_types::TY_SwiftModuleInterfaceFile));
+  }
+
   virtual std::error_code findModuleFilesInDirectory(
       AccessPathElem ModuleID,
       const SerializedModuleBaseName &BaseName,
@@ -56,12 +66,9 @@ class ModuleDependencyScanner : public SerializedModuleLoaderBase {
     auto &fs = *Ctx.SourceMgr.getFileSystem();
 
     // Compute the full path of the module we're looking for.
-    auto ModPath = BaseName.getName(file_types::TY_SwiftModuleFile);
-    if (LoadMode == ModuleLoadingMode::OnlySerialized) {
-      // If there is no module file, there's nothing we can do.
-      if (!fs.exists(ModPath))
-        return std::make_error_code(std::errc::no_such_file_or_directory);
+    auto ModPath = getCompiledModulePath(BaseName);
 
+    if (fs.exists(ModPath)) {
       // The module file will be loaded directly.
       auto dependencies = scanModuleFile(ModPath);
       if (dependencies) {
@@ -108,10 +115,11 @@ ErrorOr<ModuleDependencies> ModuleDependencyScanner::scanInterfaceFile(
                                               moduleInterfacePath.str(),
                                               StringRef(),
                                               SourceLoc(),
-                [&](ASTContext &Ctx, ArrayRef<StringRef> Args, StringRef Hash) {
-    Result = ModuleDependencies::forSwiftInterface(modulePath.str().str(),
-                                                   moduleInterfacePath.str(),
+                [&](ASTContext &Ctx, ArrayRef<StringRef> Args,
+                    ArrayRef<StringRef> PCMArgs, StringRef Hash) {
+    Result = ModuleDependencies::forSwiftInterface(moduleInterfacePath.str(),
                                                    Args,
+                                                   PCMArgs,
                                                    Hash);
     // Open the interface file.
     auto &fs = *Ctx.SourceMgr.getFileSystem();
diff --git a/lib/Serialization/ModuleFile.h b/lib/Serialization/ModuleFile.h
index fcbcda07ac089..bd2f2fef92a4e 100644
--- a/lib/Serialization/ModuleFile.h
+++ b/lib/Serialization/ModuleFile.h
@@ -20,6 +20,7 @@
 #include "swift/AST/FileUnit.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/RawComment.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/Serialization/Validation.h"
 #include "swift/Basic/LLVM.h"
 #include "clang/AST/Type.h"
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
index 065150c5d4d3b..88c11081e8905 100644
--- a/lib/Serialization/ModuleFormat.h
+++ b/lib/Serialization/ModuleFormat.h
@@ -55,7 +55,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 560; // SILVTable flag for non-overridden entries
+const uint16_t SWIFTMODULE_VERSION_MINOR = 562; // base_addr_for_offset instruction
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
index 2920b29971e44..6b6d26d1e5646 100644
--- a/lib/Serialization/Serialization.cpp
+++ b/lib/Serialization/Serialization.cpp
@@ -31,6 +31,7 @@
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/RawComment.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/SynthesizedFileUnit.h"
 #include "swift/AST/TypeCheckRequests.h"
@@ -1020,13 +1021,12 @@ void Serializer::writeInputBlock(const SerializationOptions &options) {
   if (!options.ModuleInterface.empty())
     ModuleInterface.emit(ScratchRecord, options.ModuleInterface);
 
-  ModuleDecl::ImportFilter allImportFilter;
-  allImportFilter |= ModuleDecl::ImportFilterKind::Public;
-  allImportFilter |= ModuleDecl::ImportFilterKind::Private;
-  allImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
-  allImportFilter |= ModuleDecl::ImportFilterKind::SPIAccessControl;
   SmallVector<ModuleDecl::ImportedModule, 8> allImports;
-  M->getImportedModules(allImports, allImportFilter);
+  M->getImportedModules(allImports,
+                        {ModuleDecl::ImportFilterKind::Public,
+                         ModuleDecl::ImportFilterKind::Private,
+                         ModuleDecl::ImportFilterKind::ImplementationOnly,
+                         ModuleDecl::ImportFilterKind::SPIAccessControl});
   ModuleDecl::removeDuplicateImports(allImports);
 
   // Collect the public and private imports as a subset so that we can
diff --git a/lib/Serialization/SerializeSIL.cpp b/lib/Serialization/SerializeSIL.cpp
index aad7fa2b7d3c8..af20a44e2c83a 100644
--- a/lib/Serialization/SerializeSIL.cpp
+++ b/lib/Serialization/SerializeSIL.cpp
@@ -734,8 +734,26 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
   PrettyStackTraceSILNode stackTrace("Serializing", &SI);
 
   switch (SI.getKind()) {
-  case SILInstructionKind::ObjectInst:
-    llvm_unreachable("static initializers of sil_global are not serialized");
+  case SILInstructionKind::ObjectInst: {
+    const ObjectInst *OI = cast<ObjectInst>(&SI);
+    unsigned abbrCode = SILAbbrCodes[SILOneTypeValuesLayout::Code];
+    SmallVector<ValueID, 4> Args;
+    Args.push_back((unsigned)OI->getBaseElements().size());
+    for (const Operand &op : OI->getAllOperands()) {
+      SILValue OpVal = op.get();
+      Args.push_back(addValueRef(OpVal));
+      SILType OpType = OpVal->getType();
+      assert(OpType.isObject());
+      Args.push_back(S.addTypeRef(OpType.getASTType()));
+    }
+    SILOneTypeValuesLayout::emitRecord(Out, ScratchRecord, abbrCode,
+                                       (unsigned)SI.getKind(),
+                                       S.addTypeRef(
+                                         OI->getType().getASTType()),
+                                       (unsigned)OI->getType().getCategory(),
+                                       Args);
+    break;
+  }
 
   case SILInstructionKind::DebugValueInst:
   case SILInstructionKind::DebugValueAddrInst:
@@ -1073,6 +1091,12 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
         S.addUniquedStringRef(G->getName()));
     break;
   }
+  case SILInstructionKind::BaseAddrForOffsetInst: {
+    const BaseAddrForOffsetInst *BAI = cast<BaseAddrForOffsetInst>(&SI);
+    writeOneTypeLayout(BAI->getKind(), /*attrs*/ 0, BAI->getType());
+    break;
+  }
+
   case SILInstructionKind::BranchInst: {
     // Format: destination basic block ID, a list of arguments. Use
     // SILOneTypeValuesLayout.
@@ -2349,6 +2373,19 @@ void SILSerializer::writeSILGlobalVar(const SILGlobalVariable &g) {
                                  (unsigned)!g.isDefinition(),
                                  (unsigned)g.isLet(),
                                  TyID, dID);
+
+  ValueIDs.clear();
+  InstID = 0;
+  unsigned ValueID = 2;
+  for (const SILInstruction &initInst : g) {
+      for (auto result : initInst.getResults()) {
+        ValueIDs[result] = ValueID++;
+      }
+  }
+
+  for (const SILInstruction &initInst : g) {
+    writeSILInstruction(initInst);
+  }
 }
 
 void SILSerializer::writeSILVTable(const SILVTable &vt) {
diff --git a/lib/Serialization/SerializedModuleLoader.cpp b/lib/Serialization/SerializedModuleLoader.cpp
index 8120f5d33cffa..a746312e141cc 100644
--- a/lib/Serialization/SerializedModuleLoader.cpp
+++ b/lib/Serialization/SerializedModuleLoader.cpp
@@ -366,13 +366,14 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
   // Load the module file without validation.
   std::unique_ptr<ModuleFile> loadedModuleFile;
   bool isFramework = false;
+  serialization::ExtendedValidationInfo extInfo;
   serialization::ValidationInfo loadInfo =
       ModuleFile::load(modulePath.str(),
                        std::move(moduleBuf.get()),
                        nullptr,
                        nullptr,
                        isFramework, loadedModuleFile,
-                       nullptr);
+                       &extInfo);
 
   // Map the set of dependencies over to the "module dependencies".
   auto dependencies = ModuleDependencies::forSwiftModule(modulePath.str());
@@ -959,7 +960,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
 
   auto M = ModuleDecl::create(moduleID.Item, Ctx);
   M->setIsSystemModule(isSystemModule);
-  Ctx.LoadedModules[moduleID.Item] = M;
+  Ctx.addLoadedModule(M);
   SWIFT_DEFER { M->setHasResolvedImports(); };
 
   StringRef moduleInterfacePathStr =
@@ -1010,7 +1011,7 @@ MemoryBufferSerializedModuleLoader::loadModule(SourceLoc importLoc,
     return nullptr;
 
   M->addFile(*file);
-  Ctx.LoadedModules[moduleID.Item] = M;
+  Ctx.addLoadedModule(M);
   return M;
 }
 
@@ -1087,12 +1088,9 @@ void SerializedASTFile::getImportedModules(
 
 void SerializedASTFile::collectLinkLibrariesFromImports(
     ModuleDecl::LinkLibraryCallback callback) const {
-  ModuleDecl::ImportFilter ImportFilter;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Private;
-
   llvm::SmallVector<ModuleDecl::ImportedModule, 8> Imports;
-  File.getImportedModules(Imports, ImportFilter);
+  File.getImportedModules(Imports, {ModuleDecl::ImportFilterKind::Public,
+                                    ModuleDecl::ImportFilterKind::Private});
 
   for (auto Import : Imports)
     Import.importedModule->collectLinkLibraries(callback);
diff --git a/lib/Serialization/SerializedSILLoader.cpp b/lib/Serialization/SerializedSILLoader.cpp
index f0162dbd06b5e..2ddeedcca5304 100644
--- a/lib/Serialization/SerializedSILLoader.cpp
+++ b/lib/Serialization/SerializedSILLoader.cpp
@@ -27,7 +27,7 @@ SerializedSILLoader::SerializedSILLoader(
 
   // Get a list of SerializedModules from ASTContext.
   // FIXME: Iterating over LoadedModules is not a good way to do this.
-  for (auto &Entry : Ctx.LoadedModules) {
+  for (const auto &Entry : Ctx.getLoadedModules()) {
     for (auto File : Entry.second->getFiles()) {
       if (auto LoadedAST = dyn_cast<SerializedASTFile>(File)) {
         auto Des = new SILDeserializer(&LoadedAST->File, *SILMod, callbacks);
diff --git a/lib/SwiftRemoteMirror/CMakeLists.txt b/lib/SwiftRemoteMirror/CMakeLists.txt
index e67c34a24938e..f774297e51cc6 100644
--- a/lib/SwiftRemoteMirror/CMakeLists.txt
+++ b/lib/SwiftRemoteMirror/CMakeLists.txt
@@ -1,5 +1,8 @@
 add_swift_host_library(swiftRemoteMirror STATIC
   ${SWIFT_SOURCE_DIR}/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp)
+target_link_libraries(swiftRemoteMirror PRIVATE
+  swiftDemangling)
+
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
   target_compile_definitions(swiftRemoteMirror PRIVATE _LIB)
 endif()
diff --git a/lib/SymbolGraphGen/AvailabilityMixin.cpp b/lib/SymbolGraphGen/AvailabilityMixin.cpp
index 3ac0ecaba3d05..eb0e7c1041522 100644
--- a/lib/SymbolGraphGen/AvailabilityMixin.cpp
+++ b/lib/SymbolGraphGen/AvailabilityMixin.cpp
@@ -70,7 +70,8 @@ Availability::Availability(const AvailableAttr &AvAttr)
     Obsoleted(AvAttr.Obsoleted),
     Message(AvAttr.Message),
     Renamed(AvAttr.Rename),
-    IsUnconditionallyDeprecated(AvAttr.isUnconditionallyDeprecated()) {
+    IsUnconditionallyDeprecated(AvAttr.isUnconditionallyDeprecated()),
+    IsUnconditionallyUnavailable(AvAttr.isUnconditionallyUnavailable()) {
       assert(!Domain.empty());
 }
 
@@ -93,6 +94,9 @@ Availability::updateFromDuplicate(const Availability &Other) {
   // Same for `deprecated` with no version.
   IsUnconditionallyDeprecated = Other.IsUnconditionallyDeprecated;
 
+  // Same for `unavailable` with no version.
+  IsUnconditionallyUnavailable = Other.IsUnconditionallyUnavailable;
+
   // Same for `obsoleted`.
   Obsoleted = Other.Obsoleted;
 
@@ -150,6 +154,10 @@ Availability::updateFromParent(const Availability &Parent) {
   // If a parent is unconditionally deprecated, then so are all
   // of its children.
   IsUnconditionallyDeprecated |= Parent.IsUnconditionallyDeprecated;
+
+  // If a parent is unconditionally unavailable, then so are all
+  // of its children.
+  IsUnconditionallyUnavailable |= Parent.IsUnconditionallyUnavailable;
 }
 
 void Availability::serialize(llvm::json::OStream &OS) const {
@@ -176,6 +184,9 @@ void Availability::serialize(llvm::json::OStream &OS) const {
     if (IsUnconditionallyDeprecated) {
       OS.attribute("isUnconditionallyDeprecated", true);
     }
+    if (IsUnconditionallyUnavailable) {
+      OS.attribute("isUnconditionallyUnavailable", true);
+    }
   }); // end availability object
 }
 
@@ -183,5 +194,6 @@ bool Availability::empty() const {
   return !Introduced.hasValue() &&
          !Deprecated.hasValue() &&
          !Obsoleted.hasValue() &&
-         !IsUnconditionallyDeprecated;
+         !IsUnconditionallyDeprecated &&
+         !IsUnconditionallyUnavailable;
 }
diff --git a/lib/SymbolGraphGen/AvailabilityMixin.h b/lib/SymbolGraphGen/AvailabilityMixin.h
index 34fc2bc34b2c2..b04cd6ec638fd 100644
--- a/lib/SymbolGraphGen/AvailabilityMixin.h
+++ b/lib/SymbolGraphGen/AvailabilityMixin.h
@@ -46,6 +46,9 @@ struct Availability {
   /// If \c true, is unconditionally deprecated in this \c Domain.
   bool IsUnconditionallyDeprecated;
 
+  /// If \c true, is unconditionally unavailable in this \c Domain.
+  bool IsUnconditionallyUnavailable;
+
   Availability(const AvailableAttr &AvAttr);
 
   /// Update this availability from a duplicate @available
diff --git a/lib/SymbolGraphGen/JSON.cpp b/lib/SymbolGraphGen/JSON.cpp
index 2517b08d96cd2..b72f1813cb86d 100644
--- a/lib/SymbolGraphGen/JSON.cpp
+++ b/lib/SymbolGraphGen/JSON.cpp
@@ -69,9 +69,7 @@ void swift::symbolgraphgen::serialize(const ExtensionDecl *Extension,
 
     SmallVector<Requirement, 4> FilteredRequirements;
 
-    filterGenericRequirements(Extension->getGenericRequirements(),
-        Extension->getExtendedNominal()
-            ->getDeclContext()->getSelfNominalTypeDecl(),
+    filterGenericRequirements(Extension,
                               FilteredRequirements);
 
     if (!FilteredRequirements.empty()) {
@@ -122,24 +120,36 @@ void swift::symbolgraphgen::filterGenericRequirements(
     const NominalTypeDecl *Self,
     SmallVectorImpl<Requirement> &FilteredRequirements) {
   for (const auto &Req : Requirements) {
-      if (Req.getKind() == RequirementKind::Layout) {
-        continue;
-      }
-    /*
-     Don't serialize constraints that aren't applicable for display.
+    if (Req.getKind() == RequirementKind::Layout) {
+      continue;
+    }
+    // extension /* protocol */ Q {
+    // func foo() {}
+    // }
+    // ignore Self : Q, obvious
+    if (Req.getSecondType()->getAnyNominal() == Self) {
+      continue;
+    }
+    FilteredRequirements.push_back(Req);
+  }
+}
 
-     For example:
+void
+swift::symbolgraphgen::filterGenericRequirements(const ExtensionDecl *Extension,
+    SmallVectorImpl<Requirement> &FilteredRequirements) {
+  for (const auto &Req : Extension->getGenericRequirements()) {
+    if (Req.getKind() == RequirementKind::Layout) {
+      continue;
+    }
 
-     extension Equatable {
-       func foo(_ thing: Self) {}
-     }
+    if (!isa<ProtocolDecl>(Extension->getExtendedNominal()) &&
+        Req.getFirstType()->isEqual(Extension->getExtendedType())) {
+      continue;
+    }
 
-     `foo` includes a constraint `Self: Equatable` for the compiler's purposes,
-     but that's redundant for the purposes of documentation.
-     This is extending Equatable, after all!
-    */
-    if (Req.getFirstType()->getString() == "Self" &&
-        Req.getSecondType()->getAnyNominal() == Self) {
+    // extension /* protocol */ Q
+    // ignore Self : Q, obvious
+    if (Req.getSecondType()->isEqual(Extension->getExtendedType())) {
       continue;
     }
     FilteredRequirements.push_back(Req);
diff --git a/lib/SymbolGraphGen/JSON.h b/lib/SymbolGraphGen/JSON.h
index 6c773353b4897..fa593df75b81b 100644
--- a/lib/SymbolGraphGen/JSON.h
+++ b/lib/SymbolGraphGen/JSON.h
@@ -45,11 +45,19 @@ void serialize(const swift::GenericTypeParamType *Param,
                llvm::json::OStream &OS);
 
 
-/// Filter generic requirements that aren't relevant for documentation.
+/// Filter generic requirements on an extension that aren't relevant
+/// for documentation.
 void
 filterGenericRequirements(ArrayRef<Requirement> Requirements,
                           const NominalTypeDecl *Self,
                           SmallVectorImpl<Requirement> &FilteredRequirements);
+
+/// Filter generic requirements on an extension that aren't relevant
+/// for documentation.
+void
+filterGenericRequirements(const ExtensionDecl *Extension,
+                          SmallVectorImpl<Requirement> &FilteredRequirements);
+
 } // end namespace symbolgraphgen
 } // end namespace swift
 
diff --git a/lib/SymbolGraphGen/Symbol.cpp b/lib/SymbolGraphGen/Symbol.cpp
index 96efe87adb5f8..a23855b2f43da 100644
--- a/lib/SymbolGraphGen/Symbol.cpp
+++ b/lib/SymbolGraphGen/Symbol.cpp
@@ -280,8 +280,8 @@ void Symbol::serializeSwiftGenericMixin(llvm::json::OStream &OS) const {
       }
 
       filterGenericRequirements(Generics->getRequirements(),
-                         Self,
-                         FilteredRequirements);
+                                Self,
+                                FilteredRequirements);
 
       if (FilteredParams.empty() && FilteredRequirements.empty()) {
         return;
diff --git a/lib/TBDGen/TBDGen.cpp b/lib/TBDGen/TBDGen.cpp
index 4967d90799466..5d5a63d06d614 100644
--- a/lib/TBDGen/TBDGen.cpp
+++ b/lib/TBDGen/TBDGen.cpp
@@ -70,7 +70,12 @@ void TBDGenVisitor::addSymbolInternal(StringRef name,
   if (StringSymbols && kind == SymbolKind::GlobalSymbol) {
     auto isNewValue = StringSymbols->insert(name).second;
     (void)isNewValue;
-    assert(isNewValue && "symbol appears twice");
+#ifndef NDEBUG
+    if (!isNewValue) {
+      llvm::dbgs() << "TBDGen duplicate symbol: " << name << '\n';
+      assert(false && "TBDGen symbol appears twice");
+    }
+#endif
   }
 }
 
@@ -731,7 +736,7 @@ void TBDGenVisitor::visitAbstractStorageDecl(AbstractStorageDecl *ASD) {
   for (const auto *differentiableAttr :
        ASD->getAttrs().getAttributes<DifferentiableAttr>())
     addDerivativeConfiguration(
-        ASD->getAccessor(AccessorKind::Get),
+        ASD->getOpaqueAccessor(AccessorKind::Get),
         AutoDiffConfig(differentiableAttr->getParameterIndices(),
                        IndexSubset::get(ASD->getASTContext(), 1, {0}),
                        differentiableAttr->getDerivativeGenericSignature()));
diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
index 6feafeddbc345..6cca0cd27f18a 100644
--- a/stdlib/cmake/modules/AddSwiftStdlib.cmake
+++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -884,6 +884,13 @@ function(_add_swift_target_library_single target name)
   endif()
   _set_target_prefix_and_suffix("${target}" "${libkind}" "${SWIFTLIB_SINGLE_SDK}")
 
+  # Target libraries that include libDemangling must define the name to use for
+  # the inline namespace to distinguish symbols from those built for the
+  # compiler, in order to avoid possible ODR violations if both are statically
+  # linked into the same binary.
+  target_compile_definitions("${target}" PRIVATE
+                             SWIFT_INLINE_NAMESPACE=__runtime)
+
   if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "WINDOWS")
     swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE} SWIFTLIB_INCLUDE)
     target_include_directories("${target}" SYSTEM PRIVATE
@@ -1120,6 +1127,8 @@ function(_add_swift_target_library_single target name)
       list(APPEND library_search_directories "$ENV{SDKROOT}/usr/lib/swift")
   endif()
 
+  list(APPEND library_search_directories "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift")
+
   # Add variant-specific flags.
   if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
     set(build_type "${SWIFT_STDLIB_BUILD_TYPE}")
diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake
index bba54e78019d4..f2fd7c491223e 100644
--- a/stdlib/cmake/modules/SwiftSource.cmake
+++ b/stdlib/cmake/modules/SwiftSource.cmake
@@ -385,7 +385,6 @@ function(_compile_swift_files
   # The standard library and overlays are always built resiliently.
   if(SWIFTFILE_IS_STDLIB)
     list(APPEND swift_flags "-enable-library-evolution")
-    list(APPEND swift_flags "-Xfrontend" "-enable-ownership-stripping-after-serialization")
   endif()
 
   if(SWIFT_STDLIB_USE_NONATOMIC_RC)
@@ -584,7 +583,7 @@ function(_compile_swift_files
   set(swift_compiler_tool_dep)
   if(SWIFT_INCLUDE_TOOLS)
     # Depend on the binary itself, in addition to the symlink.
-    set(swift_compiler_tool_dep "swift")
+    set(swift_compiler_tool_dep "swift-frontend")
   endif()
 
   # If there are more than one output files, we assume that they are specified
diff --git a/stdlib/private/StdlibUnittest/RaceTest.swift b/stdlib/private/StdlibUnittest/RaceTest.swift
index 6b8ad6791e9e5..ef25992e8c54d 100644
--- a/stdlib/private/StdlibUnittest/RaceTest.swift
+++ b/stdlib/private/StdlibUnittest/RaceTest.swift
@@ -39,9 +39,9 @@
 import SwiftPrivate
 import SwiftPrivateLibcExtras
 import SwiftPrivateThreadExtras
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
diff --git a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
index db3262166f40e..a734f9fc0e047 100644
--- a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
+++ b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
@@ -12,9 +12,9 @@
 
 import SwiftPrivate
 import SwiftPrivateLibcExtras
-#if os(macOS) || os(iOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
diff --git a/stdlib/private/StdlibUnittest/StdlibUnittest.swift b/stdlib/private/StdlibUnittest/StdlibUnittest.swift
index cbb62fd096fbc..f8841795eee92 100644
--- a/stdlib/private/StdlibUnittest/StdlibUnittest.swift
+++ b/stdlib/private/StdlibUnittest/StdlibUnittest.swift
@@ -15,10 +15,10 @@ import SwiftPrivate
 import SwiftPrivateThreadExtras
 import SwiftPrivateLibcExtras
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import Foundation
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -1728,7 +1728,7 @@ public final class TestSuite {
   var _testNameToIndex: [String : Int] = [:]
 }
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 func _getSystemVersionPlistProperty(_ propertyName: String) -> String? {
   return NSDictionary(contentsOfFile: "/System/Library/CoreServices/SystemVersion.plist")?[propertyName] as? String
 }
diff --git a/stdlib/private/StdlibUnittest/SymbolLookup.swift b/stdlib/private/StdlibUnittest/SymbolLookup.swift
index 74dedcd918f87..2d99cc4f6f3da 100644
--- a/stdlib/private/StdlibUnittest/SymbolLookup.swift
+++ b/stdlib/private/StdlibUnittest/SymbolLookup.swift
@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -21,7 +21,7 @@
 #error("Unsupported platform")
 #endif
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(OpenBSD)
+#if canImport(Darwin) || os(OpenBSD)
   let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
 #elseif os(Linux)
   let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: 0)
diff --git a/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
index 7ec50172cc9e9..0b9aeb8466b65 100644
--- a/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
+++ b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftPrivate
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
diff --git a/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
index a72fa0982517e..d9dd93277e471 100644
--- a/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
+++ b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftPrivate
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
diff --git a/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift b/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
index 906dd18880393..9b044cbd55457 100644
--- a/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
+++ b/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
@@ -15,9 +15,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -117,17 +117,18 @@ public func _stdlib_thread_join<Result>(
 ) -> (CInt, Result?) {
 #if os(Windows)
   let result = WaitForSingleObject(thread, INFINITE)
-  if result == WAIT_OBJECT_0 {
-    var threadResult: DWORD = 0
-    GetExitCodeThread(thread, &threadResult)
-    CloseHandle(thread)
-
-    return (CInt(result),
-            UnsafeMutablePointer<DWORD>(&threadResult)
-                .withMemoryRebound(to: Result.self, capacity: 1){ $0.pointee })
-  } else {
-    return (CInt(result), nil)
+  guard result == WAIT_OBJECT_0 else { return (CInt(result), nil) }
+
+  var dwResult: DWORD = 0
+  GetExitCodeThread(thread, &dwResult)
+  CloseHandle(thread)
+
+  let value: Result = withUnsafePointer(to: &dwResult) {
+    $0.withMemoryRebound(to: Result.self, capacity: 1) {
+      $0.pointee
+    }
   }
+  return (CInt(result), value)
 #else
   var threadResultRawPtr: UnsafeMutableRawPointer?
   let result = pthread_join(thread, &threadResultRawPtr)
diff --git a/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift b/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
index 6ef0a4b82ec16..73b989377c578 100644
--- a/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
+++ b/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
diff --git a/stdlib/public/Darwin/ARKit/ARKit.swift b/stdlib/public/Darwin/ARKit/ARKit.swift
deleted file mode 100644
index 6fe12d52a7a8c..0000000000000
--- a/stdlib/public/Darwin/ARKit/ARKit.swift
+++ /dev/null
@@ -1,249 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import ARKit
-
-@available(iOS, introduced: 11.0)
-extension ARCamera {
-    /**
-     A value describing the camera's tracking state.
-     */
-    @frozen
-    public enum TrackingState {
-        public enum Reason {
-            /** Tracking is limited due to initialization in progress. */
-            case initializing
-            
-            /** Tracking is limited due to a excessive motion of the camera. */
-            case excessiveMotion
-            
-            /** Tracking is limited due to a lack of features visible to the camera. */
-            case insufficientFeatures
-
-            /** Tracking is limited due to a relocalization in progress. */
-            @available(iOS, introduced: 11.3)
-            case relocalizing
-        }
-        
-        /** Tracking is not available. */
-        case notAvailable
-        
-        /** Tracking is limited. See tracking reason for details. */
-        case limited(Reason)
-        
-        /** Tracking is normal. */
-        case normal
-    }
-    
-    /**
-     The tracking state of the camera.
-     */
-    public var trackingState: TrackingState {
-        switch __trackingState {
-        case .notAvailable: return .notAvailable
-        case .normal: return .normal
-        case .limited:
-            let reason: TrackingState.Reason
-            
-            if #available(iOS 11.3, *) {
-                switch __trackingStateReason {
-                case .initializing: reason = .initializing
-                case .relocalizing: reason = .relocalizing
-                case .excessiveMotion: reason = .excessiveMotion
-                default: reason = .insufficientFeatures
-                }
-            }
-            else {
-                switch __trackingStateReason {
-                case .initializing: reason = .initializing
-                case .excessiveMotion: reason = .excessiveMotion
-                default: reason = .insufficientFeatures
-                }
-            }
-            
-            return .limited(reason)
-        }
-    }
-    
-    @available(iOS, introduced: 12.0)
-    @nonobjc
-    public func unprojectPoint(
-      _ point: CGPoint,
-      ontoPlane planeTransform: simd_float4x4,
-      orientation: UIInterfaceOrientation,
-      viewportSize: CGSize
-    ) -> simd_float3? {
-        let result = __unprojectPoint(
-          point,
-          ontoPlaneWithTransform: planeTransform,
-          orientation: orientation,
-          viewportSize: viewportSize)
-        if result.x.isNaN || result.y.isNaN || result.z.isNaN {
-            return nil
-        }
-        
-        return result
-    }
-}
-
-@available(iOS, introduced: 12.0)
-extension ARSCNView {
-    @nonobjc public func unprojectPoint(
-      _ point: CGPoint, ontoPlane planeTransform: simd_float4x4
-    ) -> simd_float3? {
-        let result = __unprojectPoint(
-          point, ontoPlaneWithTransform: planeTransform)
-        if result.x.isNaN || result.y.isNaN || result.z.isNaN {
-            return nil
-        }
-        
-        return result
-    }
-}
-
-@available(iOS, introduced: 11.0)
-extension ARPointCloud {
-    /**
-     The 3D points comprising the point cloud.
-     */
-    @nonobjc public var points: [vector_float3] {
-        let buffer = UnsafeBufferPointer(start: __points, count: Int(__count))
-        return Array(buffer)
-    }
-    
-    /**
-     The 3D point identifiers comprising the point cloud.
-     */
-    @nonobjc public var identifiers: [UInt64] {
-        let buffer = UnsafeBufferPointer(start: __identifiers, count: Int(__count))
-        return Array(buffer)
-    }
-}
-
-@available(iOS, introduced: 11.0)
-extension ARFaceGeometry {
-    /**
-     The mesh vertices of the geometry.
-     */
-    @nonobjc public var vertices: [vector_float3] {
-        let buffer = UnsafeBufferPointer(start: __vertices, count: Int(__vertexCount))
-        return Array(buffer)
-    }
-
-    /**
-     The texture coordinates of the geometry.
-     */
-    @nonobjc public var textureCoordinates: [vector_float2] {
-        let buffer = UnsafeBufferPointer(start: __textureCoordinates, count: Int(__textureCoordinateCount))
-        return Array(buffer)
-    }
-
-    /**
-     The triangle indices of the geometry.
-     */
-    @nonobjc public var triangleIndices: [Int16] {
-        let buffer = UnsafeBufferPointer(start: __triangleIndices, count: Int(triangleCount * 3))
-        return Array(buffer)
-    }
-}
-
-@available(iOS, introduced: 11.3)
-extension ARPlaneGeometry {
-    /**
-     The mesh vertices of the geometry.
-     */
-    @nonobjc public var vertices: [vector_float3] {
-        let buffer = UnsafeBufferPointer(start: __vertices, count: Int(__vertexCount))
-        return Array(buffer)
-    }
-    
-    /**
-     The texture coordinates of the geometry.
-     */
-    @nonobjc public var textureCoordinates: [vector_float2] {
-        let buffer = UnsafeBufferPointer(start: __textureCoordinates, count: Int(__textureCoordinateCount))
-        return Array(buffer)
-    }
-    
-    /**
-     The triangle indices of the geometry.
-     */
-    @nonobjc public var triangleIndices: [Int16] {
-        let buffer = UnsafeBufferPointer(start: __triangleIndices, count: Int(triangleCount * 3))
-        return Array(buffer)
-    }
-    
-    /**
-     The vertices of the geometry's outermost boundary.
-     */
-    @nonobjc public var boundaryVertices: [vector_float3] {
-        let buffer = UnsafeBufferPointer(start: __boundaryVertices, count: Int(__boundaryVertexCount))
-        return Array(buffer)
-    }
-}
-
-@available(iOS, introduced: 12.0)
-extension ARPlaneAnchor {
-    /**
-     A value describing the classification of a plane anchor.
-     */
-    public enum Classification {
-        
-        public enum Status {
-            
-            /** Plane classification is currently unavailable. */
-            case notAvailable
-            
-            /** ARKit has not yet determined the classification of this plane. */
-            case undetermined
-            
-            /** ARKit is confident the plane is not any of the known classes. */
-            case unknown
-        }
-        
-        /** The classification is not any of the known classes. */
-        case none(Status)
-        
-        case wall
-        
-        case floor
-        
-        case ceiling
-        
-        case table
-        
-        case seat
-    }
-    
-    
-    /**
-     Classification of the plane.
-     */
-    public var classification: ARPlaneAnchor.Classification {
-        switch __classification {
-        case .wall: return .wall
-        case .floor: return .floor
-        case .ceiling: return .ceiling
-        case .table: return .table
-        case .seat: return .seat
-        case .none: fallthrough
-        default:
-            switch __classificationStatus {
-            case .notAvailable: return .none(.notAvailable)
-            case .unknown: return .none(.unknown)
-            case .undetermined: fallthrough
-            case .known: fallthrough
-            default: return .none(.undetermined)
-            }
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/ARKit/CMakeLists.txt b/stdlib/public/Darwin/ARKit/CMakeLists.txt
deleted file mode 100644
index f8e3eeff16388..0000000000000
--- a/stdlib/public/Darwin/ARKit/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftARKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  ARKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit SceneKit simd Foundation AVFoundation SpriteKit CoreMedia QuartzCore ModelIO CoreFoundation CoreAudio ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK ARKit
-  SWIFT_MODULE_DEPENDS_FROM_SDK CoreMIDI
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_ARKIT_IOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/AVFoundation/AVCaptureDevice.swift b/stdlib/public/Darwin/AVFoundation/AVCaptureDevice.swift
deleted file mode 100644
index c7519a2fc3852..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVCaptureDevice.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-
-
-#if os(iOS)
-
-@available(iOS, introduced: 10.0)
-extension AVCaptureDevice.Format {
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var supportedColorSpaces: [NSNumber]! {
-    return __supportedColorSpaces
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var supportedColorSpaces: [AVCaptureColorSpace] {
-    return __supportedColorSpaces.map { AVCaptureColorSpace(rawValue: $0.intValue)! }
-  }
-}
-
-#endif
-
diff --git a/stdlib/public/Darwin/AVFoundation/AVCapturePhotoOutput.swift b/stdlib/public/Darwin/AVFoundation/AVCapturePhotoOutput.swift
deleted file mode 100644
index 70cac62515eaf..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVCapturePhotoOutput.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-
-
-#if os(iOS)
-
-@available(iOS, introduced: 10.0)
-extension AVCapturePhotoOutput {
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var supportedFlashModes: [NSNumber] {
-    return __supportedFlashModes
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var supportedFlashModes: [AVCaptureDevice.FlashMode] {
-    return __supportedFlashModes.map { AVCaptureDevice.FlashMode(rawValue: $0.intValue)! }
-  }
-  
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availablePhotoPixelFormatTypes: [NSNumber] {
-    return __availablePhotoPixelFormatTypes
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availablePhotoPixelFormatTypes: [OSType] {
-    return __availablePhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
-  }
-  
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availableRawPhotoPixelFormatTypes: [NSNumber] {
-    return __availableRawPhotoPixelFormatTypes
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availableRawPhotoPixelFormatTypes: [OSType] {
-    return __availableRawPhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
-  }
-}
-
-@available(iOS, introduced: 10.0)
-extension AVCapturePhotoSettings {
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availablePreviewPhotoPixelFormatTypes: [NSNumber] {
-    return __availablePreviewPhotoPixelFormatTypes
-  }
-
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 10.0)
-  @nonobjc
-  public var availablePreviewPhotoPixelFormatTypes: [OSType] {
-    return __availablePreviewPhotoPixelFormatTypes.map { $0.uint32Value } as [OSType]
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/AVFoundation/AVCaptureSynchronizedDataCollection.swift b/stdlib/public/Darwin/AVFoundation/AVCaptureSynchronizedDataCollection.swift
deleted file mode 100644
index a17beb151790c..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVCaptureSynchronizedDataCollection.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-
-
-#if os(iOS)
-@available(iOS, introduced: 11.0)
-extension AVCaptureSynchronizedDataCollection : Sequence {
-  public func makeIterator() -> Iterator {
-    return Iterator(self)
-  }
-
-  public struct Iterator : IteratorProtocol {
-    internal var fastIterator: NSFastEnumerationIterator
-
-    internal init(_ collection: AVCaptureSynchronizedDataCollection) {
-      self.fastIterator = NSFastEnumerationIterator(collection)
-    }
-
-    public mutating func next() -> AVCaptureSynchronizedData? {
-      guard let nextAny = fastIterator.next() else { return nil }
-      return (nextAny as! AVCaptureSynchronizedData)
-    }
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/AVFoundation/AVCaptureVideoDataOutput.swift b/stdlib/public/Darwin/AVFoundation/AVCaptureVideoDataOutput.swift
deleted file mode 100644
index 7cb9c4e06ed6d..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVCaptureVideoDataOutput.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-
-
-#if os(macOS) || os(iOS)
-  
-extension AVCaptureVideoDataOutput {
-  @available(swift, obsoleted: 4.0)
-  @available(macOS, introduced: 10.7)
-  @available(iOS, introduced: 5.0)
-  @nonobjc
-  public var availableVideoCVPixelFormatTypes: [Any]! {
-    return __availableVideoCVPixelFormatTypes
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(macOS, introduced: 10.7)
-  @available(iOS, introduced: 5.0)
-  @nonobjc
-  public var availableVideoPixelFormatTypes: [OSType] {
-    return __availableVideoCVPixelFormatTypes.map { $0.uint32Value } as [OSType]
-  }
-}
-  
-#endif
diff --git a/stdlib/public/Darwin/AVFoundation/AVError.swift b/stdlib/public/Darwin/AVFoundation/AVError.swift
deleted file mode 100644
index 3b6da62e01048..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVError.swift
+++ /dev/null
@@ -1,103 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-
-
-extension AVError {
-  /// The device name.
-#if os(tvOS)
-  @available(*, unavailable)
-  public var device: String? { return nil }
-#else
-  @available(swift, obsoleted: 4.2, message: "Use `device: AVCaptureDevice?` instead")
-  public var device: String? { return nil }
-
-  @available(swift, introduced: 4.2)
-  public var device: AVCaptureDevice? {
-    return userInfo[AVErrorDeviceKey] as? AVCaptureDevice
-  }
-#endif
-
-  /// The time.
-  public var time: CMTime? {
-    if let time = userInfo[AVErrorTimeKey] as? CMTime {
-      return time
-    }
-    else if let timeDictionary = userInfo[AVErrorTimeKey] {
-      return CMTimeMakeFromDictionary((timeDictionary as! CFDictionary))
-    }
-    else {
-      return nil
-    }
-  }
-
-  /// The file size.
-  public var fileSize: Int64? {
-    return userInfo[AVErrorFileSizeKey] as? Int64
-  }
-
-  /// The process ID number.
-  public var processID: Int? {
-    return userInfo[AVErrorPIDKey] as? Int
-  }
-
-  /// Whether the recording successfully finished.
-  public var recordingSuccessfullyFinished: Bool? {
-    return userInfo[AVErrorRecordingSuccessfullyFinishedKey] as? Bool
-  }
-
-  /// The media type.
-  @available(swift, obsoleted: 4.2)
-  public var mediaType: String? {
-    return userInfo[AVErrorMediaTypeKey] as? String
-  }
-
-  /// The media type.
-  @available(swift, introduced: 4.2)
-  public var mediaType: AVMediaType? {
-    return userInfo[AVErrorMediaTypeKey] as? AVMediaType
-  }
-
-  /// The media subtypes.
-  public var mediaSubtypes: [Int]? {
-    return userInfo[AVErrorMediaSubTypeKey] as? [Int]
-  }
-
-  /// The presentation time stamp.
-  @available(swift, introduced: 4.2)
-  @available(macOS, introduced: 10.10)
-  @available(iOS, introduced: 8.0)
-  @available(tvOS, introduced: 9.0)
-  public var presentationTimeStamp: CMTime? {
-    return userInfo[AVErrorPresentationTimeStampKey] as? CMTime
-  }
-
-  /// The persistent track ID.
-  @available(swift, introduced: 4.2)
-  @available(macOS, introduced: 10.10)
-  @available(iOS, introduced: 8.0)
-  @available(tvOS, introduced: 9.0)
-  public var persistentTrackID: CMPersistentTrackID? {
-    return userInfo[AVErrorPersistentTrackIDKey] as? CMPersistentTrackID
-  }
-
-  /// The file type.
-  @available(swift, introduced: 4.2)
-  @available(macOS, introduced: 10.10)
-  @available(iOS, introduced: 8.0)
-  @available(tvOS, introduced: 9.0)
-  public var fileType: AVFileType? {
-    return userInfo[AVErrorFileTypeKey] as? AVFileType
-  }
-}
diff --git a/stdlib/public/Darwin/AVFoundation/AVMetadataObject.swift b/stdlib/public/Darwin/AVFoundation/AVMetadataObject.swift
deleted file mode 100644
index d884fcdef848e..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/AVMetadataObject.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AVFoundation // Clang module
-import Foundation
-import CoreGraphics
-
-
-#if os(iOS)
-  
-extension AVMetadataMachineReadableCodeObject {
-  @available(swift, obsoleted: 4.0)
-  @available(iOS, introduced: 7.0)
-  @nonobjc
-  public var corners: [Any]! {
-    return __corners
-  }
-  
-  @available(swift, introduced: 4.0)
-  @available(iOS, introduced: 7.0)
-  @nonobjc
-  public var corners: [CGPoint] {
-    return __corners.map { CGPoint(dictionaryRepresentation: $0 as CFDictionary)! }
-  }
-}
-  
-#endif
-
diff --git a/stdlib/public/Darwin/AVFoundation/CMakeLists.txt b/stdlib/public/Darwin/AVFoundation/CMakeLists.txt
deleted file mode 100644
index e77e6e3618d0b..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  AVCaptureDevice.swift
-  AVCapturePhotoOutput.swift
-  AVCaptureSynchronizedDataCollection.swift
-  AVCaptureVideoDataOutput.swift
-  AVError.swift
-  AVMetadataObject.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    NSValue.swift.gyb
-
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-L${sdk}/usr/lib/swift/"
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit simd Foundation CoreMedia QuartzCore XPC CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Metal Dispatch simd Foundation CoreMedia QuartzCore CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreGraphics Metal Dispatch simd Foundation CoreMedia QuartzCore CoreFoundation CoreAudio ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS AVFoundation
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_AVFOUNDATION_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_AVFOUNDATION_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_AVFOUNDATION_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/AVFoundation/NSValue.swift.gyb b/stdlib/public/Darwin/AVFoundation/NSValue.swift.gyb
deleted file mode 100644
index f4004ca838f0c..0000000000000
--- a/stdlib/public/Darwin/AVFoundation/NSValue.swift.gyb
+++ /dev/null
@@ -1,29 +0,0 @@
-@_exported import AVFoundation // Clang module
-import CoreMedia
-import Foundation
-
-%{
-from gyb_foundation_support import \
-  ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods
-}%
-
-// Bridge CoreMedia structs to NSValue.
-// AVFoundation provides internal NSValue subclasses for these structures that
-// are incompatible with the NSConcreteValue subclasses you get using
-// -[NSValue valueWithBytes:objCType:].
-
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="CMTime",
-  initializer="{ NSValue(time: $0) }",
-  getter="{ $0.timeValue }",
-) }
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="CMTimeRange",
-  initializer="{ NSValue(timeRange: $0) }",
-  getter="{ $0.timeRangeValue }",
-) }
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="CMTimeMapping",
-  initializer="{ NSValue(timeMapping: $0) }",
-  getter="{ $0.timeMappingValue }",
-) }
diff --git a/stdlib/public/Darwin/Accelerate/Accelerate.swift b/stdlib/public/Darwin/Accelerate/Accelerate.swift
deleted file mode 100644
index 047420decd9bb..0000000000000
--- a/stdlib/public/Darwin/Accelerate/Accelerate.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-/// An enum that acts as a namespace for Swift overlays to vImage option sets and enums..
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public enum vImage {}
-
-/// An enum that acts as a namespace for Swift overlays to vDSP based functions.
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public enum vDSP {}
-
-/// An enum that acts as a namespace for Swift overlays to vForce based functions.
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public enum vForce {}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    public struct VectorizableFloat {
-        public typealias Scalar = Float
-    }
-  
-    @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    public struct VectorizableDouble {
-        public typealias Scalar = Double
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/AccelerateBuffer.swift b/stdlib/public/Darwin/Accelerate/AccelerateBuffer.swift
deleted file mode 100644
index c1a68eec66f6e..0000000000000
--- a/stdlib/public/Darwin/Accelerate/AccelerateBuffer.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-/// An object composed of count elements that are stored contiguously in memory.
-///
-/// In practice, most types conforming to this protocol will be Collections,
-/// but they need not be--they need only have an Element type and count, and
-/// provide the withUnsafeBufferPointer function.
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol AccelerateBuffer {
-    /// The buffer's element type.
-    associatedtype Element
-    
-    /// The number of elements in the buffer.
-    var count: Int { get }
-    
-    /// Calls a closure with a pointer to the object's contiguous storage.
-    func withUnsafeBufferPointer<R>(
-        _ body: (UnsafeBufferPointer<Element>) throws -> R
-    ) rethrows -> R
-}
-
-/// A mutable object composed of count elements that are stored contiguously
-/// in memory.
-///
-/// In practice, most types conforming to this protocol will be
-/// MutableCollections, but they need not be.
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol AccelerateMutableBuffer: AccelerateBuffer {
-    /// Calls the given closure with a pointer to the object's mutable
-    /// contiguous storage.
-    mutating func withUnsafeMutableBufferPointer<R>(
-        _ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
-    ) rethrows -> R
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public extension AccelerateBuffer where Self: Collection {
-    @inlinable
-    func withUnsafeBufferPointer<R>(
-        _ body: (UnsafeBufferPointer<Element>) throws -> R
-    ) rethrows -> R {
-        return try withContiguousStorageIfAvailable(body)!
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension AccelerateMutableBuffer where Self: MutableCollection {
-    @inlinable
-    public mutating func withUnsafeMutableBufferPointer<R>(
-        _ body: (inout UnsafeMutableBufferPointer<Element>) throws -> R
-    ) rethrows -> R {
-        return try withContiguousMutableStorageIfAvailable(body)!
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Array: AccelerateMutableBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension ContiguousArray: AccelerateMutableBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension ArraySlice: AccelerateMutableBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension UnsafeBufferPointer: AccelerateBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension UnsafeMutableBufferPointer: AccelerateMutableBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Slice: AccelerateBuffer where Base: AccelerateBuffer { }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Slice: AccelerateMutableBuffer
-where Base: AccelerateMutableBuffer & MutableCollection { }
diff --git a/stdlib/public/Darwin/Accelerate/BNNS.swift.gyb b/stdlib/public/Darwin/Accelerate/BNNS.swift.gyb
deleted file mode 100644
index e64cbd73436f2..0000000000000
--- a/stdlib/public/Darwin/Accelerate/BNNS.swift.gyb
+++ /dev/null
@@ -1,303 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Accelerate
-@_exported import Accelerate.vecLib.BNNS
-
-%{
-bnns2016 = [
-  ('macOS','10.12'), ('iOS','10.0'), ('tvOS','10.0'), ('watchOS','3.0')
-]
-
-bnns2017 = [
-  ('macOS','10.13'), ('iOS','11.0'), ('tvOS','11.0'), ('watchOS','4.0')
-]
-
-def relString(releases):
-  if not releases:
-    return '*'
-  return ', '.join([
-    r[0] + ' ' + r[1] for r in releases
-  ] + ['*'])
-
-def available(releases):
-  return '@available(' + relString(releases) + ')'
-
-def renamed(name, rel=None):
-  return '\n'.join([
-    available(rel),
-    '@available(*, deprecated, renamed: "' + name + '")'
-  ])
-
-def newEnumValue(base, new, old, rel):
-  decl = '  public static var ' + new + ': ' + base + ' {\n'
-  impl = '    return __' + base + old + '\n  }'
-  return '  ' + available(rel) + '\n' + decl + impl
-
-def oldEnumValue(base, new, old, oldRel):
-  return renamed(base + '.' + new, oldRel) + '\n' + \
-  'public var ' + base + old + ' = __' + base + old
-
-def renameEnumMembers(base, baseRel, names):
-  return available(baseRel) + \
-  '\nextension ' + base + ' {\n' + \
-  '\n'.join([newEnumValue(base, new, old, rel) for new, old, rel in names]) + '\n}\n' + \
-  '\n'.join([oldEnumValue(base, new, old, rel) for new, old, rel in names if rel != bnns2017])
-}%
-
-${renameEnumMembers('BNNSDataType', bnns2016, [
-  ('float16', 'Float16', bnns2016),
-  ('float',   'Float32', bnns2016),
-  ('int8',    'Int8',    bnns2016),
-  ('int16',   'Int16',   bnns2016),
-  ('int32',   'Int32',   bnns2016),
-  ('uint8',   'UInt8',   bnns2017),
-  ('uint16',  'UInt16',  bnns2017),
-  ('uint32',  'UInt32',  bnns2017),
-  ('indexed8','Indexed8',bnns2016),
-])}
-
-${renameEnumMembers('BNNSPoolingFunction', bnns2016, [
-  ('max',     'Max',     bnns2016),
-  ('average', 'Average', bnns2016),
-])}
-
-${renameEnumMembers('BNNSActivationFunction', bnns2016, [
-  ('identity', 'Identity', bnns2016),
-  ('rectifiedLinear', 'RectifiedLinear', bnns2016),
-  ('leakyRectifiedLinear', 'LeakyRectifiedLinear', bnns2016),
-  ('sigmoid', 'Sigmoid', bnns2016),
-  ('tanh', 'Tanh', bnns2016),
-  ('scaledTanh', 'ScaledTanh', bnns2016),
-  ('abs', 'Abs', bnns2016),
-  ('linear', 'Linear', bnns2017),
-  ('clamp', 'Clamp', bnns2017),
-  ('integerLinearSaturate', 'IntegerLinearSaturate', bnns2017),
-  ('integerLinearSaturatePerChannel', 'IntegerLinearSaturatePerChannel', bnns2017),
-  ('softmax', 'Softmax', bnns2017),
-])}
-
-${renameEnumMembers('BNNSFlags', bnns2016, [('useClientPointer', 'UseClientPtr', bnns2016)])}
-
-${available(bnns2016)}
-extension BNNSImageStackDescriptor {
-  ${available(bnns2016)}
-  public init(width: Int,
-              height: Int,
-              channels: Int,
-              row_stride: Int,
-              image_stride: Int,
-              data_type: BNNSDataType) {
-
-    precondition(data_type != .indexed8,
-                  "Image stacks cannot use the indexed8 data type.")
-
-    self.init(width: width,
-              height: height,
-              channels: channels,
-              row_stride: row_stride,
-              image_stride: image_stride,
-              data_type: data_type,
-              data_scale: 1,
-              data_bias: 0)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSVectorDescriptor {
-  ${available(bnns2016)}
-  public init(size: Int,
-              data_type: BNNSDataType) {
-
-    precondition(data_type != .indexed8,
-                  "Vectors cannot use the indexed8 data type.")
-
-    self.init(size: size,
-              data_type: data_type,
-              data_scale: 1,
-              data_bias: 0)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSLayerData {
-  ${available(bnns2016)}
-  public init(data: UnsafeRawPointer?,
-              data_type: BNNSDataType,
-              data_scale: Float = 1,
-              data_bias: Float = 0) {
-
-    precondition(data_type != .indexed8,
-                  "This initializer cannot be used with the indexed8 data type; use BNNSLayerData.indexed8 instead.")
-
-    self.init(data: data,
-              data_type: data_type,
-              data_scale: data_scale,
-              data_bias: data_bias,
-              data_table: nil)
-  }
-
-  ${available(bnns2016)}
-  public static var zero: BNNSLayerData {
-    return BNNSLayerData()
-  }
-
-  /// A BNNSLayerData object with the indexed8 data type.
-  ${available(bnns2016)}
-  public static func indexed8(data: UnsafePointer<Int8>?,
-                              data_table: UnsafePointer<Float>)
-                              -> BNNSLayerData {
-    return BNNSLayerData(data: data,
-                         data_type: .indexed8,
-                         data_scale: 1, // unused
-                         data_bias: 0, // unused
-                         data_table: data_table)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSActivation {
-
-  ${available(bnns2016)}
-  public init(function: BNNSActivationFunction,
-              alpha: Float = .nan,
-              beta: Float = .nan) {
-    if #available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
-      precondition(function != .integerLinearSaturate,
-                    "This initializer cannot be used with the integerLinearSaturate activation function; use BNNSActivation.integerLinearSaturate(scale:Int32, offset:Int32, shift:Int32) instead.")
-      precondition(function != .integerLinearSaturatePerChannel,
-                    "This initializer cannot be used with the integerLinearSaturatePerChannel activation function; use BNNSActivation.integerLinearSaturatePerChannel(scale:UnsafePointer<Int32>, offset:UnsafePointer<Int32>, shift:UnsafePointer<Int32>) instead.")
-    }
-    self.init(function: function,
-              alpha: alpha,
-              beta: beta,
-              iscale: 1,                // unused
-              ioffset: 0,               // unused
-              ishift: 0,                // unused
-              iscale_per_channel: nil,  // unused
-              ioffset_per_channel: nil, // unused
-              ishift_per_channel: nil)  // unused
-  }
-
-  /// A BNNSActivation object that uses the identity activation function.
-  ${available(bnns2016)}
-  public static var identity: BNNSActivation {
-    return BNNSActivation(function: .identity)
-  }
-
-  /// A BNNSActivation object that uses the integerLinearSaturate
-  /// activation function.
-  ${available(bnns2017)}
-  public static func integerLinearSaturate(
-    scale: Int32 = 1,
-    offset: Int32 = 0,
-    shift: Int32 = 0)
-    -> BNNSActivation {
-    return BNNSActivation(function: .integerLinearSaturate,
-                          alpha: .nan,     // unused
-                          beta: .nan,      // unused
-                          iscale: scale,
-                          ioffset: offset,
-                          ishift: shift,
-                          iscale_per_channel: nil, // unused
-                          ioffset_per_channel: nil,// unused
-                          ishift_per_channel: nil) // unused
-  }
-
-  /// A BNNSActivation object that uses the integerLinearSaturatePerChannel
-  /// activation function.
-  ///
-  /// `scale`, `offset`, and `shift` must each point to a buffer with count
-  /// equal to the number of channels on which this activation object operates.
-  ${available(bnns2017)}
-  public static func integerLinearSaturatePerChannel(
-    scale:  UnsafePointer<Int32>,
-    offset: UnsafePointer<Int32>,
-    shift:  UnsafePointer<Int32>)
-    -> BNNSActivation {
-    return BNNSActivation(function: .integerLinearSaturatePerChannel,
-                          alpha: .nan,     // unused
-                          beta: .nan,      // unused
-                          iscale: 1,       // unused
-                          ioffset: 0,      // unused
-                          ishift: 0,       // unused
-                          iscale_per_channel: scale,
-                          ioffset_per_channel: offset,
-                          ishift_per_channel: shift)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSConvolutionLayerParameters {
-  ${available(bnns2016)}
-  public init(x_stride: Int,
-              y_stride: Int,
-              x_padding: Int,
-              y_padding: Int,
-              k_width: Int,
-              k_height: Int,
-              in_channels: Int,
-              out_channels: Int,
-              weights: BNNSLayerData) {
-    self.init(x_stride: x_stride,
-              y_stride: y_stride,
-              x_padding: x_padding,
-              y_padding: y_padding,
-              k_width: k_width,
-              k_height: k_height,
-              in_channels: in_channels,
-              out_channels: out_channels,
-              weights: weights,
-              bias: .zero,
-              activation: .identity)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSPoolingLayerParameters {
-  ${available(bnns2016)}
-  public init(x_stride: Int,
-              y_stride: Int,
-              x_padding: Int,
-              y_padding: Int,
-              k_width: Int,
-              k_height: Int,
-              in_channels: Int,
-              out_channels: Int,
-              pooling_function: BNNSPoolingFunction) {
-    self.init(x_stride: x_stride,
-              y_stride: y_stride,
-              x_padding: x_padding,
-              y_padding: y_padding,
-              k_width: k_width,
-              k_height: k_height,
-              in_channels: in_channels,
-              out_channels: out_channels,
-              pooling_function: pooling_function,
-              bias: .zero,
-              activation: .identity)
-  }
-}
-
-${available(bnns2016)}
-extension BNNSFullyConnectedLayerParameters {
-  ${available(bnns2016)}
-  public init(in_size: Int,
-              out_size: Int,
-              weights: BNNSLayerData) {
-    self.init(in_size: in_size,
-              out_size: out_size,
-              weights: weights,
-              bias: .zero,
-              activation: .identity)
-  }
-}
diff --git a/stdlib/public/Darwin/Accelerate/CMakeLists.txt b/stdlib/public/Darwin/Accelerate/CMakeLists.txt
deleted file mode 100644
index 6bb4e7329a496..0000000000000
--- a/stdlib/public/Darwin/Accelerate/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftAccelerate ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  Accelerate.swift
-  vImage_Error.swift
-  vImage_Options.swift
-  vImage_Buffer.swift
-  vImage_CVImageFormat.swift
-  vImage_CGImageFormat.swift
-  vImage_Converter.swift
-  AccelerateBuffer.swift
-  Quadrature.swift
-  vDSP_Arithmetic.swift
-  vDSP_Biquad.swift
-  vDSP_ClippingLimitThreshold.swift
-  vDSP_ComplexConversion.swift
-  vDSP_ComplexOperations.swift
-  vDSP_Conversion.swift
-  vDSP_Convolution.swift
-  vDSP_DCT.swift
-  vDSP_DFT.swift
-  vDSP_DecibelConversion.swift
-  vDSP_FFT.swift
-  vDSP_FFT_DFT_Common.swift
-  vDSP_FIR.swift
-  vDSP_FillClearGenerate.swift
-  vDSP_Geometry.swift
-  vDSP_Integration.swift
-  vDSP_Interpolation.swift
-  vDSP_PolarRectangularConversion.swift
-  vDSP_PolynomialEvaluation.swift
-  vDSP_RecursiveFilters.swift
-  vDSP_Reduction.swift
-  vDSP_SingleVectorOperations.swift
-  vDSP_SlidingWindow.swift
-  vForce_Operations.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    BNNS.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Metal Dispatch IOKit Foundation os XPC CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreFoundation CoreGraphics Dispatch Foundation Metal ObjectiveC os # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreFoundation CoreGraphics Dispatch Foundation Metal ObjectiveC os # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics Dispatch os CoreFoundation ObjectiveC # auto-updated
-
-  FRAMEWORK_DEPENDS Accelerate
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Accelerate/Quadrature.swift b/stdlib/public/Darwin/Accelerate/Quadrature.swift
deleted file mode 100644
index 8a9ce9d2df3e1..0000000000000
--- a/stdlib/public/Darwin/Accelerate/Quadrature.swift
+++ /dev/null
@@ -1,293 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// MARK: Quadrature
-
-/// A structure that approximates the definite integral of a function over a finite interval.
-///
-/// The following code is an example of using a `Quadrature` structure to calculate the
-/// area under a curve defined by `y = sqrt(radius * radius - pow(x - radius, 2))`:
-///
-///
-///     let quadrature = Quadrature(integrator: .qags(maxIntervals: 10),
-///                                 absoluteTolerance: 1.0e-8,
-///                                 relativeTolerance: 1.0e-2)
-///
-///     let result = quadrature.integrate(over: 0.0 ... 25.0) { x in
-///         let radius: Double = 12.5
-///         return sqrt(radius * radius - pow(x - radius, 2))
-///     }
-///
-///     switch result {
-///     case .success(let (integralResult, estimatedAbsoluteError)):
-///         print("quadrature success:", integralResult,
-///                                      estimatedAbsoluteError)
-///     case .failure(let error):
-///         print("quadrature error:", error.errorDescription)
-///     }
-///
-/// Alternatively, you can integrate over a function that uses vectors for its
-/// source and destination. For example:
-///
-///     func vectorExp(x: UnsafeBufferPointer<Double>,
-///                    y: UnsafeMutableBufferPointer<Double>) {
-///         let radius: Double = 12.5
-///         for i in 0 ..< x.count {
-///             y[i] = sqrt(radius * radius - pow(x[i] - radius, 2))
-///         }
-///     }
-///
-///     let vRresult = quadrature.integrate(over: 0.0 ... 25.0,
-///                                         integrand: vectorExp)
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public struct Quadrature {
-    
-    private var integrateOptions = quadrature_integrate_options()
-    
-    /// Initializes and returns a quadrature instance.
-    ///
-    /// - Parameter integrator: An enumeration specifying the integration algorithm and relevant properties.
-    /// - Parameter absoluteTolerance: Requested absolute tolerance on the result.
-    /// - Parameter relativeTolerance: Requested relative tolerance on the result.
-    public init(integrator: Integrator,
-                absoluteTolerance: Double = 1.0e-8,
-                relativeTolerance: Double = 1.0e-2){
-        
-        integrateOptions.abs_tolerance = absoluteTolerance
-        integrateOptions.rel_tolerance = relativeTolerance
-        
-        switch integrator {
-        case .qng:
-            integrateOptions.integrator = QUADRATURE_INTEGRATE_QNG
-        case .qag(let pointsPerInterval, let maxIntervals):
-            integrateOptions.integrator = QUADRATURE_INTEGRATE_QAG
-            integrateOptions.qag_points_per_interval = pointsPerInterval.points
-            integrateOptions.max_intervals = maxIntervals
-        case .qags(let maxIntervals):
-            integrateOptions.integrator = QUADRATURE_INTEGRATE_QAGS
-            integrateOptions.max_intervals = maxIntervals
-        }
-    }
-    
-    /// The quadrature instance's requested absolute tolerance on the result.
-    public var absoluteTolerance: Double {
-        set {
-            integrateOptions.abs_tolerance = newValue
-        }
-        get {
-            return integrateOptions.abs_tolerance
-        }
-    }
-    
-    /// The quadrature instance's requested relative tolerance on the result.
-    public var relativeTolerance: Double {
-        set {
-            integrateOptions.rel_tolerance = newValue
-        }
-        get {
-            return integrateOptions.rel_tolerance
-        }
-    }
-    
-    /// Performs the integration over the supplied function.
-    ///
-    /// - Parameter interval: The lower and upper bounds of the integration interval.
-    /// - Parameter integrand: The function to integrate. The input value is `x` that's within the interval over which the integrand is being integrated, and the output value is the corresponding value `y = integrand(x)` at those points.
-    public func integrate(over interval: ClosedRange<Double>,
-                          integrand: (_ input: UnsafeBufferPointer<Double>, _ result: UnsafeMutableBufferPointer<Double>) -> ()) ->
-        Result<(integralResult: Double, estimatedAbsoluteError: Double), Error>{
-            
-            var status = QUADRATURE_SUCCESS
-            var estimatedAbsoluteError: Double = 0
-            var result: Double = 0
-            
-            var callback: quadrature_integrate_function!
-            
-            withoutActuallyEscaping(integrand) {escapableIntegrand in
-                withUnsafePointer(to: escapableIntegrand) {
-                    let integrandPointer = UnsafeMutableRawPointer(mutating: $0)
-                    
-                    callback = quadrature_integrate_function(
-                        fun: { (arg: UnsafeMutableRawPointer?,
-                            n: Int,
-                            x: UnsafePointer<Double>,
-                            y: UnsafeMutablePointer<Double>
-                            ) in
-                            
-                            guard let integrand = arg?.load(as: ((UnsafeBufferPointer<Double>, UnsafeMutableBufferPointer<Double>) ->()).self) else {
-                                return
-                            }
-                            
-                            integrand(UnsafeBufferPointer(start: x, count: n),
-                                      UnsafeMutableBufferPointer(start: y, count: n))
-                    },
-                        fun_arg: integrandPointer)
-                    
-                    withUnsafePointer(to: self.integrateOptions) { options in
-                        result = quadrature_integrate(&callback,
-                                                      interval.lowerBound,
-                                                      interval.upperBound,
-                                                      options,
-                                                      &status,
-                                                      &estimatedAbsoluteError,
-                                                      0,
-                                                      nil)
-                    }
-                }
-            }
-            
-            if status == QUADRATURE_SUCCESS {
-                return .success((integralResult: result,
-                                 estimatedAbsoluteError: estimatedAbsoluteError))
-            } else {
-                return .failure(Error(quadratureStatus: status))
-            }
-    }
-    
-    /// Performs the integration over the supplied function.
-    ///
-    /// - Parameter interval: The lower and upper bounds of the integration interval.
-    /// - Parameter integrand: The function to integrate. The input value is `x` that's within the interval over which the integrand is being integrated, and the output value is the corresponding value `y = integrand(x)` at those points.
-    public func integrate(over interval: ClosedRange<Double>,
-                          integrand: (Double) -> Double) ->
-        Result<(integralResult: Double, estimatedAbsoluteError: Double), Error> {
-            
-            var status = QUADRATURE_SUCCESS
-            var estimatedAbsoluteError: Double = 0
-            var result: Double = 0
-            
-            var callback: quadrature_integrate_function!
-            
-            withoutActuallyEscaping(integrand) {escapableIntegrand in
-                withUnsafePointer(to: escapableIntegrand) {
-                    let integrandPointer = UnsafeMutableRawPointer(mutating: $0)
-                    
-                    callback = quadrature_integrate_function(
-                        fun: { (arg: UnsafeMutableRawPointer?,
-                            n: Int,
-                            x: UnsafePointer<Double>,
-                            y: UnsafeMutablePointer<Double>
-                            ) in
-                            
-                            guard let integrand = arg?.load(as: ((Double) -> Double).self) else {
-                                return
-                            }
-                            
-                            (0 ..< n).forEach { i in
-                                y[i] = integrand(x[i])
-                            }
-                    },
-                        fun_arg: integrandPointer)
-                    
-                    withUnsafePointer(to: self.integrateOptions) { options in
-                        result = quadrature_integrate(&callback,
-                                                      interval.lowerBound,
-                                                      interval.upperBound,
-                                                      options,
-                                                      &status,
-                                                      &estimatedAbsoluteError,
-                                                      0,
-                                                      nil)
-                    }
-                }
-            }
-            
-            if status == QUADRATURE_SUCCESS {
-                return .success((integralResult: result,
-                                 estimatedAbsoluteError: estimatedAbsoluteError))
-            } else {
-                return .failure(Error(quadratureStatus: status))
-            }
-    }
-    
-    public enum Integrator {
-        /// Simple non-adaptive automatic integrator using Gauss-Kronrod-Patterson quadrature coefficients.
-        /// Evaluates 21, or 43, or 87 points in the interval until the requested accuracy is reached.
-        case qng
-        
-        /// Simple non-adaptive automatic integrator using Gauss-Kronrod-Patterson quadrature coefficients.
-        /// Evaluates 21, or 43, or 87 points in the interval until the requested accuracy is reached.
-        public static let nonAdaptive = Integrator.qng
-        
-        /// Simple globally adaptive integrator.
-        /// Allows selection of the number of Gauss-Kronrod points used in each subinterval, and the max number of subintervals.
-        case qag(pointsPerInterval: QAGPointsPerInterval, maxIntervals: Int)
-        
-        /// Simple globally adaptive integrator.
-        /// Allows selection of the number of Gauss-Kronrod points used in each subinterval, and the max number of subintervals.
-        public static func adaptive(pointsPerInterval: QAGPointsPerInterval, maxIntervals: Int) -> Integrator  {
-            return Integrator.qag(pointsPerInterval: pointsPerInterval, maxIntervals: maxIntervals)
-        }
-        
-        /// Global adaptive quadrature based on 21-point or 15-point (if at least one bound is infinite) Gauss–Kronrod quadrature within each subinterval, with acceleration by Peter Wynn's epsilon algorithm.
-        /// If at least one of the interval bounds is infinite, this is equivalent to the QUADPACK QAGI routine. Otherwise, this is equivalent to the QUADPACK QAGS routine.
-        case qags(maxIntervals: Int)
-        
-        /// Global adaptive quadrature based on 21-point or 15-point (if at least one bound is infinite) Gauss–Kronrod quadrature within each subinterval, with acceleration by Peter Wynn's epsilon algorithm.
-        /// If at least one of the interval bounds is infinite, this is equivalent to the QUADPACK QAGI routine. Otherwise, this is equivalent to the QUADPACK QAGS routine.
-        public static func adaptiveWithSingularities(maxIntervals: Int) -> Integrator  {
-            return Integrator.qags(maxIntervals: maxIntervals)
-        }
-    }
-    
-    public struct QAGPointsPerInterval {
-        public let points: Int
-        private init(points: Int) { self.points = points }
-        
-        public static let fifteen = QAGPointsPerInterval(points: 15)
-        public static let twentyOne = QAGPointsPerInterval(points: 21)
-        public static let thirtyOne = QAGPointsPerInterval(points: 31)
-        public static let fortyOne = QAGPointsPerInterval(points: 41)
-        public static let fiftyOne = QAGPointsPerInterval(points: 51)
-        public static let sixtyOne = QAGPointsPerInterval(points: 61)
-    }
-    
-    public enum Error: Swift.Error {
-        case generic
-        case invalidArgument
-        case `internal`
-        case integrateMaxEval
-        case badIntegrandBehaviour
-        
-        public init(quadratureStatus: quadrature_status) {
-            switch quadratureStatus {
-            case QUADRATURE_ERROR:
-                self = .generic
-            case QUADRATURE_INVALID_ARG_ERROR:
-                self = .invalidArgument
-            case QUADRATURE_INTERNAL_ERROR:
-                self = .internal
-            case QUADRATURE_INTEGRATE_MAX_EVAL_ERROR:
-                self = .integrateMaxEval
-            case QUADRATURE_INTEGRATE_BAD_BEHAVIOUR_ERROR:
-                self = .badIntegrandBehaviour
-            default:
-                self = .internal
-            }
-        }
-        
-        public var errorDescription: String {
-            switch self {
-            case .generic:
-                return "Generic error."
-            case .invalidArgument:
-                return "Invalid Argument."
-            case .internal:
-                return "This is a bug in the Quadrature code, please file a bug report."
-            case .integrateMaxEval:
-                return "The requested accuracy limit could not be reached with the allowed number of evals/subdivisions."
-            case .badIntegrandBehaviour:
-                return "Extremely bad integrand behaviour, or excessive roundoff error occurs at some points of the integration interval."
-            }
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Arithmetic.swift b/stdlib/public/Darwin/Accelerate/vDSP_Arithmetic.swift
deleted file mode 100644
index 2e0438616b8f0..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Arithmetic.swift
+++ /dev/null
@@ -1,3206 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// Vector-vector and vector-scalar arithmetic
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: c[i] = a[i] + b                                vDSP_vsadd
-    
-    /// Returns the elementwise sum of `vector` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter scalar: the `b` in `c[i] = a[i] + b`.
-    /// - Parameter vector: the `a` in `c[i] = a[i] + b`.
-    /// - Returns: The `c` in `c[i] = a[i] + b`.
-    @inlinable
-    public static func add<U>(_ scalar: Float,
-                              _ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(scalar,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter scalar: the `b` in `c[i] = a[i] + b`.
-    /// - Parameter vector: the `a` in `c[i] = a[i] + b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b`.
-    @inlinable
-    public static func add<U, V>(_ scalar: Float,
-                                 _ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsadd(v.baseAddress!, 1,
-                                   s,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of `vector` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter scalar: the `b` in `c[i] = a[i] + b`.
-    /// - Parameter vector: the `a` in `c[i] = a[i] + b`.
-    /// - Returns: The `c` in `c[i] = a[i] + b`.
-    @inlinable
-    public static func add<U>(_ scalar: Double,
-                              _ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(scalar,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter scalar: the `b` in `c[i] = a[i] + b`.
-    /// - Parameter vector: the `a` in `c[i] = a[i] + b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b`.
-    @inlinable
-    public static func add<U, V>(_ scalar: Double,
-                                 _ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsaddD(v.baseAddress!, 1,
-                                    s,
-                                    r.baseAddress!, 1,
-                                    vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] + b[i]                             vDSP_vadd
-    
-    /// Returns the elementwise sum of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add<T, U>(_ vectorA: T,
-                                 _ vectorB: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                add(vectorA,
-                    vectorB,
-                    result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add<T, U, V>(_ vectorA: T,
-                                    _ vectorB: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vadd(a.baseAddress!, 1,
-                                  b.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add<T, U>(_ vectorA: T,
-                                 _ vectorB: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                add(vectorA,
-                    vectorB,
-                    result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add<T, U, V>(_ vectorA: T,
-                                    _ vectorB: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vaddD(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] - b[i]                             vDSP_vsub
-    
-    /// Returns the elementwise difference of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract<T, U>(_ vectorA: U,
-                                      _ vectorB: T) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                subtract(vectorA,
-                         vectorB,
-                         result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract<T, U, V>(_ vectorA: U,
-                                         _ vectorB: T,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorB.withUnsafeBufferPointer { b in
-                    vectorA.withUnsafeBufferPointer { a in
-                        vDSP_vsub(b.baseAddress!, 1,
-                                  a.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise difference of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract<T, U>(_ vectorA: U,
-                                      _ vectorB: T) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                subtract(vectorA,
-                         vectorB,
-                         result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract<T, U, V>(_ vectorA: U,
-                                         _ vectorB: T,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorB.withUnsafeBufferPointer { b in
-                    vectorA.withUnsafeBufferPointer { a in
-                        vDSP_vsubD(b.baseAddress!, 1,
-                                   a.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] * b                                vDSP_vsmul
-    
-    /// Returns the elementwise product of `vector` and `scalar
-    /// single-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] * b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] * b`.
-    /// - Returns: The `c` in `c[i] = a[i] * b`.
-    @inlinable
-    public static func multiply<U>(_ scalar: Float,
-                                   _ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(scalar,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of `vector` and `scalar
-    /// single-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] * b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] * b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b`.
-    @inlinable
-    public static func multiply<U, V>(_ scalar: Float,
-                                      _ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsmul(v.baseAddress!, 1,
-                                   s,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of `vector` and `scalar
-    /// double-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] * b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] * b`.
-    /// - Returns: The `c` in `c[i] = a[i] * b`.
-    @inlinable
-    public static func multiply<U>(_ scalar: Double,
-                                   _ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(scalar,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of `vector` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] * b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] * b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b`.
-    @inlinable
-    public static func multiply<U, V>(_ scalar: Double,
-                                      _ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsmulD(v.baseAddress!, 1,
-                                    s,
-                                    r.baseAddress!, 1,
-                                    vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] * b[i]                                 vDSP_vmul
-    
-    /// Returns the elementwise product of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<T, U>(_ vectorA: T,
-                                      _ vectorB: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                multiply(vectorA,
-                         vectorB,
-                         result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<T, U, V>(_ vectorA: T,
-                                         _ vectorB: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vmul(a.baseAddress!, 1,
-                                  b.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<T, U>(_ vectorA: T,
-                                      _ vectorB: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                multiply(vectorA,
-                         vectorB,
-                         result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<T, U, V>(_ vectorA: T,
-                                         _ vectorB: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vmulD(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] / b                                vDSP_vsdiv
-    
-    /// Returns the elementwise division of `vector` by `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] / b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] / b`.
-    /// - Returns: The `c` in `c[i] = a[i] / b`
-    @inlinable
-    public static func divide<U>(_ vector: U,
-                                 _ scalar: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                divide(vector,
-                       scalar,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `vector` by `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] / b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] / b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b`
-    @inlinable
-    public static func divide<U, V>(_ vector: U,
-                                    _ scalar: Float,
-                                    result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsdiv(v.baseAddress!, 1,
-                                   [scalar],
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise division of `vector` by `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] / b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] / b`.
-    /// - Returns: The `c` in `c[i] = a[i] / b`
-    @inlinable
-    public static func divide<U>(_ vector: U,
-                                 _ scalar: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                divide(vector,
-                       scalar,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `vector` by `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: the `a` in `c[i] = a[i] / b`.
-    /// - Parameter scalar: the `b` in `c[i] = a[i] / b`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b`
-    @inlinable
-    public static func divide<U, V>(_ vector: U,
-                                    _ scalar: Double,
-                                    result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_vsdivD(v.baseAddress!, 1,
-                                    s,
-                                    r.baseAddress!, 1,
-                                    vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a / b[i]                                vDSP_svdiv
-    
-    /// Returns the elementwise division of `scalar` by `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter scalar: the `a` in `c[i] = a / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a / b[i]`.
-    /// - Returns: The `c` in `c[i] = a / b[i]`.
-    @inlinable
-    public static func divide<U>(_ scalar: Float,
-                                 _ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                divide(scalar,
-                       vector,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `scalar` by `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter scalar: the `a` in `c[i] = a / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a / b[i]`.
-    @inlinable
-    public static func divide<U, V>(_ scalar: Float,
-                                    _ vector: U,
-                                    result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_svdiv(s,
-                                   v.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise division of `scalar` by `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter scalar: the `a` in `c[i] = a / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a / b[i]`.
-    /// - Returns: The `c` in `c[i] = a / b[i]`.
-    @inlinable
-    public static func divide<U>(_ scalar: Double,
-                                 _ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                divide(scalar,
-                       vector,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `scalar` by `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter scalar: the `a` in `c[i] = a / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a / b[i]`.
-    @inlinable
-    public static func divide<U, V>(_ scalar: Double,
-                                    _ vector: U,
-                                    result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    withUnsafePointer(to: scalar) { s in
-                        vDSP_svdivD(s,
-                                    v.baseAddress!, 1,
-                                    r.baseAddress!, 1,
-                                    vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: c[i] = a[i] / b[i]                             vDSP_vdiv
-    
-    /// Returns the elementwise division of `vectorA` by `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<T, U>(_ vectorA: T,
-                                    _ vectorB: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                divide(vectorA,
-                       vectorB,
-                       result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `vectorA` by `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<T, U, V>(_ vectorA: T,
-                                       _ vectorB: U,
-                                       result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vdiv(b.baseAddress!, 1,
-                                  a.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise division of `vectorA` by `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Returns: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<T, U>(_ vectorA: T,
-                                    _ vectorB: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                divide(vectorA,
-                       vectorB,
-                       result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise division of `vectorA` by `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<T, U, V>(_ vectorA: T,
-                                       _ vectorB: U,
-                                       result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vectorA.count == n && vectorB.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vdivD(b.baseAddress!, 1,
-                                   a.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   vDSP_Length(n))
-                    }
-                }
-            }
-    }
-    
-    // MARK: o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]  vDSP_vaddsub
-    
-    /// Calculates elementwise sum and difference of `vectorA` and `vectorB`,
-    /// single-precision.
-    ///
-    /// - Parameter vectorA: the `i1` in `o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter vectorB: the `i0` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter addResult: The `o0` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter subtractResult: The `o1` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    @inlinable
-    public static func addSubtract<S, T, U, V>(_ vectorA: S,
-                                               _ vectorB: T,
-                                               addResult: inout U,
-                                               subtractResult: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateMutableBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = addResult.count
-            precondition(vectorA.count == n &&
-                vectorB.count == n &&
-                subtractResult.count == n)
-            
-            addResult.withUnsafeMutableBufferPointer { o0 in
-                subtractResult.withUnsafeMutableBufferPointer { o1 in
-                    vectorA.withUnsafeBufferPointer { i1 in
-                        vectorB.withUnsafeBufferPointer { i0 in
-                            vDSP_vaddsub(i0.baseAddress!, 1,
-                                         i1.baseAddress!, 1,
-                                         o0.baseAddress!, 1,
-                                         o1.baseAddress!, 1,
-                                         vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Calculates elementwise sum and difference of `vectorA` and `vectorB`,
-    /// double-precision.
-    ///
-    /// - Parameter vectorA: the `i1` in `o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter vectorB: the `i0` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter addResult: The `o0` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    /// - Parameter subtractResult: The `o1` in o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]`.
-    @inlinable
-    public static func addSubtract<S, T, U, V>(_ vectorA: S,
-                                               _ vectorB: T,
-                                               addResult: inout U,
-                                               subtractResult: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateMutableBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = addResult.count
-            precondition(vectorA.count == n &&
-                vectorB.count == n &&
-                subtractResult.count == n)
-            
-            addResult.withUnsafeMutableBufferPointer { o0 in
-                subtractResult.withUnsafeMutableBufferPointer { o1 in
-                    vectorA.withUnsafeBufferPointer { i1 in
-                        vectorB.withUnsafeBufferPointer { i0 in
-                            vDSP_vaddsubD(i0.baseAddress!, 1,
-                                          i1.baseAddress!, 1,
-                                          o0.baseAddress!, 1,
-                                          o1.baseAddress!, 1,
-                                          vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] + b[i]) * c                       vDSP_vasm
-    
-    /// Returns the elementwise product of the sum of the vectors in `addition` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] + b[i]) * c`.
-    /// - Returns: The `d` in `d[i] = `(a[i] + b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U>(addition: (a: T, b: U),
-                                      _ scalar: Float) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: addition.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         scalar,
-                         result: &buffer)
-                
-                initializedCount = addition.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the sum of the vectors in `addition` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] + b[i]) * c`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] + b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U, V>(addition: (a: T, b: U),
-                                         _ scalar: Float,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vasm(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      s,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of the sum of the vectors in `addition` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] + b[i]) * c`.
-    /// - Returns: The `d` in `d[i] = `(a[i] + b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U>(addition: (a: T, b: U),
-                                      _ scalar: Double) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: addition.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         scalar,
-                         result: &buffer)
-                
-                initializedCount = addition.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the sum of the vectors in `addition` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] + b[i]) * c`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] + b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U, V>(addition: (a: T, b: U),
-                                         _ scalar: Double,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vasmD(a.baseAddress!, 1,
-                                       b.baseAddress!, 1,
-                                       s,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] + b[i]) * c[i]                    vDSP_vam
-    
-    /// Returns the elementwise product of the sum of the vectors in `addition` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Returns: The `d` in `d[i] = (a[i] + b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U>(addition: (a: S, b: T),
-                                         _ vector: U) -> [Float]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the sum of the vectors in `addition` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter result: The `d` in `d[i] = (a[i] + b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U, V>(addition: (a: S, b: T),
-                                            _ vector: U,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vam(a.baseAddress!, 1,
-                                     b.baseAddress!, 1,
-                                     c.baseAddress!, 1,
-                                     r.baseAddress!, 1,
-                                     vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of the sum of the vectors in `addition` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Returns: The `d` in `d[i] = (a[i] + b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U>(addition: (a: S, b: T),
-                                         _ vector: U) -> [Double]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the sum of the vectors in `addition` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] + b[i]) * c[i]`.
-    /// - Parameter result: The `d` in `d[i] = (a[i] + b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U, V>(addition: (a: S, b: T),
-                                            _ vector: U,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vamD(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      c.baseAddress!, 1,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] - b[i]) * c                       vDSP_vsbsm
-    
-    /// Returns the elementwise product of the difference of the vectors in `subtraction` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] - b[i]) * c`.
-    /// - Returns: The `d` in `d[i] = `(a[i] - b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U>(subtraction: (a: T, b: U),
-                                      _ scalar: Float) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: subtraction.a.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtraction,
-                         scalar,
-                         result: &buffer)
-                
-                initializedCount = subtraction.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the difference of the vectors in `subtraction` and `scalar`,
-    /// single-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] - b[i]) * c`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] - b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U, V>(subtraction: (a: T, b: U),
-                                         _ scalar: Float,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(subtraction.a.count == n &&
-                subtraction.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtraction.a.withUnsafeBufferPointer { a in
-                    subtraction.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vsbsm(a.baseAddress!, 1,
-                                       b.baseAddress!, 1,
-                                       s,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of the difference of the vectors in `subtraction` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] - b[i]) * c`.
-    /// - Returns: The `d` in `d[i] = `(a[i] - b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U>(subtraction: (a: T, b: U),
-                                      _ scalar: Double) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: subtraction.a.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtraction,
-                         scalar,
-                         result: &buffer)
-                
-                initializedCount = subtraction.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the difference of the vectors in `subtraction` and `scalar`,
-    /// double-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c`.
-    /// - Parameter scalar: the `c` in `d[i] = `(a[i] - b[i]) * c`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] - b[i]) * c`.
-    @inlinable
-    public static func multiply<T, U, V>(subtraction: (a: T, b: U),
-                                         _ scalar: Double,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(subtraction.a.count == n &&
-                subtraction.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtraction.a.withUnsafeBufferPointer { a in
-                    subtraction.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vsbsmD(a.baseAddress!, 1,
-                                        b.baseAddress!, 1,
-                                        s,
-                                        r.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] - b[i]) * c[i]                    vDSP_vsbm
-    
-    /// Returns the elementwise product of the difference of the vectors in `subtraction` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    /// - Returns: The `d` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U>(subtraction: (a: S, b: T),
-                                         _ vector: U) -> [Float]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtraction,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the difference of the vectors in `subtraction` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U, V>(subtraction: (a: S, b: T),
-                                            _ vector: U,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(subtraction.a.count == n &&
-                subtraction.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtraction.a.withUnsafeBufferPointer { a in
-                    subtraction.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vsbm(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      c.baseAddress!, 1,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of the difference of the vectors in `subtraction` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    /// - Returns: The `d` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U>(subtraction: (a: S, b: T),
-                                         _ vector: U) -> [Double]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtraction,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of the difference of the vectors in `subtraction` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter subtraction: the `a` and `b` in `d[i] = (a[i] - b[i]) * c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    /// - Parameter result: The `d` in `d[i] = `(a[i] - b[i]) * c[i]`.
-    @inlinable
-    public static func multiply<S, T, U, V>(subtraction: (a: S, b: T),
-                                            _ vector: U,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(subtraction.a.count == n &&
-                subtraction.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtraction.a.withUnsafeBufferPointer { a in
-                    subtraction.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vsbmD(a.baseAddress!, 1,
-                                       b.baseAddress!, 1,
-                                       c.baseAddress!, 1,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = a[i]*b[i] + c;                       vDSP_vmsa
-    
-    /// Returns the elementwise sum of `scalar`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter scalar: the `c` in `d[i] = a[i]*b[i] + c`.
-    /// - Returns: the `d` in `d[i] = a[i]*b[i] + c`.
-    @inlinable
-    public static func add<T, U>(multiplication: (a: T, b: U),
-                                 _ scalar: Float) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: multiplication.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    scalar,
-                    result: &buffer)
-                
-                initializedCount = multiplication.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `scalar`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter scalar: the `c` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter result: the `d` in `d[i] = a[i]*b[i] + c`.
-    @inlinable
-    public static func add<T, U, V>(multiplication: (a: T, b: U),
-                                    _ scalar: Float,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vmsa(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      s,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of `scalar`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter scalar: the `c` in `d[i] = a[i]*b[i] + c`.
-    /// - Returns: the `d` in `d[i] = a[i]*b[i] + c`.
-    @inlinable
-    public static func add<T, U>(multiplication: (a: T, b: U),
-                                 _ scalar: Double) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: multiplication.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    scalar,
-                    result: &buffer)
-                
-                initializedCount = multiplication.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `scalar`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter scalar: the `c` in `d[i] = a[i]*b[i] + c`.
-    /// - Parameter result: the `d` in `d[i] = a[i]*b[i] + c`.
-    @inlinable
-    public static func add<T, U, V>(multiplication: (a: T, b: U),
-                                    _ scalar: Double,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        withUnsafePointer(to: scalar) { s in
-                            vDSP_vmsaD(a.baseAddress!, 1,
-                                       b.baseAddress!, 1,
-                                       s,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] * b) + c[i]                       vDSP_vsma
-    
-    /// Returns the elementwise sum of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b) + c[i]`.
-    @inlinable
-    public static func add<T, U>(multiplication: (a: T, b: Float),
-                                 _ vector: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b) + c[i]`.
-    @inlinable
-    public static func add<T, U, V>(multiplication: (a: T, b: Float),
-                                    _ vector: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    vector.withUnsafeBufferPointer { c in
-                        withUnsafePointer(to: multiplication.b) { b in
-                            vDSP_vsma(a.baseAddress!, 1,
-                                      b,
-                                      c.baseAddress!, 1,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b) + c[i]`.
-    @inlinable
-    public static func add<T, U>(multiplication: (a: T, b: Double),
-                                 _ vector: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b) + c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b) + c[i]`.
-    @inlinable
-    public static func add<T, U, V>(multiplication: (a: T, b: Double),
-                                    _ vector: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    vector.withUnsafeBufferPointer { c in
-                        withUnsafePointer(to: multiplication.b) { b in
-                            vDSP_vsmaD(a.baseAddress!, 1,
-                                       b,
-                                       c.baseAddress!, 1,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] * b[i]) + c[i]                    vDSP_vma
-    
-    /// Returns the elementwise sum of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b[i]) + c[i]`.
-    @inlinable
-    public static func add<S, T, U>(multiplication: (a: S, b: T),
-                                    _ vector: U) -> [Float]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b[i]) + c[i]`.
-    @inlinable
-    public static func add<S, T, U, V>(multiplication: (a: S, b: T),
-                                       _ vector: U,
-                                       result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vma(a.baseAddress!, 1,
-                                     b.baseAddress!, 1,
-                                     c.baseAddress!, 1,
-                                     r.baseAddress!, 1,
-                                     vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b[i]) + c[i]`.
-    @inlinable
-    public static func add<S, T, U>(multiplication: (a: S, b: T),
-                                    _ vector: U) -> [Double]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) + c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b[i]) + c[i]`.
-    @inlinable
-    public static func add<S, T, U, V>(multiplication: (a: S, b: T),
-                                       _ vector: U,
-                                       result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vmaD(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      c.baseAddress!, 1,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[i] = (a[i] * b[i]) - c[i]             vDSP_vmsb
-    
-    /// Returns the elementwise difference of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b[i]) - c[i]`.
-    @inlinable
-    public static func subtract<S, T, U>(multiplication: (a: T, b: U),
-                                         _ vector: S) -> [Float]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplication,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b[i]) - c[i]`.
-    @inlinable
-    public static func subtract<S, T, U, V>(multiplication: (a: T, b: U),
-                                            _ vector: S,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vmsb(a.baseAddress!, 1,
-                                      b.baseAddress!, 1,
-                                      c.baseAddress!, 1,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise difference of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Returns: the `d` in `d[i] = (a[i] * b[i]) - c[i]`.
-    @inlinable
-    public static func subtract<S, T, U>(multiplication: (a: T, b: U),
-                                         _ vector: S) -> [Double]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplication,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vector`
-    /// and the product of the two vectors in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter vector: the `c` in `d[i] = (a[i] * b[i]) - c[i]`.
-    /// - Parameter result: the `d` in `d[i] = (a[i] * b[i]) - c[i]`.
-    @inlinable
-    public static func subtract<S, T, U, V>(multiplication: (a: T, b: U),
-                                            _ vector: S,
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n &&
-                multiplication.b.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    multiplication.b.withUnsafeBufferPointer { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vmsbD(a.baseAddress!, 1,
-                                       b.baseAddress!, 1,
-                                       c.baseAddress!, 1,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] * b) + (c[i] * d)          vDSP_vsmsma
-    
-    /// Returns the elementwise sum of two elementwise
-    /// vector-scalar products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    @inlinable
-    public static func add<T, U>(multiplication multiplicationAB: (a: T, b: Float),
-                                 multiplication multiplicationCD: (c: U, d: Float)) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplicationAB,
-                    multiplication: multiplicationCD,
-                    result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of two elementwise
-    /// vector-scalar products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    @inlinable
-    public static func add<T, U, V>(multiplication multiplicationAB: (a: T, b: Float),
-                                    multiplication multiplicationCD: (c: U, d: Float),
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationCD.c.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationCD.c.withUnsafeBufferPointer { c in
-                        withUnsafePointer(to: multiplicationAB.b) { b in
-                            withUnsafePointer(to: multiplicationCD.d) { d in
-                                vDSP_vsmsma(a.baseAddress!, 1,
-                                            b,
-                                            c.baseAddress!, 1,
-                                            d,
-                                            r.baseAddress!, 1,
-                                            vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of two elementwise
-    /// vector-scalar products, double-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    @inlinable
-    public static func add<T, U>(multiplication multiplicationAB: (a: T, b: Double),
-                                 multiplication multiplicationCD: (c: U, d: Double)) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplicationAB,
-                    multiplication: multiplicationCD,
-                    result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of two elementwise
-    /// vector-scalar products, double-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b) + (c[i] * d)`.
-    @inlinable
-    public static func add<T, U, V>(multiplication multiplicationAB: (a: T, b: Double),
-                                    multiplication multiplicationCD: (c: U, d: Double),
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationCD.c.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationCD.c.withUnsafeBufferPointer { c in
-                        withUnsafePointer(to: multiplicationAB.b) { b in
-                            withUnsafePointer(to: multiplicationCD.d) { d in
-                                vDSP_vsmsmaD(a.baseAddress!, 1,
-                                             b,
-                                             c.baseAddress!, 1,
-                                             d,
-                                             r.baseAddress!, 1,
-                                             vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] * b[i]) + (c[i] * d[i])          vDSP_vmma
-    
-    /// Returns the elementwise sum of two elementwise
-    /// vector-vector products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    @inlinable
-    public static func add<R, S, T, U>(multiplication multiplicationAB: (a: R, b: S),
-                                       multiplication multiplicationCD: (c: T, d: U)) -> [Float]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplicationAB,
-                    multiplication: multiplicationCD,
-                    result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of two elementwise
-    /// vector-vector products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    @inlinable
-    public static func add<R, S, T, U, V>(multiplication multiplicationAB: (a: R, b: S),
-                                          multiplication multiplicationCD: (c: T, d: U),
-                                          result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationAB.b.count == n &&
-                multiplicationCD.c.count == n &&
-                multiplicationCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationAB.b.withUnsafeBufferPointer { b in
-                        multiplicationCD.c.withUnsafeBufferPointer { c in
-                            multiplicationCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vmma(a.baseAddress!, 1,
-                                          b.baseAddress!, 1,
-                                          c.baseAddress!, 1,
-                                          d.baseAddress!, 1,
-                                          r.baseAddress!, 1,
-                                          vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of two elementwise
-    /// vector-vector products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    @inlinable
-    public static func add<R, S, T, U>(multiplication multiplicationAB: (a: R, b: S),
-                                       multiplication multiplicationCD: (c: T, d: U)) -> [Double]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplicationAB,
-                    multiplication: multiplicationCD,
-                    result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of two elementwise
-    /// vector-vector products, double-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b[i]) + (c[i] * d[i])`.
-    @inlinable
-    public static func add<R, S, T, U, V>(multiplication multiplicationAB: (a: R, b: S),
-                                          multiplication multiplicationCD: (c: T, d: U),
-                                          result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationAB.b.count == n &&
-                multiplicationCD.c.count == n &&
-                multiplicationCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationAB.b.withUnsafeBufferPointer { b in
-                        multiplicationCD.c.withUnsafeBufferPointer { c in
-                            multiplicationCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vmmaD(a.baseAddress!, 1,
-                                           b.baseAddress!, 1,
-                                           c.baseAddress!, 1,
-                                           d.baseAddress!, 1,
-                                           r.baseAddress!, 1,
-                                           vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] + b[i]) * (c[i] + d[i])    vDSP_vaam
-    
-    /// Returns the elementwise product of two elementwise
-    /// vector-vector sums, single-precision.
-    ///
-    /// - Parameter additionAB: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter additionCD: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    @inlinable
-    public static func multiply<S, T, U>(addition additionAB: (a: S, b: T),
-                                         addition additionCD: (c: U, d: U)) -> [Float]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: additionAB.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: additionAB,
-                         addition: additionCD,
-                         result: &buffer)
-                
-                initializedCount = additionAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of two elementwise
-    /// vector-vector sums, single-precision.
-    ///
-    /// - Parameter additionAB: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter additionCD: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    @inlinable
-    public static func multiply<S, T, U, V>(addition additionAB: (a: S, b: T),
-                                            addition additionCD: (c: U, d: U),
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(additionAB.a.count == n &&
-                additionAB.b.count == n &&
-                additionCD.c.count == n &&
-                additionCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                additionAB.a.withUnsafeBufferPointer { a in
-                    additionAB.b.withUnsafeBufferPointer { b in
-                        additionCD.c.withUnsafeBufferPointer { c in
-                            additionCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vaam(a.baseAddress!, 1,
-                                          b.baseAddress!, 1,
-                                          c.baseAddress!, 1,
-                                          d.baseAddress!, 1,
-                                          r.baseAddress!, 1,
-                                          vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of two elementwise
-    /// vector-vector sums, double-precision.
-    ///
-    /// - Parameter additionAB: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter additionCD: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    @inlinable
-    public static func multiply<S, T, U>(addition additionAB: (a: S, b: T),
-                                         addition additionCD: (c: U, d: U)) -> [Double]
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: additionAB.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: additionAB,
-                         addition: additionCD,
-                         result: &buffer)
-                
-                initializedCount = additionAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of two elementwise
-    /// vector-vector sums, double-precision.
-    ///
-    /// - Parameter additionAB: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter additionCD: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] + b[i]) * (c[i] + d[i])`.
-    @inlinable
-    public static func multiply<S, T, U, V>(addition additionAB: (a: S, b: T),
-                                            addition additionCD: (c: U, d: U),
-                                            result: inout V)
-        where
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(additionAB.a.count == n &&
-                additionAB.b.count == n &&
-                additionCD.c.count == n &&
-                additionCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                additionAB.a.withUnsafeBufferPointer { a in
-                    additionAB.b.withUnsafeBufferPointer { b in
-                        additionCD.c.withUnsafeBufferPointer { c in
-                            additionCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vaamD(a.baseAddress!, 1,
-                                           b.baseAddress!, 1,
-                                           c.baseAddress!, 1,
-                                           d.baseAddress!, 1,
-                                           r.baseAddress!, 1,
-                                           vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] * b[i]) - (c[i] * d[i])    vDSP_vmmsb
-    
-    /// Returns the elementwise difference of two elementwise
-    /// vector-vector products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    @inlinable
-    public static func subtract<R, S, T, U>(multiplication multiplicationAB: (a: T, b: U),
-                                            multiplication multiplicationCD: (c: R, d: S)) -> [Float]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplicationAB,
-                         multiplication: multiplicationCD,
-                         result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of two elementwise
-    /// vector-vector products, single-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    @inlinable
-    public static func subtract<R, S, T, U, V>(multiplication multiplicationAB: (a: T, b: U),
-                                               multiplication multiplicationCD: (c: R, d: S),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationAB.b.count == n &&
-                multiplicationCD.c.count == n &&
-                multiplicationCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationAB.b.withUnsafeBufferPointer { b in
-                        multiplicationCD.c.withUnsafeBufferPointer { c in
-                            multiplicationCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vmmsb(a.baseAddress!, 1,
-                                           b.baseAddress!, 1,
-                                           c.baseAddress!, 1,
-                                           d.baseAddress!, 1,
-                                           r.baseAddress!, 1,
-                                           vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise difference of two elementwise
-    /// vector-vector products, double-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    @inlinable
-    public static func subtract<R, S, T, U>(multiplication multiplicationAB: (a: T, b: U),
-                                            multiplication multiplicationCD: (c: R, d: S)) -> [Double]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: multiplicationAB.a.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplicationAB,
-                         multiplication: multiplicationCD,
-                         result: &buffer)
-                
-                initializedCount = multiplicationAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of two elementwise
-    /// vector-vector products, double-precision.
-    ///
-    /// - Parameter multiplicationAB: the `a` and `b` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter multiplicationCD: the `c` and `d` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] * b[i]) - (c[i] * d[i])`.
-    @inlinable
-    public static func subtract<R, S, T, U, V>(multiplication multiplicationAB: (a: T, b: U),
-                                               multiplication multiplicationCD: (c: R, d: S),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplicationAB.a.count == n &&
-                multiplicationAB.b.count == n &&
-                multiplicationCD.c.count == n &&
-                multiplicationCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplicationAB.a.withUnsafeBufferPointer { a in
-                    multiplicationAB.b.withUnsafeBufferPointer { b in
-                        multiplicationCD.c.withUnsafeBufferPointer { c in
-                            multiplicationCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vmmsbD(a.baseAddress!, 1,
-                                            b.baseAddress!, 1,
-                                            c.baseAddress!, 1,
-                                            d.baseAddress!, 1,
-                                            r.baseAddress!, 1,
-                                            vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] - b[i]) * (c[i] - d[i])    vDSP_vsbsbm
-    
-    /// Returns the elementwise product of two elementwise
-    /// vector-vector differences, single-precision.
-    ///
-    /// - Parameter subtractionAB: the `a` and `b` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtractionCD: the `c` and `d` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U>(subtraction subtractionAB: (a: R, b: S),
-                                            subtraction subtractionCD: (c: T, d: U)) -> [Float]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: subtractionAB.a.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtractionAB,
-                         subtraction: subtractionCD,
-                         result: &buffer)
-                
-                initializedCount = subtractionAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of two elementwise
-    /// vector-vector differences, single-precision.
-    ///
-    /// - Parameter subtractionAB: the `a` and `b` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtractionCD: the `c` and `d` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U, V>(subtraction subtractionAB: (a: R, b: S),
-                                               subtraction subtractionCD: (c: T, d: U),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(subtractionAB.a.count == n &&
-                subtractionAB.b.count == n &&
-                subtractionCD.c.count == n &&
-                subtractionCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtractionAB.a.withUnsafeBufferPointer { a in
-                    subtractionAB.b.withUnsafeBufferPointer { b in
-                        subtractionCD.c.withUnsafeBufferPointer { c in
-                            subtractionCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vsbsbm(a.baseAddress!, 1,
-                                            b.baseAddress!, 1,
-                                            c.baseAddress!, 1,
-                                            d.baseAddress!, 1,
-                                            r.baseAddress!, 1,
-                                            vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of two elementwise
-    /// vector-vector differences, double-precision.
-    ///
-    /// - Parameter subtractionAB: the `a` and `b` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtractionCD: the `c` and `d` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U>(subtraction subtractionAB: (a: R, b: S),
-                                            subtraction subtractionCD: (c: T, d: U)) -> [Double]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: subtractionAB.a.count) {
-                buffer, initializedCount in
-                
-                multiply(subtraction: subtractionAB,
-                         subtraction: subtractionCD,
-                         result: &buffer)
-                
-                initializedCount = subtractionAB.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of two elementwise
-    /// vector-vector differences, double-precision.
-    ///
-    /// - Parameter subtractionAB: the `a` and `b` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtractionCD: the `c` and `d` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] - b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U, V>(subtraction subtractionAB: (a: R, b: S),
-                                               subtraction subtractionCD: (c: T, d: U),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(subtractionAB.a.count == n &&
-                subtractionAB.b.count == n &&
-                subtractionCD.c.count == n &&
-                subtractionCD.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                subtractionAB.a.withUnsafeBufferPointer { a in
-                    subtractionAB.b.withUnsafeBufferPointer { b in
-                        subtractionCD.c.withUnsafeBufferPointer { c in
-                            subtractionCD.d.withUnsafeBufferPointer { d in
-                                vDSP_vsbsbmD(a.baseAddress!, 1,
-                                             b.baseAddress!, 1,
-                                             c.baseAddress!, 1,
-                                             d.baseAddress!, 1,
-                                             r.baseAddress!, 1,
-                                             vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: e[i] = (a[i] + b[i]) * (c[i] - d[i])    vDSP_vasbm
-    
-    /// Returns the elementwise product of an elementwise
-    /// vector-vector sum and an elementwise vector-vector sum, single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtraction: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U>(addition: (a: R, b: S),
-                                            subtraction: (c: T, d: U)) -> [Float]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: addition.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         subtraction: subtraction,
-                         result: &buffer)
-                
-                initializedCount = addition.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of an elementwise
-    /// vector-vector sum and an elementwise vector-vector sum, single-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtraction: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U, V>(addition: (a: R, b: S),
-                                               subtraction: (c: T, d: U),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Float,
-        S.Element == Float, T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n &&
-                subtraction.c.count == n &&
-                subtraction.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        subtraction.c.withUnsafeBufferPointer { c in
-                            subtraction.d.withUnsafeBufferPointer { d in
-                                vDSP_vasbm(a.baseAddress!, 1,
-                                           b.baseAddress!, 1,
-                                           c.baseAddress!, 1,
-                                           d.baseAddress!, 1,
-                                           r.baseAddress!, 1,
-                                           vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise product of an elementwise
-    /// vector-vector sum and an elementwise vector-vector sum, double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtraction: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Returns: the `e` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U>(addition: (a: R, b: S),
-                                            subtraction: (c: T, d: U)) -> [Double]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: addition.a.count) {
-                buffer, initializedCount in
-                
-                multiply(addition: addition,
-                         subtraction: subtraction,
-                         result: &buffer)
-                
-                initializedCount = addition.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise product of an elementwise
-    /// vector-vector sum and an elementwise vector-vector sum, double-precision.
-    ///
-    /// - Parameter addition: the `a` and `b` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter subtraction: the `c` and `d` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    /// - Parameter result: the `e` in `e[i] = (a[i] + b[i]) * (c[i] - d[i])`.
-    @inlinable
-    public static func multiply<R, S, T, U, V>(addition: (a: R, b: S),
-                                               subtraction: (c: T, d: U),
-                                               result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Double,
-        S.Element == Double, T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(addition.a.count == n &&
-                addition.b.count == n &&
-                subtraction.c.count == n &&
-                subtraction.d.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                addition.a.withUnsafeBufferPointer { a in
-                    addition.b.withUnsafeBufferPointer { b in
-                        subtraction.c.withUnsafeBufferPointer { c in
-                            subtraction.d.withUnsafeBufferPointer { d in
-                                vDSP_vasbmD(a.baseAddress!, 1,
-                                            b.baseAddress!, 1,
-                                            c.baseAddress!, 1,
-                                            d.baseAddress!, 1,
-                                            r.baseAddress!, 1,
-                                            vDSP_Length(n))
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: d[n] = a[n]*b + c              vDSP_vsmsa
-    
-    /// Returns the elementwise sum of an elementwise
-    /// vector-scalar product and aa scalar value, single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[n] = a[n]*b + c`.
-    /// - Parameter scalar: the `c` in `d[n] = a[n]*b + c`.
-    /// - Returns: the `e` in `d[n] = a[n]*b + c`.
-    @inlinable
-    public static func add<U>(multiplication: (a: U, b: Float),
-                              _ scalar: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: multiplication.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    scalar,
-                    result: &buffer)
-                
-                initializedCount =  multiplication.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of an elementwise
-    /// vector-scalar product and aa scalar value, single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[n] = a[n]*b + c`.
-    /// - Parameter scalar: the `c` in `d[n] = a[n]*b + c`.
-    /// - Parameter result: the `e` in `d[n] = a[n]*b + c`.
-    @inlinable
-    public static func add<U, V>(multiplication: (a: U, b: Float),
-                                 _ scalar: Float,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    withUnsafePointer(to: multiplication.b) { b in
-                        withUnsafePointer(to: scalar) { c in
-                            vDSP_vsmsa(a.baseAddress!, 1,
-                                       b,
-                                       c,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise sum of an elementwise
-    /// vector-scalar product and aa scalar value, double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[n] = a[n]*b + c`.
-    /// - Parameter scalar: the `c` in `d[n] = a[n]*b + c`.
-    /// - Returns: the `e` in `d[n] = a[n]*b + c`.
-    @inlinable
-    public static func add<U>(multiplication: (a: U, b: Double),
-                              _ scalar: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: multiplication.a.count) {
-                buffer, initializedCount in
-                
-                add(multiplication: multiplication,
-                    scalar,
-                    result: &buffer)
-                
-                initializedCount =  multiplication.a.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise sum of an elementwise
-    /// vector-scalar product and aa scalar value, double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `d[n] = a[n]*b + c`.
-    /// - Parameter scalar: the `c`in `d[n] = a[n]*b + c`.
-    /// - Parameter result: the `e` in `d[n] = a[n]*b + c`.
-    @inlinable
-    public static func add<U, V>(multiplication: (a: U, b: Double),
-                                 _ scalar: Double,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    withUnsafePointer(to: multiplication.b) { b in
-                        withUnsafePointer(to: scalar) { c in
-                            vDSP_vsmsaD(a.baseAddress!, 1,
-                                        b,
-                                        c,
-                                        r.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: D[n] = A[n]*B - C[n];       vDSP_vsmsb
-    
-    /// Returns the elementwise difference of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter vector: the `c` in `D[n] = A[n]*B - C[n]`.
-    /// - Returns: the `d` in `D[n] = A[n]*B - C[n]`.
-    @inlinable
-    public static func subtract<T, U>(multiplication: (a: U, b: Float),
-                                      _ vector: T) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplication,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// single-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter vector: the `c` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter result: the `d` in `D[n] = A[n]*B - C[n]`.
-    @inlinable
-    public static func subtract<T, U, V>(multiplication: (a: U, b: Float),
-                                         _ vector: T,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            precondition(vector.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    withUnsafePointer(to: multiplication.b) { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vsmsb(a.baseAddress!, 1,
-                                       b,
-                                       c.baseAddress!, 1,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elementwise difference of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter multiplication: the `a` and `b` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter vector: the `c` in `D[n] = A[n]*B - C[n]`.
-    /// - Returns: the `d` in `D[n] = A[n]*B - C[n]`.
-    @inlinable
-    public static func subtract<T, U>(multiplication: (a: U, b: Double),
-                                      _ vector: T) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                subtract(multiplication: multiplication,
-                         vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elementwise difference of `vector`
-    /// and the product of the vector and scalar in `multiplication`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: the `c` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter multiplication: the `a` and `b` in `D[n] = A[n]*B - C[n]`.
-    /// - Parameter result: the `d` in `D[n] = A[n]*B - C[n]`.
-    @inlinable
-    public static func subtract<T, U, V>(multiplication: (a: U, b: Double),
-                                         _ vector: T,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(multiplication.a.count == n)
-            precondition(vector.count == n)
-            
-            result.withUnsafeMutableBufferPointer { r in
-                multiplication.a.withUnsafeBufferPointer { a in
-                    withUnsafePointer(to: multiplication.b) { b in
-                        vector.withUnsafeBufferPointer { c in
-                            vDSP_vsmsbD(a.baseAddress!, 1,
-                                        b,
-                                        c.baseAddress!, 1,
-                                        r.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-}
-
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Biquad.swift b/stdlib/public/Darwin/Accelerate/vDSP_Biquad.swift
deleted file mode 100644
index 9e666da33faa1..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Biquad.swift
+++ /dev/null
@@ -1,414 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  Biquad Structure
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    public struct Biquad <T: vDSP_FloatingPointBiquadFilterable> {
-        
-        private var biquadRef: BiquadRef<T>
-        
-        /// Initializes a new single or multichannel cascaded biquad IIR structure.
-        ///
-        /// - Parameter coefficients: Array of double-precision real coefficients. Its length should be 5 times the number of sections in the biquad filter.
-        /// - Parameter sectionCount: The number of sections in the biquad filter. The same number of sections is used for each channel, so only one value is specified.
-        /// - Parameter channelCount: The number of input/output channels.
-        /// - Parameter ofType: Specifies single- or double-precision.
-        public init?(coefficients: [Double],
-                     channelCount: vDSP_Length,
-                     sectionCount: vDSP_Length,
-                     ofType: T.Type) {
-            
-            if coefficients.count != 5 * channelCount * sectionCount {
-                return nil
-            }
-            
-            guard let ref = BiquadRef(coefficients: coefficients,
-                                      channelCount: channelCount,
-                                      sectionCount: sectionCount,
-                                      ofType: ofType) else {
-                                        return nil
-            }
-            
-            biquadRef = ref
-        }
-        
-        /// Applies a single- or double-precision single or multichannel biquad IIR filter, returning the filtered signal.
-        public mutating func apply<U>(input: U) -> [T]
-            where
-            U: AccelerateBuffer,
-            U.Element == T {
-                
-                let result = Array<T>(unsafeUninitializedCapacity: input.count) {
-                    buffer, initializedCount in
-                    
-                    apply(input: input,
-                          output: &buffer)
-                    
-                    initializedCount = input.count
-                }
-                
-                return result
-        }
-        
-        /// Applies a single- or double-precision single or multichannel biquad IIR filter, overwriting the supplied output.
-        public mutating func apply<U, V>(input: U, output: inout V)
-            where
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element == T, V.Element == T {
-                
-                // `apply(input:output:)` mutates `delays` and `setup`.
-                if !isKnownUniquelyReferenced(&biquadRef) {
-                    biquadRef = BiquadRef(coefficients: biquadRef.coefficients,
-                                          channelCount: biquadRef.channelCount,
-                                          sectionCount: biquadRef.sectionCount,
-                                          ofType: T.self)!
-                }
-                
-                biquadRef.apply(input: input,
-                                output: &output)
-        }
-        
-    }
-    
-    private class BiquadRef<T: vDSP_FloatingPointBiquadFilterable> {
-        
-        let coefficients: [Double]
-        let channelCount: vDSP_Length
-        let sectionCount: vDSP_Length
-        var delays: [T]
-        
-        private let biquadSetup: OpaquePointer
-        
-        /// Initializes a new single or multichannel cascaded biquad IIR instance.
-        ///
-        /// - Parameter coefficients: Array of double-precision real coefficients. Its length should be 5 times the number of sections in the biquad filter.
-        /// - Parameter sectionCount: The number of sections in the biquad filter. The same number of sections is used for each channel, so only one value is specified.
-        /// - Parameter channelCount: The number of input/output channels.
-        /// - Parameter ofType: Specifies single- or double-precision.
-        ///
-        /// For multiple channel signals, this class supports data in non-interleaved format. For example, when applying
-        /// a filter to a signal represented by an array of 100 elements, elements 0...49 contain the data for channel 0,
-        /// and elements 50...99 contain the data for channel 1.
-        
-        init?(coefficients: [Double],
-              channelCount: vDSP_Length,
-              sectionCount: vDSP_Length,
-              ofType: T.Type) {
-            
-            self.coefficients = coefficients
-            self.channelCount = channelCount
-            self.sectionCount = sectionCount
-            
-            delays = [T](repeating: 0.0,
-                         count: Int(2 * sectionCount) + 2)
-            
-            guard let setup = T.BiquadFunctions.makeBiquadSetup(channelCount: channelCount,
-                                                                coefficients: coefficients,
-                                                                sectionCount: sectionCount) else {
-                                                                    return nil
-            }
-            
-            biquadSetup = setup
-        }
-        
-        /// Applies a single- or double-precision single or multichannel biquad IIR filter, overwriting the supplied output.
-        func apply<U, V>(input: U, output: inout V)
-            where
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element == T, V.Element == T {
-                
-                let n = vDSP_Length(min(input.count, output.count))
-                
-                if channelCount == 1 {
-                    BiquadFunctions.applyBiquadSingle(source: input,
-                                                      destination: &output,
-                                                      delays: &delays,
-                                                      setup: biquadSetup,
-                                                      sectionCount: sectionCount,
-                                                      count: n)
-                } else  {
-                    BiquadFunctions.applyBiquadMulti(source: input,
-                                                     destination: &output,
-                                                     setup: biquadSetup,
-                                                     channelCount: channelCount,
-                                                     count: n)
-                }
-        }
-        
-        deinit {
-            BiquadFunctions.destroySetup(ofType: T.self,
-                                         channelCount: channelCount,
-                                         biquadSetup: biquadSetup)
-        }
-    }
-    
-    struct BiquadFunctions {
-        
-        @inlinable
-        static func applyBiquadSingle<U, V, Scalar>(source: U,
-                                                    destination: inout V,
-                                                    delays: inout [Scalar],
-                                                    setup: OpaquePointer,
-                                                    sectionCount: UInt,
-                                                    count: UInt)
-            where
-            Scalar: vDSP_FloatingPointBiquadFilterable,
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element == Scalar,
-            V.Element == Scalar {
-                
-                Scalar.BiquadFunctions.applySingle(source: source,
-                                                   destination: &destination,
-                                                   delays: &delays,
-                                                   setup: setup,
-                                                   sectionCount: sectionCount,
-                                                   count: count)
-        }
-        
-        @inlinable
-        static func applyBiquadMulti<U, V>(source: U,
-                                           destination: inout V,
-                                           setup: OpaquePointer,
-                                           channelCount: UInt,
-                                           count: UInt)
-            where
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element: vDSP_FloatingPointBiquadFilterable,
-            V.Element: vDSP_FloatingPointBiquadFilterable {
-                
-                source.withUnsafeBufferPointer { biquadInput in
-                    let inputPointer = biquadInput.baseAddress!
-                    destination.withUnsafeMutableBufferPointer { page in
-                        let outputPointer = page.baseAddress!
-                        
-                        let length = count / channelCount
-                        
-                        var inputs: [UnsafePointer<U.Element>] = (0 ..< channelCount).map { i in
-                            return inputPointer.advanced(by: Int(i * length))
-                        }
-                        
-                        var outputs: [UnsafeMutablePointer<U.Element>] = (0 ..< channelCount).map { i in
-                            return (outputPointer as! UnsafeMutablePointer<U.Element>).advanced(by: Int(i * length))
-                        }
-                        
-                        U.Element.BiquadFunctions.applyMulti(setup: setup,
-                                                             pInputs: &inputs,
-                                                             pOutputs: &outputs,
-                                                             count: count / channelCount)
-                    }
-                }
-        }
-        
-        static func destroySetup<T: vDSP_FloatingPointBiquadFilterable>(ofType: T.Type,
-                                                                        channelCount: UInt,
-                                                                        biquadSetup: OpaquePointer) {
-            T.BiquadFunctions.destroySetup(channelCount: channelCount,
-                                           biquadSetup: biquadSetup)
-        }
-    }
-    
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FloatingPointBiquadFilterable: BinaryFloatingPoint {
-    associatedtype BiquadFunctions: vDSP_BiquadFunctions where BiquadFunctions.Scalar == Self
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Float: vDSP_FloatingPointBiquadFilterable {
-    public typealias BiquadFunctions = vDSP.VectorizableFloat
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Double: vDSP_FloatingPointBiquadFilterable {
-    public typealias BiquadFunctions = vDSP.VectorizableDouble
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_BiquadFunctions {
-    associatedtype Scalar
-    
-    /// Returns a data structure that contains precalculated data for use by the cascaded biquad IIR filter function.
-    static func makeBiquadSetup(channelCount: vDSP_Length,
-                                coefficients: [Double],
-                                sectionCount: vDSP_Length) -> OpaquePointer?
-    
-    /// Applies a single-channel biquad IIR filter.
-    static func applySingle<U, V>(source: U,
-                                  destination: inout V,
-                                  delays: UnsafeMutablePointer<Scalar>,
-                                  setup: vDSP_biquad_Setup,
-                                  sectionCount: vDSP_Length,
-                                  count: vDSP_Length)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Scalar, V.Element == Scalar
-    
-    /// Applies a multichannel biquad IIR filter.
-    static func applyMulti(setup: vDSP_biquadm_SetupD,
-                           pInputs: UnsafeMutablePointer<UnsafePointer<Scalar>>,
-                           pOutputs: UnsafeMutablePointer<UnsafeMutablePointer<Scalar>>,
-                           count: vDSP_Length)
-    
-    /// Destroys a setup object.
-    static func destroySetup(channelCount: UInt,
-                             biquadSetup: OpaquePointer)
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Type-specific Biquad function implementations
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP.VectorizableFloat: vDSP_BiquadFunctions {
-    
-    /// Returns a data structure that contains precalculated data for use by the cascaded biquad IIR filter function.
-    @inlinable
-    public static func makeBiquadSetup(channelCount: UInt,
-                                       coefficients: [Double],
-                                       sectionCount: UInt) -> OpaquePointer? {
-        if channelCount == 1 {
-            return vDSP_biquad_CreateSetup(coefficients,
-                                           sectionCount)
-        } else {
-            return vDSP_biquadm_CreateSetup(coefficients,
-                                            sectionCount,
-                                            channelCount)
-        }
-    }
-    
-    /// Applies a single-channel biquad IIR filter.
-    @inlinable
-    public static func applySingle<U, V>(source: U,
-                                         destination: inout V,
-                                         delays: UnsafeMutablePointer<Scalar>,
-                                         setup: vDSP_biquad_Setup,
-                                         sectionCount: vDSP_Length,
-                                         count: vDSP_Length)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_biquad(setup,
-                                delays,
-                                src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                count)
-                }
-            }
-    }
-    
-    /// Applies a multichannel biquad IIR filter.
-    @inlinable
-    public static func applyMulti(setup: vDSP_biquadm_SetupD,
-                                  pInputs: UnsafeMutablePointer<UnsafePointer<Scalar>>,
-                                  pOutputs: UnsafeMutablePointer<UnsafeMutablePointer<Scalar>>,
-                                  count: vDSP_Length) {
-        vDSP_biquadm(setup,
-                     pInputs, 1,
-                     pOutputs, 1,
-                     count)
-    }
-    
-    /// Destroys a setup object.
-    @inlinable
-    public static func destroySetup(channelCount: UInt,
-                                    biquadSetup: OpaquePointer) {
-        if channelCount == 1 {
-            vDSP_biquad_DestroySetup(biquadSetup)
-        } else {
-            vDSP_biquadm_DestroySetup(biquadSetup)
-        }
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP.VectorizableDouble: vDSP_BiquadFunctions {
-    
-    /// Returns a data structure that contains precalculated data for use by the cascaded biquad IIR filter function.
-    @inlinable
-    public static func makeBiquadSetup(channelCount: vDSP_Length,
-                                       coefficients: [Double],
-                                       sectionCount: vDSP_Length) -> OpaquePointer? {
-        if channelCount == 1 {
-            return vDSP_biquad_CreateSetupD(coefficients,
-                                            sectionCount)
-        } else {
-            return vDSP_biquadm_CreateSetupD(coefficients,
-                                             sectionCount,
-                                             channelCount)
-        }
-    }
-    
-    /// Applies a single-channel biquad IIR filter.
-    @inlinable
-    public static func applySingle<U, V>(source: U,
-                                         destination: inout V,
-                                         delays: UnsafeMutablePointer<Scalar>,
-                                         setup: vDSP_biquad_Setup,
-                                         sectionCount: vDSP_Length,
-                                         count: vDSP_Length)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_biquadD(setup,
-                                 delays,
-                                 src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 count)
-                }
-            }
-    }
-    
-    /// Applies a multichannel biquad IIR filter.
-    @inlinable
-    public static func applyMulti(setup: vDSP_biquadm_SetupD,
-                                  pInputs: UnsafeMutablePointer<UnsafePointer<Scalar>>,
-                                  pOutputs: UnsafeMutablePointer<UnsafeMutablePointer<Scalar>>,
-                                  count: vDSP_Length) {
-        vDSP_biquadmD(setup,
-                      pInputs, 1,
-                      pOutputs, 1,
-                      count)
-    }
-    
-    /// Destroys a setup object.
-    @inlinable
-    public static func destroySetup(channelCount: UInt,
-                                    biquadSetup: OpaquePointer) {
-        if channelCount == 1 {
-            vDSP_biquad_DestroySetupD(biquadSetup)
-        } else {
-            vDSP_biquadm_DestroySetupD(biquadSetup)
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_ClippingLimitThreshold.swift b/stdlib/public/Darwin/Accelerate/vDSP_ClippingLimitThreshold.swift
deleted file mode 100644
index 693a155bc9d6b..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_ClippingLimitThreshold.swift
+++ /dev/null
@@ -1,600 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Clip
-    
-    /// Returns the elements of `vector` clipped to the specified range. Single-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func clip<U>(_ vector: U,
-                               to bounds: ClosedRange<Float>) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                clip(vector,
-                     to: bounds,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elements of `vector` clipped to the specified range. Single-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Parameter result: The clipped result.
-    @inlinable
-    public static func clip<U, V>(_ vector: U,
-                                  to bounds: ClosedRange<Float>,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: bounds.lowerBound) { lowerBound in
-                withUnsafePointer(to: bounds.upperBound) { upperBound in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_vclip(v.baseAddress!, 1,
-                                       lowerBound,
-                                       upperBound,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elements of `vector` clipped to the specified range. Double-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func clip<U>(_ vector: U,
-                               to bounds: ClosedRange<Double>) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                clip(vector,
-                     to: bounds,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elements of `vector` clipped to the specified range. Double-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Parameter result: The clipped result.
-    @inlinable
-    public static func clip<U, V>(_ vector: U,
-                                  to bounds: ClosedRange<Double>,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: bounds.lowerBound) { lowerBound in
-                withUnsafePointer(to: bounds.upperBound) { upperBound in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_vclipD(v.baseAddress!, 1,
-                                        lowerBound,
-                                        upperBound,
-                                        r.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: Inverted Clip
-    
-    /// Returns the elements of `vector` inverted-clipped to the specified range. Single-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    ///
-    /// This function performs the following operation where `A` is `vector`, `B` is `bounds.lowerBound`,
-    /// `C` is `bounds.upperBound`, and `D` is the inverted clip result:
-    /// ```
-    /// for (int n = 0; n < N; ++n) {
-    ///     if (A[n] <= *B || A[n] >= *C)
-    ///         D[n] = A[n];
-    ///     else if (A[n] < 0)
-    ///         D[n] = *B;
-    ///     else
-    ///         D[n] = *C;
-    /// }
-    /// ```
-    @inlinable
-    public static func invertedClip<U>(_ vector: U,
-                                       to bounds: ClosedRange<Float>) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                invertedClip(vector,
-                             to: bounds,
-                             result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elements of `vector` inverted-clipped to the specified range. Single-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Parameter result: The clipped result.
-    ///
-    /// This function performs the following operation where `A` is `vector`, `B` is `bounds.lowerBound`,
-    /// `C` is `bounds.upperBound`, and `D` is the inverted clip result:
-    /// ```
-    /// for (int n = 0; n < N; ++n) {
-    ///     if (A[n] <= *B || A[n] >= *C)
-    ///         D[n] = A[n];
-    ///     else if (A[n] < 0)
-    ///         D[n] = *B;
-    ///     else
-    ///         D[n] = *C;
-    /// }
-    /// ```
-    @inlinable
-    public static func invertedClip<U, V>(_ vector: U,
-                                          to bounds: ClosedRange<Float>,
-                                          result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: bounds.lowerBound) { lowerBound in
-                withUnsafePointer(to: bounds.upperBound) { upperBound in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_viclip(v.baseAddress!, 1,
-                                        lowerBound,
-                                        upperBound,
-                                        r.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elements of `vector` inverted-clipped to the specified range. Double-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    ///
-    /// This function performs the following operation where `A` is `vector`, `B` is `bounds.lowerBound`,
-    /// `C` is `bounds.upperBound`, and `D` is the inverted clip result:
-    /// ```
-    /// for (int n = 0; n < N; ++n) {
-    ///     if (A[n] <= *B || A[n] >= *C)
-    ///         D[n] = A[n];
-    ///     else if (A[n] < 0)
-    ///         D[n] = *B;
-    ///     else
-    ///         D[n] = *C;
-    /// }
-    /// ```
-    @inlinable
-    public static func invertedClip<U>(_ vector: U,
-                                       to bounds: ClosedRange<Double>) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                invertedClip(vector,
-                             to: bounds,
-                             result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the elements of `vector` inverted-clipped to the specified range. Double-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Parameter result: The clipped result.
-    ///
-    /// This function performs the following operation where `A` is `vector`, `B` is `bounds.lowerBound`,
-    /// `C` is `bounds.upperBound`, and `D` is the inverted clip result:
-    /// ```
-    /// for (int n = 0; n < N; ++n) {
-    ///     if (A[n] <= *B || A[n] >= *C)
-    ///         D[n] = A[n];
-    ///     else if (A[n] < 0)
-    ///         D[n] = *B;
-    ///     else
-    ///         D[n] = *C;
-    /// }
-    /// ```
-    @inlinable
-    public static func invertedClip<U, V>(_ vector: U,
-                                          to bounds: ClosedRange<Double>,
-                                          result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: bounds.lowerBound) { lowerBound in
-                withUnsafePointer(to: bounds.upperBound) { upperBound in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_viclipD(v.baseAddress!, 1,
-                                         lowerBound,
-                                         upperBound,
-                                         r.baseAddress!, 1,
-                                         vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: Vector threshold.
-  
-    public enum ThresholdRule<T: BinaryFloatingPoint> {
-        /// Returns threshold if input is less than threshold; otherwise input value.
-        case clampToThreshold
-        /// Returns zero if input is less than threshold; otherwise input value.
-        case zeroFill
-        /// Returns `-x` if input is less than threshold; otherwise `+x`.
-        case signedConstant(_ x: T)
-    }
-    
-    /// Returns the elements of `vector` after applying a specified thresholding rule. Single-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func threshold<U>(_ vector: U,
-                                    to lowerBound: Float,
-                                    with rule: ThresholdRule<Float>) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                threshold(vector,
-                          to: lowerBound,
-                          with: rule,
-                          result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with with the corresponding value in `vector` after applying a specified thresholding rule. Single-precision.
-    ///
-    /// This function supports the following rules:
-    ///
-    /// * `clampToThreshold` - Returns `lowerBound` if input is less than `lowerBound`; otherwise returns input value.
-    /// * `zeroFill` - Returns `0` if input is less than `lowerBound`; otherwise returns input value.
-    /// * `signedConstant(x)` - returns `-x` if input is less than `lowerBound`; otherwise `+x`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter lowerBound: Low clipping threshold.
-    /// - Parameter rule: The thresholding rule.
-    /// - Parameter result: The threshold result.
-    public static func threshold<U, V>(_ vector: U,
-                                       to lowerBound: Float,
-                                       with rule: ThresholdRule<Float>,
-                                       result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: lowerBound) { lowerBound in
-                result.withUnsafeMutableBufferPointer { dest in
-                    vector.withUnsafeBufferPointer { src in
-                        switch rule {
-                        case .clampToThreshold:
-                            vDSP_vthr(src.baseAddress!, 1,
-                                      lowerBound,
-                                      dest.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        case .zeroFill:
-                            vDSP_vthres(src.baseAddress!, 1,
-                                        lowerBound,
-                                        dest.baseAddress!, 1,
-                                        vDSP_Length(n))
-                        case .signedConstant(let x):
-                            vDSP_vthrsc(src.baseAddress!, 1,
-                                        lowerBound,
-                                        [x],
-                                        dest.baseAddress!, 1,
-                                        vDSP_Length(n))
-                            
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the elements of `vector` after applying a specified thresholding rule. Double-precision.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter bounds: Clipping threshold.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func threshold<U>(_ vector: U,
-                                    to lowerBound: Double,
-                                    with rule: ThresholdRule<Double>) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                threshold(vector,
-                          to: lowerBound,
-                          with: rule,
-                          result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with with the corresponding value in `vector` after applying a specified thresholding rule. Double-precision.
-    ///
-    /// This function supports the following rules:
-    ///
-    /// * `clampToThreshold` - Returns `lowerBound` if input is less than `lowerBound`; otherwise returns input value.
-    /// * `zeroFill` - Returns `0` if input is less than `lowerBound`; otherwise returns input value.
-    /// * `signedConstant(x)` - returns `-x` if input is less than `lowerBound`; otherwise `+x`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter lowerBound: Low clipping threshold.
-    /// - Parameter rule: The thresholding rule.
-    /// - Parameter result: The threshold result.
-    public static func threshold<U, V>(_ vector: U,
-                                       to lowerBound: Double,
-                                       with rule: ThresholdRule<Double>,
-                                       result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: lowerBound) { lowerBound in
-                result.withUnsafeMutableBufferPointer { dest in
-                    vector.withUnsafeBufferPointer { src in
-                        switch rule {
-                        case .clampToThreshold:
-                            vDSP_vthrD(src.baseAddress!, 1,
-                                       lowerBound,
-                                       dest.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        case .zeroFill:
-                            vDSP_vthresD(src.baseAddress!, 1,
-                                         lowerBound,
-                                         dest.baseAddress!, 1,
-                                         vDSP_Length(n))
-                        case .signedConstant(let x):
-                            vDSP_vthrscD(src.baseAddress!, 1,
-                                         lowerBound,
-                                         [x],
-                                         dest.baseAddress!, 1,
-                                         vDSP_Length(n))
-                            
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: Limit (vlim)
-    
-    /// Vector test limit; single-precision.
-    ///
-    /// Compares values from source vector to `limit`. For inputs greater than or equal to `limit`, `outputConstant` is written to `result`. For inputs less than `limit`, the negated value of `outputConstant` is written to `result`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter limit: Limit.
-    /// - Parameter x: Value written to result.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func limit<U>(_ vector: U,
-                                limit: Float,
-                                withOutputConstant outputConstant: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                vDSP.limit(vector,
-                           limit: limit,
-                           withOutputConstant: outputConstant,
-                           result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Vector test limit; single-precision.
-    ///
-    /// Compares values from source vector to `limit`. For inputs greater than or equal to `limit`, `outputConstant` is written to `result`. For inputs less than `limit`, the negated value of `outputConstant` is written to `result`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter limit: Limit.
-    /// - Parameter x: Value written to result.
-    /// - Parameter result: The clipped result.
-    @inlinable
-    public static func limit<U, V>(_ vector: U,
-                                   limit: Float,
-                                   withOutputConstant outputConstant: Float,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: limit) { limit in
-                withUnsafePointer(to: outputConstant) { x in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_vlim(v.baseAddress!, 1,
-                                      limit,
-                                      x,
-                                      r.baseAddress!, 1,
-                                      vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Vector test limit; double-precision.
-    ///
-    /// Compares values from source vector to `limit`. For inputs greater than or equal to `limit`, `outputConstant` is written to `result`. For inputs less than `limit`, the negated value of `outputConstant` is written to `result`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter limit: Limit.
-    /// - Parameter x: Value written to result.
-    /// - Returns: The clipped result.
-    @inlinable
-    public static func limit<U>(_ vector: U,
-                                limit: Double,
-                                withOutputConstant outputConstant: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                vDSP.limit(vector,
-                           limit: limit,
-                           withOutputConstant: outputConstant,
-                           result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Vector test limit; double-precision.
-    ///
-    /// Compares values from source vector to `limit`. For inputs greater than or equal to `limit`, `outputConstant` is written to `result`. For inputs less than `limit`, the negated value of `outputConstant` is written to `result`.
-    ///
-    /// - Parameter vector: Source vector.
-    /// - Parameter limit: Limit.
-    /// - Parameter x: Value written to result.
-    /// - Parameter result: The clipped result.
-    @inlinable
-    public static func limit<U, V>(_ vector: U,
-                                   limit: Double,
-                                   withOutputConstant outputConstant: Double,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            
-            withUnsafePointer(to: limit) { limit in
-                withUnsafePointer(to: outputConstant) { x in
-                    result.withUnsafeMutableBufferPointer { r in
-                        vector.withUnsafeBufferPointer { v in
-                            vDSP_vlimD(v.baseAddress!, 1,
-                                       limit,
-                                       x,
-                                       r.baseAddress!, 1,
-                                       vDSP_Length(n))
-                        }
-                    }
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_ComplexConversion.swift b/stdlib/public/Darwin/Accelerate/vDSP_ComplexConversion.swift
deleted file mode 100644
index fac607037142f..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_ComplexConversion.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Converts split complex to interleaved complex; single-precision.
-    ///
-    /// - Parameter splitComplexVector: Source vector.
-    /// - Parameter interleavedComplexVector: Destination vector.
-    @inlinable
-    public static func convert(splitComplexVector: DSPSplitComplex,
-                               toInterleavedComplexVector interleavedComplexVector: inout [DSPComplex]) {
-        
-        withUnsafePointer(to: splitComplexVector) {
-            vDSP_ztoc($0, 1,
-                      &interleavedComplexVector, 2,
-                      vDSP_Length(interleavedComplexVector.count))
-        }
-    }
-    
-    /// Converts interleaved complex to split complex; single-precision.
-    ///
-    /// - Parameter interleavedComplexVector: Source vector.
-    /// - Parameter splitComplexVector: Destination vector.
-    @inlinable
-    public static func convert(interleavedComplexVector: [DSPComplex],
-                               toSplitComplexVector splitComplexVector: inout DSPSplitComplex) {
-        
-        vDSP_ctoz(interleavedComplexVector, 2,
-                  &splitComplexVector, 1,
-                  vDSP_Length(interleavedComplexVector.count))
-    }
-    
-    /// Converts split complex to interleaved complex; double-precision.
-    ///
-    /// - Parameter splitComplexVector: Source vector.
-    /// - Parameter interleavedComplexVector: Destination vector.
-    @inlinable
-    public static func convert(splitComplexVector: DSPDoubleSplitComplex,
-                               toInterleavedComplexVector interleavedComplexVector: inout [DSPDoubleComplex]) {
-        
-        withUnsafePointer(to: splitComplexVector) {
-            vDSP_ztocD($0, 1,
-                       &interleavedComplexVector, 2,
-                       vDSP_Length(interleavedComplexVector.count))
-        }
-    }
-    
-    /// Converts interleaved complex to split complex; double-precision.
-    ///
-    /// - Parameter interleavedComplexVector: Source vector.
-    /// - Parameter splitComplexVector: Destination vector.
-    @inlinable
-    public static func convert(interleavedComplexVector: [DSPDoubleComplex],
-                               toSplitComplexVector splitComplexVector: inout DSPDoubleSplitComplex) {
-        
-        vDSP_ctozD(interleavedComplexVector, 2,
-                   &splitComplexVector, 1,
-                   vDSP_Length(interleavedComplexVector.count))
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_ComplexOperations.swift b/stdlib/public/Darwin/Accelerate/vDSP_ComplexOperations.swift
deleted file mode 100644
index b4be22e8fff76..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_ComplexOperations.swift
+++ /dev/null
@@ -1,543 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Phase calculation
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Populates `result` with the elementwise phase values, in radians, of the supplied complex vector; single-precision.
-    ///
-    /// - Parameter splitComplex: Single-precision complex input vector.
-    /// - Parameter result: Single-precision real output vector.
-    @inlinable
-    public static func phase<V>(_ splitComplex: DSPSplitComplex,
-                                result: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                withUnsafePointer(to: splitComplex) { src in
-                    vDSP_zvphas(src, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Populates `result` with the elementwise phase values, in radians, of the supplied complex vector; double-precision.
-    ///
-    /// - Parameter splitComplex: Double-precision complex input vector.
-    /// - Parameter result: Double-precision real output vector.
-    @inlinable
-    public static func phase<V>(_ splitComplex: DSPDoubleSplitComplex,
-                                result: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                withUnsafePointer(to: splitComplex) { src in
-                    vDSP_zvphasD(src, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Complex vector copying
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Copies a complex vector; single-precision.
-    ///
-    /// - Parameter source: Single-precision complex input vector.
-    /// - Parameter destination: Single-precision real output vector.
-    @inlinable
-    public static func copy(_ source: DSPSplitComplex,
-                            to destination: inout DSPSplitComplex,
-                            count: Int) {
-        
-        let n = vDSP_Length(count)
-        
-        withUnsafePointer(to: source) { src in
-            vDSP_zvmov(src, 1,
-                       &destination, 1,
-                       n)
-        }
-    }
-    
-    /// Copies a complex vector; double-precision.
-    ///
-    /// - Parameter source: Double-precision complex input vector.
-    /// - Parameter destination: Double-precision real output vector.
-    @inlinable
-    public static func copy(_ source: DSPDoubleSplitComplex,
-                            to destination: inout DSPDoubleSplitComplex,
-                            count: Int) {
-        
-        let n = vDSP_Length(count)
-        
-        withUnsafePointer(to: source) { src in
-            vDSP_zvmovD(src, 1,
-                        &destination, 1,
-                        n)
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Complex vector conjugate
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Populates `result` with the conjugate of `splitComplex`; single-precision.
-    ///
-    /// - Parameter splitComplex: the `A` in `C[n] = conj(A[n])`.
-    /// - Parameter result: The `C` in `C[n] = conj(A[n])`.
-    @inlinable
-    public static func conjugate(_ splitComplex: DSPSplitComplex,
-                                 count: Int,
-                                 result: inout DSPSplitComplex) {
-        
-        withUnsafePointer(to: splitComplex) { a in
-            vDSP_zvconj(a, 1,
-                        &result, 1,
-                        vDSP_Length(count))
-        }
-    }
-    
-    /// Populates `result` with the conjugate of `splitComplex`; double-precision.
-    ///
-    /// - Parameter splitComplex: the `A` in `C[n] = conj(A[n])`.
-    /// - Parameter result: The `C` in `C[n] = conj(A[n])`.
-    @inlinable
-    public static func conjugate(_ splitComplex: DSPDoubleSplitComplex,
-                                 count: Int,
-                                 result: inout DSPDoubleSplitComplex) {
-        
-        withUnsafePointer(to: splitComplex) { a in
-            vDSP_zvconjD(a, 1,
-                         &result, 1,
-                         vDSP_Length(count))
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Complex vector arithmetic
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Populates `result` with the elementwise division of `splitComplex` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplex: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<U>(_ splitComplex: DSPSplitComplex,
-                                 by vector: U,
-                                 result: inout DSPSplitComplex)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            withUnsafePointer(to: splitComplex) { a in
-                vector.withUnsafeBufferPointer { b in
-                    vDSP_zrvdiv(a, 1,
-                                b.baseAddress!, 1,
-                                &result, 1,
-                                vDSP_Length(vector.count))
-                }
-            }
-    }
-    
-    /// Populates `result` with the elementwise division of `splitComplex` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter splitComplex: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide<U>(_ splitComplex: DSPDoubleSplitComplex,
-                                 by vector: U,
-                                 result: inout DSPDoubleSplitComplex)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            withUnsafePointer(to: splitComplex) { a in
-                vector.withUnsafeBufferPointer { b in
-                    vDSP_zrvdivD(a, 1,
-                                 b.baseAddress!, 1,
-                                 &result, 1,
-                                 vDSP_Length(vector.count))
-                }
-            }
-    }
-    
-    /// Populates `result` with the elementwise product of `splitComplex` and `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplex: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<U>(_ splitComplex: DSPSplitComplex,
-                                   by vector: U,
-                                   result: inout DSPSplitComplex)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            withUnsafePointer(to: splitComplex) { a in
-                vector.withUnsafeBufferPointer { b in
-                    vDSP_zrvmul(a, 1,
-                                b.baseAddress!, 1,
-                                &result, 1,
-                                vDSP_Length(vector.count))
-                }
-            }
-    }
-    
-    /// Populates `result` with the elementwise product of `splitComplex` and `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter splitComplex: the `a` in `c[i] = a[i] * b[i]`.
-    /// - Parameter vector: the `b` in `c[i] = a[i] * b[i]`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]`.
-    @inlinable
-    public static func multiply<U>(_ splitComplex: DSPDoubleSplitComplex,
-                                   by vector: U,
-                                   result: inout DSPDoubleSplitComplex)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            withUnsafePointer(to: splitComplex) { a in
-                vector.withUnsafeBufferPointer { b in
-                    vDSP_zrvmulD(a, 1,
-                                 b.baseAddress!, 1,
-                                 &result, 1,
-                                 vDSP_Length(vector.count))
-                }
-            }
-    }
-    
-    /// Populates `result` with the elementwise product of `splitComplexA` and `splitComplexB`,
-    /// optionally conjugating one of them; single-precision
-    ///
-    /// - Parameter splitComplexA: The `a` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    /// - Parameter splitComplexB: The `b` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter useConjugate: Specifies whether to multiply the complex conjugates of `splitComplexA`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    @inlinable
-    public static func multiply(_ splitComplexA: DSPSplitComplex,
-                                by splitComplexB: DSPSplitComplex,
-                                count: Int,
-                                useConjugate: Bool,
-                                result: inout DSPSplitComplex) {
-        
-        let conjugate: Int32 = useConjugate ? -1 : 1
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvmul(a, 1,
-                           b, 1,
-                           &result, 1,
-                           vDSP_Length(count),
-                           conjugate)
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise product of `splitComplexA` and `splitComplexB`,
-    /// optionally conjugating one of them; double-precision
-    ///
-    /// - Parameter splitComplexA: The `a` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    /// - Parameter splitComplexB: The `b` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter useConjugate: Specifies whether to multiply the complex conjugates of `splitComplexA`.
-    /// - Parameter result: The `c` in `c[i] = a[i] * b[i]` or `c[i] = conj(a[i]) * b[i]`.
-    @inlinable
-    public static func multiply(_ splitComplexA: DSPDoubleSplitComplex,
-                                by splitComplexB: DSPDoubleSplitComplex,
-                                count: Int,
-                                useConjugate: Bool,
-                                result: inout DSPDoubleSplitComplex) {
-        
-        let conjugate: Int32 = useConjugate ? -1 : 1
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvmulD(a, 1,
-                            b, 1,
-                            &result, 1,
-                            vDSP_Length(count),
-                            conjugate)
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise sum of `splitComplexA` and `splitComplexB`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add(_ splitComplexA: DSPSplitComplex,
-                           to splitComplexB: DSPSplitComplex,
-                           count: Int,
-                           result: inout DSPSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvadd(a, 1,
-                           b, 1,
-                           &result, 1,
-                           vDSP_Length(count))
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise sum of `splitComplexA` and `splitComplexB`,
-    /// double-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] + b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] + b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] + b[i]`.
-    @inlinable
-    public static func add(_ splitComplexA: DSPDoubleSplitComplex,
-                           to splitComplexB: DSPDoubleSplitComplex,
-                           count: Int,
-                           result: inout DSPDoubleSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvaddD(a, 1,
-                            b, 1,
-                            &result, 1,
-                            vDSP_Length(count))
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise division of `splitComplexA` and `splitComplexB`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide(_ splitComplexA: DSPSplitComplex,
-                              by splitComplexB: DSPSplitComplex,
-                              count: Int,
-                              result: inout DSPSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvdiv(b, 1,
-                           a, 1,
-                           &result, 1,
-                           vDSP_Length(count))
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise division of `splitComplexA` and `splitComplexB`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] / b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] / b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] / b[i]`.
-    @inlinable
-    public static func divide(_ splitComplexA: DSPDoubleSplitComplex,
-                              by splitComplexB: DSPDoubleSplitComplex,
-                              count: Int,
-                              result: inout DSPDoubleSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvdivD(b, 1,
-                            a, 1,
-                            &result, 1,
-                            vDSP_Length(count))
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise difference of `splitComplexA` and `splitComplexB`,
-    /// single-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract(_ splitComplexB: DSPSplitComplex,
-                                from splitComplexA: DSPSplitComplex,
-                                count: Int,
-                                result: inout DSPSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvsub(b, 1,
-                           a, 1,
-                           &result, 1,
-                           vDSP_Length(count))
-            }
-        }
-    }
-    
-    /// Populates `result` with the elementwise difference of `splitComplexA` and `splitComplexB`,
-    /// double-precision.
-    ///
-    /// - Parameter splitComplexA: the `a` in `c[i] = a[i] - b[i]`.
-    /// - Parameter splitComplexB: the `b` in `c[i] = a[i] - b[i]`.
-    /// - Parameter count: The number of elements to process.
-    /// - Parameter result: The `c` in `c[i] = a[i] - b[i]`.
-    @inlinable
-    public static func subtract(_ splitComplexB: DSPDoubleSplitComplex,
-                                from splitComplexA: DSPDoubleSplitComplex,
-                                count: Int,
-                                result: inout DSPDoubleSplitComplex) {
-        
-        withUnsafePointer(to: splitComplexA) { a in
-            withUnsafePointer(to: splitComplexB) { b in
-                vDSP_zvsubD(b, 1,
-                            a, 1,
-                            &result, 1,
-                            vDSP_Length(count))
-            }
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Complex vector absolute
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Populates `result` with the absolute values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<V>(_ vector: DSPSplitComplex,
-                                   result: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = result.count
-            
-            result.withUnsafeMutableBufferPointer { r in
-                withUnsafePointer(to: vector) { v in
-                    vDSP_zvabs(v, 1,
-                               r.baseAddress!, 1,
-                               vDSP_Length(n))
-                }
-            }
-    }
-    
-    /// Populates `result` with the absolute values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<V>(_ vector: DSPDoubleSplitComplex,
-                                   result: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = result.count
-            
-            result.withUnsafeMutableBufferPointer { r in
-                withUnsafePointer(to: vector) { v in
-                    vDSP_zvabsD(v, 1,
-                                r.baseAddress!, 1,
-                                vDSP_Length(n))
-                }
-            }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Complex squared magnitude
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Calculates the squared magnitude of each element in `vector`, writing the result to `result`; single-precision.
-    ///
-    /// - Parameter splitComplex: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func squareMagnitudes<V>(_ splitComplex: DSPSplitComplex,
-                                           result: inout V)
-        where
-        V : AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                withUnsafePointer(to: splitComplex) { src in
-                    vDSP_zvmags(src, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    @inlinable
-    /// Calculates the squared magnitude of each element in `vector`, writing the result to `result`; double-precision.
-    ///
-    /// - Parameter splitComplex: Input values.
-    /// - Parameter result: Output values.
-    public static func squareMagnitudes<V>(_ splitComplex: DSPDoubleSplitComplex,
-                                           result: inout V)
-        where
-        V : AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                withUnsafePointer(to: splitComplex) { src in
-                    vDSP_zvmagsD(src, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Conversion.swift b/stdlib/public/Darwin/Accelerate/vDSP_Conversion.swift
deleted file mode 100644
index fbc0e97d94250..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Conversion.swift
+++ /dev/null
@@ -1,1256 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Integer to floating-point conversion
-    
-    /// Converts an array of unsigned 8-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt8,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu8(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Converts an array of unsigned 8-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt8,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu8D(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    /// Converts an array of unsigned 16-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt16,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu16(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    /// Converts an array of unsigned 16-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt16,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu16D(src.baseAddress!, 1,
-                                  dest.baseAddress!, 1,
-                                  n)
-                }
-            }
-    }
-    
-    /// Converts an array of unsigned 32-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt32,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu32(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    /// Converts an array of unsigned 32-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == UInt32,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vfltu32D(src.baseAddress!, 1,
-                                  dest.baseAddress!, 1,
-                                  n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 8-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int8,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt8(src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 8-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int8,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt8D(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 16-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int16,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt16(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 16-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int16,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt16D(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 32-bit integers to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int32,
-        V.Element == Float {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt32(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Converts an array of signed 32-bit integers to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Int32,
-        V.Element == Double {
-            
-            precondition(source.count == destination.count)
-            
-            let n = vDSP_Length(source.count)
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vflt32D(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 n)
-                }
-            }
-    }
-    
-    // MARK: Floating-point to integer conversion
-    public enum RoundingMode {
-        case towardZero
-        case towardNearestInteger
-    }
-    
-    /// Converts an array of single-precision floating-point values to signed 32-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Int32 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix32(src.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr32(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to signed 32-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Int32 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix32D(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr32D(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of single-precision floating-point values to unsigned 16-bit integer values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == UInt16 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu16(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru16(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to unsigned 16-bit integer values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == UInt16 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu16D(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru16D(src.baseAddress!, 1,
-                                       dest.baseAddress!, 1,
-                                       n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of single-precision floating-point values to unsigned 32-bit integer values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == UInt32 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu32(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru32(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to unsigned 32-bit integer values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == UInt32 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu32D(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru32D(src.baseAddress!, 1,
-                                       dest.baseAddress!, 1,
-                                       n)
-                    }
-                }
-            }
-    }
-    
-    
-    /// Converts an array of single-precision floating-point values to signed 16-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Int16 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix16(src.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr16(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to signed 16-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Int16 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix16D(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr16D(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of single-precision floating-point values to signed 8-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Int8 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix8(src.baseAddress!, 1,
-                                   dest.baseAddress!, 1,
-                                   n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr8(src.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to signed 8-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Int8 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfix8D(src.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    case .towardNearestInteger:
-                        vDSP_vfixr8D(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of single-precision floating-point values to unsigned 8-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == UInt8 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu8(src.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru8(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to unsigned 8-bit integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V,
-                                             rounding: RoundingMode)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == UInt8 {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    switch rounding {
-                    case .towardZero:
-                        vDSP_vfixu8D(src.baseAddress!, 1,
-                                     dest.baseAddress!, 1,
-                                     n)
-                    case .towardNearestInteger:
-                        vDSP_vfixru8D(src.baseAddress!, 1,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Converts an array of single-precision floating-point values to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Double {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vspdp(src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Parameter destination: Destination vector.
-    @inlinable
-    public static func convertElements<U, V>(of source: U,
-                                             to destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Float {
-            let n = vDSP_Length(min(source.count,
-                                    destination.count))
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_vdpsp(src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Conversion functions that return the result
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_IntegerConvertable {}
-extension UInt8: vDSP_IntegerConvertable {}
-extension UInt16: vDSP_IntegerConvertable {}
-extension UInt32: vDSP_IntegerConvertable {}
-extension Int8: vDSP_IntegerConvertable {}
-extension Int16: vDSP_IntegerConvertable {}
-extension Int32: vDSP_IntegerConvertable {}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FloatingPointConvertable {}
-extension Float: vDSP_FloatingPointConvertable {}
-extension Double: vDSP_FloatingPointConvertable {}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Integer to floating-point conversion
-    
-    /// Converts an array of unsigned 8-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == UInt8,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of unsigned 16-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == UInt16,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of unsigned 32-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == UInt32,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of signed 8-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == Int8,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of signed 16-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == Int16,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of signed 32-bit integers to floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func integerToFloatingPoint<T, U>(_ vector: T,
-                                                    floatingPointType: U.Type) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == Int32,
-        U: vDSP_FloatingPointConvertable {
-            
-            switch floatingPointType {
-            case is Float.Type:
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Double.Type:
-                let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-                
-            default:
-                fatalError("\(floatingPointType) not supported as a destination type.")
-            }
-    }
-    
-    // MARK: Floating-point to integer conversion
-    
-    /// Converts an array of single-precision floating-point values to integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func floatingPointToInteger<T, U>(_ vector: T,
-                                                    integerType: U.Type,
-                                                    rounding: RoundingMode) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == Float,
-        U: vDSP_IntegerConvertable {
-            
-            switch integerType {
-            case is UInt8.Type:
-                let result = Array<UInt8>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is UInt16.Type:
-                let result = Array<UInt16>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is UInt32.Type:
-                let result = Array<UInt32>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int8.Type:
-                let result = Array<Int8>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int16.Type:
-                let result = Array<Int16>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int32.Type:
-                let result = Array<Int32>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            default:
-                fatalError("\(integerType) not supported as a destination type.")
-            }
-    }
-    
-    /// Converts an array of double-precision floating-point values to integer values using specified rounding.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func floatingPointToInteger<T, U>(_ vector: T,
-                                                    integerType: U.Type,
-                                                    rounding: RoundingMode) -> [U]
-        where
-        T: AccelerateBuffer,
-        T.Element == Double,
-        U: vDSP_IntegerConvertable {
-            
-            switch integerType {
-            case is UInt8.Type:
-                let result = Array<UInt8>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is UInt16.Type:
-                let result = Array<UInt16>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is UInt32.Type:
-                let result = Array<UInt32>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int8.Type:
-                let result = Array<Int8>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int16.Type:
-                let result = Array<Int16>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            case is Int32.Type:
-                let result = Array<Int32>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    convertElements(of: vector,
-                                    to: &buffer,
-                                    rounding: rounding)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result as! [U]
-            default:
-                fatalError("\(integerType) not supported as a destination type.")
-            }
-    }
-    
-    // MARK: Floating-point to floating-point conversion
-    
-    /// Converts an array of single-precision floating-point values to double-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func floatToDouble<U>(_ source: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            let result = Array<Double>(unsafeUninitializedCapacity: source.count) {
-                buffer, initializedCount in
-                
-                convertElements(of: source,
-                                to: &buffer)
-                
-                initializedCount = source.count
-            }
-            
-            return result
-    }
-    
-    /// Converts an array of double-precision floating-point values to single-precision floating-point values.
-    ///
-    /// - Parameter source: Source vector.
-    /// - Returns: Conversion result.
-    @inlinable
-    public static func doubleToFloat<U>(_ source: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            let result = Array<Float>(unsafeUninitializedCapacity: source.count) {
-                buffer, initializedCount in
-                
-                convertElements(of: source,
-                                to: &buffer)
-                
-                initializedCount = source.count
-            }
-            
-            return result
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Convolution.swift b/stdlib/public/Darwin/Accelerate/vDSP_Convolution.swift
deleted file mode 100644
index 71f37c85093d0..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Convolution.swift
+++ /dev/null
@@ -1,731 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: One-dimensional convolution
-    
-    /// Returns one-dimensional convolution, single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      withKernel kernel: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let n = vector.count - kernel.count
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         withKernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// One-dimensional convolution, single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         withKernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count >= n + kernel.count - 1,
-                         "Source vector count must be at least the sum of the result and kernel counts, minus one.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_conv(src.baseAddress!, 1,
-                                  k.baseAddress!.advanced(by: kernel.count - 1), -1,
-                                  dest.baseAddress!, 1,
-                                  vDSP_Length(n),
-                                  vDSP_Length(kernel.count))
-                    }
-                }
-            }
-    }
-    
-    /// Returns one-dimensional convolution, double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter kernel: Double-precision convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      withKernel kernel: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let n = vector.count - kernel.count
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         withKernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// One-dimensional convolution, double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter kernel: Double-precision convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         withKernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count >= n + kernel.count - 1,
-                         "Source vector count must be at least the sum of the result and kernel counts, minus one.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_convD(src.baseAddress!, 1,
-                                   k.baseAddress!.advanced(by: kernel.count - 1), -1,
-                                   dest.baseAddress!, 1,
-                                   vDSP_Length(n),
-                                   vDSP_Length(kernel.count))
-                    }
-                }
-            }
-    }
-    
-    // MARK: One-dimensional correlation
-    
-    /// Returns one-dimensional correlation, single-precision.
-    ///
-    /// - Parameter vector: The vector to correlate.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Returns: Correlation result.
-    @inlinable
-    public static func correlate<T, U>(_ vector: T,
-                                       withKernel kernel: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let n = vector.count - kernel.count
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                correlate(vector,
-                          withKernel: kernel,
-                          result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// One-dimensional correlation, single-precision.
-    ///
-    /// - Parameter vector: The vector to correlate.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func correlate<T, U, V>(_ vector: T,
-                                          withKernel kernel: U,
-                                          result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count >= n + kernel.count - 1,
-                         "Source vector count must be at least the sum of the result and kernel counts, minus one.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_conv(src.baseAddress!, 1,
-                                  k.baseAddress!, 1,
-                                  dest.baseAddress!, 1,
-                                  vDSP_Length(n),
-                                  vDSP_Length(kernel.count))
-                    }
-                }
-            }
-    }
-    
-    /// Returns one-dimensional correlation, double-precision.
-    ///
-    /// - Parameter vector: The vector to correlate.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Returns: Correlation result.
-    @inlinable
-    public static func correlate<T, U>(_ vector: T,
-                                       withKernel kernel: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let n = vector.count - kernel.count
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                correlate(vector,
-                          withKernel: kernel,
-                          result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// One-dimensional correlation, double-precision.
-    ///
-    /// - Parameter vector: The vector to correlate.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func correlate<T, U, V>(_ vector: T,
-                                          withKernel kernel: U,
-                                          result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count >= n + kernel.count - 1,
-                         "Source vector count must be at least the sum of the result and kernel counts, minus one.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_convD(src.baseAddress!, 1,
-                                   k.baseAddress!, 1,
-                                   dest.baseAddress!, 1,
-                                   vDSP_Length(n),
-                                   vDSP_Length(kernel.count))
-                    }
-                }
-            }
-    }
-    
-}
-
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Two-dimensional convolution
-    
-    /// Returns two-dimensional convolution with a 3 x 3 kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision 3x3 convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      with3x3Kernel kernel: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         with3x3Kernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with a 3 x 3 kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision 3x3 convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         with3x3Kernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernel.count == 9,
-                         "Kernel must contain 9 elements.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_f3x3(src.baseAddress!,
-                                  vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                  k.baseAddress!,
-                                  dest.baseAddress!)
-                    }
-                }
-            }
-    }
-    
-    /// Returns two-dimensional convolution with a 3 x 3 kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Double-precision 3x3 convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      with3x3Kernel kernel: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         with3x3Kernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with a 3 x 3 kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Double-precision 3x3 convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         with3x3Kernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernel.count == 9,
-                         "Kernel must contain 9 elements.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_f3x3D(src.baseAddress!,
-                                   vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                   k.baseAddress!,
-                                   dest.baseAddress!)
-                    }
-                }
-            }
-    }
-    
-    /// Returns two-dimensional convolution with a 5 x 5 kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision 5x5 convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      with5x5Kernel kernel: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         with5x5Kernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with a 5 x 5 kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision 5x5 convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         with5x5Kernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernel.count == 25,
-                         "Kernel must contain 25 elements.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_f5x5(src.baseAddress!,
-                                  vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                  k.baseAddress!,
-                                  dest.baseAddress!)
-                    }
-                }
-            }
-    }
-    
-    /// Returns two-dimensional convolution with a 5 x 5 kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Double-precision 3x3 convolution kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      with5x5Kernel kernel: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         with5x5Kernel: kernel,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with a 5 x 5 kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Double-precision 5x5 convolution kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         with5x5Kernel kernel: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernel.count == 25,
-                         "Kernel must contain 25 elements.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_f5x5D(src.baseAddress!,
-                                   vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                   k.baseAddress!,
-                                   dest.baseAddress!)
-                    }
-                }
-            }
-    }
-    
-    /// Returns two-dimensional convolution with arbitrarily sized kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter kernelRowCount: The number of rows in the kernel.
-    /// - Parameter kernelColumnCount: The number of columns in the kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      withKernel kernel: U,
-                                      kernelRowCount: Int, kernelColumnCount: Int) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         withKernel: kernel,
-                         kernelRowCount: kernelRowCount, kernelColumnCount: kernelColumnCount,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with arbitrarily sized kernel; single-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter kernelRowCount: The number of rows in the kernel.
-    /// - Parameter kernelColumnCount: The number of columns in the kernel.
-    /// - Parameter result: Destination vector.
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         withKernel kernel: U,
-                                         kernelRowCount: Int, kernelColumnCount: Int,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernelRowCount % 2 == 1,
-                         "Kernel row count must be odd.")
-            
-            precondition(kernelColumnCount % 2 == 1,
-                         "Kernel column count must be odd.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_imgfir(src.baseAddress!,
-                                    vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                    k.baseAddress!,
-                                    dest.baseAddress!,
-                                    vDSP_Length(kernelRowCount), vDSP_Length(kernelColumnCount))
-                    }
-                }
-            }
-    }
-    
-    /// Returns two-dimensional convolution with arbitrarily sized kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Single-precision convolution kernel.
-    /// - Parameter kernelRowCount: The number of rows in the kernel.
-    /// - Parameter kernelColumnCount: The number of columns in the kernel.
-    /// - Returns: Convolution result.
-    @inlinable
-    public static func convolve<T, U>(_ vector: T,
-                                      rowCount: Int, columnCount: Int,
-                                      withKernel kernel: U,
-                                      kernelRowCount: Int, kernelColumnCount: Int) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                convolve(vector,
-                         rowCount: rowCount, columnCount: columnCount,
-                         withKernel: kernel,
-                         kernelRowCount: kernelRowCount, kernelColumnCount: kernelColumnCount,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Two-dimensional convolution with arbitrarily sized kernel; double-precision.
-    ///
-    /// - Parameter vector: The vector to convolve.
-    /// - Parameter rowCount: The number of rows in the input vector.
-    /// - Parameter columnCount: The number of columns in the input vector.
-    /// - Parameter kernel: Double-precision convolution kernel.
-    /// - Parameter kernelRowCount: The number of rows in the kernel.
-    /// - Parameter kernelColumnCount: The number of columns in the kernel.
-    /// - Parameter result: Destination vector.
-    
-    @inlinable
-    public static func convolve<T, U, V>(_ vector: T,
-                                         rowCount: Int, columnCount: Int,
-                                         withKernel kernel: U,
-                                         kernelRowCount: Int, kernelColumnCount: Int,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(rowCount >= 3,
-                         "Row count must be greater than or equal to 3.")
-            
-            precondition(columnCount >= 4,
-                         "Column count must be even and greater than or equal to 4")
-            
-            precondition(rowCount * columnCount == vector.count,
-                         "Row count `x` column count must equal source vector count.")
-            
-            precondition(kernelRowCount % 2 == 1,
-                         "Kernel row count must be odd.")
-            
-            precondition(kernelColumnCount % 2 == 1,
-                         "Kernel column count must be odd.")
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    kernel.withUnsafeBufferPointer { k in
-                        vDSP_imgfirD(src.baseAddress!,
-                                     vDSP_Length(rowCount), vDSP_Length(columnCount),
-                                     k.baseAddress!,
-                                     dest.baseAddress!,
-                                     vDSP_Length(kernelRowCount), vDSP_Length(kernelColumnCount))
-                    }
-                }
-            }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_DCT.swift b/stdlib/public/Darwin/Accelerate/vDSP_DCT.swift
deleted file mode 100644
index 319b51ec22526..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_DCT.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-///===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// An enum that specifies which DCT variant to perform.
-    public enum DCTTransformType: CaseIterable {
-        case II
-        case III
-        case IV
-        
-        public var dctType: vDSP_DCT_Type {
-            switch self {
-            case .II:
-                return .II
-            case .III:
-                return .III
-            case .IV:
-                return .IV
-            }
-        }
-    }
-    
-     /// A class that provides single-precision discrete cosine transform.
-    public class DCT {
-        
-        fileprivate let dctSetup: vDSP_DFT_Setup
-        
-        /// Initializes a new discrete cosine transform instance.
-        ///
-        /// - Parameter previous: a previous vDSP_DCT instance to share data with.
-        /// - Parameter count: the number of real elements to be transformed.
-        /// - Parameter transformType: Specifies the transform type (type II for forward and type III for inverse).
-        public init?(previous: DCT? = nil,
-                     count: Int,
-                     transformType: DCTTransformType) {
-            
-            guard let setup = vDSP.VectorizableFloat.makeDCTSetup(previous: previous,
-                                                                  count: count,
-                                                                  transformType: transformType) else {
-                                                                    return nil
-            }
-            
-            dctSetup = setup
-        }
-        
-        /// Returns the single-precision real discrete cosine transform.
-        ///
-        /// - Parameter input: Real input vector.
-        /// - Returns: Real output vector.
-        public func transform<U>(_ vector: U) -> [Float]
-            where
-            U: AccelerateBuffer,
-            U.Element == Float {
-                
-                let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                    buffer, initializedCount in
-                    
-                    transform(vector,
-                              result: &buffer)
-                    
-                    initializedCount = vector.count
-                }
-                
-                return result
-        }
-        
-        /// Computes an out-of-place single-precision real discrete cosine transform.
-        ///
-        /// - Parameter input: Real input vector.
-        /// - Parameter output: Real output vector.
-        public func transform<U, V>(_ vector: U, result: inout V)
-            where
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element == Float, V.Element == Float {
-                
-                vDSP.VectorizableFloat.transform(dctSetup: dctSetup,
-                                                 source: vector,
-                                                 destination: &result)
-        }
-        
-        deinit {
-            vDSP_DFT_DestroySetup(dctSetup)
-        }
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-fileprivate protocol vDSP_FloatingPointDiscreteCosineTransformable: BinaryFloatingPoint {
-    associatedtype DCTFunctions: vDSP_DCTFunctions where DCTFunctions.Scalar == Self
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Float: vDSP_FloatingPointDiscreteCosineTransformable {
-    typealias DCTFunctions = vDSP.VectorizableFloat
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-fileprivate protocol vDSP_DCTFunctions {
-    associatedtype Scalar
-    
-    static func makeDCTSetup(previous: vDSP.DCT?,
-                             count: Int,
-                             transformType: vDSP.DCTTransformType) -> OpaquePointer?
-    
-    static func transform<U, V>(dctSetup: OpaquePointer,
-                                source: U,
-                                destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Scalar, V.Element == Scalar
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP.VectorizableFloat: vDSP_DCTFunctions {
-    
-    fileprivate static func makeDCTSetup(previous: vDSP.DCT? = nil,
-                                    count: Int,
-                                    transformType: vDSP.DCTTransformType) -> OpaquePointer? {
-        
-        return vDSP_DCT_CreateSetup(previous?.dctSetup,
-                                    vDSP_Length(count),
-                                    transformType.dctType)
-    }
-    
-    fileprivate static func transform<U, V>(dctSetup: OpaquePointer,
-                                       source: U,
-                                       destination: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Float {
-            
-            destination.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_DCT_Execute(dctSetup,
-                                     src.baseAddress!,
-                                     dest.baseAddress!)
-                }
-            }
-    }
-}
-
-
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_DFT.swift b/stdlib/public/Darwin/Accelerate/vDSP_DFT.swift
deleted file mode 100644
index ef0a0ffdf8c9b..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_DFT.swift
+++ /dev/null
@@ -1,328 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  Discrete Fourier Transform
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// An enumeration that specifies whether to perform complex-to-complex or
-    /// complex-to-real discrete Fourier transform.
-    // TODO: Should probably be @_frozen; check with Accelerate.
-    public enum DFTTransformType {
-        /// Specifies complex-to-complex discrete Fourier transform, forward
-        /// or inverse
-        case complexComplex
-        
-        /// Specifies real-to-complex (forward) or complex-to-real (inverse)
-        /// discrete Fourier transform.
-        case complexReal
-    }
-    
-    /// A class that provides single- and double-precision discrete Fourier transform.
-    public class DFT <T: vDSP_FloatingPointDiscreteFourierTransformable> {
-        fileprivate let dftSetup: vDSP_DFT_Setup
-        
-        /// Initializes a new discrete Fourier transform structure.
-        ///
-        /// - Parameter previous: a previous vDSP_DFT instance to share data with.
-        /// - Parameter count: the number of real elements to be transformed.
-        /// - Parameter direction: Specifies the transform direction.
-        /// - Parameter transformType: Specficies whether to forward transform is real-to-complex or complex-to-complex.
-        public init?(previous: DFT? = nil,
-                     count: Int,
-                     direction: vDSP.FourierTransformDirection,
-                     transformType: DFTTransformType,
-                     ofType: T.Type) {
-            
-            guard let setup = T.DFTFunctions.makeDFTSetup(previous: previous,
-                                                          count: count,
-                                                          direction: direction,
-                                                          transformType: transformType) else {
-                                                            return nil
-            }
-            
-            self.transformType = transformType
-            
-            dftSetup = setup
-        }
-        
-        /// The transform type of this DFT.
-        private let transformType: DFTTransformType
-        
-        /// Returns a single-precision real discrete Fourier transform.
-        ///
-        /// - Parameter inputReal: Input vector - real part.
-        /// - Parameter inputImaginary: Input vector - imaginary part.
-        /// - Returns: A tuple of two arrays representing the real and imaginary parts of the output.
-        ///
-        /// When the `transformType` is `complexComplex`, each input array (Ir, Ii)
-        /// must have `count` elements, and the returned arrays have `count` elements.
-        ///
-        /// When the `transformType` is `complexReal`, each input array (Ir, Ii)
-        /// must have `count` elements, and the returned arrays have `count / 2` elements.
-        public func transform<U>(inputReal: U,
-                                 inputImaginary: U) -> (real:[T], imaginary: [T])
-            where
-            U: AccelerateBuffer,
-            U.Element == T {
-                
-                let n = transformType == .complexReal ? inputReal.count / 2 : inputReal.count
-                
-                var imaginaryResult: Array<T>!
-                
-                let realResult = Array<T>(unsafeUninitializedCapacity: n) {
-                    realBuffer, realInitializedCount in
-                    
-                    imaginaryResult = Array<T>(unsafeUninitializedCapacity: n) {
-                        imaginaryBuffer, imaginaryInitializedCount in
-                        
-                        transform(inputReal: inputReal,
-                                  inputImaginary: inputImaginary,
-                                  outputReal: &realBuffer,
-                                  outputImaginary: &imaginaryBuffer)
-                        
-                        imaginaryInitializedCount = n
-                    }
-                    
-                    realInitializedCount = n
-                }
-                
-                return (real: realResult,
-                        imaginary: imaginaryResult)
-        }
-        
-        /// Computes an out-of-place single-precision real discrete Fourier transform.
-        ///
-        /// - Parameter inputReal: Input vector - real part.
-        /// - Parameter inputImaginary: Input vector - imaginary part.
-        /// - Parameter outputReal: Output vector - real part.
-        /// - Parameter outputImaginary: Output vector - imaginary part.
-        ///
-        /// When the `transformType` is `complexComplex`, each array (Ir, Ii,
-        /// Or, and Oi) must have `count` elements.
-        ///
-        /// When the `transformType` is `complexReal`, each array (Ir, Ii,
-        /// Or, and Oi) must have `count/2` elements.
-        public func transform<U, V>(inputReal: U,
-                                    inputImaginary: U,
-                                    outputReal: inout V,
-                                    outputImaginary: inout V)
-            where
-            U: AccelerateBuffer,
-            V: AccelerateMutableBuffer,
-            U.Element == T, V.Element == T {
-                
-                T.DFTFunctions.transform(dftSetup: dftSetup,
-                                         inputReal: inputReal,
-                                         inputImaginary: inputImaginary,
-                                         outputReal: &outputReal,
-                                         outputImaginary: &outputImaginary)
-        }
-        
-        deinit {
-            T.DFTFunctions.destroySetup(dftSetup)
-        }
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FloatingPointDiscreteFourierTransformable: BinaryFloatingPoint {
-    associatedtype DFTFunctions: vDSP_DFTFunctions where DFTFunctions.Scalar == Self
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Float: vDSP_FloatingPointDiscreteFourierTransformable {
-    public typealias DFTFunctions = vDSP.VectorizableFloat
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension Double: vDSP_FloatingPointDiscreteFourierTransformable {
-    public typealias DFTFunctions = vDSP.VectorizableDouble
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_DFTFunctions {
-    associatedtype Scalar
-    
-    /// Returns a setup structure to perform a discrete Fourier transform
-    ///
-    /// - Parameter previous: a previous vDSP_DFT instance to share data with.
-    /// - Parameter count: the number of real elements to be transformed.
-    /// - Parameter direction: Specifies the transform direction.
-    /// - Parameter transformType: Specficies whether to forward transform is real-to-complex or complex-to-complex.
-    static func makeDFTSetup<T>(previous: vDSP.DFT<T>?,
-                                count: Int,
-                                direction: vDSP.FourierTransformDirection,
-                                transformType: vDSP.DFTTransformType) -> OpaquePointer?
-    
-    /// Computes an out-of-place single-precision real discrete Fourier transform.
-    ///
-    /// - Parameter dftSetup: A DCT setup object.
-    /// - Parameter inputReal: Input vector - real part.
-    /// - Parameter inputImaginary: Input vector - imaginary part.
-    /// - Parameter outputReal: Output vector - real part.
-    /// - Parameter outputImaginary: Output vector - imaginary part.
-    static func transform<U, V>(dftSetup: OpaquePointer,
-                                inputReal: U,
-                                inputImaginary: U,
-                                outputReal: inout V,
-                                outputImaginary: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Scalar, V.Element == Scalar
-    
-    /// Releases a DFT setup object.
-    static func destroySetup(_ setup: OpaquePointer)
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Type-specific DFT function implementations
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP.VectorizableFloat: vDSP_DFTFunctions {
-    
-    /// Returns a setup structure to perform a discrete Fourier transform
-    ///
-    /// - Parameter previous: a previous vDSP_DFT instance to share data with.
-    /// - Parameter count: the number of real elements to be transformed.
-    /// - Parameter direction: Specifies the transform direction.
-    /// - Parameter transformType: Specficies whether to forward transform is real-to-complex or complex-to-complex.
-    public static func makeDFTSetup<T>(previous: vDSP.DFT<T>? = nil,
-                                       count: Int,
-                                       direction: vDSP.FourierTransformDirection,
-                                       transformType: vDSP.DFTTransformType) -> OpaquePointer?
-        where T : vDSP_FloatingPointDiscreteFourierTransformable {
-            
-            switch transformType {
-            case .complexComplex:
-                return vDSP_DFT_zop_CreateSetup(previous?.dftSetup,
-                                                vDSP_Length(count),
-                                                direction.dftDirection)
-            case .complexReal:
-                return vDSP_DFT_zrop_CreateSetup(previous?.dftSetup,
-                                                 vDSP_Length(count),
-                                                 direction.dftDirection)
-            }
-    }
-    
-    /// Computes an out-of-place single-precision real discrete Fourier transform.
-    ///
-    /// - Parameter dftSetup: A DCT setup object.
-    /// - Parameter inputReal: Input vector - real part.
-    /// - Parameter inputImaginary: Input vector - imaginary part.
-    /// - Parameter outputReal: Output vector - real part.
-    /// - Parameter outputImaginary: Output vector - imaginary part.
-    public static func transform<U, V>(dftSetup: OpaquePointer,
-                                       inputReal: U,
-                                       inputImaginary: U,
-                                       outputReal: inout V,
-                                       outputImaginary: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            inputReal.withUnsafeBufferPointer { Ir in
-                inputImaginary.withUnsafeBufferPointer { Ii in
-                    outputReal.withUnsafeMutableBufferPointer { Or in
-                        outputImaginary.withUnsafeMutableBufferPointer { Oi in
-                            
-                            vDSP_DFT_Execute(dftSetup,
-                                             Ir.baseAddress!,
-                                             Ii.baseAddress!,
-                                             Or.baseAddress!,
-                                             Oi.baseAddress!)
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Releases a DFT setup object.
-    public static func destroySetup(_ setup: OpaquePointer) {
-        vDSP_DFT_DestroySetup(setup)
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP.VectorizableDouble: vDSP_DFTFunctions {
-    
-    /// Returns a data structure for use with to perform a discrete Fourier transform
-    ///
-    /// - Parameter previous: a previous vDSP_DFT instance to share data with.
-    /// - Parameter count: the number of real elements to be transformed.
-    /// - Parameter direction: Specifies the transform direction.
-    /// - Parameter transformType: Specficies whether to forward transform is real-to-complex or complex-to-complex.
-    public static func makeDFTSetup<T>(previous: vDSP.DFT<T>? = nil,
-                                       count: Int,
-                                       direction: vDSP.FourierTransformDirection,
-                                       transformType: vDSP.DFTTransformType) -> OpaquePointer?
-        where T : vDSP_FloatingPointDiscreteFourierTransformable {
-            
-            switch transformType {
-            case .complexComplex:
-                return vDSP_DFT_zop_CreateSetupD(previous?.dftSetup,
-                                                 vDSP_Length(count),
-                                                 direction.dftDirection)
-            case .complexReal:
-                return vDSP_DFT_zrop_CreateSetupD(previous?.dftSetup,
-                                                  vDSP_Length(count),
-                                                  direction.dftDirection)
-            }
-    }
-    
-    /// Computes an out-of-place single-precision real discrete Fourier transform.
-    ///
-    /// - Parameter dftSetup: A DCT setup object.
-    /// - Parameter inputReal: Input vector - real part.
-    /// - Parameter inputImaginary: Input vector - imaginary part.
-    /// - Parameter outputReal: Output vector - real part.
-    /// - Parameter outputImaginary: Output vector - imaginary part.
-    public static func transform<U, V>(dftSetup: OpaquePointer,
-                                       inputReal: U, inputImaginary: U,
-                                       outputReal: inout V, outputImaginary: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            inputReal.withUnsafeBufferPointer { Ir in
-                inputImaginary.withUnsafeBufferPointer { Ii in
-                    outputReal.withUnsafeMutableBufferPointer { Or in
-                        outputImaginary.withUnsafeMutableBufferPointer { Oi in
-                            
-                            vDSP_DFT_ExecuteD(dftSetup,
-                                              Ir.baseAddress!,
-                                              Ii.baseAddress!,
-                                              Or.baseAddress!,
-                                              Oi.baseAddress!)
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Releases a DFT setup object.
-    public static func destroySetup(_ setup: OpaquePointer) {
-        vDSP_DFT_DestroySetupD(setup)
-    }
-}
-
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_DecibelConversion.swift b/stdlib/public/Darwin/Accelerate/vDSP_DecibelConversion.swift
deleted file mode 100644
index ed0a76ec9e84f..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_DecibelConversion.swift
+++ /dev/null
@@ -1,235 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Converts power to decibels, single-precision.
-    ///
-    /// - Parameter power: Source vector.
-    /// - Parameter zeroReference: Zero reference.
-    /// - Returns: `power` converted to decibels.
-    @inlinable
-    public static func powerToDecibels<U>(_ power: U,
-                                          zeroReference: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: power.count) {
-                buffer, initializedCount in
-                
-                convert(power: power,
-                        toDecibels: &buffer,
-                        zeroReference: zeroReference)
-                
-                initializedCount = power.count
-            }
-            
-            return result
-    }
-    
-    /// Converts power to decibels, single-precision.
-    ///
-    /// - Parameter power: Source vector.
-    /// - Parameter decibels: Destination vector.
-    /// - Parameter zeroReference: Zero reference.
-    @inlinable
-    public static func convert<U, V>(power: U,
-                                     toDecibels decibels: inout V,
-                                     zeroReference: Float)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = decibels.count
-            precondition(power.count == n)
-            
-            decibels.withUnsafeMutableBufferPointer { db in
-                power.withUnsafeBufferPointer { pwr in
-                    withUnsafePointer(to: zeroReference) { zref in
-                        vDSP_vdbcon(pwr.baseAddress!, 1,
-                                    zref,
-                                    db.baseAddress!, 1,
-                                    vDSP_Length(n),
-                                    0)
-                    }
-                }
-            }
-    }
-    
-    /// Converts power to decibels, double-precision.
-    ///
-    /// - Parameter power: Source vector.
-    /// - Parameter zeroReference: Zero reference.
-    /// - Returns: `power` converted to decibels.
-    @inlinable
-    public static func powerToDecibels<U>(_ power: U,
-                                          zeroReference: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: power.count) {
-                buffer, initializedCount in
-                
-                convert(power: power,
-                        toDecibels: &buffer,
-                        zeroReference: zeroReference)
-                
-                initializedCount = power.count
-            }
-            
-            return result
-    }
-    
-    /// Converts power to decibels, double-precision.
-    ///
-    /// - Parameter power: Source vector.
-    /// - Parameter decibels: Destination vector.
-    /// - Parameter zeroReference: Zero reference.
-    @inlinable
-    public static func convert<U, V>(power: U,
-                                     toDecibels decibels: inout V,
-                                     zeroReference: Double)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = decibels.count
-            precondition(power.count == n)
-            
-            decibels.withUnsafeMutableBufferPointer { db in
-                power.withUnsafeBufferPointer { pwr in
-                    withUnsafePointer(to: zeroReference) { zref in
-                        vDSP_vdbconD(pwr.baseAddress!, 1,
-                                     zref,
-                                     db.baseAddress!, 1,
-                                     vDSP_Length(n),
-                                     0)
-                    }
-                }
-            }
-    }
-    
-    /// Converts amplitude to decibels, single-precision.
-    ///
-    /// - Parameter amplitude: Source vector.
-    /// - Parameter zeroReference: Zero reference.
-    /// - Returns: `amplitude` converted to decibels.
-    @inlinable
-    public static func amplitudeToDecibels<U>(_ amplitude: U,
-                                              zeroReference: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: amplitude.count) {
-                buffer, initializedCount in
-                
-                convert(amplitude: amplitude,
-                        toDecibels: &buffer,
-                        zeroReference: zeroReference)
-                
-                initializedCount = amplitude.count
-            }
-            
-            return result
-    }
-    
-    /// Converts amplitude to decibels, single-precision.
-    ///
-    /// - Parameter amplitude: Source vector.
-    /// - Parameter decibels: Destination vector.
-    /// - Parameter zeroReference: Zero reference.
-    @inlinable
-    public static func convert<U, V>(amplitude: U,
-                                     toDecibels decibels: inout V,
-                                     zeroReference: Float)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = decibels.count
-            precondition(amplitude.count == n)
-            
-            decibels.withUnsafeMutableBufferPointer { db in
-                amplitude.withUnsafeBufferPointer { amp in
-                    withUnsafePointer(to: zeroReference) { zref in
-                        vDSP_vdbcon(amp.baseAddress!, 1,
-                                    zref,
-                                    db.baseAddress!, 1,
-                                    vDSP_Length(n),
-                                    1)
-                    }
-                }
-            }
-    }
-    
-    /// Converts amplitude to decibels, double-precision.
-    ///
-    /// - Parameter amplitude: Source vector.
-    /// - Parameter zeroReference: Zero reference.
-    /// - Returns: `amplitude` converted to decibels.
-    @inlinable
-    public static func amplitudeToDecibels<U>(_ amplitude: U,
-                                              zeroReference: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: amplitude.count) {
-                buffer, initializedCount in
-                
-                convert(amplitude: amplitude,
-                        toDecibels: &buffer,
-                        zeroReference: zeroReference)
-                
-                initializedCount = amplitude.count
-            }
-            
-            return result
-    }
-    
-    /// Converts amplitude to decibels, double-precision.
-    ///
-    /// - Parameter amplitude: Source vector.
-    /// - Parameter decibels: Destination vector.
-    /// - Parameter zeroReference: Zero reference.
-    @inlinable
-    public static func convert<U, V>(amplitude: U,
-                                     toDecibels decibels: inout V,
-                                     zeroReference: Double)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = decibels.count
-            precondition(amplitude.count == n)
-            
-            decibels.withUnsafeMutableBufferPointer { db in
-                amplitude.withUnsafeBufferPointer { amp in
-                    withUnsafePointer(to: zeroReference) { zref in
-                        vDSP_vdbconD(amp.baseAddress!, 1,
-                                     zref,
-                                     db.baseAddress!, 1,
-                                     vDSP_Length(n),
-                                     1)
-                    }
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_FFT.swift b/stdlib/public/Darwin/Accelerate/vDSP_FFT.swift
deleted file mode 100644
index aa6861d6041c6..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_FFT.swift
+++ /dev/null
@@ -1,450 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  1D and 2D Fast Fourier Transform
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// An enumeration that defines the size of the FFT decomposition.
-    public enum Radix {
-        case radix2
-        case radix3
-        case radix5
-        
-        public var fftRadix: FFTRadix {
-            switch self {
-            case .radix2:
-                return FFTRadix(kFFTRadix2)
-            case .radix3:
-                return FFTRadix(kFFTRadix3)
-            case .radix5:
-                return FFTRadix(kFFTRadix5)
-            }
-        }
-    }
-    
-    /// A class that provides forward and inverse FFT on `DSPSplitComplex` or `DSPDoubleSplitComplex` structure.
-    public class FFT<T: vDSP_FourierTransformable> {
-        
-        let log2n: vDSP_Length
-        let radix: Radix
-        
-        fileprivate let fftSetup: OpaquePointer
-        
-        /// Initializes a new fast Fourier transform structure.
-        ///
-        /// - Parameter log2n: The base-two logarithm of the maximum number of elements to be transformed.
-        /// - Parameter radix: Specifies radix options.
-        public init?(log2n: vDSP_Length,
-                     radix: Radix,
-                     ofType: T.Type) {
-            
-            self.log2n = log2n
-            self.radix = radix
-            
-            guard let setup = T.FFTFunctions.makeFFTSetup(log2n: log2n,
-                                                          radix: radix) else {
-                                                            return nil
-            }
-            
-            fftSetup = setup
-        }
-        
-        /// Computes an out-of-place single-precision real forward or inverse fast Fourier transform.
-        ///
-        /// - Parameter input: Complex input vector.
-        /// - Parameter output: Complex output vector.
-        /// - Parameter direction: The transform direction.
-        public func transform<T: vDSP_FourierTransformable>(input: T,
-                                                            output: inout T,
-                                                            direction: vDSP.FourierTransformDirection) {
-            
-            vDSP_FFTFunctions.fftTransform(fftSetup: fftSetup,
-                                           log2n: log2n,
-                                           source: input,
-                                           destination: &output,
-                                           direction: direction)
-        }
-        
-        /// Computes an out-of-place single-precision real forward fast Fourier transform.
-        ///
-        /// - Parameter input: Complex input vector.
-        /// - Parameter output: Complex output vector.
-        public func forward(input: DSPSplitComplex,
-                            output: inout DSPSplitComplex) {
-            transform(input: input,
-                      output: &output,
-                      direction: .forward)
-        }
-        
-        /// Computes an out-of-place single-precision real inverse fast Fourier transform.
-        ///
-        /// - Parameter input: Complex input vector.
-        /// - Parameter output: Complex output vector.
-        public func inverse(input: DSPSplitComplex,
-                            output: inout DSPSplitComplex) {
-            transform(input: input,
-                      output: &output,
-                      direction: .inverse)
-        }
-        
-        /// Frees memory associated with this `FFT` struct.
-        deinit {
-            T.FFTFunctions.destroySetup(fftSetup)
-        }
-    }
-    
-    // MARK: 2D FFT
-    
-    /// A class that provides forward and inverse 2D FFT on `DSPSplitComplex` or `DSPDoubleSplitComplex` structure.
-    public class FFT2D<T: vDSP_FourierTransformable>: FFT<T> {
-        
-        let width: Int
-        let height: Int
-        
-        /// Initializes a new fast Fourier transform structure for 2D FFT.
-        ///
-        /// - Parameter width: The width of the matrix to be transformed.
-        /// - Parameter height: The width of the matrix to be transformed.
-        required public init?(width: Int,
-                              height: Int,
-                              ofType: T.Type) {
-            self.width = width
-            self.height = height
-            
-            let log2n = vDSP_Length(log2(Float(width * height)))
-            
-            super.init(log2n: log2n,
-                       radix: .radix2,
-                       ofType: ofType)
-        }
-        
-        /// Computes an out-of-place 2D fast Fourier transform.
-        ///
-        /// - Parameter input: Complex input vector.
-        /// - Parameter output: Complex output vector.
-        /// - Parameter direction: Specifies transform direction.
-        override public func transform<T: vDSP_FourierTransformable>(input: T,
-                                                                     output: inout T,
-                                                                     direction: vDSP.FourierTransformDirection) {
-            vDSP_FFTFunctions.fftTransform2D(fftSetup: fftSetup,
-                                             width: width,
-                                             height: height,
-                                             source: input,
-                                             destination: &output,
-                                             direction: direction)
-        }
-    }
-    
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FourierTransformFunctions {
-    associatedtype SplitComplex
-    
-    static func makeFFTSetup(log2n: vDSP_Length,
-                             radix: vDSP.Radix) -> OpaquePointer?
-    
-    static func transform(fftSetup: OpaquePointer,
-                          log2n: vDSP_Length,
-                          source: UnsafePointer<SplitComplex>,
-                          destination: UnsafeMutablePointer<SplitComplex>,
-                          direction: vDSP.FourierTransformDirection)
-    
-    static func transform2D(fftSetup: OpaquePointer,
-                            width: Int,
-                            height: Int,
-                            source: UnsafePointer<SplitComplex>,
-                            destination: UnsafeMutablePointer<SplitComplex>,
-                            direction: vDSP.FourierTransformDirection)
-    
-    static func destroySetup(_ setup: OpaquePointer)
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Type-specific FFT function implementations
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public struct vDSP_SplitComplexFloat: vDSP_FourierTransformFunctions {
-    public typealias SplitComplex = DSPSplitComplex
-    
-    /// Returns a setup structure to perform a fast Fourier transform.
-    public static func makeFFTSetup(log2n: vDSP_Length,
-                                    radix: vDSP.Radix) -> OpaquePointer? {
-        
-        return vDSP_create_fftsetup(
-            log2n,
-            radix.fftRadix)
-    }
-    
-    /// Performs a 1D fast Fourier transform.
-    public static func transform(fftSetup: OpaquePointer,
-                                 log2n: vDSP_Length,
-                                 source: UnsafePointer<SplitComplex>,
-                                 destination: UnsafeMutablePointer<SplitComplex>,
-                                 direction: vDSP.FourierTransformDirection) {
-        vDSP_fft_zrop(fftSetup,
-                      source, 1,
-                      destination, 1,
-                      log2n,
-                      direction.fftDirection)
-    }
-    
-    /// Performs a 2D fast Fourier transform.
-    public static func transform2D(fftSetup: OpaquePointer,
-                                   width: Int,
-                                   height: Int,
-                                   source: UnsafePointer<SplitComplex>,
-                                   destination: UnsafeMutablePointer<SplitComplex>,
-                                   direction: vDSP.FourierTransformDirection) {
-        vDSP_fft2d_zrop(fftSetup,
-                        source, 1, 0,
-                        destination, 1, 0,
-                        vDSP_Length(log2(Float(width))),
-                        vDSP_Length(log2(Float(height))),
-                        direction.fftDirection)
-    }
-    
-    /// Releases an FFT setup object.
-    public static func destroySetup(_ setup: OpaquePointer) {
-        vDSP_destroy_fftsetup(setup)
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public struct vDSP_SplitComplexDouble: vDSP_FourierTransformFunctions {
-    public typealias SplitComplex = DSPDoubleSplitComplex
-    
-    /// Returns a setup structure to perform a fast Fourier transform.
-    public static func makeFFTSetup(log2n: vDSP_Length,
-                                    radix: vDSP.Radix) -> OpaquePointer? {
-        
-        return vDSP_create_fftsetupD(
-            log2n,
-            radix.fftRadix)
-    }
-    
-    /// Performs a 1D fast Fourier transform.
-    public static func transform(fftSetup: OpaquePointer,
-                                 log2n: vDSP_Length,
-                                 source: UnsafePointer<SplitComplex>,
-                                 destination: UnsafeMutablePointer<SplitComplex>,
-                                 direction: vDSP.FourierTransformDirection) {
-        vDSP_fft_zropD(fftSetup,
-                       source, 1,
-                       destination, 1,
-                       log2n,
-                       direction.fftDirection)
-    }
-    
-    /// Performs a 2D fast Fourier transform.
-    public static func transform2D(fftSetup: OpaquePointer,
-                                   width: Int,
-                                   height: Int,
-                                   source: UnsafePointer<SplitComplex>,
-                                   destination: UnsafeMutablePointer<SplitComplex>,
-                                   direction: vDSP.FourierTransformDirection) {
-        vDSP_fft2d_zropD(fftSetup,
-                         source, 1, 0,
-                         destination, 1, 0,
-                         vDSP_Length(log2(Float(width))),
-                         vDSP_Length(log2(Float(height))),
-                         direction.fftDirection)
-    }
-    
-    /// Releases an FFT setup object.
-    public static func destroySetup(_ setup: OpaquePointer) {
-        vDSP_destroy_fftsetupD(setup)
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FourierTransformable {
-    associatedtype FFTFunctions: vDSP_FourierTransformFunctions where FFTFunctions.SplitComplex == Self
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension DSPSplitComplex: vDSP_FourierTransformable {
-    public typealias FFTFunctions = vDSP_SplitComplexFloat
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension DSPDoubleSplitComplex: vDSP_FourierTransformable {
-    public typealias FFTFunctions = vDSP_SplitComplexDouble
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-struct vDSP_FFTFunctions {
-    /// Performs a 1D fast Fourier transform.
-    @inlinable
-    static func fftTransform<SplitComplex>(fftSetup: OpaquePointer,
-                                           log2n: vDSP_Length,
-                                           source: SplitComplex,
-                                           destination: inout SplitComplex,
-                                           direction: vDSP.FourierTransformDirection) where SplitComplex: vDSP_FourierTransformable {
-        
-        withUnsafePointer(to: source) { sourcePointer in
-            SplitComplex.FFTFunctions.transform(fftSetup: fftSetup,
-                                                log2n: log2n,
-                                                source: sourcePointer,
-                                                destination: &destination,
-                                                direction: direction)
-        }
-    }
-    
-    /// Performs a 2D fast Fourier transform.
-    @inlinable
-    static func fftTransform2D<SplitComplex>(fftSetup: OpaquePointer,
-                                             width: Int,
-                                             height: Int,
-                                             source: SplitComplex,
-                                             destination: inout SplitComplex,
-                                             direction: vDSP.FourierTransformDirection) where SplitComplex: vDSP_FourierTransformable {
-        
-        withUnsafePointer(to: source) { sourcePointer in
-            SplitComplex.FFTFunctions.transform2D(fftSetup: fftSetup,
-                                                  width: width,
-                                                  height: height,
-                                                  source: sourcePointer,
-                                                  destination: &destination,
-                                                  direction: direction)
-        }
-    }
-}
-
-@available(macOS, introduced: 10.15, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(iOS, introduced: 13.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(watchOS, introduced: 6.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(tvOS, introduced: 13.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(*, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-extension DSPSplitComplex {
-    
-    /// Creates a new `DSPSplitComplex` structure from a real array not in even-odd split configuration.
-    ///
-    /// - Parameter inputArray: The source array of contiguous values.
-    /// - Parameter realParts: An array of real parts of the complex numbers.
-    /// - Parameter imaginaryParts: An array of imaginary parts of the complex numbers.
-    public init(fromInputArray inputArray: [Float],
-                realParts: inout [Float],
-                imaginaryParts: inout [Float]) {
-        
-        self.init(realp: &realParts,
-                  imagp: &imaginaryParts)
-        
-        inputArray.withUnsafeBytes{
-            vDSP_ctoz([DSPComplex]($0.bindMemory(to: DSPComplex.self)), 2,
-                      &self, 1,
-                      vDSP_Length(inputArray.count / 2))
-        }
-    }
-}
-
-@available(macOS, introduced: 10.15, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(iOS, introduced: 13.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(watchOS, introduced: 6.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(tvOS, introduced: 13.0, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-@available(*, deprecated, message: "Use the `withUnsafeMutableBufferPointer` method on the real and imaginary arrays to create `DSPSplitComplex` for a defined scope.")
-extension DSPDoubleSplitComplex {
-    
-    /// Creates a new `DSPDoubleSplitComplex` structure from a real array not in even-odd split configuration.
-    ///
-    /// - Parameter inputArray: The source array of contiguous values.
-    /// - Parameter realParts: An array of real parts of the complex numbers.
-    /// - Parameter imaginaryParts: An array of imaginary parts of the complex numbers.
-    public init(fromInputArray inputArray: [Double],
-                realParts: inout [Double],
-                imaginaryParts: inout [Double]) {
-        
-        self.init(realp: &realParts,
-                  imagp: &imaginaryParts)
-        
-        inputArray.withUnsafeBytes{
-            vDSP_ctozD([DSPDoubleComplex]($0.bindMemory(to: DSPDoubleComplex.self)), 2,
-                       &self, 1,
-                       vDSP_Length(inputArray.count / 2))
-        }
-    }
-}
-
-extension Array where Element == Float {
-    /// Creates a new array of single-precision values from a `DSPSplitComplex` structure.
-    ///
-    /// - Parameter scale: A multiplier to apply during conversion.
-    /// - Parameter count: The length of the required resulting array (typically half the count of either the real or imaginary parts of the `DSPSplitComplex`.
-    @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    public init(fromSplitComplex splitComplex: DSPSplitComplex,
-                scale: Float,
-                count: Int) {
-        var complexPairs = [DSPComplex](repeating: DSPComplex(real: 0, imag: 0),
-                                        count: count / 2)
-        
-        withUnsafePointer(to: splitComplex) {
-            vDSP_ztoc($0, 1,
-                      &complexPairs, 2,
-                      vDSP_Length(count / 2))
-        }
-        
-        self = [Float](repeating: 0, count: count)
-        
-        complexPairs.withUnsafeBytes {
-            guard let complexPairsUnsafePointer = $0.bindMemory(to: Float.self).baseAddress else {
-                fatalError("Internal error")
-            }
-            
-            vDSP_vsmul(complexPairsUnsafePointer, 1,
-                       [scale],
-                       &self, 1,
-                       vDSP_Length(count))
-        }
-    }
-}
-
-extension Array where Element == Double {
-    /// Creates a new array of single-precision values from a `DSPDoubleSplitComplex` structure.
-    ///
-    /// - Parameter scale: A multiplier to apply during conversion.
-    /// - Parameter count: The length of the required resulting array (typically half the count of either the real or imaginary parts of the `DSPSplitComplex`.
-    @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-    public init(fromSplitComplex splitComplex: DSPDoubleSplitComplex,
-                scale: Double,
-                count: Int) {
-        var complexPairs = [DSPDoubleComplex](repeating: DSPDoubleComplex(real: 0, imag: 0),
-                                              count: count / 2)
-        
-        withUnsafePointer(to: splitComplex) {
-            vDSP_ztocD($0, 1,
-                       &complexPairs, 2,
-                       vDSP_Length(count / 2))
-        }
-        
-        self = [Double](repeating: 0, count: count)
-        
-        complexPairs.withUnsafeBytes {
-            guard let complexPairsUnsafePointer = $0.bindMemory(to: Double.self).baseAddress else {
-                fatalError("Internal error")
-            }
-            
-            vDSP_vsmulD(complexPairsUnsafePointer, 1,
-                        [scale],
-                        &self, 1,
-                        vDSP_Length(count))
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_FFT_DFT_Common.swift b/stdlib/public/Darwin/Accelerate/vDSP_FFT_DFT_Common.swift
deleted file mode 100644
index e4ba1c37c2a31..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_FFT_DFT_Common.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    public enum FourierTransformDirection {
-        case forward
-        case inverse
-        
-        public var dftDirection: vDSP_DFT_Direction {
-            switch self {
-            case .forward:
-                return .FORWARD
-            case .inverse:
-                return .INVERSE
-            }
-        }
-        
-        public var fftDirection: FFTDirection {
-            switch self {
-            case .forward:
-                return FFTDirection(kFFTDirection_Forward)
-            case .inverse:
-                return FFTDirection(kFFTDirection_Inverse)
-            }
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_FIR.swift b/stdlib/public/Darwin/Accelerate/vDSP_FIR.swift
deleted file mode 100644
index 54b2284aafe82..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_FIR.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// FIR filtering with decimation and antialiasing; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter decimationFactor: The integer factor by which to divide the sampling rate.
-    /// - Parameter filter: Filter to use during the downsampling operation.
-    /// - Returns: Single-precision output vector.
-    @inlinable
-    public static func downsample<T, U>(_ source: U,
-                                        decimationFactor: Int,
-                                        filter: T) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float,
-        U.Element == Float {
-            
-            let n = (source.count - filter.count) / decimationFactor + 1
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                downsample(source,
-                           decimationFactor: decimationFactor,
-                           filter: filter,
-                           result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// FIR filtering with decimation and antialiasing; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter decimationFactor: The integer factor by which to divide the sampling rate.
-    /// - Parameter filter: Filter to use during the downsampling operation.
-    /// - Parameter result: Single-precision output vector.
-    @inlinable
-    public static func downsample<T, U, V>(_ source: U,
-                                           decimationFactor: Int,
-                                           filter: T,
-                                           result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float,
-        U.Element == Float,
-        V.Element == Float {
-            
-            let p = filter.count
-            let n = result.count
-            
-            precondition(source.count == decimationFactor * (n - 1) + p)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    filter.withUnsafeBufferPointer { f in
-                        
-                        vDSP_desamp(src.baseAddress!,
-                                    vDSP_Stride(decimationFactor),
-                                    f.baseAddress!,
-                                    dest.baseAddress!,
-                                    vDSP_Length(n),
-                                    vDSP_Length(p))
-                    }
-                }
-            }
-    }
-    
-    /// FIR filtering with decimation and antialiasing; double-precision.
-    ///
-    /// - Parameter source: Double-precision input vector.
-    /// - Parameter decimationFactor: The integer factor by which to divide the sampling rate.
-    /// - Parameter filter: Filter to use during the downsampling operation.
-    /// - Returns: Double-precision output vector.
-    @inlinable
-    public static func downsample<T, U>(_ source: U,
-                                        decimationFactor: Int,
-                                        filter: T) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double,
-        U.Element == Double {
-            let n = (source.count - filter.count) / decimationFactor + 1
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                downsample(source,
-                           decimationFactor: decimationFactor,
-                           filter: filter,
-                           result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// FIR filtering with decimation and antialiasing; double-precision.
-    ///
-    /// - Parameter source: Double-precision input vector.
-    /// - Parameter decimationFactor: The integer factor by which to divide the sampling rate.
-    /// - Parameter filter: Filter to use during the downsampling operation.
-    /// - Parameter result: Double-precision output vector.
-    @inlinable
-    public static func downsample<T, U, V>(_ source: U,
-                                           decimationFactor: Int,
-                                           filter: T,
-                                           result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double,
-        U.Element == Double,
-        V.Element == Double {
-            
-            let p = filter.count
-            let n = result.count
-            
-            precondition(source.count == decimationFactor * (n - 1) + p)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    filter.withUnsafeBufferPointer { f in
-                        
-                        vDSP_desampD(src.baseAddress!,
-                                     vDSP_Stride(decimationFactor),
-                                     f.baseAddress!,
-                                     dest.baseAddress!,
-                                     vDSP_Length(n),
-                                     vDSP_Length(p))
-                    }
-                }
-            }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_FillClearGenerate.swift b/stdlib/public/Darwin/Accelerate/vDSP_FillClearGenerate.swift
deleted file mode 100644
index 4e27aadb7523d..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_FillClearGenerate.swift
+++ /dev/null
@@ -1,735 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-/// Types that support vectorized window generation.
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public protocol vDSP_FloatingPointGeneratable: BinaryFloatingPoint {
-}
-extension Float: vDSP_FloatingPointGeneratable {}
-extension Double: vDSP_FloatingPointGeneratable {}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Fill vector with specified scalar value, single-precision.
-    ///
-    /// - Parameter vector: The vector to fill.
-    /// - Parameter value: The fill value.
-    @inlinable
-    public static func fill<V>(_ vector: inout V,
-                               with value: Float)
-        where V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                withUnsafePointer(to: value) {
-                    vDSP_vfill($0,
-                               v.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    /// Fill vector with specified scalar value, double-precision.
-    ///
-    /// - Parameter vector: The vector to fill.
-    /// - Parameter value: The fill value.
-    @inlinable
-    public static func fill<V>(_ vector: inout V,
-                               with value: Double)
-        where V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                withUnsafePointer(to: value) {
-                    vDSP_vfillD($0,
-                                v.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    /// Fill vector with zeros, single-precision.
-    ///
-    /// - Parameter vector: The vector to fill.
-    @inlinable
-    public static func clear<V>(_ vector: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vclr(v.baseAddress!, 1,
-                          n)
-            }
-    }
-    
-    /// Fill vector with zeros, double-precision.
-    ///
-    /// - Parameter vector: The vector to fill.
-    @inlinable
-    public static func clear<V>(_ vector: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vclrD(v.baseAddress!, 1,
-                           n)
-            }
-    }
-    
-    /// Enum specifying window sequence.
-    public enum WindowSequence {
-        /// Creates a normalized Hanning window.
-        case hanningNormalized
-        
-        /// Creates a denormalized Hanning window.
-        case hanningDenormalized
-        
-        /// Creates a Hamming window.
-        case hamming
-        
-        /// Creates a Blackman window.
-        case blackman
-    }
-    
-    /// Creates an array containing the specified window.
-    ///
-    /// - Parameter ofType: Specifies single- or double-precision.
-    /// - Parameter sequence: Specifies the window sequence.
-    /// - Parameter count: The number of elements in the array.
-    /// - Parameter isHalfWindow: When true, creates a window with only the first `(N+1)/2` points.
-    /// - Returns: An array containing the specified window.
-    @inlinable
-    public static func window<T: vDSP_FloatingPointGeneratable>(ofType: T.Type,
-                                                                usingSequence sequence: WindowSequence,
-                                                                count: Int,
-                                                                isHalfWindow: Bool) -> [T] {
-        
-        precondition(count > 0)
-        
-        if T.self == Float.self {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: count) {
-                buffer, initializedCount in
-                
-                formWindow(usingSequence: sequence,
-                           result: &buffer,
-                           isHalfWindow: isHalfWindow)
-                
-                initializedCount = count
-            }
-            return result as! [T]
-            
-        } else if T.self == Double.self {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: count) {
-                buffer, initializedCount in
-                
-                formWindow(usingSequence: sequence,
-                           result: &buffer,
-                           isHalfWindow: isHalfWindow)
-                
-                initializedCount = count
-            }
-            return result as! [T]
-            
-        } else {
-            fatalError("This operation only supports `Float` and `Double` types.")
-        }
-    }
-    
-    /// Fills a supplied array with the specified window, single-precision.
-    ///
-    /// - Parameter sequence: Specifies the window sequence.
-    /// - Parameter result: Output values.
-    /// - Parameter isHalfWindow: When true, creates a window with only the first `(N+1)/2` points.
-    public static func formWindow<V>(usingSequence sequence: WindowSequence,
-                                     result: inout V,
-                                     isHalfWindow: Bool)
-        where V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { v in
-                switch sequence {
-                case .hanningNormalized:
-                    vDSP_hann_window(v.baseAddress!,
-                                     n,
-                                     Int32(vDSP_HANN_NORM) |
-                                        Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .hanningDenormalized:
-                    vDSP_hann_window(v.baseAddress!,
-                                     n,
-                                     Int32(vDSP_HANN_DENORM) |
-                                        Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .hamming:
-                    vDSP_hamm_window(v.baseAddress!,
-                                     n,
-                                     Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .blackman:
-                    vDSP_blkman_window(v.baseAddress!,
-                                       n,
-                                       Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                }
-            }
-    }
-    
-    /// Fills a supplied array with the specified window, double-precision.
-    ///
-    /// - Parameter sequence: Specifies the window sequence.
-    /// - Parameter result: Output values.
-    /// - Parameter isHalfWindow: When true, creates a window with only the first `(N+1)/2` points.
-    public static func formWindow<V>(usingSequence sequence: WindowSequence,
-                                     result: inout V,
-                                     isHalfWindow: Bool)
-        where V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { v in
-                switch sequence {
-                case .hanningNormalized:
-                    vDSP_hann_windowD(v.baseAddress!,
-                                      n,
-                                      Int32(vDSP_HANN_NORM) |
-                                        Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .hanningDenormalized:
-                    vDSP_hann_windowD(v.baseAddress!,
-                                      n,
-                                      Int32(vDSP_HANN_DENORM) |
-                                        Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .hamming:
-                    vDSP_hamm_windowD(v.baseAddress!,
-                                      n,
-                                      Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                case .blackman:
-                    vDSP_blkman_windowD(v.baseAddress!,
-                                        n,
-                                        Int32(isHalfWindow ?  vDSP_HALF_WINDOW : 0))
-                }
-            }
-    }
-    
-    // MARK: Ramps
-    
-    //===----------------------------------------------------------------------===//
-    //  withInitialValue and increment
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns an array containing monotonically incrementing or decrementing values, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp(withInitialValue initialValue: Float,
-                            increment: Float,
-                            count: Int) -> [Float] {
-        
-        precondition(count > 0)
-        
-        let result = Array<Float>(unsafeUninitializedCapacity: count) {
-            buffer, initializedCount in
-            
-            formRamp(withInitialValue: initialValue,
-                     increment: increment,
-                     result: &buffer)
-            
-            initializedCount = count
-        }
-        
-        return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<V>(withInitialValue initialValue: Float,
-                                   increment: Float,
-                                   result: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(result.count)
-            
-            withUnsafePointer(to: initialValue) { a in
-                withUnsafePointer(to: increment) { b in
-                    result.withUnsafeMutableBufferPointer { c in
-                        vDSP_vramp(a,
-                                   b,
-                                   c.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns an array containing monotonically incrementing or decrementing values, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp(withInitialValue initialValue: Double,
-                            increment: Double,
-                            count: Int) -> [Double] {
-        
-        precondition(count > 0)
-        
-        let result = Array<Double>(unsafeUninitializedCapacity: count) {
-            buffer, initializedCount in
-            
-            formRamp(withInitialValue: initialValue,
-                     increment: increment,
-                     result: &buffer)
-            
-            initializedCount = count
-        }
-        
-        return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<V>(withInitialValue initialValue: Double,
-                                   increment: Double,
-                                   result: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(result.count)
-            
-            withUnsafePointer(to: initialValue) { a in
-                withUnsafePointer(to: increment) { b in
-                    result.withUnsafeMutableBufferPointer { c in
-                        vDSP_vrampD(a,
-                                    b,
-                                    c.baseAddress!, 1,
-                                    n)
-                    }
-                }
-            }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //  range
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns an array containing monotonically incrementing or decrementing values within a specified range, single-precision.
-    ///
-    /// - Parameter range: Specifies range of the ramp..
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp(in range: ClosedRange<Float>,
-                            count: Int) -> [Float] {
-        
-        precondition(count > 0)
-        
-        let result = Array<Float>(unsafeUninitializedCapacity: count) {
-            buffer, initializedCount in
-            
-            formRamp(in: range,
-                     result: &buffer)
-            
-            initializedCount = count
-        }
-        
-        return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values within a specified range, single-precision.
-    ///
-    /// - Parameter range: Specifies range of the ramp.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<V>(in range: ClosedRange<Float>,
-                                   result: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(result.count)
-            
-            withUnsafePointer(to: range.lowerBound) { a in
-                withUnsafePointer(to: range.upperBound) { b in
-                    result.withUnsafeMutableBufferPointer { c in
-                        vDSP_vgen(a,
-                                  b,
-                                  c.baseAddress!, 1,
-                                  n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns an array containing monotonically incrementing or decrementing values within a specified range, double-precision.
-    ///
-    /// - Parameter range: Specifies range of the ramp..
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp(in range: ClosedRange<Double>,
-                            count: Int) -> [Double] {
-        
-        precondition(count > 0)
-        
-        let result = Array<Double>(unsafeUninitializedCapacity: count) {
-            buffer, initializedCount in
-            
-            formRamp(in: range,
-                     result: &buffer)
-            
-            initializedCount = count
-        }
-        
-        return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values within a specified range, double-precision.
-    ///
-    /// - Parameter range: Specifies range of the ramp.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<V>(in range: ClosedRange<Double>,
-                                   result: inout V)
-        where V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(result.count)
-            
-            withUnsafePointer(to: range.lowerBound) { a in
-                withUnsafePointer(to: range.upperBound) { b in
-                    result.withUnsafeMutableBufferPointer { c in
-                        vDSP_vgenD(a,
-                                   b,
-                                   c.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //  initialValue, multiplyingBy, and increment
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns an array containing monotonically incrementing or decrementing values, multiplying by a source vector, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplyingBy: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp<U>(withInitialValue initialValue: inout Float,
-                               multiplyingBy vector: U,
-                               increment: Float) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                formRamp(withInitialValue: &initialValue,
-                         multiplyingBy: vector,
-                         increment: increment,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, multiplying by a source vector, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplyingBy: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<U,V>(withInitialValue initialValue: inout Float,
-                                     multiplyingBy vector: U,
-                                     increment: Float,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    withUnsafePointer(to: increment) { step in
-                        vDSP_vrampmul(src.baseAddress!, 1,
-                                      &initialValue,
-                                      step,
-                                      dest.baseAddress!, 1,
-                                      n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns an array containing monotonically incrementing or decrementing values, multiplying by a source vector, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplyingBy: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements
-    /// - Parameter count: The number of elements in the array.
-    /// - Returns: An array containing the specified ramp.
-    @inlinable
-    public static func ramp<U>(withInitialValue initialValue: inout Double,
-                               multiplyingBy vector: U,
-                               increment: Double) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                formRamp(withInitialValue: &initialValue,
-                         multiplyingBy: vector,
-                         increment: increment,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, multiplying by a source vector, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplyingBy: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func formRamp<U,V>(withInitialValue initialValue: inout Double,
-                                     multiplyingBy vector: U,
-                                     increment: Double,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    withUnsafePointer(to: increment) { step in
-                        vDSP_vrampmulD(src.baseAddress!, 1,
-                                       &initialValue,
-                                       step,
-                                       dest.baseAddress!, 1,
-                                       n)
-                    }
-                }
-            }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //  stereo
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns two arraya containing monotonically monotonically incrementing or decrementing values, multiplying by a source vector, stereo, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplierOne: Input values multiplied by the ramp function.
-    /// - Parameter multiplierTwo: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Returns: A tuple of two arrays containing the specified ramps.
-    @inlinable
-    public static func stereoRamp<U>(withInitialValue initialValue: inout Float,
-                                     multiplyingBy multiplierOne: U, _ multiplierTwo: U,
-                                     increment: Float) -> (firstOutput:[Float], secondOutput: [Float])
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = multiplierOne.count
-            
-            var firstOutput: Array<Float>!
-            
-            let secondOutput = Array<Float>(unsafeUninitializedCapacity: n) {
-                secondBuffer, secondInitializedCount in
-                
-                firstOutput = Array<Float>(unsafeUninitializedCapacity: n) {
-                    firstBuffer, firstInitializedCount in
-                    
-                    formStereoRamp(withInitialValue: &initialValue,
-                                   multiplyingBy: multiplierOne, multiplierTwo,
-                                   increment: increment,
-                                   results: &firstBuffer, &secondBuffer)
-                    
-                    firstInitializedCount = n
-                }
-                
-                secondInitializedCount = n
-            }
-            
-            return (firstOutput: firstOutput,
-                    secondOutput: secondOutput)
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, multiplying by a source vector, stereo, single-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplierOne: Input values multiplied by the ramp function.
-    /// - Parameter multiplierTwo: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter resultOne: Output values.
-    /// - Parameter resultTwo: Output values.
-    @inlinable
-    public static func formStereoRamp<U,V>(withInitialValue initialValue: inout Float,
-                                           multiplyingBy multiplierOne: U, _ multiplierTwo: U,
-                                           increment: Float,
-                                           results resultOne: inout V, _ resultTwo: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(multiplierOne.count == multiplierTwo.count)
-            precondition(resultOne.count == resultTwo.count)
-            precondition(multiplierOne.count == resultOne.count)
-            let n = vDSP_Length(resultTwo.count)
-            
-            resultOne.withUnsafeMutableBufferPointer { o0 in
-                resultTwo.withUnsafeMutableBufferPointer { o1 in
-                    multiplierOne.withUnsafeBufferPointer { i0 in
-                        multiplierTwo.withUnsafeBufferPointer { i1 in
-                            withUnsafePointer(to: increment) { step in
-                                vDSP_vrampmul2(i0.baseAddress!,
-                                               i1.baseAddress!, 1,
-                                               &initialValue,
-                                               step,
-                                               o0.baseAddress!,
-                                               o1.baseAddress!, 1,
-                                               n)
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns two arraya containing monotonically monotonically incrementing or decrementing values, multiplying by a source vector, stereo, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplierOne: Input values multiplied by the ramp function.
-    /// - Parameter multiplierTwo: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Returns: A tuple of two arrays containing the specified ramps.
-    @inlinable
-    public static func stereoRamp<U>(withInitialValue initialValue: inout Double,
-                                     multiplyingBy multiplierOne: U, _ multiplierTwo: U,
-                                     increment: Double) -> (firstOutput:[Double], secondOutput: [Double])
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = multiplierOne.count
-            
-            var firstOutput: Array<Double>!
-            
-            let secondOutput = Array<Double>(unsafeUninitializedCapacity: n) {
-                secondBuffer, secondInitializedCount in
-                
-                firstOutput = Array<Double>(unsafeUninitializedCapacity: n) {
-                    firstBuffer, firstInitializedCount in
-                    
-                    formStereoRamp(withInitialValue: &initialValue,
-                                   multiplyingBy: multiplierOne, multiplierTwo,
-                                   increment: increment,
-                                   results: &firstBuffer, &secondBuffer)
-                    
-                    firstInitializedCount = n
-                }
-                
-                secondInitializedCount = n
-            }
-            
-            return (firstOutput: firstOutput,
-                    secondOutput: secondOutput)
-    }
-    
-    /// Fills a supplied array with monotonically incrementing or decrementing values, multiplying by a source vector, stereo, double-precision.
-    ///
-    /// - Parameter initialValue: Specifies the initial value. Modified on return to hold the next value (including accumulated errors) so that the ramp function can be continued smoothly.
-    /// - Parameter multiplierOne: Input values multiplied by the ramp function.
-    /// - Parameter multiplierTwo: Input values multiplied by the ramp function.
-    /// - Parameter increment: The increment (or decrement if negative) between consecutive elements.
-    /// - Parameter resultOne: Output values.
-    /// - Parameter resultTwo: Output values.
-    @inlinable
-    public static func formStereoRamp<U,V>(withInitialValue initialValue: inout Double,
-                                           multiplyingBy multiplierOne: U, _ multiplierTwo: U,
-                                           increment: Double,
-                                           results resultOne: inout V, _ resultTwo: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(multiplierOne.count == multiplierTwo.count)
-            precondition(resultOne.count == resultTwo.count)
-            precondition(multiplierOne.count == resultOne.count)
-            let n = vDSP_Length(resultTwo.count)
-            
-            resultOne.withUnsafeMutableBufferPointer { o0 in
-                resultTwo.withUnsafeMutableBufferPointer { o1 in
-                    multiplierOne.withUnsafeBufferPointer { i0 in
-                        multiplierTwo.withUnsafeBufferPointer { i1 in
-                            withUnsafePointer(to: increment) { step in
-                                vDSP_vrampmul2D(i0.baseAddress!,
-                                                i1.baseAddress!, 1,
-                                                &initialValue,
-                                                step,
-                                                o0.baseAddress!,
-                                                o1.baseAddress!, 1,
-                                                n)
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Geometry.swift b/stdlib/public/Darwin/Accelerate/vDSP_Geometry.swift
deleted file mode 100644
index b237af23c7173..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Geometry.swift
+++ /dev/null
@@ -1,424 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK Dot product
-    
-    /// Returns the dot or scalar product of vectors A and B; single-precision.
-    ///
-    /// - Parameter vectorA: Single-precision real input vector A.
-    /// - Parameter vectorB: Single-precision real input vector B.
-    /// - Returns: The dot product of vectors A and B.
-    @inlinable
-    public static func dot<U>(_ vectorA: U,
-                              _ vectorB: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            precondition(vectorA.count == vectorB.count)
-            
-            let n = vDSP_Length(vectorA.count)
-            var result = Float.nan
-            
-            vectorA.withUnsafeBufferPointer { a in
-                vectorB.withUnsafeBufferPointer { b in
-                    
-                    vDSP_dotpr(a.baseAddress!, 1,
-                               b.baseAddress!, 1,
-                               &result, n)
-                    
-                }
-            }
-            
-            return result
-    }
-    
-    /// Returns the dot or scalar product of vectors A and B; double-precision.
-    ///
-    /// - Parameter vectorA: Double-precision real input vector A.
-    /// - Parameter vectorB: Double-precision real input vector B.
-    /// - Returns: The dot product of vectors A and B.
-    @inlinable
-    public static func dot<U>(_ vectorA: U,
-                              _ vectorB: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            precondition(vectorA.count == vectorB.count)
-            
-            let n = vDSP_Length(vectorA.count)
-            var result = Double.nan
-            
-            vectorA.withUnsafeBufferPointer { a in
-                vectorB.withUnsafeBufferPointer { b in
-                    
-                    vDSP_dotprD(a.baseAddress!, 1,
-                                b.baseAddress!, 1,
-                                &result, n)
-                    
-                }
-            }
-            
-            return result
-    }
-    
-    // MARK: Distance
-    
-    /// Returns the hypotenuse of right-angled triangles with sides that are the lengths of
-    /// corresponding elements in vectors `x` and `y`; single-precision.
-    ///
-    /// - Parameter x: The `x` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter y: The `y` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter result: The `z` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    @inlinable
-    public static func hypot<U, V>(_ x: U,
-                                   _ y: V) -> [Float]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(x.count == y.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: x.count) {
-                buffer, initializedCount in
-                
-                hypot(x, y,
-                     result: &buffer)
-                
-                initializedCount = x.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hypotenuse of right-angled triangles with sides that are the lengths of
-    /// corresponding elements in vectors `x` and `y`; single-precision.
-    ///
-    /// - Parameter x: The `x` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter y: The `y` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter result: The `z` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    @inlinable
-    public static func hypot<T, U, V>(_ x: T,
-                                      _ y: U,
-                                      result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(x.count == y.count && y.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            x.withUnsafeBufferPointer { a in
-                y.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        vDSP_vdist(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   dest.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns the hypotenuse of right-angled triangles with sides that are the lengths of
-    /// corresponding elements in vectors `x` and `y`; double-precision.
-    ///
-    /// - Parameter x: The `x` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter y: The `y` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter result: The `z` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    @inlinable
-    public static func hypot<U, V>(_ x: U,
-                                   _ y: V) -> [Double]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(x.count == y.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: x.count) {
-                buffer, initializedCount in
-                
-                hypot(x, y,
-                      result: &buffer)
-                
-                initializedCount = x.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hypotenuse of right-angled triangles with sides that are the lengths of
-    /// corresponding elements in vectors `x` and `y`; double-precision.
-    ///
-    /// - Parameter x: The `x` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter y: The `y` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    /// - Parameter result: The `z` in `z[i] = sqrt(x[i]² + y[i]²)`.
-    @inlinable
-    public static func hypot<T, U, V>(_ x: T,
-                                      _ y: U,
-                                      result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(x.count == y.count && y.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            x.withUnsafeBufferPointer { a in
-                y.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        vDSP_vdistD(a.baseAddress!, 1,
-                                    b.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n)
-                    }
-                }
-            }
-    }
-    
-    // MARK: Pythagoras
-    
-    /// Returns the hypotenuse of right-angled triangles with sides that are the differences of
-    /// corresponding values in x0 and x1, and y0 and y1. Single-precision.
-    ///
-    /// - Parameter x0: The `x0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter x1: The `x1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y0: The `y0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y1: The `y1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter result: The `z` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    @inlinable
-    public static func hypot<R, S, T, U>(x0: R, x1: S,
-                                            y0: T, y1: U) -> [Float]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Float, S.Element == Float,
-        T.Element == Float, U.Element == Float {
-            
-            precondition(x0.count == x1.count)
-            precondition(y0.count == y1.count)
-            precondition(x0.count == y0.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: x0.count) {
-                buffer, initializedCount in
-                
-                hypot(x0: x0, x1: x1,
-                      y0: y0, y1: y1,
-                      result: &buffer)
-                
-                initializedCount = x0.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hypotenuse of right-angled triangles with sides that are the differences of
-    /// corresponding values in x0 and x1, and y0 and y1. Single-precision.
-    ///
-    /// - Parameter x0: The `x0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter x1: The `x1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y0: The `y0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y1: The `y1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter result: The `z` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    @inlinable
-    public static func hypot<R, S, T, U, V>(x0: R, x1: S,
-                                            y0: T, y1: U,
-                                            result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Float, S.Element == Float,
-        T.Element == Float, U.Element == Float,
-        V.Element == Float {
-            
-            precondition(x0.count == x1.count && x0.count == result.count)
-            precondition(y0.count == y1.count && y0.count == result.count)
-            
-            let n = vDSP_Length(result.count)
-            
-            x0.withUnsafeBufferPointer { a in
-                x1.withUnsafeBufferPointer { c in
-                    y0.withUnsafeBufferPointer { b in
-                        y1.withUnsafeBufferPointer { d in
-                            result.withUnsafeMutableBufferPointer { dest in
-                                vDSP_vpythg(a.baseAddress!, 1,
-                                            b.baseAddress!, 1,
-                                            c.baseAddress!, 1,
-                                            d.baseAddress!, 1,
-                                            dest.baseAddress!, 1,
-                                            n)
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    /// Returns the hypotenuse of right-angled triangles with sides that are the differences of
-    /// corresponding values in x0 and x1, and y0 and y1. Double-precision.
-    ///
-    /// - Parameter x0: The `x0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter x1: The `x1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y0: The `y0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y1: The `y1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter result: The `z` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    @inlinable
-    public static func hypot<R, S, T, U>(x0: R, x1: S,
-                                            y0: T, y1: U) -> [Double]
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        R.Element == Double, S.Element == Double,
-        T.Element == Double, U.Element == Double {
-            
-            precondition(x0.count == x1.count)
-            precondition(y0.count == y1.count)
-            precondition(x0.count == y0.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: x0.count) {
-                buffer, initializedCount in
-                
-                hypot(x0: x0, x1: x1,
-                      y0: y0, y1: y1,
-                      result: &buffer)
-                
-                initializedCount = x0.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hypotenuse of right-angled triangles with sides that are the differences of
-    /// corresponding values in x0 and x1, and y0 and y1. Double-precision.
-    ///
-    /// - Parameter x0: The `x0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter x1: The `x1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y0: The `y0` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter y1: The `y1` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    /// - Parameter result: The `z` in `z[i] = sqrt( (x0[i] - x1[i])² + (y0[i] - y1[i])² )`.
-    @inlinable
-    public static func hypot<R, S, T, U, V>(x0: R, x1: S,
-                                            y0: T, y1: U,
-                                            result: inout V)
-        where
-        R: AccelerateBuffer,
-        S: AccelerateBuffer,
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        R.Element == Double, S.Element == Double,
-        T.Element == Double, U.Element == Double,
-        V.Element == Double {
-            
-            precondition(x0.count == x1.count && x0.count == result.count)
-            precondition(y0.count == y1.count && y0.count == result.count)
-            
-            let n = vDSP_Length(result.count)
-            
-            x0.withUnsafeBufferPointer { a in
-                x1.withUnsafeBufferPointer { c in
-                    y0.withUnsafeBufferPointer { b in
-                        y1.withUnsafeBufferPointer { d in
-                            result.withUnsafeMutableBufferPointer { dest in
-                                vDSP_vpythgD(a.baseAddress!, 1,
-                                             b.baseAddress!, 1,
-                                             c.baseAddress!, 1,
-                                             d.baseAddress!, 1,
-                                             dest.baseAddress!, 1,
-                                             n)
-                            }
-                        }
-                    }
-                }
-            }
-    }
-    
-    // MARK: Distance Squared
-    
-    /// Returns the distance squared between two points in `n` dimensional space. Single-precision.
-    ///
-    /// - Parameter pointA: First point in `n` dimensional space, where `n` is the collection count.
-    /// - Parameter pointB: Second point in `n` dimensional space, where `n` is the collection count.
-    /// - Returns: The distance squared between `pointA` and `pointB`.
-    @inlinable
-    public static func distanceSquared<U, V>(_ pointA: U,
-                                             _ pointB: V) -> Float
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(pointA.count == pointB.count)
-            
-            let n = vDSP_Length(pointA.count)
-            var result = Float.nan
-            
-            pointA.withUnsafeBufferPointer { a in
-                pointB.withUnsafeBufferPointer { b in
-                    vDSP_distancesq(a.baseAddress!, 1,
-                                    b.baseAddress!, 1,
-                                    &result,
-                                    n)
-                }
-            }
-            
-            return result
-    }
-    
-    /// Returns the distance squared between two points in `n` dimensional space. Double-precision.
-    ///
-    /// - Parameter pointA: First point in `n` dimensional space, where `n` is the collection count.
-    /// - Parameter pointB: Second point in `n` dimensional space, where `n` is the collection count.
-    /// - Returns: The distance squared between `pointA` and `pointB`.
-    @inlinable
-    public static func distanceSquared<U, V>(_ pointA: U,
-                                             _ pointB: V) -> Double
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(pointA.count == pointB.count)
-            
-            let n = vDSP_Length(pointA.count)
-            var result = Double.nan
-            
-            pointA.withUnsafeBufferPointer { a in
-                pointB.withUnsafeBufferPointer { b in
-                    vDSP_distancesqD(a.baseAddress!, 1,
-                                     b.baseAddress!, 1,
-                                     &result,
-                                     n)
-                }
-            }
-            
-            return result
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Integration.swift b/stdlib/public/Darwin/Accelerate/vDSP_Integration.swift
deleted file mode 100644
index 78a7665c0fc52..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Integration.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-  
-    public enum IntegrationRule {
-        case runningSum
-        case simpson
-        case trapezoidal
-    }
-    
-    /// Integrates source vector using specified rule, single-precision.
-    ///
-    /// - Parameter vector: The vector to integrate.
-    /// - Parameter rule: The integration rule.
-    /// - Parameter stepSize: The integration step size (weighting factor for running sum).
-    /// - Returns: The integration result.
-    @inlinable
-    public static func integrate<U>(_ vector: U,
-                                    using rule: IntegrationRule,
-                                    stepSize: Float = 1) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                integrate(vector,
-                          using: rule,
-                          result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Integrates source vector using specified rule, single-precision.
-    ///
-    /// - Parameter vector: The vector to integrate.
-    /// - Parameter rule: The integration rule.
-    /// - Parameter stepSize: The integration step size (weighting factor for running sum).
-    /// - Parameter result: The destination vector to receive the result.
-    public static func integrate<U, V>(_ vector: U,
-                                       using rule: IntegrationRule,
-                                       stepSize: Float = 1,
-                                       result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = vDSP_Length(min(vector.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { output in
-                vector.withUnsafeBufferPointer { input in
-                    switch rule {
-                    case .runningSum:
-                        vDSP_vrsum(input.baseAddress!, 1,
-                                   [stepSize],
-                                   output.baseAddress!, 1,
-                                   n)
-                    case .simpson:
-                        vDSP_vsimps(input.baseAddress!, 1,
-                                    [stepSize],
-                                    output.baseAddress!, 1,
-                                    n)
-                    case .trapezoidal:
-                        vDSP_vtrapz(input.baseAddress!, 1,
-                                    [stepSize],
-                                    output.baseAddress!, 1,
-                                    n)
-                    }
-                }
-            }
-    }
-    
-    /// Integrates source vector using specified rule, double-precision.
-    ///
-    /// - Parameter vector: The vector to integrate.
-    /// - Parameter rule: The integration rule.
-    /// - Parameter stepSize: The integration step size (weighting factor for running sum).
-    /// - Returns: The integration result.
-    @inlinable
-    public static func integrate<U>(_ vector: U,
-                                    using rule: IntegrationRule,
-                                    stepSize: Double = 1) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                integrate(vector,
-                          using: rule,
-                          result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Integrates source vector using specified rule, double-precision.
-    ///
-    /// - Parameter vector: The vector to integrate.
-    /// - Parameter rule: The integration rule.
-    /// - Parameter stepSize: The integration step size (weighting factor for running sum).
-    /// - Parameter result: The destination vector to receive the result.
-    public static func integrate<U, V>(_ vector: U,
-                                       using rule: IntegrationRule,
-                                       stepSize: Double = 1,
-                                       result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = vDSP_Length(min(vector.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { output in
-                vector.withUnsafeBufferPointer { input in
-                    switch rule {
-                    case .runningSum:
-                        vDSP_vrsumD(input.baseAddress!, 1,
-                                    [stepSize],
-                                    output.baseAddress!, 1,
-                                    n)
-                    case .simpson:
-                        vDSP_vsimpsD(input.baseAddress!, 1,
-                                     [stepSize],
-                                     output.baseAddress!, 1,
-                                     n)
-                    case .trapezoidal:
-                        vDSP_vtrapzD(input.baseAddress!, 1,
-                                     [stepSize],
-                                     output.baseAddress!, 1,
-                                     n)
-                    }
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Interpolation.swift b/stdlib/public/Darwin/Accelerate/vDSP_Interpolation.swift
deleted file mode 100644
index 23f37f6b22ec1..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Interpolation.swift
+++ /dev/null
@@ -1,303 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Vector linear interpolation between vectors; single-precision.
-    ///
-    /// - Parameter vectorA: The `A` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter vectorB: The `B` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter interpolationConstant: The `C` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Returns: The `D` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    @inlinable
-    public static func linearInterpolate<T, U>(_ vectorA: T,
-                                               _ vectorB: U,
-                                               using interpolationConstant: Float) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float{
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                linearInterpolate(vectorA,
-                                  vectorB,
-                                  using: interpolationConstant,
-                                  result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Vector linear interpolation between vectors; single-precision.
-    ///
-    /// - Parameter vectorA: The `A` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter vectorB: The `B` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter interpolationConstant: The `C` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter result: The `D` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    @inlinable
-    public static func linearInterpolate<T, U, V>(_ vectorA: T,
-                                                  _ vectorB: U,
-                                                  using interpolationConstant: Float,
-                                                  result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(vectorA.count == result.count)
-            precondition(vectorB.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            vectorA.withUnsafeBufferPointer { a in
-                vectorB.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        
-                        vDSP_vintb(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   [interpolationConstant],
-                                   dest.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-    
-    /// Vector linear interpolation between vectors; double-precision.
-    ///
-    /// - Parameter vectorA: The `A` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter vectorB: The `B` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter interpolationConstant: The `C` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Returns: The `D` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    @inlinable
-    public static func linearInterpolate<T, U>(_ vectorA: T,
-                                               _ vectorB: U,
-                                               using interpolationConstant: Double) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double{
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                linearInterpolate(vectorA,
-                                  vectorB,
-                                  using: interpolationConstant,
-                                  result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Vector linear interpolation between vectors; double-precision.
-    ///
-    /// - Parameter vectorA: The `A` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter vectorB: The `B` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter interpolationConstant: The `C` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    /// - Parameter result: The `D` in `D[n] = A[n] + C * (B[n] - A[n])`.
-    @inlinable
-    public static func linearInterpolate<T, U, V>(_ vectorA: T,
-                                                  _ vectorB: U,
-                                                  using interpolationConstant: Double,
-                                                  result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(vectorA.count == result.count)
-            precondition(vectorB.count == result.count)
-            let n = vDSP_Length(result.count)
-            
-            vectorA.withUnsafeBufferPointer { a in
-                vectorB.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        
-                        vDSP_vintbD(a.baseAddress!, 1,
-                                    b.baseAddress!, 1,
-                                    [interpolationConstant],
-                                    dest.baseAddress!, 1,
-                                    n)
-                    }
-                }
-            }
-    }
-    
-    /// Vector linear interpolation between neighboring elements; single-precision.
-    ///
-    /// This function interpolates between the elements of `vector` using the following:
-    ///
-    ///        for (n = 0; n < N; ++n) {
-    ///            b = trunc(B[n]);
-    ///            a = B[n] - b;
-    ///            C[n] = A[b] + a * (A[b+1] - A[b]);
-    ///        }
-    ///
-    /// Where `A` is the input vector, `B` is the control vector, and
-    /// `C` is the output vector.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter controlVector: Vector that controls interpolation.
-    /// - Returns: Output values.
-    @inlinable
-    public static func linearInterpolate<T, U>(elementsOf vector: T,
-                                               using controlVector: U) -> [Float]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Float, U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: controlVector.count) {
-                buffer, initializedCount in
-                
-                linearInterpolate(elementsOf: vector,
-                                  using: controlVector,
-                                  result: &buffer)
-                
-                initializedCount = controlVector.count
-            }
-            
-            return result
-    }
-    
-    /// Vector linear interpolation between neighboring elements; single-precision.
-    ///
-    /// This function interpolates between the elements of `vector` using the following:
-    ///
-    ///        for (n = 0; n < N; ++n) {
-    ///            b = trunc(B[n]);
-    ///            a = B[n] - b;
-    ///            C[n] = A[b] + a * (A[b+1] - A[b]);
-    ///        }
-    ///
-    /// Where `A` is the input vector, `B` is the control vector, and
-    /// `C` is the output vector.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter controlVector: Vector that controls interpolation.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func linearInterpolate<T, U, V>(elementsOf vector: T,
-                                                  using controlVector: U,
-                                                  result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(controlVector.count == result.count)
-            
-            let n = vDSP_Length(result.count)
-            let m = vDSP_Length(vector.count)
-            
-            vector.withUnsafeBufferPointer { a in
-                controlVector.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        vDSP_vlint(a.baseAddress!,
-                                   b.baseAddress!, 1,
-                                   dest.baseAddress!, 1,
-                                   n, m)
-                    }
-                }
-            }
-    }
-    
-    /// Vector linear interpolation between neighboring elements; double-precision.
-    ///
-    /// This function interpolates between the elements of `vector` using the following:
-    ///
-    ///        for (n = 0; n < N; ++n) {
-    ///            b = trunc(B[n]);
-    ///            a = B[n] - b;
-    ///            C[n] = A[b] + a * (A[b+1] - A[b]);
-    ///        }
-    ///
-    /// Where `A` is the input vector, `B` is the control vector, and
-    /// `C` is the output vector.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter controlVector: Vector that controls interpolation.
-    /// - Returns: Output values.
-    @inlinable
-    public static func linearInterpolate<T, U>(elementsOf vector: T,
-                                               using controlVector: U) -> [Double]
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        T.Element == Double, U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: controlVector.count) {
-                buffer, initializedCount in
-                
-                linearInterpolate(elementsOf: vector,
-                                  using: controlVector,
-                                  result: &buffer)
-                
-                initializedCount = controlVector.count
-            }
-            
-            return result
-    }
-    
-    /// Vector linear interpolation between neighboring elements; double-precision.
-    ///
-    /// This function interpolates between the elements of `vector` using the following:
-    ///
-    ///        for (n = 0; n < N; ++n) {
-    ///            b = trunc(B[n]);
-    ///            a = B[n] - b;
-    ///            C[n] = A[b] + a * (A[b+1] - A[b]);
-    ///        }
-    ///
-    /// Where `A` is the input vector, `B` is the control vector, and
-    /// `C` is the output vector.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter controlVector: Vector that controls interpolation.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func linearInterpolate<T, U, V>(elementsOf vector: T,
-                                                  using controlVector: U,
-                                                  result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(controlVector.count == result.count)
-            
-            let n = vDSP_Length(result.count)
-            let m = vDSP_Length(vector.count)
-            
-            vector.withUnsafeBufferPointer { a in
-                controlVector.withUnsafeBufferPointer { b in
-                    result.withUnsafeMutableBufferPointer { dest in
-                        vDSP_vlintD(a.baseAddress!,
-                                    b.baseAddress!, 1,
-                                    dest.baseAddress!, 1,
-                                    n, m)
-                    }
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_PolarRectangularConversion.swift b/stdlib/public/Darwin/Accelerate/vDSP_PolarRectangularConversion.swift
deleted file mode 100644
index fd14bff63b315..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_PolarRectangularConversion.swift
+++ /dev/null
@@ -1,203 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Rectangular to polar conversion, single-precision.
-    ///
-    /// - Parameter rectangularCoordinates: Source vector, represented as consecutive x, y pairs.
-    /// - Returns: Polar coordinates, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    @inlinable
-    public static func rectangularToPolar<U>(_ rectangularCoordinates: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: rectangularCoordinates.count) {
-                buffer, initializedCount in
-                
-                convert(rectangularCoordinates: rectangularCoordinates,
-                        toPolarCoordinates: &buffer)
-                
-                initializedCount = rectangularCoordinates.count
-            }
-            
-            return result
-    }
-    
-    /// Rectangular to polar conversion, single-precision.
-    ///
-    /// - Parameter rectangularCoordinates: Source vector, represented as consecutive x, y pairs.
-    /// - Parameter polarCoordinates: Destination vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    @inlinable
-    public static func convert<U, V>(rectangularCoordinates: U,
-                                     toPolarCoordinates polarCoordinates: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Float {
-            
-            let n = rectangularCoordinates.count
-            precondition(polarCoordinates.count == n)
-            
-            polarCoordinates.withUnsafeMutableBufferPointer { dest in
-                rectangularCoordinates.withUnsafeBufferPointer { src in
-                    vDSP_polar(src.baseAddress!, 2,
-                               dest.baseAddress!, 2,
-                               vDSP_Length(n / 2))
-                }
-            }
-    }
-    
-    /// Rectangular to polar conversion, double-precision.
-    ///
-    /// - Parameter rectangularCoordinates: Source vector, represented as consecutive x, y pairs.
-    /// - Returns: Polar coordinates, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    @inlinable
-    public static func rectangularToPolar<U>(_ rectangularCoordinates: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: rectangularCoordinates.count) {
-                buffer, initializedCount in
-                
-                convert(rectangularCoordinates: rectangularCoordinates,
-                        toPolarCoordinates: &buffer)
-                
-                initializedCount = rectangularCoordinates.count
-            }
-            
-            return result
-    }
-    
-    /// Rectangular to polar conversion, double-precision.
-    ///
-    /// - Parameter rectangularCoordinates: Source vector, represented as consecutive x, y pairs.
-    /// - Parameter polarCoordinates: Destination vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    @inlinable
-    public static func convert<U, V>(rectangularCoordinates: U,
-                                     toPolarCoordinates polarCoordinates: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Double {
-            
-            let n = rectangularCoordinates.count
-            precondition(polarCoordinates.count == n)
-            
-            polarCoordinates.withUnsafeMutableBufferPointer { dest in
-                rectangularCoordinates.withUnsafeBufferPointer { src in
-                    vDSP_polarD(src.baseAddress!, 2,
-                                dest.baseAddress!, 2,
-                                vDSP_Length(n / 2))
-                }
-            }
-    }
-    
-    /// Polar to rectangular conversion, single-precision.
-    ///
-    /// - Parameter polarCoordinates: Source vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    /// - Returns: Rectangular coordinates, represented as consecutive x, y pairs.
-    @inlinable
-    public static func polarToRectangular<U>(_ polarCoordinates: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: polarCoordinates.count) {
-                buffer, initializedCount in
-                
-                convert(polarCoordinates: polarCoordinates,
-                        toRectangularCoordinates: &buffer)
-                
-                initializedCount = polarCoordinates.count
-            }
-            
-            return result
-    }
-    
-    /// Polar to rectangular conversion, single-precision.
-    ///
-    /// - Parameter polarCoordinates: Source vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    /// - Parameter rectangularCoordinates: Destination vector, represented as consecutive x, y pairs.
-    @inlinable
-    public static func convert<U, V>(polarCoordinates: U,
-                                     toRectangularCoordinates rectangularCoordinates: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Float {
-            
-            let n = rectangularCoordinates.count
-            precondition(polarCoordinates.count == n)
-            
-            rectangularCoordinates.withUnsafeMutableBufferPointer { dest in
-                polarCoordinates.withUnsafeBufferPointer { src in
-                    vDSP_rect(src.baseAddress!, 2,
-                              dest.baseAddress!, 2,
-                              vDSP_Length(n / 2))
-                }
-            }
-    }
-    
-    /// Polar to rectangular conversion, double-precision.
-    ///
-    /// - Parameter polarCoordinates: Source vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    /// - Returns: Rectangular coordinates, represented as consecutive x, y pairs.
-    @inlinable
-    public static func polarToRectangular<U>(_ polarCoordinates: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: polarCoordinates.count) {
-                buffer, initializedCount in
-                
-                convert(polarCoordinates: polarCoordinates,
-                        toRectangularCoordinates: &buffer)
-                
-                initializedCount = polarCoordinates.count
-            }
-            
-            return result
-    }
-    
-    /// Polar to rectangular conversion, double-precision.
-    ///
-    /// - Parameter polarCoordinates: Source vector, represented as consecutive rho, (radius) theta (angle in radians) pairs.
-    /// - Parameter rectangularCoordinates: Destination vector, represented as consecutive x, y pairs.
-    @inlinable
-    public static func convert<U, V>(polarCoordinates: U,
-                                     toRectangularCoordinates rectangularCoordinates: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Double {
-            
-            let n = rectangularCoordinates.count
-            precondition(polarCoordinates.count == n)
-            
-            rectangularCoordinates.withUnsafeMutableBufferPointer { dest in
-                polarCoordinates.withUnsafeBufferPointer { src in
-                    vDSP_rectD(src.baseAddress!, 2,
-                               dest.baseAddress!, 2,
-                               vDSP_Length(n / 2))
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_PolynomialEvaluation.swift b/stdlib/public/Darwin/Accelerate/vDSP_PolynomialEvaluation.swift
deleted file mode 100644
index 1f3b90004b956..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_PolynomialEvaluation.swift
+++ /dev/null
@@ -1,154 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Evaluates a polynomial using specified coefficients and independent variables. Single-precision.
-    ///
-    /// - Parameter coefficients: Coefficients.
-    /// - Parameter variables: Independent variables.
-    /// - Returns: The polynomial evaluation result.
-    ///
-    /// For example, given the coefficients `[10, 20, 30]`, and independent variables `[2, 5]`,
-    /// the result is calculated as:
-    ///
-    /// `result[0] = (10 * 2²) + (20 * 2¹) + (30 * 2⁰) // 110`
-    ///
-    /// `result[1] = (10 * 5²) + (20 * 5¹) + (30 * 5⁰) // 380`
-    @inlinable
-    public static func evaluatePolynomial<U>(usingCoefficients coefficients: [Float],
-                                             withVariables variables: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: variables.count) {
-                buffer, initializedCount in
-                
-                evaluatePolynomial(usingCoefficients: coefficients,
-                                   withVariables: variables,
-                                   result: &buffer)
-                
-                initializedCount = variables.count
-            }
-            
-            return result
-    }
-    
-    /// Evaluates a polynomial using specified coefficients and independent variables. Single-precision.
-    ///
-    /// - Parameter coefficients: Coefficients.
-    /// - Parameter variables: Independent variables.
-    /// - Parameter result: Destination vector.
-    ///
-    /// For example, given the coefficients `[10, 20, 30]`, and independent variables `[2, 5]`,
-    /// the result is calculated as:
-    ///
-    /// `result[0] = (10 * 2²) + (20 * 2¹) + (30 * 2⁰) // 110`
-    ///
-    /// `result[1] = (10 * 5²) + (20 * 5¹) + (30 * 5⁰) // 380`
-    @inlinable
-    public static func evaluatePolynomial<U, V>(usingCoefficients coefficients: [Float],
-                                                withVariables variables: U,
-                                                result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = vDSP_Length(min(variables.count,
-                                    result.count))
-            
-            let degreeOfPolynomial = vDSP_Length(coefficients.count - 1)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                variables.withUnsafeBufferPointer { src in
-                    vDSP_vpoly(coefficients, 1,
-                               src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n,
-                               degreeOfPolynomial)
-                }
-            }
-    }
-    
-    /// Evaluates a polynomial using specified coefficients and independent variables. Double-precision.
-    ///
-    /// - Parameter coefficients: Coefficients.
-    /// - Parameter variables: Independent variables.
-    /// - Returns: The polynomial evaluation result.
-    ///
-    /// For example, given the coefficients `[10, 20, 30]`, and independent variables `[2, 5]`,
-    /// the result is calculated as:
-    ///
-    /// `result[0] = (10 * 2²) + (20 * 2¹) + (30 * 2⁰) // 110`
-    ///
-    /// `result[1] = (10 * 5²) + (20 * 5¹) + (30 * 5⁰) // 380`
-    @inlinable
-    public static func evaluatePolynomial<U>(usingCoefficients coefficients: [Double],
-                                             withVariables variables: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: variables.count) {
-                buffer, initializedCount in
-                
-                evaluatePolynomial(usingCoefficients: coefficients,
-                                   withVariables: variables,
-                                   result: &buffer)
-                
-                initializedCount = variables.count
-            }
-            
-            return result
-    }
-    
-    /// Evaluates a polynomial using specified coefficients and independent variables. Double-precision.
-    ///
-    /// - Parameter coefficients: Coefficients.
-    /// - Parameter variables: Independent variables.
-    /// - Parameter result: Destination vector.
-    ///
-    /// For example, given the coefficients `[10, 20, 30]`, and independent variables `[2, 5]`,
-    /// the result is calculated as:
-    ///
-    /// `result[0] = (10 * 2²) + (20 * 2¹) + (30 * 2⁰) // 110`
-    ///
-    /// `result[1] = (10 * 5²) + (20 * 5¹) + (30 * 5⁰) // 380`
-    @inlinable
-    public static func evaluatePolynomial<U, V>(usingCoefficients coefficients: [Double],
-                                                withVariables variables: U,
-                                                result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = vDSP_Length(min(variables.count,
-                                    result.count))
-            
-            let degreeOfPolynomial = vDSP_Length(coefficients.count - 1)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                variables.withUnsafeBufferPointer { src in
-                    vDSP_vpolyD(coefficients, 1,
-                                src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n,
-                                degreeOfPolynomial)
-                }
-            }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_RecursiveFilters.swift b/stdlib/public/Darwin/Accelerate/vDSP_RecursiveFilters.swift
deleted file mode 100644
index f9bf29d5f31d0..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_RecursiveFilters.swift
+++ /dev/null
@@ -1,186 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-
-    /// Performs two-pole two-zero recursive filtering; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter coefficients: Filter coefficients.
-    /// - Returns: Single-precision output vector.
-    ///
-    /// This function performs the following calculation:
-    ///
-    ///                for (n = 2; n < N+2; ++n)
-    ///                    C[n] =
-    ///                        + A[n-0]*B[0]
-    ///                        + A[n-1]*B[1]
-    ///                        + A[n-2]*B[2]
-    ///                        - C[n-1]*B[3]
-    ///                        - C[n-2]*B[4];
-    ///
-    /// Where `A` is the input vector, `B` is the filter coefficients, and `C`
-    /// is the output vector. Note that outputs start with C[2].
-    @inlinable
-    public static func twoPoleTwoZeroFilter<U>(_ source: U,
-                                                  coefficients: (Float, Float, Float, Float, Float)) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: source.count) {
-                buffer, initializedCount in
-                
-                buffer[0] = 0
-                buffer[1] = 0
-                
-                twoPoleTwoZeroFilter(source,
-                                     coefficients: coefficients,
-                                     result: &buffer)
-                
-                initializedCount = source.count
-            }
-            
-            return result
-    }
-    
-    /// Performs two-pole two-zero recursive filtering; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter coefficients: Filter coefficients.
-    /// - Parameter result: Single-precision output vector.
-    ///
-    /// This function performs the following calculation:
-    ///
-    ///                for (n = 2; n < N+2; ++n)
-    ///                    C[n] =
-    ///                        + A[n-0]*B[0]
-    ///                        + A[n-1]*B[1]
-    ///                        + A[n-2]*B[2]
-    ///                        - C[n-1]*B[3]
-    ///                        - C[n-2]*B[4];
-    ///
-    /// Where `A` is the input vector, `B` is the filter coefficients, and `C`
-    /// is the output vector. Note that outputs start with C[2].
-    @inlinable
-    public static func twoPoleTwoZeroFilter<U, V>(_ source: U,
-                                                  coefficients: (Float, Float, Float, Float, Float),
-                                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Float {
-            
-            precondition(source.count == result.count)
-            
-            let n = vDSP_Length(source.count - 2)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_deq22(src.baseAddress!, 1,
-                               [coefficients.0, coefficients.1,
-                                coefficients.2, coefficients.3,
-                                coefficients.4],
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    /// Performs two-pole two-zero recursive filtering; double-precision.
-    ///
-    /// - Parameter source: Double-precision input vector.
-    /// - Parameter coefficients: Filter coefficients.
-    /// - Returns: Double-precision output vector.
-    ///
-    /// This function performs the following calculation:
-    ///
-    ///                for (n = 2; n < N+2; ++n)
-    ///                    C[n] =
-    ///                        + A[n-0]*B[0]
-    ///                        + A[n-1]*B[1]
-    ///                        + A[n-2]*B[2]
-    ///                        - C[n-1]*B[3]
-    ///                        - C[n-2]*B[4];
-    ///
-    /// Where `A` is the input vector, `B` is the filter coefficients, and `C`
-    /// is the output vector. Note that outputs start with C[2].
-    @inlinable
-    public static func twoPoleTwoZeroFilter<U>(_ source: U,
-                                                  coefficients: (Double, Double, Double, Double, Double)) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: source.count) {
-                buffer, initializedCount in
-                
-                buffer[0] = 0
-                buffer[1] = 0
-                
-                twoPoleTwoZeroFilter(source,
-                                     coefficients: coefficients,
-                                     result: &buffer)
-                
-                initializedCount = source.count
-            }
-            
-            return result
-    }
-    
-    /// Performs two-pole two-zero recursive filtering; double-precision.
-    ///
-    /// - Parameter source: single-precision input vector.
-    /// - Parameter coefficients: Filter coefficients.
-    /// - Parameter result: single-precision output vector.
-    ///
-    /// This function performs the following calculation:
-    ///
-    ///                for (n = 2; n < N+2; ++n)
-    ///                    C[n] =
-    ///                        + A[n-0]*B[0]
-    ///                        + A[n-1]*B[1]
-    ///                        + A[n-2]*B[2]
-    ///                        - C[n-1]*B[3]
-    ///                        - C[n-2]*B[4];
-    ///
-    /// Where `A` is the input vector, `B` is the filter coefficients, and `C`
-    /// is the output vector. Note that outputs start with C[2].
-    @inlinable
-    public static func twoPoleTwoZeroFilter<U, V>(_ source: U,
-                                                  coefficients: (Double, Double, Double, Double, Double),
-                                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Double {
-            
-            precondition(source.count == result.count)
-            
-            let n = vDSP_Length(source.count - 2)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                source.withUnsafeBufferPointer { src in
-                    vDSP_deq22D(src.baseAddress!, 1,
-                                [coefficients.0, coefficients.1,
-                                 coefficients.2, coefficients.3,
-                                 coefficients.4],
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_Reduction.swift b/stdlib/public/Darwin/Accelerate/vDSP_Reduction.swift
deleted file mode 100644
index f0f9fca78686e..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_Reduction.swift
+++ /dev/null
@@ -1,671 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Maximum
-    
-    /// Returns vector maximum value; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The maximum value in `vector`.
-    @inlinable
-    public static func maximum<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxv(v.baseAddress!, 1,
-                          &output,
-                          n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector maximum value; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The maximum value in `vector`.
-    @inlinable
-    public static func maximum<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxvD(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    // MARK: Maximum magnitude
-    
-    /// Returns vector maximum magnitude; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The maximum magnitude in `vector`.
-    @inlinable
-    public static func maximumMagnitude<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxmgv(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector maximum magnitude; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The maximum magnitude in `vector`.
-    @inlinable
-    public static func maximumMagnitude<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxmgvD(v.baseAddress!, 1,
-                             &output,
-                             n)
-            }
-            
-            return output
-    }
-    
-    // MARK: Minimum
-    
-    /// Returns vector minimum value; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The minimum value in `vector`.
-    @inlinable
-    public static func minimum<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_minv(v.baseAddress!, 1,
-                          &output,
-                          n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector minimum value; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The minimum value in `vector`.
-    @inlinable
-    public static func minimum<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_minvD(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    // MARK: Summation
-    
-    /// Returns vector sum; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of values in `vector`.
-    @inlinable
-    public static func sum<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_sve(v.baseAddress!, 1,
-                         &output,
-                         n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector sum; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of values in `vector`.
-    @inlinable
-    public static func sum<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_sveD(v.baseAddress!, 1,
-                          &output,
-                          n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector sum of squares; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of squares in `vector`.
-    @inlinable
-    public static func sumOfSquares<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_svesq(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector sum of squares; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of squares in `vector`.
-    @inlinable
-    public static func sumOfSquares<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_svesqD(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-    /// Returns sum of elements and sum of elements' squares; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of values and the sum of squares in `vector`.
-    @inlinable
-    public static func sumAndSumOfSquares<U>(_ vector: U) -> (elementsSum: Float, squaresSum: Float)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var sum = Float.nan
-            var sumOfSquares = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_sve_svesq(v.baseAddress!, 1,
-                               &sum,
-                               &sumOfSquares,
-                               n)
-            }
-            
-            return (elementsSum: sum, squaresSum: sumOfSquares)
-    }
-    
-    /// Returns sum of elements and sum of elements' squares; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of values and the sum of squares in `vector`.
-    @inlinable
-    public static func sumAndSumOfSquares<U>(_ vector: U) -> (elementsSum: Double, squaresSum: Double)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var sum = Double.nan
-            var sumOfSquares = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_sve_svesqD(v.baseAddress!, 1,
-                                &sum,
-                                &sumOfSquares,
-                                n)
-            }
-            
-            return (elementsSum: sum, squaresSum: sumOfSquares)
-    }
-    
-    /// Returns vector sum of magnitudes; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of magnitudes in `vector`.
-    @inlinable
-    public static func sumOfMagnitudes<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_svemg(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    /// Returns vector sum of magnitudes; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: The sum of magnitudes in `vector`.
-    @inlinable
-    public static func sumOfMagnitudes<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_svemgD(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Maximum with index
-    
-    /// Returns vector maximum with index; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the maximum value and its index.
-    @inlinable
-    public static func indexOfMaximum<U>(_ vector: U) -> (UInt, Float)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxvi(v.baseAddress!, 1,
-                           &output,
-                           &index,
-                           n)
-            }
-            
-            return (index, output)
-    }
-    
-    /// Returns vector maximum with index; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the maximum value and its index.
-    @inlinable
-    public static func indexOfMaximum<U>(_ vector: U) -> (UInt, Double)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxviD(v.baseAddress!, 1,
-                            &output,
-                            &index,
-                            n)
-            }
-            
-            return (index, output)
-    }
-    
-    // MARK: Maximum magnitude with index
-    
-    /// Returns vector maximum magnitude with index; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the maximum magnitude and its index.
-    @inlinable
-    public static func indexOfMaximumMagnitude<U>(_ vector: U) -> (UInt, Float)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxmgvi(v.baseAddress!, 1,
-                             &output,
-                             &index,
-                             n)
-            }
-            
-            return (index, output)
-    }
-    
-    /// Returns vector maximum magnitude with index; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the maximum magnitude and its index.
-    @inlinable
-    public static func indexOfMaximumMagnitude<U>(_ vector: U) -> (UInt, Double)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_maxmgviD(v.baseAddress!, 1,
-                              &output,
-                              &index,
-                              n)
-            }
-            
-            return (index, output)
-    }
-    
-    // MARK: Minimum with index
-    
-    /// Returns vector minimum with index; single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the minimum value and its index.
-    @inlinable
-    public static func indexOfMinimum<U>(_ vector: U) -> (UInt, Float)
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_minvi(v.baseAddress!, 1,
-                           &output,
-                           &index,
-                           n)
-            }
-            
-            return (index, output)
-    }
-    
-    /// Returns vector minimum with index; double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Returns: A tuple containing the minimum value and its index.
-    @inlinable
-    public static func indexOfMinimum<U>(_ vector: U) -> (UInt, Double)
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            var index: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_minviD(v.baseAddress!, 1,
-                            &output,
-                            &index,
-                            n)
-            }
-            
-            return (index, output)
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Mean Square (vDSP_measqv)
-    
-    /// Returns the mean square of the supplied single-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func meanSquare<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_measqv(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-    /// Returns the mean square of the supplied double-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func meanSquare<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_measqvD(v.baseAddress!, 1,
-                             &output,
-                             n)
-            }
-            
-            return output
-    }
-    
-    // MARK: Mean Magnitude
-    
-    /// Returns the mean magnitude of the supplied single-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func meanMagnitude<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_meamgv(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-    /// Returns the mean magnitude of the supplied double-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func meanMagnitude<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_meamgvD(v.baseAddress!, 1,
-                             &output,
-                             n)
-            }
-            
-            return output
-    }
-    
-    
-    // MARK: Mean
-    
-    /// Returns the mean magnitude of the supplied single-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func mean<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_meanv(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    /// Returns the mean of the supplied double-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func mean<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_meanvD(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-    // MARK: Root Mean Square
-    
-    /// Returns the root-mean-square of the supplied single-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func rootMeanSquare<U>(_ vector: U) -> Float
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Float.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_rmsqv(v.baseAddress!, 1,
-                           &output,
-                           n)
-            }
-            
-            return output
-    }
-    
-    /// Returns the root-mean-square of the supplied double-precision vector.
-    ///
-    /// - Parameter vector: The input vector.
-    @inlinable
-    public static func rootMeanSquare<U>(_ vector: U) -> Double
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var output = Double.nan
-            
-            vector.withUnsafeBufferPointer { v in
-                vDSP_rmsqvD(v.baseAddress!, 1,
-                            &output,
-                            n)
-            }
-            
-            return output
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_SingleVectorOperations.swift b/stdlib/public/Darwin/Accelerate/vDSP_SingleVectorOperations.swift
deleted file mode 100644
index a01b02e1a32eb..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_SingleVectorOperations.swift
+++ /dev/null
@@ -1,990 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Extrema
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Elementwise minimum
-    
-    /// Returns an array containing the lesser of the corresponding values in `vectorA` and `vectorB`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func minimum<U>(_ vectorA: U,
-                                  _ vectorB: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            precondition(vectorA.count == vectorB.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                minimum(vectorA,
-                        vectorB,
-                        result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the lesser of the corresponding values in `vectorA` and `vectorB`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter result: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func minimum<U, V>(_ vectorA: U,
-                                     _ vectorB: U,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = vDSP_Length(min(vectorA.count,
-                                    vectorB.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vmin(a.baseAddress!, 1,
-                                  b.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns an array containing the lesser of the corresponding values in `vectorA` and `vectorB`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func minimum<U>(_ vectorA: U,
-                                  _ vectorB: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            precondition(vectorA.count == vectorB.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                minimum(vectorA,
-                        vectorB,
-                        result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the lesser of the corresponding values in `vectorA` and `vectorB`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter result: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func minimum<U, V>(_ vectorA: U,
-                                     _ vectorB: U,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = vDSP_Length(min(vectorA.count,
-                                    vectorB.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vminD(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-    
-    // MARK: Elementwise maximum
-    
-    /// Returns an array containing the greater of the corresponding values in `vectorA` and `vectorB`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func maximum<U>(_ vectorA: U,
-                                  _ vectorB: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            precondition(vectorA.count == vectorB.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                maximum(vectorA,
-                        vectorB,
-                        result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the greater of the corresponding values in `vectorA` and `vectorB`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter result: the `c` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func maximum<U, V>(_ vectorA: U,
-                                     _ vectorB: U,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = vDSP_Length(min(vectorA.count,
-                                    vectorB.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vmax(a.baseAddress!, 1,
-                                  b.baseAddress!, 1,
-                                  r.baseAddress!, 1,
-                                  n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns an array containing the greater of the corresponding values in `vectorA` and `vectorB`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func maximum<U>(_ vectorA: U,
-                                  _ vectorB: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            precondition(vectorA.count == vectorB.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vectorA.count) {
-                buffer, initializedCount in
-                
-                maximum(vectorA,
-                        vectorB,
-                        result: &buffer)
-                
-                initializedCount = vectorA.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the greater of the corresponding values in `vectorA` and `vectorB`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    /// - Parameter result: the `c` in `c[i] = a[i] > b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func maximum<U, V>(_ vectorA: U,
-                                     _ vectorB: U,
-                                     result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = vDSP_Length(min(vectorA.count,
-                                    vectorB.count,
-                                    result.count))
-            
-            result.withUnsafeMutableBufferPointer { r in
-                vectorA.withUnsafeBufferPointer { a in
-                    vectorB.withUnsafeBufferPointer { b in
-                        vDSP_vmaxD(a.baseAddress!, 1,
-                                   b.baseAddress!, 1,
-                                   r.baseAddress!, 1,
-                                   n)
-                    }
-                }
-            }
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Absolute and Negation
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Returns an array containing the absolute values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                absolute(vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the absolute values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<U, V>(_ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vabs(v.baseAddress!, 1,
-                              r.baseAddress!, 1,
-                              vDSP_Length(n))
-                }
-            }
-            
-    }
-    
-    /// Returns an array containing the absolute values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                absolute(vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the absolute values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func absolute<U, V>(_ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vabsD(v.baseAddress!, 1,
-                               r.baseAddress!, 1,
-                               vDSP_Length(n))
-                }
-            }
-    }
-    
-    /// Returns an array containing the negative absolute values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negativeAbsolute<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                negativeAbsolute(vector,
-                                 result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the negative absolute values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negativeAbsolute<U, V>(_ vector: U,
-                                              result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vnabs(v.baseAddress!, 1,
-                               r.baseAddress!, 1,
-                               vDSP_Length(n))
-                }
-            }
-    }
-    
-    /// Returns an array containing the negative absolute values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negativeAbsolute<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                negativeAbsolute(vector,
-                                 result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the negative absolute values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negativeAbsolute<U, V>(_ vector: U,
-                                              result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vnabsD(v.baseAddress!, 1,
-                                r.baseAddress!, 1,
-                                vDSP_Length(n))
-                }
-            }
-    }
-    
-    /// Returns an array containing the negative values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negative<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                negative(vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the negative values of `vector`,
-    /// single-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negative<U, V>(_ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vneg(v.baseAddress!, 1,
-                              r.baseAddress!, 1,
-                              vDSP_Length(n))
-                }
-            }
-    }
-    
-    /// Returns an array containing the negative values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negative<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                negative(vector,
-                         result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Populates `result` with the negative values of `vector`,
-    /// double-precision.
-    ///
-    /// - Parameter vector: The input vector.
-    /// - Parameter result: The output vector.
-    @inlinable
-    public static func negative<U, V>(_ vector: U,
-                                      result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n)
-            result.withUnsafeMutableBufferPointer { r in
-                vector.withUnsafeBufferPointer { v in
-                    vDSP_vnegD(v.baseAddress!, 1,
-                               r.baseAddress!, 1,
-                               vDSP_Length(n))
-                }
-            }
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP In-place reversing and sorting
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Reversing
-    
-    /// Reverses an array of single-precision values in-place.
-    ///
-    /// - Parameter vector: The array to reverse.
-    @inlinable
-    public static func reverse<V>(_ vector: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vrvrs(v.baseAddress!, 1,
-                           n)
-            }
-    }
-    
-    /// Reverses an array of double-precision values in-place.
-    ///
-    /// - Parameter vector: The array to reverse.
-    @inlinable
-    public static func reverse<V>(_ vector: inout V)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vrvrsD(v.baseAddress!, 1,
-                            n)
-            }
-    }
-    
-    // MARK: Sorting
-    public enum SortOrder: Int32 {
-        case ascending = 1
-        case descending = -1
-    }
-    
-    /// Sorts an array of single-precision values in-place.
-    ///
-    /// - Parameter vector: The array to sort.
-    /// - Parameter sortOrder: The sort direction.
-    @inlinable
-    public static func sort<V>(_ vector: inout V,
-                               sortOrder: SortOrder)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vsort(v.baseAddress!,
-                           n,
-                           sortOrder.rawValue)
-            }
-    }
-    
-    /// Sorts an array of double-precision values in-place.
-    ///
-    /// - Parameter vector: The array to sort.
-    /// - Parameter sortOrder: The sort direction.
-    @inlinable
-    public static func sort<V>(_ vector: inout V,
-                               sortOrder: SortOrder)
-        where
-        V: AccelerateMutableBuffer,
-        V.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            
-            vector.withUnsafeMutableBufferPointer { v in
-                vDSP_vsortD(v.baseAddress!,
-                            n,
-                            sortOrder.rawValue)
-            }
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Single vector arithmetic
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    // MARK: Square
-    
-    /// Returns an array containing the square of each element in `vector`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func square<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                square(vector,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the square of each element in `vector`, writing the result to `result`; single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func square<U, V>(_ vector: U,
-                                    result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vsq(src.baseAddress!, 1,
-                             dest.baseAddress!, 1,
-                             n)
-                }
-            }
-    }
-    
-    /// Returns an array containing the square of each element in `vector`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func square<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                square(vector,
-                       result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the square of each element in `vector`, writing the result to `result`; double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func square<U, V>(_ vector: U,
-                                    result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vsqD(src.baseAddress!, 1,
-                              dest.baseAddress!, 1,
-                              n)
-                }
-            }
-    }
-    
-    // MARK: Signed Square
-    
-    /// Returns an array containing the signed square of each element in `vector`, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func signedSquare<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                signedSquare(vector,
-                             result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the signed square of each element in `vector`, writing the result to `result`; single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func signedSquare<U, V>(_ vector: U,
-                                          result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vssq(src.baseAddress!, 1,
-                              dest.baseAddress!, 1,
-                              n)
-                }
-            }
-    }
-    
-    /// Returns an array containing the signed square of each element in `vector`, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func signedSquare<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                signedSquare(vector,
-                             result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the signed square of each element in `vector`, writing the result to `result`; double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func signedSquare<U, V>(_ vector: U,
-                                          result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vssqD(src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    // MARK: Truncate to Fraction
-    
-    /// Returns an array containing each element in `vector` truncated to fraction, single-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func trunc<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                trunc(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Truncates to fraction each element in `vector`, writing the result to `result`; single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func trunc<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vfrac(src.baseAddress!, 1,
-                               dest.baseAddress!, 1,
-                               n)
-                }
-            }
-    }
-    
-    /// Returns an array containing each element in `vector` truncated to fraction, double-precision.
-    ///
-    /// - Parameter vectorA: the `a` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Parameter vectorB: the `b` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    /// - Returns: the `c` in `c[i] = a[i] < b[i] ? a[i] : b[i]`
-    @inlinable
-    public static func trunc<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                trunc(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Truncates to fraction each element in `vector`, writing the result to `result`; double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func trunc<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U : AccelerateBuffer,
-        V : AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            let n = vDSP_Length(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vfracD(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                n)
-                }
-            }
-    }
-    
-    // Zero crossing
-    
-    /// Returns the number of zero crossings in `vector`; single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: The total number of transitions from positive to negative values and from negative to positive values.
-    @inlinable
-    public static func countZeroCrossings<U>(_ vector: U) -> UInt
-        where
-        U : AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vDSP_Length(vector.count)
-            var crossingCount: vDSP_Length = 0
-            var lastCrossingIndex: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { src in
-                vDSP_nzcros(src.baseAddress!, 1,
-                            n,
-                            &lastCrossingIndex,
-                            &crossingCount,
-                            n)
-            }
-            
-            return crossingCount
-    }
-    
-    /// Returns the number of zero crossings in `vector`; double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: The total number of transitions from positive to negative values and from negative to positive values.
-    @inlinable
-    public static func countZeroCrossings<U>(_ vector: U) -> UInt
-        where
-        U : AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vDSP_Length(vector.count)
-            var crossingCount: vDSP_Length = 0
-            var lastCrossingIndex: vDSP_Length = 0
-            
-            vector.withUnsafeBufferPointer { src in
-                vDSP_nzcrosD(src.baseAddress!, 1,
-                             n,
-                             &lastCrossingIndex,
-                             &crossingCount,
-                             n)
-            }
-            
-            return crossingCount
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vDSP_SlidingWindow.swift b/stdlib/public/Darwin/Accelerate/vDSP_SlidingWindow.swift
deleted file mode 100644
index 44e728df236bd..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vDSP_SlidingWindow.swift
+++ /dev/null
@@ -1,127 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vDSP {
-    
-    /// Vector sliding window sum; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter windowLength: The number of consecutive elements to sum.
-    /// - Returns: Single-precision output vector.
-    @inlinable
-    public static func slidingWindowSum<U>(_ vector: U,
-                                           usingWindowLength windowLength: Int) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let n = vector.count - windowLength + 1
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                slidingWindowSum(vector,
-                                 usingWindowLength: windowLength,
-                                 result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// Vector sliding window sum; single-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter windowLength: The number of consecutive elements to sum.
-    /// - Parameter result: Single-precision output vector.
-    @inlinable
-    public static func slidingWindowSum<U, V>(_ vector: U,
-                                              usingWindowLength windowLength: Int,
-                                              result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float,
-        V.Element == Float {
-            
-            let n = result.count
-            precondition(vector.count == n + windowLength - 1)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vswsum(src.baseAddress!, 1,
-                                dest.baseAddress!, 1,
-                                vDSP_Length(n),
-                                vDSP_Length(windowLength))
-                }
-            }
-            
-    }
-    
-    /// Vector sliding window sum; double-precision.
-    ///
-    /// - Parameter source: Single-precision input vector.
-    /// - Parameter windowLength: The number of consecutive elements to sum.
-    /// - Returns: Single-precision output vector.
-    @inlinable
-    public static func slidingWindowSum<U>(_ vector: U,
-                                           usingWindowLength windowLength: Int) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let n = vector.count - windowLength + 1
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: n) {
-                buffer, initializedCount in
-                
-                slidingWindowSum(vector,
-                                 usingWindowLength: windowLength,
-                                 result: &buffer)
-                
-                initializedCount = n
-            }
-            
-            return result
-    }
-    
-    /// Vector sliding window sum; double-precision.
-    ///
-    /// - Parameter source: Double-precision input vector.
-    /// - Parameter windowLength: The number of consecutive elements to sum.
-    /// - Parameter result: Double-precision output vector.
-    @inlinable
-    public static func slidingWindowSum<U, V>(_ vector: U,
-                                              usingWindowLength windowLength: Int,
-                                              result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double,
-        V.Element == Double {
-            
-            let n = result.count
-            precondition(vector.count == n + windowLength - 1)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vDSP_vswsumD(src.baseAddress!, 1,
-                                 dest.baseAddress!, 1,
-                                 vDSP_Length(n),
-                                 vDSP_Length(windowLength))
-                }
-            }
-            
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vForce_Operations.swift b/stdlib/public/Darwin/Accelerate/vForce_Operations.swift
deleted file mode 100644
index f0b9949e2e944..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vForce_Operations.swift
+++ /dev/null
@@ -1,3311 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//  TODO: Support vectors with `count > Int32.max` by calling vvceilf in a
-//  loop, processing 0x40000000 elements at a go.
-
-// Array-Oriented Arithmetic and Auxiliary Functions
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vForce {
-    
-    // MARK: Ceiling
-    
-    /// Returns the ceiling of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func ceil<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                ceil(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the ceiling of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func ceil<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvceilf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the ceiling of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func ceil<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                ceil(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the ceiling of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func ceil<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvceil(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Floor
-    
-    /// Returns the floor of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func floor<U>(_ vector: U) -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                floor(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the floor of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func floor<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvfloorf(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the floor of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func floor<U>(_ vector: U) -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                floor(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the floor of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func floor<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvfloor(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Copy sign
-    
-    /// Returns the sign of each element in `signs` to the corresponding element in `magnitudes`, single-precision.
-    ///
-    /// - Parameter magnitudes: Input magnitudes.
-    /// - Parameter signs: Input signs.
-    /// - Returns: Output values.
-    @inlinable
-    public static func copysign<U, V>(magnitudes: U,
-                                      signs: V) -> [Float]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(magnitudes.count == signs.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: magnitudes.count) {
-                buffer, initializedCount in
-                
-                copysign(magnitudes: magnitudes,
-                         signs: signs,
-                         result: &buffer)
-                
-                initializedCount = magnitudes.count
-            }
-            
-            return result
-    }
-    
-    /// Copies the sign of each element in `signs` to the corresponding element in `magnitudes`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter magnitudes: Input magnitudes.
-    /// - Parameter signs: Input signs.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func copysign<T, U, V>(magnitudes: T,
-                                         signs: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(magnitudes.count == signs.count && signs.count == result.count)
-            
-            var n = Int32(magnitudes.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                magnitudes.withUnsafeBufferPointer { mag in
-                    signs.withUnsafeBufferPointer { sgn in
-                        vvcopysignf(dest.baseAddress!,
-                                    mag.baseAddress!,
-                                    sgn.baseAddress!,
-                                    &n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns the sign of each element in `signs` to the corresponding element in `magnitudes`, double-precision.
-    ///
-    /// - Parameter magnitudes: Input magnitudes.
-    /// - Parameter signs: Input signs.
-    /// - Returns: Output values.
-    @inlinable
-    public static func copysign<U, V>(magnitudes: U,
-                                      signs: V) -> [Double]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(magnitudes.count == signs.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: magnitudes.count) {
-                buffer, initializedCount in
-                
-                copysign(magnitudes: magnitudes,
-                         signs: signs,
-                         result: &buffer)
-                
-                initializedCount = magnitudes.count
-            }
-            
-            return result
-    }
-    
-    /// Copies the sign of each element in `signs` to the corresponding element in `magnitudes`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter magnitudes: Input magnitudes.
-    /// - Parameter signs: Input signs.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func copysign<T, U, V>(magnitudes: T,
-                                         signs: U,
-                                         result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(magnitudes.count == signs.count && signs.count == result.count)
-            
-            var n = Int32(magnitudes.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                magnitudes.withUnsafeBufferPointer { mag in
-                    signs.withUnsafeBufferPointer { sgn in
-                        vvcopysign(dest.baseAddress!,
-                                   mag.baseAddress!,
-                                   sgn.baseAddress!,
-                                   &n)
-                    }
-                }
-            }
-    }
-    
-    // `vvdiv(_:_:_:_:)` omitted, we have `vDSP_vdiv` in vDSP already.
-    // `vvfabs(_:_:_:)` omitted, we have `vDSP_zvabs` in vDSP already.
-    
-    // MARK: Modulus
-    
-    /// Returns the remainder of the elements in `dividends` divided by the the elements in `divisors` using truncating division; single-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Returns: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is the integer formed by rounding `a/b` towards zero, so `abs(r) < abs(b)` and `r` has the same sign as `a`.
-    @inlinable
-    public static func truncatingRemainder<U, V>(dividends: U,
-                                                 divisors: V) -> [Float]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(dividends.count == divisors.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: dividends.count) {
-                buffer, initializedCount in
-                
-                truncatingRemainder(dividends: dividends,
-                                    divisors: divisors,
-                                    result: &buffer)
-                
-                initializedCount = dividends.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the remainder of the elements in `dividends` divided by the the elements
-    /// in `divisors` using truncating division; single-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Parameter result: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is the integer formed by rounding `a/b` towards zero, so `abs(r) < abs(b)` and `r` has the same sign as `a`.
-    @inlinable
-    public static func truncatingRemainder<T, U, V>(dividends: T,
-                                                    divisors: U,
-                                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(dividends.count == divisors.count && divisors.count == result.count)
-            
-            var n = Int32(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                dividends.withUnsafeBufferPointer { a in
-                    divisors.withUnsafeBufferPointer { b in
-                        vvfmodf(dest.baseAddress!,
-                                a.baseAddress!,
-                                b.baseAddress!,
-                                &n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns the remainder of the elements in `dividends` divided by the the elements in `divisors` using truncating division; double-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Returns: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is the integer formed by rounding `a/b` towards zero, so `abs(r) < abs(b)` and `r` has the same sign as `a`.
-    @inlinable
-    public static func truncatingRemainder<U, V>(dividends: U,
-                                                 divisors: V) -> [Double]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(dividends.count == divisors.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: dividends.count) {
-                buffer, initializedCount in
-                
-                truncatingRemainder(dividends: dividends,
-                                    divisors: divisors,
-                                    result: &buffer)
-                
-                initializedCount = dividends.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the remainder of the elements in `dividends` divided by the the elements
-    /// in `divisors` using truncating division; single-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Parameter result: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is the integer formed by rounding `a/b` towards zero, so `abs(r) < abs(b)` and `r` has the same sign as `a`.
-    @inlinable
-    public static func truncatingRemainder<T, U, V>(dividends: T,
-                                                    divisors: U,
-                                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(dividends.count == divisors.count && divisors.count == result.count)
-            
-            var n = Int32(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                dividends.withUnsafeBufferPointer { a in
-                    divisors.withUnsafeBufferPointer { b in
-                        vvfmod(dest.baseAddress!,
-                               a.baseAddress!,
-                               b.baseAddress!,
-                               &n)
-                    }
-                }
-            }
-    }
-    
-    // MARK: Remainder
-    
-    /// Returns the remainder after dividing each element in `dividends` by the corresponding element in `divisors`, single-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Returns: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is `a/b` rounded to the nearest integer, so `abs(r) <= abs(b/2)`.
-    @inlinable
-    public static func remainder<U, V>(dividends: U,
-                                       divisors: V) -> [Float]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(dividends.count == divisors.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: dividends.count) {
-                buffer, initializedCount in
-                
-                remainder(dividends: dividends,
-                          divisors: divisors,
-                          result: &buffer)
-                
-                initializedCount = dividends.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the remainder after dividing each element in `dividends` by the corresponding element in `divisors`, single-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Parameter result: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is `a/b` rounded to the nearest integer, so `abs(r) <= abs(b/2)`.
-    @inlinable
-    public static func remainder<T, U, V>(dividends: T,
-                                          divisors: U,
-                                          result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(dividends.count == divisors.count && divisors.count == result.count)
-            
-            var n = Int32(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                dividends.withUnsafeBufferPointer { a in
-                    divisors.withUnsafeBufferPointer { b in
-                        vvremainderf(dest.baseAddress!,
-                                     a.baseAddress!,
-                                     b.baseAddress!,
-                                     &n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns the remainder after dividing each element in `dividends` by the corresponding element in `divisors`, double-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Returns: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is `a/b` rounded to the nearest integer, so `abs(r) <= abs(b/2)`.
-    @inlinable
-    public static func remainder<U, V>(dividends: U,
-                                       divisors: V) -> [Double]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(dividends.count == divisors.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: dividends.count) {
-                buffer, initializedCount in
-                
-                remainder(dividends: dividends,
-                          divisors: divisors,
-                          result: &buffer)
-                
-                initializedCount = dividends.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the remainder after dividing each element in `dividends` by the corresponding element in `divisors`, double-precision.
-    ///
-    /// - Parameter dividends: Input dividends.
-    /// - Parameter divisors: Input divisors.
-    /// - Parameter result: Output values.
-    ///
-    /// For each corresponding `a` from `dividends` and `b` from `divisors`, the result `r` satisfies:
-    ///     a = bq + r
-    /// where q is `a/b` rounded to the nearest integer, so `abs(r) <= abs(b/2)`.
-    @inlinable
-    public static func remainder<T, U, V>(dividends: T,
-                                          divisors: U,
-                                          result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(dividends.count == divisors.count && divisors.count == result.count)
-            
-            var n = Int32(result.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                dividends.withUnsafeBufferPointer { a in
-                    divisors.withUnsafeBufferPointer { b in
-                        vvremainder(dest.baseAddress!,
-                                    a.baseAddress!,
-                                    b.baseAddress!,
-                                    &n)
-                    }
-                }
-            }
-    }
-    
-    // MARK: Integer Truncation
-    
-    /// Returns the integer truncation of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func trunc<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                trunc(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the integer truncation of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func trunc<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvintf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the integer truncation of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func trunc<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                trunc(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the integer truncation of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func trunc<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvint(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-    
-    // MARK: Nearest Integer
-    
-    /// Returns the nearest integer to each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func nearestInteger<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                nearestInteger(vector,
-                               result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the nearest integer to each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func nearestInteger<U, V>(_ vector: U,
-                                            result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvnintf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the nearest integer to each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func nearestInteger<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                nearestInteger(vector,
-                               result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the nearest integer to each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func nearestInteger<U, V>(_ vector: U,
-                                            result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvnint(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Reciprocal Square Root
-    
-    /// Returns the reciprocal square root of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func rsqrt<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                rsqrt(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the reciprocal square root of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func rsqrt<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvrsqrtf(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the reciprocal square root of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func rsqrt<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                rsqrt(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the reciprocal square root of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func rsqrt<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvrsqrt(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Square Root
-    
-    /// Returns the square root of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sqrt<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sqrt(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the square root of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sqrt<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsqrtf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the square root of each element in `vector`, double-precision.
-    ///
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sqrt<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sqrt(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the square root of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sqrt<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsqrt(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Reciprocal
-    
-    /// Returns the reciprocal of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func reciprocal<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                reciprocal(vector,
-                           result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the reciprocal of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func reciprocal<U, V>(_ vector: U,
-                                        result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvrecf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the reciprocal of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func reciprocal<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                reciprocal(vector,
-                           result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the reciprocal of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func reciprocal<U, V>(_ vector: U,
-                                        result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvrec(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-}
-
-// Array-Oriented Exponential and Logarithmic Functions
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vForce {
-    
-    // MARK: Exponential
-    
-    /// Returns e raised to the power of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func exp<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                exp(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates e raised to the power of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func exp<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexpf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns e raised to the power of each element minus one in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func expm1<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                expm1(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates e raised to the power of each element minus one in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func expm1<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexpm1f(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns 2 raised to the power of each element  minus one  in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func exp2<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                exp2(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates 2 raised to the power of each element  minus one  in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func exp2<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexp2f(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns e raised to the power of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func exp<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                exp(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates e raised to the power of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func exp<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexp(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-    
-    /// Returns e raised to the power of each element minus one in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func expm1<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                expm1(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates e raised to the power of each element  minus one  in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func expm1<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexpm1(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns 2 raised to the power of each element  minus one  in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func exp2<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                exp2(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates 2 raised to the power of each element  minus one  in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func exp2<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvexp2(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Logarithm
-    
-    /// Returns the base two logarithm of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func log2<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                log2(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the base two logarithm of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func log2<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlog2f(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the base ten logarithm of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func log10<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                log10(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the base ten logarithm of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func log10<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlog10f(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the base two logarithm of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func log2<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                log2(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the base two logarithm of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func log2<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlog2(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the base ten logarithm of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func log10<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                log10(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the ten logarithm of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func log10<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlog10(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Unbiased Exponent
-    
-    /// Returns the unbiased exponent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func logb<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                logb(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the unbiased exponent of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    ///
-    /// This function calculates `floor(log2(vector))`.
-    @inlinable
-    public static func logb<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlogbf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the unbiased exponent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func logb<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                logb(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the unbiased exponent of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Parameter result: Output values.
-    ///
-    /// This function calculates `floor(log2(vector))`.
-    @inlinable
-    public static func logb<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvlogb(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-}
-
-// Array-Oriented Power Functions
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vForce {
-    
-    // MARK: Power
-    
-    /// Returns each element in `bases` rasied to the power of the corresponding element in `exponents`, single-precision.
-    ///
-    /// - Parameter bases: Input base values.
-    /// - Parameter exponents: Input exponents.
-    /// - Returns: Output values.
-    @inlinable
-    public static func pow<U, V>(bases: U,
-                                 exponents: V) -> [Float]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(bases.count == exponents.count)
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: exponents.count) {
-                buffer, initializedCount in
-                
-                pow(bases: bases,
-                    exponents: exponents,
-                    result: &buffer)
-                
-                initializedCount = exponents.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates each element in `bases` rasied to the power of the corresponding element in `exponents`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter bases: Input base values.
-    /// - Parameter exponents: Input exponents.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func pow<T, U, V>(bases: T,
-                                    exponents: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(bases.count == exponents.count && exponents.count == result.count)
-            
-            var n = Int32(bases.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                bases.withUnsafeBufferPointer { bases in
-                    exponents.withUnsafeBufferPointer { exponents in
-                        vvpowf(dest.baseAddress!,
-                               exponents.baseAddress!,
-                               bases.baseAddress!,
-                               &n)
-                    }
-                }
-            }
-    }
-    
-    /// Returns each element in `bases` rasied to the power of the corresponding element in `exponents`, double-precision.
-    ///
-    /// - Parameter bases: Input base values.
-    /// - Parameter exponents: Input exponents.
-    /// - Returns: Output values.
-    @inlinable
-    public static func pow<U, V>(bases: U,
-                                 exponents: V) -> [Double]
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(bases.count == exponents.count)
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: exponents.count) {
-                buffer, initializedCount in
-                
-                pow(bases: bases,
-                    exponents: exponents,
-                    result: &buffer)
-                
-                initializedCount = exponents.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates each element in `bases` rasied to the power of the corresponding element in `exponents`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter bases: Input base values.
-    /// - Parameter exponents: Input exponents.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func pow<T, U, V>(bases: T,
-                                    exponents: U,
-                                    result: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double,
-        U.Element == Double,
-        V.Element == Double {
-            
-            precondition(bases.count == exponents.count && exponents.count == result.count)
-            
-            var n = Int32(bases.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                bases.withUnsafeBufferPointer { bases in
-                    exponents.withUnsafeBufferPointer { exponents in
-                        vvpow(dest.baseAddress!,
-                              exponents.baseAddress!,
-                              bases.baseAddress!,
-                              &n)
-                    }
-                }
-            }
-    }
-    
-    
-}
-
-// Array-Oriented Trigonometric Functions
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vForce {
-    
-    // MARK: Sine
-    
-    /// Returns the sine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sin<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sin(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the sine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sin<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsinf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the sine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sin<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sin(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the sine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sin<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsin(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-    
-    /// Returns the sine of pi multiplied of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sinPi<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sinPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the sine of pi multiplied by each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sinPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsinpif(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the sine of pi multiplied of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sinPi<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sinPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the sine of pi multiplied by each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sinPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsinpi(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Cosine
-    
-    /// Returns the cosine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cos<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cos(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the cosine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cos<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcosf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the cosine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cos<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cos(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the cosine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cos<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcos(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-    
-    /// Returns the cosine of pi multiplied of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cosPi<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cosPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the cosine of pi multiplied by each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cosPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcospif(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the cosine of pi multiplied of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cosPi<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cosPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the cosine of pi multiplied by each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cosPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcospi(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Cosine & Sine
-    
-    /// Calculates the sine and cosine of each element in `vector`, writing the results to `sinresult` and `cosresult` respectively, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter sinresult: Output sine values.
-    /// - Parameter cosresult: Output cosine values.
-    @inlinable
-    public static func sincos<T, U, V>(_ vector: T,
-                                       sinResult: inout U,
-                                       cosResult: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateMutableBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Float, U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == sinResult.count && sinResult.count == cosResult.count)
-            
-            var n = Int32(vector.count)
-            
-            sinResult.withUnsafeMutableBufferPointer { sinDest in
-                cosResult.withUnsafeMutableBufferPointer { cosDest in
-                    vector.withUnsafeBufferPointer { src in
-                        vvsincosf(sinDest.baseAddress!,
-                                  cosDest.baseAddress!,
-                                  src.baseAddress!,
-                                  &n)
-                    }
-                }
-            }
-    }
-    
-    /// Calculates the sine and cosine of each element in `vector`, writing the results to `sinresult` and `cosresult` respectively, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter sinresult: Output sine values.
-    /// - Parameter cosresult: Output cosine values.
-    @inlinable
-    public static func sincos<T, U, V>(_ vector: T,
-                                       sinResult: inout U,
-                                       cosResult: inout V)
-        where
-        T: AccelerateBuffer,
-        U: AccelerateMutableBuffer,
-        V: AccelerateMutableBuffer,
-        T.Element == Double, U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == sinResult.count && sinResult.count == cosResult.count)
-            
-            var n = Int32(vector.count)
-            
-            sinResult.withUnsafeMutableBufferPointer { sinDest in
-                cosResult.withUnsafeMutableBufferPointer { cosDest in
-                    vector.withUnsafeBufferPointer { src in
-                        vvsincos(sinDest.baseAddress!,
-                                 cosDest.baseAddress!,
-                                 src.baseAddress!,
-                                 &n)
-                    }
-                }
-            }
-    }
-    
-    // MARK: Tan
-    
-    /// Returns the tangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tan<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tan(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the tangent of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tan<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtanf(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    /// Returns the tangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tan<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tan(vector,
-                    result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    
-    /// Calculates the tangent of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tan<U, V>(_ vector: U,
-                                 result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtan(dest.baseAddress!,
-                          src.baseAddress!,
-                          &n)
-                }
-            }
-    }
-    
-    /// Returns the tangent of pi multiplied of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tanPi<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tanPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the tangent of pi multiplied by each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tanPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtanpif(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the tangent of pi multiplied of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tanPi<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tanPi(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the tangent of pi multiplied by each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tanPi<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtanpi(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Arcsine
-    
-    /// Returns the arcsine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func asin<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                asin(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arcsine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func asin<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvasinf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the arcsine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func asin<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                asin(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arcsine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func asin<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvasin(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Arccosine
-    
-    /// Returns the arccosine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func acos<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                acos(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arccosine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func acos<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvacosf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the arccosine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func acos<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                acos(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arccosine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func acos<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvacos(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Arctangent
-    
-    /// Returns the arctangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func atan<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                atan(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arctangent of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func atan<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvatanf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the arctangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func atan<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                atan(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the arctangent of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func atan<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvatan(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-}
-
-// Array-Oriented Hyperbolic Functions
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vForce {
-    
-    // MARK: Hyperbolic Sine
-    
-    /// Returns the hyperbolic sine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sinh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sinh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic sine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sinh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsinhf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the hyperbolic sine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func sinh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                sinh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic sine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func sinh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvsinh(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Hyperbolic Cosine
-    
-    /// Returns the hyperbolic cosine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cosh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cosh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic cosine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cosh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcoshf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the hyperbolic cosine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func cosh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                cosh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic cosine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func cosh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvcosh(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Hyperbolic Tangent
-    
-    /// Returns the hyperbolic tangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tanh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tanh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic tangent of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tanh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtanhf(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    /// Returns the hyperbolic tangent of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func tanh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                tanh(vector,
-                     result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the hyperbolic tangent of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func tanh<U, V>(_ vector: U,
-                                  result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvtanh(dest.baseAddress!,
-                           src.baseAddress!,
-                           &n)
-                }
-            }
-    }
-    
-    // MARK: Inverse Hyperbolic Sine
-    
-    /// Returns the inverse hyperbolic sine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func asinh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                asinh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic sine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func asinh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvasinhf(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the inverse hyperbolic sine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func asinh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                asinh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic sine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func asinh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvasinh(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Inverse Hyperbolic Cosine
-    
-    /// Returns the inverse hyperbolic cosine of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func acosh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                acosh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic cosine of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func acosh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvacoshf(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the inverse hyperbolic cosine of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func acosh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                acosh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic cosine of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func acosh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvacosh(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-    
-    // MARK: Inverse Hyperbolic Tangent
-    
-    /// Returns the inverse hyperbolic tangent of each element in `vector`, single-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func atanh<U>(_ vector: U)  -> [Float]
-        where
-        U: AccelerateBuffer,
-        U.Element == Float {
-            
-            let result = Array<Float>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                atanh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic tangent of each element in `vector`, writing the result to `result`, single-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func atanh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Float, V.Element == Float {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvatanhf(dest.baseAddress!,
-                             src.baseAddress!,
-                             &n)
-                }
-            }
-    }
-    
-    /// Returns the inverse hyperbolic tangent of each element in `vector`, double-precision.
-    ///
-    /// - Parameter _ vector: Input values.
-    /// - Returns: Output values.
-    @inlinable
-    public static func atanh<U>(_ vector: U)  -> [Double]
-        where
-        U: AccelerateBuffer,
-        U.Element == Double {
-            
-            let result = Array<Double>(unsafeUninitializedCapacity: vector.count) {
-                buffer, initializedCount in
-                
-                atanh(vector,
-                      result: &buffer)
-                
-                initializedCount = vector.count
-            }
-            
-            return result
-    }
-    
-    /// Calculates the inverse hyperbolic tangent of each element in `vector`, writing the result to `result`, double-precision.
-    ///
-    /// - Parameter vector: Input values.
-    /// - Parameter result: Output values.
-    @inlinable
-    public static func atanh<U, V>(_ vector: U,
-                                   result: inout V)
-        where
-        U: AccelerateBuffer,
-        V: AccelerateMutableBuffer,
-        U.Element == Double, V.Element == Double {
-            
-            precondition(vector.count == result.count)
-            
-            var n = Int32(vector.count)
-            
-            result.withUnsafeMutableBufferPointer { dest in
-                vector.withUnsafeBufferPointer { src in
-                    vvatanh(dest.baseAddress!,
-                            src.baseAddress!,
-                            &n)
-                }
-            }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vImage_Buffer.swift b/stdlib/public/Darwin/Accelerate/vImage_Buffer.swift
deleted file mode 100644
index 69950cc7e93d1..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_Buffer.swift
+++ /dev/null
@@ -1,232 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImage_Buffer
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage_Buffer {
-    
-    /// The size of the vImage buffer.
-    ///
-    /// The `CGSize` is rounded down to the nearest representable `CGFloat` that
-    /// is less than or equal to the actual size of the image. In practice the
-    /// conversion will always be exact, except for really big images. In that
-    /// case, some part of the bottom or right edge might be truncated.
-    public var size: CGSize {
-        var mutableSelf = self
-        return vImageBuffer_GetSize(&mutableSelf)
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns the preferred alignment and row bytes for a specified buffer
-    /// size and bits-per-pixel.
-    ///
-    /// - Parameter width: The width of the buffer.
-    /// - Parameter height: The height of the buffer.
-    /// - Parameter bitsPerPixel: The number of bits in a pixel of image data.
-    ///
-    /// - Returns: The preferred alignment and row bytes.
-    public static func preferredAlignmentAndRowBytes(width: Int,
-                                                     height: Int,
-                                                     bitsPerPixel: UInt32) throws -> (alignment: Int, rowBytes: Int) {
-        
-        if width < 0 || height < 0 {
-            throw vImage.Error.invalidParameter
-        }
-        
-        var buffer = vImage_Buffer()
-        
-        let error = vImageBuffer_Init(&buffer,
-                                      vImagePixelCount(height),
-                                      vImagePixelCount(width),
-                                      bitsPerPixel,
-                                      vImage_Flags(kvImageNoAllocate))
-        
-        if error < kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        } else {
-            return(alignment: error,
-                   rowBytes: buffer.rowBytes)
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  Initializers.
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Initializes a vImage buffer of a specified size.
-    ///
-    /// - Parameter width: The width of the buffer.
-    /// - Parameter height: The height of the buffer.
-    /// - Parameter bitsPerPixel: The number of bits in a pixel of image data.
-    ///
-    /// - Returns: An initialized vImage buffer.
-    public init(width: Int,
-                height: Int,
-                bitsPerPixel: UInt32) throws {
-        
-        if width < 0 || height < 0 {
-            throw vImage.Error.invalidParameter
-        }
-        
-        self.init()
-        
-        let error = vImageBuffer_Init(&self,
-                                      vImagePixelCount(height),
-                                      vImagePixelCount(width),
-                                      bitsPerPixel,
-                                      vImage_Flags(kvImageNoFlags))
-        
-        if error < kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        }
-    }
-    
-    public func free() {
-        Darwin.free(data)
-    }
-}
-
-// MARK: Core Graphics Support
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage_Buffer {
-    
-    /// Initialize a vImage buffer with the contents of a Core Graphics image.
-    ///
-    /// - Parameter cgImage: A `CGImage` instance to be used as the source.
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: An initialized vImage buffer.
-    ///
-    /// This function will instantiate and initialize a vImage buffer from a `CGImage` using a `CGImageFormat` based on the provided image's properties.
-    public init(cgImage: CGImage,
-                flags options: vImage.Options = .noFlags) throws {
-        
-        self.init()
-        
-        guard var format = vImage_CGImageFormat(cgImage: cgImage) else {
-            throw vImage.Error.invalidImageFormat
-        }
-        
-        let error = vImageBuffer_InitWithCGImage(&self,
-                                                 &format,
-                                                 nil,
-                                                 cgImage,
-                                                 options.flags)
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Initialize a vImage buffer with the contents of a Core Graphics image,
-    /// using a supplied format.
-    ///
-    /// - Parameter cgImage: A `CGImage` instance to be used as the source.
-    /// - Parameter format: A `vImage_CGImageFormat` that describes the source image/
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: An initialized vImage buffer.
-    ///
-    /// This function will instantiate and initialize a vImage buffer from a `CGImage` using a provided `CGImageFormat`.
-    public init(cgImage: CGImage,
-                format: vImage_CGImageFormat,
-                flags options: vImage.Options = .noFlags) throws {
-        
-        self.init()
-        
-        var format = format
-        let error = vImageBuffer_InitWithCGImage(&self,
-                                                 &format,
-                                                 nil,
-                                                 cgImage,
-                                                 options.flags)
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Creates a `CGImage` instance from a vImage buffer
-    ///
-    /// - Parameter format: The image format of this vImage buffer.
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: A Core Graphics image containing a representation of the vImage buffer.
-    public func createCGImage(format: vImage_CGImageFormat,
-                              flags options: vImage.Options = .noFlags) throws -> CGImage {
-        var format = format
-        var error = kvImageNoError
-        
-        var cgImage: CGImage?
-        
-        withUnsafePointer(to: self) {
-            cgImage = vImageCreateCGImageFromBuffer(
-                $0,
-                &format,
-                nil,
-                nil,
-                options.flags,
-                &error).takeRetainedValue()
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        } else if cgImage == nil {
-            throw vImage.Error.internalError
-        }
-        
-        return cgImage!
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Copies this buffer to `destinationBuffer`.
-    ///
-    /// - Parameter destinationBuffer: The destination vImage buffer.
-    /// - Parameter pixelSize: The number of bytes for one pixel.
-    /// - Parameter options: The options to use when performing this operation.
-    public func copy(destinationBuffer: inout vImage_Buffer,
-                     pixelSize: Int,
-                     flags options: vImage.Options = .noFlags) throws {
-        
-        if Int(width) == 0 {
-            throw vImage.Error(vImageError: kvImageInvalidParameter)
-        }
-
-        var error = kvImageNoError
-        
-        withUnsafePointer(to: self) {
-            error =  vImageCopyBuffer($0,
-                                      &destinationBuffer,
-                                      pixelSize,
-                                      options.flags)
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vImage_CGImageFormat.swift b/stdlib/public/Darwin/Accelerate/vImage_CGImageFormat.swift
deleted file mode 100644
index 4ec2521db74e6..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_CGImageFormat.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImage_CGImageFormat
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage_CGImageFormat {
-    
-    /// Initializes an image format from a Core Graphics image.
-    ///
-    /// - Parameter cgImage: The image from which to derive the image format.
-    ///
-    /// - Returns: An initialized `vImage_CGImageFormat`.
-    public init?(cgImage: CGImage) {
-        guard
-            let colorSpace = cgImage.colorSpace else {
-                return nil
-        }
-        
-        self = vImage_CGImageFormat(
-            bitsPerComponent: UInt32(cgImage.bitsPerComponent),
-            bitsPerPixel: UInt32(cgImage.bitsPerPixel),
-            colorSpace: Unmanaged.passRetained(colorSpace),
-            bitmapInfo: cgImage.bitmapInfo,
-            version: 0,
-            decode: nil,
-            renderingIntent: cgImage.renderingIntent)
-    }
-    
-    /// Initializes an image format.
-    ///
-    /// - Parameter bitsPerComponent: The number of bits needed to represent one
-    /// channel of data in one pixel.
-    /// - Parameter bitsPerPixel: The number of bits needed to represent one pixel.
-    /// - Parameter colorSpace: The color space for the format.
-    /// - Parameter bitmapInfo: The component information describing the color channels.
-    /// - Parameter renderingIntent: A rendering intent constant that specifies how
-    /// Core Graphics should handle colors that are not located within the gamut of the
-    /// destination color space of a graphics context.
-    ///
-    /// - Returns: An initialized `vImage_CGImageFormat`.
-    public init?(bitsPerComponent: Int,
-                 bitsPerPixel: Int,
-                 colorSpace: CGColorSpace,
-                 bitmapInfo: CGBitmapInfo,
-                 renderingIntent: CGColorRenderingIntent = .defaultIntent) {
-        
-        if bitsPerComponent < 1 || bitsPerPixel < 0 {
-            return nil
-        }
-        
-        self = vImage_CGImageFormat(
-            bitsPerComponent: UInt32(bitsPerComponent),
-            bitsPerPixel: UInt32(bitsPerPixel),
-            colorSpace: Unmanaged.passRetained(colorSpace),
-            bitmapInfo: bitmapInfo,
-            version: 0,
-            decode: nil,
-            renderingIntent: renderingIntent)
-    }
-    
-    /// The number of color channels.
-    public var componentCount: Int {
-        var mutableSelf = self
-        return Int(vImageCGImageFormat_GetComponentCount(&mutableSelf))
-    }
-}
-
diff --git a/stdlib/public/Darwin/Accelerate/vImage_CVImageFormat.swift b/stdlib/public/Darwin/Accelerate/vImage_CVImageFormat.swift
deleted file mode 100644
index b2deca43162bd..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_CVImageFormat.swift
+++ /dev/null
@@ -1,638 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImageCVImageFormat
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImageCVImageFormat {
-    
-    /// Creates the description of how an image is encoded in a Core Video pixel buffer.
-    ///
-    /// - Parameter format: The format type of the image.
-    /// - Parameter matrix: A `vImage_ARGBToYpCbCrMatrix` that describes the conversion from RGB to the YpCbCr format.
-    /// - Parameter chromaSiting: The chroma location.
-    /// - Parameter colorSpace: The color space of the RGB and monochrome images.
-    /// - Parameter alphaIsOpaqueHint: A hint indicating that an image with an alpha channel should be treated as opaque.
-    ///
-    /// - Returns: A `vImageCVImageFormatRef` instance encoded with the function's parameters.
-    public static func make(format: Format,
-                            matrix: vImage_ARGBToYpCbCrMatrix,
-                            chromaSiting: ChromaSiting,
-                            colorSpace: CGColorSpace,
-                            alphaIsOpaqueHint: Bool) -> vImageCVImageFormat? {
-        
-        var mutableMatrix = matrix
-        
-        return vImageCVImageFormat_Create(format.ostype,
-                                          &mutableMatrix,
-                                          chromaSiting.cfString,
-                                          colorSpace,
-                                          alphaIsOpaqueHint ? 1 : 0)?.takeRetainedValue()
-    }
-    
-    /// Creates the description of how an image is encoded in an existing Core Video pixel buffer.
-    ///
-    /// - Parameter buffer: The CVPixelBufferRef on which to base the returned vImageCVImageFormatRef.
-    ///
-    /// - Returns: A `vImageCVImageFormatRef` instance encoded with the supplied pixel buffer's pixel format.
-    public static func make(buffer: CVPixelBuffer) -> vImageCVImageFormat? {
-        
-        return vImageCVImageFormat_CreateWithCVPixelBuffer(buffer).takeRetainedValue()
-    }
-    
-    ///  The alpha hint of a Core Video image format.
-    public var alphaIsOpaqueHint: Bool {
-        get {
-            return vImageCVImageFormat_GetAlphaHint(cvConstImageFormat) != 0
-        }
-        set {
-            let error = vImageCVImageFormat_SetAlphaHint(self,
-                                                         newValue ? 2 : 0)
-            
-            if error != kvImageNoError {
-                fatalError("Unable to set `alphaIsOpaqueHint`")
-            }
-        }
-    }
-    
-    /// The number of channels, including alpha, for the Core Video image format.
-    public var channelCount: UInt32  {
-        return vImageCVImageFormat_GetChannelCount(cvConstImageFormat)
-    }
-    
-    /// The names of the channels of a Core Video image format.
-    public var channels: [vImage.BufferType] {
-        let channels = Array(UnsafeBufferPointer(start: vImageCVImageFormat_GetChannelNames(cvConstImageFormat),
-                                                 count: Int(channelCount)))
-        
-        return channels.compactMap {
-            return vImage.BufferType(bufferTypeCode: Int($0),
-                                     model: colorSpace?.model)
-        }
-    }
-    
-    /// Returns the channel description for a particular channel type.
-    public func channelDescription(bufferType: vImage.BufferType) -> vImageChannelDescription? {
-        guard let description = vImageCVImageFormat_GetChannelDescription(cvConstImageFormat,
-                                                                          bufferType.bufferTypeCode) else {
-                                                                            return nil
-        }
-        
-        return vImageChannelDescription(min: description.pointee.min,
-                                        zero: description.pointee.zero,
-                                        full: description.pointee.full,
-                                        max:  description.pointee.max)
-    }
-    
-    /// The chroma siting of a Core Video image format.
-    public var chromaSiting: ChromaSiting?  {
-        get {
-            return ChromaSiting(location: vImageCVImageFormat_GetChromaSiting(cvConstImageFormat)?.takeRetainedValue())
-        }
-        set {
-            let error = vImageCVImageFormat_SetChromaSiting(self,
-                                                            newValue?.cfString)
-            
-            if error != kvImageNoError {
-                fatalError("Unable to set `chromaSiting`")
-            }
-        }
-    }
-    
-    ///  The color space of a Core Video image format.
-    public var colorSpace: CGColorSpace?  {
-        get {
-            return vImageCVImageFormat_GetColorSpace(cvConstImageFormat)?.takeRetainedValue()
-        }
-        set {
-            let error = vImageCVImageFormat_SetColorSpace(self,
-                                                          newValue)
-            
-            if error != kvImageNoError {
-                fatalError("Unable to set `colorSpace`")
-            }
-        }
-    }
-    
-    /// The format code of a Core Video image format.
-    public var formatCode: UInt32 {
-        return vImageCVImageFormat_GetFormatCode(cvConstImageFormat)
-    }
-    
-    /// Utility to return immuatable copy of self for use in getters.
-    private var cvConstImageFormat: vImageConstCVImageFormat {
-        
-        let cvImageFormatPointer = UnsafeMutableRawPointer.allocate(byteCount: MemoryLayout<vImageCVImageFormat>.size,
-                                                                    alignment: MemoryLayout<vImageCVImageFormat>.alignment)
-        cvImageFormatPointer.storeBytes(of: self,
-                                        as: vImageCVImageFormat.self)
-        return cvImageFormatPointer.load(as: vImageConstCVImageFormat.self)
-    }
-    
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage {
-    /// Type codes for what is in a `vImage_Buffer`, such as red or luminance.
-    public enum BufferType: Int {
-        
-        /// The buffer contains the alpha channel / coverage component
-        case alpha
-        
-        /// The buffer contains data describable as a `vImage_CGImageFormat` as a
-        /// single (likely chunky) buffer.
-        case coreGraphics
-        
-        /// If the image has a CMYK color model, the buffer contains the black channel.
-        case cmykBlack
-        
-        /// If the image has a CMYK color model, the buffer contains the cyan channel.
-        case cmykCyan
-        
-        /// If the image has a CMYK color model, the buffer contains the magenta channel.
-        case cmykMagenta
-        
-        /// If the image has a CMYK color model, the buffer contains the yellow channel.
-        case cmykYellow
-        
-        /// The buffer contains luminance, and both chroma channels interleaved
-        /// according to the vImageConstCVImageFormatRef image type.
-        case YCbCr
-        
-        /// The buffer contains the blue chrominance channel.
-        case Cb
-        
-        /// The buffer contains the red chrominance channel.
-        case Cr
-        
-        /// The buffer contains both chrominance channels, interleaved.
-        case chroma
-        
-        /// The buffer contains chunky data not describable as a `vImage_CGImageFormat`.
-        case chunky
-        
-        /// The buffer contains data in an indexed colorspace.
-        case indexed
-        
-        /// If the image has a LAB color model, the buffer contains the a* channel.
-        case labA
-        
-        /// If the image has a LAB color model, the buffer contains the b* channel.
-        case labB
-        
-        /// If the image has a LAB color model, the buffer contains the L* channel.
-        case labL
-        
-        /// The buffer contains only luminance data.
-        case luminance
-        
-        /// The buffer contains monochrome data.
-        case monochrome
-        
-        /// If the image has a RGB color model, the buffer contains the red channel.
-        case rgbRed
-        
-        /// If the image has a RGB color model, the buffer contains the green channel.
-        case rgbGreen
-        
-        /// If the image has a RGB color model, the buffer contains the blue channel.
-        case rgbBlue
-        
-        ///  If the image has a XYZ color model, the buffer contains the X channel.
-        case xyzX
-        
-        /// If the image has a XYZ color model, the buffer contains the Y channel.
-        case xyzY
-        
-        /// If the image has a XYZ color model, the buffer contains the Z channel.
-        case xyzZ
-        
-        public init?(rawValue: Int) {
-            fatalError("Not supported, use `BufferType.init(bufferTypeCode:model:)`.")
-        }
-        
-        /// Returns a new `BufferType` enum from the supplied code and color
-        /// space model.
-        public init?(bufferTypeCode: Int, model: CGColorSpaceModel?) {
-            
-            switch bufferTypeCode {
-                
-                //    kvImageBufferTypeCode_RGB_Red
-                //    kvImageBufferTypeCode_CMYK_Cyan
-                //    kvImageBufferTypeCode_LAB_L
-                //    kvImageBufferTypeCode_XYZ_X
-            //    kvImageBufferTypeCode_Monochrome
-            case kvImageBufferTypeCode_ColorSpaceChannel1:
-                switch model ?? .unknown {
-                case .monochrome:
-                    self = .monochrome
-                case .cmyk:
-                    self = .cmykCyan
-                case .lab:
-                    self = .labL
-                case .XYZ:
-                    self = .xyzX
-                default:
-                    self = .rgbRed
-                }
-                
-                //    kvImageBufferTypeCode_RGB_Green
-                //    kvImageBufferTypeCode_CMYK_Magenta
-                //    kvImageBufferTypeCode_LAB_A
-            //    kvImageBufferTypeCode_XYZ_Y
-            case kvImageBufferTypeCode_ColorSpaceChannel2:
-                switch model ?? .unknown {
-                case .cmyk:
-                    self = .cmykMagenta
-                case .lab:
-                    self = .labA
-                case .XYZ:
-                    self = .xyzY
-                default:
-                    self = .rgbGreen
-                }
-                
-                //    kvImageBufferTypeCode_RGB_Blue
-                //    kvImageBufferTypeCode_CMYK_Yellow
-                //    kvImageBufferTypeCode_LAB_B
-            //    kvImageBufferTypeCode_XYZ_Z
-            case kvImageBufferTypeCode_ColorSpaceChannel3:
-                switch model ?? .unknown {
-                case .cmyk:
-                    self = .cmykYellow
-                case .lab:
-                    self = .labB
-                case .XYZ:
-                    self = .xyzZ
-                default:
-                    self = .rgbBlue
-                }
-                
-            case kvImageBufferTypeCode_Alpha:
-                self = .alpha
-            case kvImageBufferTypeCode_CGFormat:
-                self = .coreGraphics
-            case kvImageBufferTypeCode_CMYK_Black:
-                self = .cmykBlack
-            case kvImageBufferTypeCode_CVPixelBuffer_YCbCr:
-                self = .YCbCr
-            case kvImageBufferTypeCode_Cb:
-                self = .Cb
-            case kvImageBufferTypeCode_Cr:
-                self = .Cr
-            case kvImageBufferTypeCode_Chroma:
-                self = .chroma
-            case kvImageBufferTypeCode_Chunky:
-                self = .chunky
-            case kvImageBufferTypeCode_Indexed:
-                self = .indexed
-            case kvImageBufferTypeCode_Luminance:
-                self = .luminance
-                
-            default:
-                return nil
-            }
-        }
-        
-        /// The `vImageBufferTypeCode` for this `BufferType` enum.
-        public var bufferTypeCode: vImageBufferTypeCode {
-            var code = -1
-            switch self {
-            case .alpha:
-                code = kvImageBufferTypeCode_Alpha
-            case .coreGraphics:
-                code = kvImageBufferTypeCode_CGFormat
-            case .cmykBlack:
-                code = kvImageBufferTypeCode_CMYK_Black
-            case .cmykCyan:
-                code = kvImageBufferTypeCode_CMYK_Cyan
-            case .cmykMagenta:
-                code = kvImageBufferTypeCode_CMYK_Magenta
-            case .cmykYellow:
-                code = kvImageBufferTypeCode_CMYK_Yellow
-            case .YCbCr:
-                code = kvImageBufferTypeCode_CVPixelBuffer_YCbCr
-            case .Cb:
-                code = kvImageBufferTypeCode_Cb
-            case .Cr:
-                code = kvImageBufferTypeCode_Cr
-            case .chroma:
-                code = kvImageBufferTypeCode_Chroma
-            case .chunky:
-                code = kvImageBufferTypeCode_Chunky
-            case .indexed:
-                code = kvImageBufferTypeCode_Indexed
-            case .labA:
-                code = kvImageBufferTypeCode_LAB_A
-            case .labB:
-                code = kvImageBufferTypeCode_LAB_B
-            case .labL:
-                code = kvImageBufferTypeCode_LAB_L
-            case .luminance:
-                code = kvImageBufferTypeCode_Luminance
-            case .monochrome:
-                code = kvImageBufferTypeCode_Monochrome
-            case .rgbRed:
-                code = kvImageBufferTypeCode_RGB_Red
-            case .rgbGreen:
-                code = kvImageBufferTypeCode_RGB_Green
-            case .rgbBlue:
-                code = kvImageBufferTypeCode_RGB_Blue
-            case .xyzX:
-                code = kvImageBufferTypeCode_XYZ_X
-            case .xyzY:
-                code = kvImageBufferTypeCode_XYZ_Y
-            case .xyzZ:
-                code = kvImageBufferTypeCode_XYZ_Z
-            }
-            
-            return vImageBufferTypeCode(code)
-        }
-    }
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImageCVImageFormat {
-    /// Core Video pixel format type enum.
-    public enum Format {
-        case format1Monochrome
-        case format2Indexed
-        case format4Indexed
-        case format8Indexed
-        case format1IndexedGray_WhiteIsZero
-        case format2IndexedGray_WhiteIsZero
-        case format4IndexedGray_WhiteIsZero
-        case format8IndexedGray_WhiteIsZero
-        case format16BE555
-        case format16LE555
-        case format16LE5551
-        case format16BE565
-        case format16LE565
-        case format24RGB
-        case format24BGR
-        case format32ARGB
-        case format32BGRA
-        case format32ABGR
-        case format32RGBA
-        case format64ARGB
-        case format48RGB
-        case format32AlphaGray
-        case format16Gray
-        case format30RGB
-        case format422YpCbCr8
-        case format4444YpCbCrA8
-        case format4444YpCbCrA8R
-        case format4444AYpCbCr8
-        case format4444AYpCbCr16
-        case format444YpCbCr8
-        case format422YpCbCr16
-        case format422YpCbCr10
-        case format444YpCbCr10
-        case format420YpCbCr8Planar
-        case format420YpCbCr8PlanarFullRange
-        case format422YpCbCr_4A_8BiPlanar
-        case format420YpCbCr8BiPlanarVideoRange
-        case format420YpCbCr8BiPlanarFullRange
-        case format422YpCbCr8_yuvs
-        case format422YpCbCr8FullRange
-        case formatOneComponent8
-        case formatTwoComponent8
-        case format30RGBLEPackedWideGamut
-        case formatARGB2101010LEPacked
-        case formatOneComponent16Half
-        case formatOneComponent32Float
-        case formatTwoComponent16Half
-        case formatTwoComponent32Float
-        case format64RGBAHalf
-        case format128RGBAFloat
-        case format14Bayer_GRBG
-        case format14Bayer_RGGB
-        case format14Bayer_BGGR
-        case format14Bayer_GBRG
-        case formatDisparityFloat16
-        case formatDisparityFloat32
-        case formatDepthFloat16
-        case formatDepthFloat32
-        case format420YpCbCr10BiPlanarVideoRange
-        case format422YpCbCr10BiPlanarVideoRange
-        case format444YpCbCr10BiPlanarVideoRange
-        case format420YpCbCr10BiPlanarFullRange
-        case format422YpCbCr10BiPlanarFullRange
-        case format444YpCbCr10BiPlanarFullRange
-        
-        var ostype: OSType {
-            switch self {
-            case .format1Monochrome:
-                return kCVPixelFormatType_1Monochrome
-            case .format2Indexed:
-                return kCVPixelFormatType_2Indexed
-            case .format4Indexed:
-                return kCVPixelFormatType_4Indexed
-            case .format8Indexed:
-                return kCVPixelFormatType_8Indexed
-            case .format1IndexedGray_WhiteIsZero:
-                return kCVPixelFormatType_1IndexedGray_WhiteIsZero
-            case .format2IndexedGray_WhiteIsZero:
-                return kCVPixelFormatType_2IndexedGray_WhiteIsZero
-            case .format4IndexedGray_WhiteIsZero:
-                return kCVPixelFormatType_4IndexedGray_WhiteIsZero
-            case .format8IndexedGray_WhiteIsZero:
-                return kCVPixelFormatType_8IndexedGray_WhiteIsZero
-            case .format16BE555:
-                return kCVPixelFormatType_16BE555
-            case .format16LE555:
-                return kCVPixelFormatType_16LE555
-            case .format16LE5551:
-                return kCVPixelFormatType_16LE5551
-            case .format16BE565:
-                return kCVPixelFormatType_16BE565
-            case .format16LE565:
-                return kCVPixelFormatType_16LE565
-            case .format24RGB:
-                return kCVPixelFormatType_24RGB
-            case .format24BGR:
-                return kCVPixelFormatType_24BGR
-            case .format32ARGB:
-                return kCVPixelFormatType_32ARGB
-            case .format32BGRA:
-                return kCVPixelFormatType_32BGRA
-            case .format32ABGR:
-                return kCVPixelFormatType_32ABGR
-            case .format32RGBA:
-                return kCVPixelFormatType_32RGBA
-            case .format64ARGB:
-                return kCVPixelFormatType_64ARGB
-            case .format48RGB:
-                return kCVPixelFormatType_48RGB
-            case .format32AlphaGray:
-                return kCVPixelFormatType_32AlphaGray
-            case .format16Gray:
-                return kCVPixelFormatType_16Gray
-            case .format30RGB:
-                return kCVPixelFormatType_30RGB
-            case .format422YpCbCr8:
-                return kCVPixelFormatType_422YpCbCr8
-            case .format4444YpCbCrA8:
-                return kCVPixelFormatType_4444YpCbCrA8
-            case .format4444YpCbCrA8R:
-                return kCVPixelFormatType_4444YpCbCrA8R
-            case .format4444AYpCbCr8:
-                return kCVPixelFormatType_4444AYpCbCr8
-            case .format4444AYpCbCr16:
-                return kCVPixelFormatType_4444AYpCbCr16
-            case .format444YpCbCr8:
-                return kCVPixelFormatType_444YpCbCr8
-            case .format422YpCbCr16:
-                return kCVPixelFormatType_422YpCbCr16
-            case .format422YpCbCr10:
-                return kCVPixelFormatType_422YpCbCr10
-            case .format444YpCbCr10:
-                return kCVPixelFormatType_444YpCbCr10
-            case .format420YpCbCr8Planar:
-                return kCVPixelFormatType_420YpCbCr8Planar
-            case .format420YpCbCr8PlanarFullRange:
-                return kCVPixelFormatType_420YpCbCr8PlanarFullRange
-            case .format422YpCbCr_4A_8BiPlanar:
-                return kCVPixelFormatType_422YpCbCr_4A_8BiPlanar
-            case .format420YpCbCr8BiPlanarVideoRange:
-                return kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
-            case .format420YpCbCr8BiPlanarFullRange:
-                return kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
-            case .format422YpCbCr8_yuvs:
-                return kCVPixelFormatType_422YpCbCr8_yuvs
-            case .format422YpCbCr8FullRange:
-                return kCVPixelFormatType_422YpCbCr8FullRange
-            case .formatOneComponent8:
-                return kCVPixelFormatType_OneComponent8
-            case .formatTwoComponent8:
-                return kCVPixelFormatType_TwoComponent8
-            case .format30RGBLEPackedWideGamut:
-                return kCVPixelFormatType_30RGBLEPackedWideGamut
-            case .formatARGB2101010LEPacked:
-                return kCVPixelFormatType_ARGB2101010LEPacked
-            case .formatOneComponent16Half:
-                return kCVPixelFormatType_OneComponent16Half
-            case .formatOneComponent32Float:
-                return kCVPixelFormatType_OneComponent32Float
-            case .formatTwoComponent16Half:
-                return kCVPixelFormatType_TwoComponent16Half
-            case .formatTwoComponent32Float:
-                return kCVPixelFormatType_TwoComponent32Float
-            case .format64RGBAHalf:
-                return kCVPixelFormatType_64RGBAHalf
-            case .format128RGBAFloat:
-                return kCVPixelFormatType_128RGBAFloat
-            case .format14Bayer_GRBG:
-                return kCVPixelFormatType_14Bayer_GRBG
-            case .format14Bayer_RGGB:
-                return kCVPixelFormatType_14Bayer_RGGB
-            case .format14Bayer_BGGR:
-                return kCVPixelFormatType_14Bayer_BGGR
-            case .format14Bayer_GBRG:
-                return kCVPixelFormatType_14Bayer_GBRG
-            case .formatDisparityFloat16:
-                return kCVPixelFormatType_DisparityFloat16
-            case .formatDisparityFloat32:
-                return kCVPixelFormatType_DisparityFloat32
-            case .formatDepthFloat16:
-                return kCVPixelFormatType_DepthFloat16
-            case .formatDepthFloat32:
-                return kCVPixelFormatType_DepthFloat32
-            case .format420YpCbCr10BiPlanarVideoRange:
-                return kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange
-            case .format422YpCbCr10BiPlanarVideoRange:
-                return kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange
-            case .format444YpCbCr10BiPlanarVideoRange:
-                return kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange
-            case .format420YpCbCr10BiPlanarFullRange:
-                return kCVPixelFormatType_420YpCbCr10BiPlanarFullRange
-            case .format422YpCbCr10BiPlanarFullRange:
-                return kCVPixelFormatType_422YpCbCr10BiPlanarFullRange
-            case .format444YpCbCr10BiPlanarFullRange:
-                return kCVPixelFormatType_444YpCbCr10BiPlanarFullRange
-            }
-        }
-    }
-    
-    public enum ChromaSiting {
-        /// Chroma sample is horizontally co-sited with the left column of luma
-        /// samples, but centered vertically.
-        case left
-        
-        /// Chroma sample is fully centered
-        case center
-        
-        /// Chroma sample is co-sited with the top-left luma sample.
-        case topLeft
-        
-        /// Chroma sample is horizontally centered, but co-sited with the top
-        /// row of luma samples.
-        case top
-        
-        /// Chroma sample is co-sited with the bottom-left luma sample.
-        case bottomLeft
-        
-        /// Chroma sample is horizontally centered, but co-sited with the
-        /// bottom row of luma samples.
-        case bottom
-        
-        /// Cr and Cb samples are alternately co-sited with the left luma
-        /// samples of the same field.
-        case dv420
-        
-        /// Returns a new `ChromaSiting` enum from the supplied location.
-        init?(location: CFString?) {
-            switch location {
-            case kCVImageBufferChromaLocation_Left:
-                self = .left
-            case kCVImageBufferChromaLocation_Center:
-                self = .center
-            case kCVImageBufferChromaLocation_TopLeft:
-                self = .topLeft
-            case kCVImageBufferChromaLocation_Top:
-                self = .top
-            case kCVImageBufferChromaLocation_BottomLeft:
-                self = .bottomLeft
-            case kCVImageBufferChromaLocation_Bottom:
-                self = .bottom
-            case kCVImageBufferChromaLocation_DV420:
-                self = .dv420
-            default:
-                return nil
-            }
-        }
-        
-        /// Returns a `CFString` describing this `ChromaSiting`.
-        var cfString: CFString {
-            switch self {
-            case .left:
-                return kCVImageBufferChromaLocation_Left
-            case .center:
-                return kCVImageBufferChromaLocation_Center
-            case .topLeft:
-                return kCVImageBufferChromaLocation_TopLeft
-            case .top:
-                return kCVImageBufferChromaLocation_Top
-            case .bottomLeft:
-                return kCVImageBufferChromaLocation_BottomLeft
-            case .bottom:
-                return kCVImageBufferChromaLocation_Bottom
-            case .dv420:
-                return kCVImageBufferChromaLocation_DV420
-            }
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/Accelerate/vImage_Converter.swift b/stdlib/public/Darwin/Accelerate/vImage_Converter.swift
deleted file mode 100644
index 9a3774df25bb5..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_Converter.swift
+++ /dev/null
@@ -1,240 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImageConverter
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImageConverter {
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Returns an array of vImage source buffer types specifying the order of planes.
-    ///
-    /// - Parameter colorSpace: The color space of the source format.
-    public func sourceBuffers(colorSpace: CGColorSpace) -> [vImage.BufferType?]  {
-        let sourceBuffers = vImageConverter_GetSourceBufferOrder(self)
-        let codes = Array(UnsafeBufferPointer(start: sourceBuffers,
-                                              count: sourceBufferCount))
-        
-        return codes.map {
-            vImage.BufferType(bufferTypeCode: Int($0),
-                              model: colorSpace.model)
-        }
-    }
-    
-    /// Returns an array of vImage source buffer types specifying the order of planes.
-    ///
-    /// - Parameter colorSpace: The color space of the destination format.
-    public func destinationBuffers(colorSpace: CGColorSpace) -> [vImage.BufferType?]  {
-        let destinationBuffers = vImageConverter_GetDestinationBufferOrder(self)
-        let codes = Array(UnsafeBufferPointer(start: destinationBuffers,
-                                              count: destinationBufferCount))
-        
-        return codes.map {
-            vImage.BufferType(bufferTypeCode: Int($0),
-                              model: colorSpace.model)
-        }
-    }
-    
-    /// The number of source buffers consumed by the converter.
-    public var sourceBufferCount: Int {
-        return Int(vImageConverter_GetNumberOfSourceBuffers(self))
-    }
-    
-    /// The number of destination buffers written to by the converter.
-    public var destinationBufferCount: Int {
-        return Int(vImageConverter_GetNumberOfDestinationBuffers(self))
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Determines whether a converter is capable of operating in place.
-    ///
-    /// - Parameter source: The source buffer.
-    /// - Parameter destination: The destination buffer.
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: `true` if the conversion must operate out of place or `false`
-    /// if the operation will work in place.
-    public func mustOperateOutOfPlace(source: vImage_Buffer,
-                                      destination: vImage_Buffer,
-                                      flags options: vImage.Options = .noFlags) throws -> Bool {
-        var error = kvImageNoError
-        
-        withUnsafePointer(to: source) { src in
-            withUnsafePointer(to: destination) { dest in
-                error = vImageConverter_MustOperateOutOfPlace(self,
-                                                              src,
-                                                              dest,
-                                                              vImage_Flags(options.rawValue))
-            }
-        }
-        
-        switch error {
-        case kvImageOutOfPlaceOperationRequired:
-            return true
-        case kvImageNoError:
-            return false
-        default:
-            throw vImage.Error(vImageError: error)
-        }
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: CG -> CG
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Creates a vImage converter to convert from one vImage Core Graphics image format to another.
-    ///
-    /// - Parameter sourceFormat: A `vImage_CGImageFormat` structure describing the image format of the source image
-    /// - Parameter destinationFormat: A `vImage_CGImageFormat` structure describing the image format of the destination image
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: a vImage converter to convert from one vImage Core Graphics image format to another.
-    public static func make(sourceFormat: vImage_CGImageFormat,
-                            destinationFormat: vImage_CGImageFormat,
-                            flags options: vImage.Options = .noFlags) throws -> vImageConverter {
-        
-        var error = kvImageNoError
-        var unmanagedConverter: Unmanaged<vImageConverter>?
-        
-        withUnsafePointer(to: destinationFormat) { dest in
-            withUnsafePointer(to: sourceFormat) { src in
-                unmanagedConverter = vImageConverter_CreateWithCGImageFormat(
-                    src,
-                    dest,
-                    nil,
-                    vImage_Flags(options.rawValue),
-                    &error)
-            }
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        } else if unmanagedConverter == nil {
-            throw vImage.Error.internalError
-        }
-        
-        return unmanagedConverter!.takeRetainedValue()
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: CG -> CV
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Creates a vImage converter that converts a Core Graphics-formatted image to a Core Video-formatted image.
-    ///
-    /// - Parameter sourceFormat: A `vImage_CGImageFormat` structure describing the image format of the source image
-    /// - Parameter destinationFormat: A `vImageCVImageFormat` structure describing the image format of the destination image
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: a vImage converter to convert a Core Graphics-formatted image to a Core Video-formatted image.
-    public static func make(sourceFormat: vImage_CGImageFormat,
-                            destinationFormat: vImageCVImageFormat,
-                            flags options: vImage.Options = .noFlags) throws -> vImageConverter {
-        
-        var error = kvImageNoError
-        var unmanagedConverter: Unmanaged<vImageConverter>?
-        
-        withUnsafePointer(to: sourceFormat) { src in
-            unmanagedConverter = vImageConverter_CreateForCGToCVImageFormat(
-                src,
-                destinationFormat,
-                nil,
-                vImage_Flags(options.rawValue),
-                &error)
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        } else if unmanagedConverter == nil {
-            throw vImage.Error.internalError
-        }
-        
-        return unmanagedConverter!.takeRetainedValue()
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: CV -> CG
-    //
-    //===----------------------------------------------------------------------===//
-    
-    /// Creates a vImage converter that converts a Core Video-formatted image to a Core Graphics-formatted image.
-    ///
-    /// - Parameter sourceFormat: A `vImageCVImageFormat` structure describing the image format of the source image
-    /// - Parameter destinationFormat: A `vImage_CGImageFormat` structure describing the image format of the destination image
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: a vImage converter to convert a Core Video-formatted image to a Core Graphics-formatted image.
-    public static func make(sourceFormat: vImageCVImageFormat,
-                            destinationFormat: vImage_CGImageFormat,
-                            flags options: vImage.Options = .noFlags) throws -> vImageConverter {
-        
-        var error = kvImageInternalError
-        var unmanagedConverter: Unmanaged<vImageConverter>?
-        
-        withUnsafePointer(to: destinationFormat) { dest in
-            unmanagedConverter = vImageConverter_CreateForCVToCGImageFormat(
-                sourceFormat,
-                dest,
-                nil,
-                vImage_Flags(options.rawValue),
-                &error)
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        } else if unmanagedConverter == nil {
-            throw vImage.Error.internalError
-        }
-        
-        return unmanagedConverter!.takeRetainedValue()
-    }
-    
-    //===----------------------------------------------------------------------===//
-    
-    /// Converts the pixels in a vImage buffer to another format.
-    ///
-    /// - Parameter source: The source buffer.
-    /// - Parameter destination: The destination buffer.
-    /// - Parameter options: The options to use when performing this operation.
-    ///
-    /// - Returns: `kvImageNoError`; otherwise, one of the error codes described in _Data Types and Constants.
-    public func convert(source: vImage_Buffer,
-                        destination: inout vImage_Buffer,
-                        flags options: vImage.Options = .noFlags) throws {
-        
-        var error = kvImageNoError
-        
-        withUnsafePointer(to: source) { src in
-            error = vImageConvert_AnyToAny(self,
-                                           src,
-                                           &destination,
-                                           nil,
-                                           vImage_Flags(options.rawValue))
-        }
-        
-        if error != kvImageNoError {
-            throw vImage.Error(vImageError: error)
-        }
-    }
-}
-
diff --git a/stdlib/public/Darwin/Accelerate/vImage_Error.swift b/stdlib/public/Darwin/Accelerate/vImage_Error.swift
deleted file mode 100644
index 7dfa41e4c0e6f..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_Error.swift
+++ /dev/null
@@ -1,97 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImage_Error
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage {
-    
-    /// Error codes returned by vImage operations.
-    public enum Error: Int, Swift.Error {
-        /// The vImage function completed without error.
-        case noError                      =    0
-        
-        // The region of interest, as specified by the `srcOffsetToROI_X` and
-        // `srcOffsetToROI_Y` parameters and the height and width of the destination
-        // buffer, extends beyond the bottom edge or right edge of the source buffer.
-        case roiLargerThanInputBuffer     =    -21766
-        
-        /// Either the kernel height, the kernel width, or both, are even.
-        case invalidKernelSize            =    -21767
-        
-        /// The edge style specified is invalid.
-        case invalidEdgeStyle             =    -21768
-        
-        /// The `srcOffsetToROI_X` parameter that specifies the left edge of
-        /// the region of interest is greater than the width of the source image.
-        case invalidOffset_X              =    -21769
-        
-        /// The `srcOffsetToROI_X` parameter that specifies the left edge of
-        /// the region of interest is greater than the height of the source image.
-        case invalidOffset_Y              =    -21770
-        
-        /// An attempt to allocate memory failed.
-        case memoryAllocationError        =    -21771
-        
-        /// A pointer parameter is NULL and it must not be.
-        case nullPointerArgument          =    -21772
-        
-        /// Invalid parameter.
-        case invalidParameter             =    -21773
-        
-        /// The function requires the source and destination buffers to have
-        /// the same height and the same width, but they do not.
-        case bufferSizeMismatch           =    -21774
-        
-        /// The flag is not recognized.
-        case unknownFlagsBit              =    -21775
-        
-        /// A serious error occured inside vImage, which prevented vImage
-        /// from continuing.
-        case internalError                =    -21776
-        
-        /// The vImage_Buffer.rowBytes field is invalid.
-        case invalidRowBytes              =    -21777
-        
-        /// a `vImage_CGImageFormat` or `vImageCVImageFormatRef` contains
-        /// an invalid format.
-        case invalidImageFormat           =    -21778
-        
-        /// ColorSync.framework is completely missing.
-        case colorSyncIsAbsent            =    -21779
-        
-        /// The source images and destination images may not alias the same image data.
-        case outOfPlaceOperationRequired  =    -21780
-        
-        /// An invalid `CGImageRef` or `CVPixelBufferRef` was passed to the function.
-        case invalidImageObject           =    -21781
-        
-        /// A `vImageCVImageFormatRef` contains an invalid format.
-        case invalidCVImageFormat         =    -21782
-        
-        /// Some lower level conversion APIs only support conversion among a
-        /// sparse matrix of image formats.
-        case unsupportedConversion        =    -21783
-        
-        /// Core Video is absent.
-        case coreVideoIsAbsent            =    -21784
-        
-        public init(vImageError: vImage_Error) {
-            self = Error(rawValue: vImageError) ?? .internalError
-        }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/Accelerate/vImage_Options.swift b/stdlib/public/Darwin/Accelerate/vImage_Options.swift
deleted file mode 100644
index 20f277da7290f..0000000000000
--- a/stdlib/public/Darwin/Accelerate/vImage_Options.swift
+++ /dev/null
@@ -1,94 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-//===----------------------------------------------------------------------===//
-//
-//  vImage_Options
-//
-//===----------------------------------------------------------------------===//
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-extension vImage {
-    
-    /// An option set that represents `vImage_Flags`.
-    ///
-    /// You can also use this option set with the existing vImage API with the
-    /// `flags` property. For example:
-    ///
-    ///     vImageTentConvolve_ARGB8888(&src, &dst, nil,
-    ///                                0, 0, 11, 11,
-    ///                                 [0,0,0,0],
-    ///                                 vImage_Options([.backgroundColorFill,
-    ///                                                 .doNotTile]).flags)
-    public struct Options: OptionSet {
-        
-        public init(rawValue: vImage_Flags) {
-            self.rawValue = rawValue
-        }
-        
-        public let rawValue: vImage_Flags
-        
-        public static let noFlags = Options(rawValue: vImage_Flags(kvImageNoFlags))
-        
-        /// Operate on red, green and blue channels only. Alpha is copied from source
-        /// to destination. For Interleaved formats only
-        public static let leaveAlphaUnchanged = Options(rawValue: vImage_Flags(kvImageLeaveAlphaUnchanged))
-        
-        /// Copy edge pixels. Convolution Only.
-        public static let copyInPlace = Options(rawValue: vImage_Flags(kvImageCopyInPlace))
-        
-        /// Use the background color for missing pixels.
-        public static let backgroundColorFill = Options(rawValue: vImage_Flags(kvImageBackgroundColorFill))
-        
-        /// Use the nearest pixel for missing pixels.
-        public static let imageExtend = Options(rawValue: vImage_Flags(kvImageEdgeExtend))
-        
-        /// Pass to turn off internal tiling and disable internal multithreading. Use this if
-        /// you want to do your own tiling, or to use the Min/Max filters in place.
-        public static let doNotTile = Options(rawValue: vImage_Flags(kvImageDoNotTile))
-        
-        /// Use a higher quality, slower resampling filter for Geometry operations
-        /// (shear, scale, rotate, affine transform, etc.)
-        public static let highQualityResampling = Options(rawValue: vImage_Flags(kvImageHighQualityResampling))
-        
-        /// Use only the part of the kernel that overlaps the image. For integer kernels,
-        /// real_divisor = divisor * (sum of used kernel elements) / (sum of kernel elements).
-        /// This should preserve image brightness at the edges. Convolution only.
-        public static let truncateKernel = Options(rawValue: vImage_Flags(kvImageTruncateKernel))
-        
-        /// The function will return the number of bytes required for the temp buffer.
-        /// If this value is negative, it is an error, per standard usage.
-        public static let getTempBufferSize = Options(rawValue: vImage_Flags(kvImageGetTempBufferSize))
-        
-        /// Some functions such as vImageConverter_CreateWithCGImageFormat have so many possible error conditions
-        /// that developers may need more help than a simple error code to diagnose problems. When this
-        /// flag is set and an error is encountered, an informative error message will be logged to the Apple
-        /// System Logger (ASL).  The output should be visible in Console.app.
-        public static let printDiagnosticsToConsole = Options(rawValue: vImage_Flags(kvImagePrintDiagnosticsToConsole))
-        
-        /// Pass this flag to prevent vImage from allocating additional storage.
-        public static let noAllocate = Options(rawValue: vImage_Flags(kvImageNoAllocate))
-        
-        /// Use methods that are HDR-aware, capable of providing correct results for input images with pixel values
-        /// outside the otherwise limited (typically [-2,2]) range. This may be slower.
-        public static let hdrContent = Options(rawValue: vImage_Flags(kvImageHDRContent))
-        
-        /// Pass to disable clamping is some conversions to floating point formats. Use this if the input data
-        /// may describe values outside [0,1] which should be preserved.
-        public static let doNotClamp = Options(rawValue: vImage_Flags(kvImageDoNotClamp))
-        
-        public var flags: vImage_Flags {
-            return self.rawValue
-        }
-    }
-    
-}
diff --git a/stdlib/public/Darwin/AppKit/AppKit.swift b/stdlib/public/Darwin/AppKit/AppKit.swift
deleted file mode 100644
index a7162014bf72b..0000000000000
--- a/stdlib/public/Darwin/AppKit/AppKit.swift
+++ /dev/null
@@ -1,162 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import AppKit
-
-extension NSCursor : __DefaultCustomPlaygroundQuickLookable {
-  @available(*, deprecated, message: "NSCursor._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
-  public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
-    return .image(image)
-  }
-}
-
-internal struct _NSViewQuickLookState {
-  static var views = Set<NSView>()
-}
-
-extension NSView : __DefaultCustomPlaygroundQuickLookable {
-  @available(*, deprecated, message: "NSView._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
-  public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
-    // if you set NSView.needsDisplay, you can get yourself in a recursive scenario where the same view
-    // could need to draw itself in order to get a QLObject for itself, which in turn if your code was
-    // instrumented to log on-draw, would cause yourself to get back here and so on and so forth
-    // until you run out of stack and crash
-    // This code checks that we aren't trying to log the same view recursively - and if so just returns
-    // an empty view, which is probably a safer option than crashing
-    // FIXME: is there a way to say "cacheDisplayInRect butDoNotRedrawEvenIfISaidSo"?
-    if _NSViewQuickLookState.views.contains(self) {
-      return .view(NSImage())
-    } else {
-      _NSViewQuickLookState.views.insert(self)
-      let result: PlaygroundQuickLook
-      if let b = bitmapImageRepForCachingDisplay(in: bounds) {
-        cacheDisplay(in: bounds, to: b)
-        result = .view(b)
-      } else {
-        result = .view(NSImage())
-      }
-      _NSViewQuickLookState.views.remove(self)
-      return result
-    }
-  }
-}
-
-// Overlays for variadics.
-
-public extension NSGradient {
-  convenience init?(colorsAndLocations objects: (NSColor, CGFloat)...) {
-    self.init(
-      colors: objects.map { $0.0 },
-      atLocations: objects.map { $0.1 },
-      colorSpace: NSColorSpace.genericRGB)
-  }
-}
-
-// Fix the ARGV type of NSApplicationMain, which nonsensically takes
-// argv as a const char**.
-public func NSApplicationMain(
-  _ argc: Int32, _ argv: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>
-) -> Int32 {
-  return argv.withMemoryRebound(to: UnsafePointer<CChar>.self, capacity: Int(argc)) {
-    __NSApplicationMain(argc, $0)
-  }
-}
-
-extension NSApplication {
-  @available(swift 4)
-  public static func loadApplication() {
-    __NSApplicationLoad()
-  }
-}
-
-extension NSColor : _ExpressibleByColorLiteral {
-  @nonobjc
-  public required convenience init(_colorLiteralRed red: Float, green: Float,
-                                   blue: Float, alpha: Float) {
-    self.init(red: CGFloat(red), green: CGFloat(green),
-              blue: CGFloat(blue), alpha: CGFloat(alpha))
-  }
-}
-
-public typealias _ColorLiteralType = NSColor
-
-extension NSImage : _ExpressibleByImageLiteral {
-  private convenience init!(failableImageLiteral name: String) {
-    self.init(named: .init(name))
-  }
-
-  @nonobjc
-  public required convenience init(imageLiteralResourceName name: String) {
-    self.init(failableImageLiteral: name)
-  }
-}
-
-public typealias _ImageLiteralType = NSImage
-
-// Numeric backed types
-
-@available(swift 4)
-public protocol _AppKitKitNumericRawRepresentable : RawRepresentable, Comparable
-  where RawValue: Comparable & Numeric { }
-
-extension _AppKitKitNumericRawRepresentable {
-  public static func <(lhs: Self, rhs: Self) -> Bool {
-    return lhs.rawValue < rhs.rawValue
-  }
-
-  public static func +(lhs: Self, rhs: RawValue) -> Self {
-    return Self(rawValue: lhs.rawValue + rhs)!
-  }
-
-  public static func +(lhs: RawValue, rhs: Self) -> Self {
-    return Self(rawValue: lhs + rhs.rawValue)!
-  }
-
-  public static func -(lhs: Self, rhs: RawValue) -> Self {
-    return Self(rawValue: lhs.rawValue - rhs)!
-  }
-
-  public static func -(lhs: Self, rhs: Self) -> RawValue {
-    return lhs.rawValue - rhs.rawValue
-  }
-
-  public static func +=(lhs: inout Self, rhs: RawValue) {
-    lhs = Self(rawValue: lhs.rawValue + rhs)!
-  }
-
-  public static func -=(lhs: inout Self, rhs: RawValue) {
-    lhs = Self(rawValue: lhs.rawValue - rhs)!
-  }
-}
-
-@available(swift 4)
-extension NSAppKitVersion : _AppKitKitNumericRawRepresentable { }
-
-@available(swift 4)
-extension NSLayoutConstraint.Priority : _AppKitKitNumericRawRepresentable { }
-
-@available(swift 4)
-extension NSStackView.VisibilityPriority : _AppKitKitNumericRawRepresentable { }
-
-@available(swift 4)
-extension NSToolbarItem.VisibilityPriority : _AppKitKitNumericRawRepresentable { }
-
-@available(macOS 10.12.2, *)
-@available(swift 4)
-extension NSTouchBarItem.Priority : _AppKitKitNumericRawRepresentable { }
-
-@available(swift 4)
-extension NSWindow.Level : _AppKitKitNumericRawRepresentable { }
-
-@available(swift 4)
-extension NSFont.Weight : _AppKitKitNumericRawRepresentable { }
diff --git a/stdlib/public/Darwin/AppKit/AppKit_FoundationExtensions.swift b/stdlib/public/Darwin/AppKit/AppKit_FoundationExtensions.swift
deleted file mode 100644
index de20813aaab11..0000000000000
--- a/stdlib/public/Darwin/AppKit/AppKit_FoundationExtensions.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import AppKit
-
-// NSCollectionView extensions
-extension IndexPath {
-    
-    /// Initialize for use with `NSCollectionView`.
-    public init(item: Int, section: Int) {
-        self.init(indexes: [section, item])
-    }
-    
-    /// The item of this index path, when used with `NSCollectionView`.
-    ///
-    /// - precondition: The index path must have exactly two elements.
-    public var item : Int {
-        get {
-            precondition(count == 2, "Invalid index path for use with NSCollectionView. This index path must contain exactly two indices specifying the section and item.")
-            return self[1]
-        }
-        set {
-            precondition(count == 2, "Invalid index path for use with NSCollectionView. This index path must contain exactly two indices specifying the section and item.")
-            self[1] = newValue
-        }
-    }
-    
-    /// The section of this index path, when used with `NSCollectionView`.
-    ///
-    /// - precondition: The index path must have exactly two elements.
-    public var section : Int {
-        get {
-            precondition(count == 2, "Invalid index path for use with NSCollectionView. This index path must contain exactly two indices specifying the section and item.")
-            return self[0]
-        }
-        set {
-            precondition(count == 2, "Invalid index path for use with NSCollectionView. This index path must contain exactly two indices specifying the section and item.")
-            self[0] = newValue
-        }
-    }
-    
-}
-
-extension URLResourceValues {
-    /// Returns all thumbnails as a single NSImage.
-    @available(macOS 10.10, *)
-    public var thumbnail : NSImage? {
-        return allValues[URLResourceKey.thumbnailKey] as? NSImage
-    }
-    
-    /// The color of the assigned label.
-    public var labelColor: NSColor? {
-        return allValues[URLResourceKey.labelColorKey] as? NSColor
-    }
-    
-    /// The icon normally displayed for the resource
-    public var effectiveIcon: AnyObject? {
-        return allValues[URLResourceKey.effectiveIconKey] as? NSImage
-    }
-    
-    /// The custom icon assigned to the resource, if any (Currently not implemented)
-    public var customIcon: NSImage? {
-        return allValues[URLResourceKey.customIconKey] as? NSImage
-    }
-    
-    /// Returns a dictionary of NSImage objects keyed by size.
-    @available(macOS 10.10, *)
-    public var thumbnailDictionary : [URLThumbnailDictionaryItem : NSImage]? {
-        return allValues[URLResourceKey.thumbnailDictionaryKey] as? [URLThumbnailDictionaryItem : NSImage]
-    }
-
-}
diff --git a/stdlib/public/Darwin/AppKit/CMakeLists.txt b/stdlib/public/Darwin/AppKit/CMakeLists.txt
deleted file mode 100644
index de7289090159a..0000000000000
--- a/stdlib/public/Darwin/AppKit/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  AppKit.swift
-  AppKit_FoundationExtensions.swift
-  NSError.swift
-  NSEvent.swift
-  NSGraphics.swift
-  NSOpenGL.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit Foundation CoreData QuartzCore XPC CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS AppKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_APPKIT_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/AppKit/NSError.swift b/stdlib/public/Darwin/AppKit/NSError.swift
deleted file mode 100644
index d6fa31db22011..0000000000000
--- a/stdlib/public/Darwin/AppKit/NSError.swift
+++ /dev/null
@@ -1,257 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-@_exported import AppKit
-
-extension CocoaError.Code {
-  public static var textReadInapplicableDocumentType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  public static var textWriteInapplicableDocumentType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  public static var serviceApplicationNotFound: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  public static var serviceApplicationLaunchFailed: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  public static var serviceRequestTimedOut: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  public static var serviceInvalidPasteboardData: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  public static var serviceMalformedServiceDictionary: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  public static var serviceMiscellaneousError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  public static var sharingServiceNotConfigured: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-  @available(macOS 10.13, *)
-  public static var fontAssetDownloadError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66304)
-  }
-}
-
-// Names deprecated late in Swift 3
-extension CocoaError.Code {
-  @available(*, deprecated, renamed: "textReadInapplicableDocumentType")
-  public static var textReadInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  @available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
-  public static var textWriteInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationNotFound")
-  public static var serviceApplicationNotFoundError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
-  public static var serviceApplicationLaunchFailedError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  @available(*, deprecated, renamed: "serviceRequestTimedOut")
-  public static var serviceRequestTimedOutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  @available(*, deprecated, renamed: "serviceInvalidPasteboardData")
-  public static var serviceInvalidPasteboardDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  @available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
-  public static var serviceMalformedServiceDictionaryError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  @available(*, deprecated, renamed: "serviceMiscellaneousError")
-  public static var serviceMiscellaneous: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  @available(*, deprecated, renamed: "sharingServiceNotConfigured")
-  public static var sharingServiceNotConfiguredError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-}
-
-extension CocoaError {
-  public static var textReadInapplicableDocumentType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  public static var textWriteInapplicableDocumentType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  public static var serviceApplicationNotFound: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  public static var serviceApplicationLaunchFailed: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  public static var serviceRequestTimedOut: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  public static var serviceInvalidPasteboardData: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  public static var serviceMalformedServiceDictionary: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  public static var serviceMiscellaneous: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  public static var sharingServiceNotConfigured: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-  @available(macOS 10.13, *)
-  public static var fontAssetDownloadError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66304)
-  }
-}
-
-// Names deprecated late in Swift 3
-extension CocoaError {
-  @available(*, deprecated, renamed: "textReadInapplicableDocumentType")
-  public static var textReadInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  @available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
-  public static var textWriteInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationNotFound")
-  public static var serviceApplicationNotFoundError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
-  public static var serviceApplicationLaunchFailedError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  @available(*, deprecated, renamed: "serviceRequestTimedOut")
-  public static var serviceRequestTimedOutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  @available(*, deprecated, renamed: "serviceInvalidPasteboardData")
-  public static var serviceInvalidPasteboardDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  @available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
-  public static var serviceMalformedServiceDictionaryError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  @available(*, deprecated, renamed: "serviceMiscellaneous")
-  public static var serviceMiscellaneousError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  @available(*, deprecated, renamed: "sharingServiceNotConfigured")
-  public static var sharingServiceNotConfiguredError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-}
-
-extension CocoaError {
-  public var isServiceError: Bool {
-    return code.rawValue >= 66560 && code.rawValue <= 66817
-  }
-
-  public var isSharingServiceError: Bool {
-    return code.rawValue >= 67072 && code.rawValue <= 67327
-  }
-
-  public var isTextReadWriteError: Bool {
-    return code.rawValue >= 65792 && code.rawValue <= 66303
-  }
-
-  @available(macOS 10.13, *)
-  public var isFontError: Bool {
-    return code.rawValue >= 66304 && code.rawValue <= 66335
-  }
-}
-
-extension CocoaError {
-  @available(*, deprecated, renamed: "textReadInapplicableDocumentType")
-  public static var TextReadInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  @available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
-  public static var TextWriteInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationNotFound")
-  public static var ServiceApplicationNotFoundError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
-  public static var ServiceApplicationLaunchFailedError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  @available(*, deprecated, renamed: "serviceRequestTimedOut")
-  public static var ServiceRequestTimedOutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  @available(*, deprecated, renamed: "serviceInvalidPasteboardData")
-  public static var ServiceInvalidPasteboardDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  @available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
-  public static var ServiceMalformedServiceDictionaryError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  @available(*, deprecated, renamed: "serviceMiscellaneous")
-  public static var ServiceMiscellaneousError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  @available(*, deprecated, renamed: "sharingServiceNotConfigured")
-  public static var SharingServiceNotConfiguredError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-}
-
-extension CocoaError.Code {
-  @available(*, deprecated, renamed: "textReadInapplicableDocumentType")
-  public static var TextReadInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 65806)
-  }
-  @available(*, deprecated, renamed: "textWriteInapplicableDocumentType")
-  public static var TextWriteInapplicableDocumentTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66062)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationNotFound")
-  public static var ServiceApplicationNotFoundError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66560)
-  }
-  @available(*, deprecated, renamed: "serviceApplicationLaunchFailed")
-  public static var ServiceApplicationLaunchFailedError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66561)
-  }
-  @available(*, deprecated, renamed: "serviceRequestTimedOut")
-  public static var ServiceRequestTimedOutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66562)
-  }
-  @available(*, deprecated, renamed: "serviceInvalidPasteboardData")
-  public static var ServiceInvalidPasteboardDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66563)
-  }
-  @available(*, deprecated, renamed: "serviceMalformedServiceDictionary")
-  public static var ServiceMalformedServiceDictionaryError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66564)
-  }
-  @available(*, deprecated, renamed: "serviceMiscellaneous")
-  public static var ServiceMiscellaneousError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 66800)
-  }
-  @available(*, deprecated, renamed: "sharingServiceNotConfigured")
-  public static var SharingServiceNotConfiguredError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 67072)
-  }
-}
diff --git a/stdlib/public/Darwin/AppKit/NSEvent.swift b/stdlib/public/Darwin/AppKit/NSEvent.swift
deleted file mode 100644
index ed4d2ef7117fb..0000000000000
--- a/stdlib/public/Darwin/AppKit/NSEvent.swift
+++ /dev/null
@@ -1,162 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AppKit
-
-extension NSEvent {
-    public struct SpecialKey : RawRepresentable, Equatable, Hashable {
-        public init(rawValue: Int) {
-            self.rawValue = rawValue
-        }
-        public let rawValue: Int
-        public var unicodeScalar: Unicode.Scalar {
-            return Unicode.Scalar(rawValue)!
-        }
-    }
-    
-    /// Returns nil if the receiver is not a "special" key event.
-    open var specialKey: SpecialKey? {
-        guard let unicodeScalars = charactersIgnoringModifiers?.unicodeScalars else {
-            return nil
-        }
-        guard unicodeScalars.count == 1 else {
-            return nil
-        }
-        guard let codePoint = unicodeScalars.first?.value else {
-            return nil
-        }
-        switch codePoint {
-        case 0x0003:
-            return .enter
-            
-        case 0x0008:
-            return .backspace
-            
-        case 0x0009:
-            return .tab
-            
-        case 0x000a:
-            return .newline
-            
-        case 0x000c:
-            return .formFeed
-            
-        case 0x000d:
-            return .carriageReturn
-            
-        case 0x0019:
-            return .backTab
-            
-        case 0x007f:
-            return .delete
-            
-        case 0x2028:
-            return .lineSeparator
-            
-        case 0x2029:
-            return .paragraphSeparator
-            
-        case 0xF700..<0xF900:
-            return SpecialKey(rawValue: Int(codePoint))
-            
-        default:
-            return nil
-        }
-    }
-}
-
-extension NSEvent.SpecialKey {
-    
-    static public let upArrow = NSEvent.SpecialKey(rawValue: 0xF700)
-    static public let downArrow = NSEvent.SpecialKey(rawValue: 0xF701)
-    static public let leftArrow = NSEvent.SpecialKey(rawValue: 0xF702)
-    static public let rightArrow = NSEvent.SpecialKey(rawValue: 0xF703)
-    static public let f1 = NSEvent.SpecialKey(rawValue: 0xF704)
-    static public let f2 = NSEvent.SpecialKey(rawValue: 0xF705)
-    static public let f3 = NSEvent.SpecialKey(rawValue: 0xF706)
-    static public let f4 = NSEvent.SpecialKey(rawValue: 0xF707)
-    static public let f5 = NSEvent.SpecialKey(rawValue: 0xF708)
-    static public let f6 = NSEvent.SpecialKey(rawValue: 0xF709)
-    static public let f7 = NSEvent.SpecialKey(rawValue: 0xF70A)
-    static public let f8 = NSEvent.SpecialKey(rawValue: 0xF70B)
-    static public let f9 = NSEvent.SpecialKey(rawValue: 0xF70C)
-    static public let f10 = NSEvent.SpecialKey(rawValue: 0xF70D)
-    static public let f11 = NSEvent.SpecialKey(rawValue: 0xF70E)
-    static public let f12 = NSEvent.SpecialKey(rawValue: 0xF70F)
-    static public let f13 = NSEvent.SpecialKey(rawValue: 0xF710)
-    static public let f14 = NSEvent.SpecialKey(rawValue: 0xF711)
-    static public let f15 = NSEvent.SpecialKey(rawValue: 0xF712)
-    static public let f16 = NSEvent.SpecialKey(rawValue: 0xF713)
-    static public let f17 = NSEvent.SpecialKey(rawValue: 0xF714)
-    static public let f18 = NSEvent.SpecialKey(rawValue: 0xF715)
-    static public let f19 = NSEvent.SpecialKey(rawValue: 0xF716)
-    static public let f20 = NSEvent.SpecialKey(rawValue: 0xF717)
-    static public let f21 = NSEvent.SpecialKey(rawValue: 0xF718)
-    static public let f22 = NSEvent.SpecialKey(rawValue: 0xF719)
-    static public let f23 = NSEvent.SpecialKey(rawValue: 0xF71A)
-    static public let f24 = NSEvent.SpecialKey(rawValue: 0xF71B)
-    static public let f25 = NSEvent.SpecialKey(rawValue: 0xF71C)
-    static public let f26 = NSEvent.SpecialKey(rawValue: 0xF71D)
-    static public let f27 = NSEvent.SpecialKey(rawValue: 0xF71E)
-    static public let f28 = NSEvent.SpecialKey(rawValue: 0xF71F)
-    static public let f29 = NSEvent.SpecialKey(rawValue: 0xF720)
-    static public let f30 = NSEvent.SpecialKey(rawValue: 0xF721)
-    static public let f31 = NSEvent.SpecialKey(rawValue: 0xF722)
-    static public let f32 = NSEvent.SpecialKey(rawValue: 0xF723)
-    static public let f33 = NSEvent.SpecialKey(rawValue: 0xF724)
-    static public let f34 = NSEvent.SpecialKey(rawValue: 0xF725)
-    static public let f35 = NSEvent.SpecialKey(rawValue: 0xF726)
-    static public let insert = NSEvent.SpecialKey(rawValue: 0xF727)
-    static public let deleteForward = NSEvent.SpecialKey(rawValue: 0xF728)
-    static public let home = NSEvent.SpecialKey(rawValue: 0xF729)
-    static public let begin = NSEvent.SpecialKey(rawValue: 0xF72A)
-    static public let end = NSEvent.SpecialKey(rawValue: 0xF72B)
-    static public let pageUp = NSEvent.SpecialKey(rawValue: 0xF72C)
-    static public let pageDown = NSEvent.SpecialKey(rawValue: 0xF72D)
-    static public let printScreen = NSEvent.SpecialKey(rawValue: 0xF72E)
-    static public let scrollLock = NSEvent.SpecialKey(rawValue: 0xF72F)
-    static public let pause = NSEvent.SpecialKey(rawValue: 0xF730)
-    static public let sysReq = NSEvent.SpecialKey(rawValue: 0xF731)
-    static public let `break` = NSEvent.SpecialKey(rawValue: 0xF732)
-    static public let reset = NSEvent.SpecialKey(rawValue: 0xF733)
-    static public let stop = NSEvent.SpecialKey(rawValue: 0xF734)
-    static public let menu = NSEvent.SpecialKey(rawValue: 0xF735)
-    static public let user = NSEvent.SpecialKey(rawValue: 0xF736)
-    static public let system = NSEvent.SpecialKey(rawValue: 0xF737)
-    static public let print = NSEvent.SpecialKey(rawValue: 0xF738)
-    static public let clearLine = NSEvent.SpecialKey(rawValue: 0xF739)
-    static public let clearDisplay = NSEvent.SpecialKey(rawValue: 0xF73A)
-    static public let insertLine = NSEvent.SpecialKey(rawValue: 0xF73B)
-    static public let deleteLine = NSEvent.SpecialKey(rawValue: 0xF73C)
-    static public let insertCharacter = NSEvent.SpecialKey(rawValue: 0xF73D)
-    static public let deleteCharacter = NSEvent.SpecialKey(rawValue: 0xF73E)
-    static public let prev = NSEvent.SpecialKey(rawValue: 0xF73F)
-    static public let next = NSEvent.SpecialKey(rawValue: 0xF740)
-    static public let select = NSEvent.SpecialKey(rawValue: 0xF741)
-    static public let execute = NSEvent.SpecialKey(rawValue: 0xF742)
-    static public let undo = NSEvent.SpecialKey(rawValue: 0xF743)
-    static public let redo = NSEvent.SpecialKey(rawValue: 0xF744)
-    static public let find = NSEvent.SpecialKey(rawValue: 0xF745)
-    static public let help = NSEvent.SpecialKey(rawValue: 0xF746)
-    static public let modeSwitch = NSEvent.SpecialKey(rawValue: 0xF747)
-    
-    static public let enter = NSEvent.SpecialKey(rawValue: 0x0003)
-    static public let backspace = NSEvent.SpecialKey(rawValue: 0x0008)
-    static public let tab = NSEvent.SpecialKey(rawValue: 0x0009)
-    static public let newline = NSEvent.SpecialKey(rawValue: 0x000a)
-    static public let formFeed = NSEvent.SpecialKey(rawValue: 0x000c)
-    static public let carriageReturn = NSEvent.SpecialKey(rawValue: 0x000d)
-    static public let backTab = NSEvent.SpecialKey(rawValue: 0x0019)
-    static public let delete = NSEvent.SpecialKey(rawValue: 0x007f)
-    static public let lineSeparator = NSEvent.SpecialKey(rawValue: 0x2028)
-    static public let paragraphSeparator = NSEvent.SpecialKey(rawValue: 0x2029)
-}
diff --git a/stdlib/public/Darwin/AppKit/NSGraphics.swift b/stdlib/public/Darwin/AppKit/NSGraphics.swift
deleted file mode 100644
index f4e2a7c77a267..0000000000000
--- a/stdlib/public/Darwin/AppKit/NSGraphics.swift
+++ /dev/null
@@ -1,215 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import AppKit
-
-extension NSRect {
-  /// Fills this rect in the current NSGraphicsContext in the context's fill
-  /// color.
-  /// The compositing operation of the fill defaults to the context's
-  /// compositing operation, not necessarily using `.copy` like `NSRectFill()`.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func fill(using operation: NSCompositingOperation =
-    NSGraphicsContext.current?.compositingOperation ?? .sourceOver) {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    __NSRectFillUsingOperation(self, operation)
-  }
-    
-  /// Draws a frame around the inside of this rect in the current
-  /// NSGraphicsContext in the context's fill color
-  /// The compositing operation of the fill defaults to the context's
-  /// compositing operation, not necessarily using `.copy` like `NSFrameRect()`.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func frame(withWidth width: CGFloat = 1.0,
-                    using operation: NSCompositingOperation =
-    NSGraphicsContext.current?.compositingOperation ?? .sourceOver) {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    __NSFrameRectWithWidthUsingOperation(self, width, operation)
-  }
-    
-  /// Modifies the current graphics context clipping path by intersecting it
-  /// with this rect.
-  /// This permanently modifies the graphics state, so the current state should
-  /// be saved beforehand and restored afterwards.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func clip() {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    __NSRectClip(self)
-  }
-}
-
-extension Sequence where Iterator.Element == NSRect {
-  /// Fills this list of rects in the current NSGraphicsContext in the context's
-  /// fill color.
-  /// The compositing operation of the fill defaults to the context's
-  /// compositing operation, not necessarily using `.copy` like `NSRectFill()`.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func fill(using operation: NSCompositingOperation =
-    NSGraphicsContext.current?.compositingOperation ?? .sourceOver) {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    let rects = Array(self)
-    let count = rects.count
-    guard count > 0 else { return }
-    rects.withUnsafeBufferPointer { rectBufferPointer in
-      guard let rectArray = rectBufferPointer.baseAddress else { return }
-      __NSRectFillListUsingOperation(rectArray, count, operation)
-    }
-  }
-    
-  /// Modifies the current graphics context clipping path by intersecting it
-  /// with the graphical union of this list of rects
-  /// This permanently modifies the graphics state, so the current state should
-  /// be saved beforehand and restored afterwards.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func clip() {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    let rects = Array(self)
-    let count = rects.count
-    guard count > 0 else { return }
-    rects.withUnsafeBufferPointer { rectBufferPointer in
-      guard let rectArray = rectBufferPointer.baseAddress else { return }
-      __NSRectClipList(rectArray, count)
-    }
-  }
-}
-
-extension Sequence where Iterator.Element == (CGRect, NSColor) {
-  /// Fills this list of rects in the current NSGraphicsContext with that rect's
-  /// associated color
-  /// The compositing operation of the fill defaults to the context's
-  /// compositing operation, not necessarily using `.copy` like `NSRectFill()`.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func fill(using operation: NSCompositingOperation =
-    NSGraphicsContext.current?.compositingOperation ?? .sourceOver) {
-    precondition(NSGraphicsContext.current != nil,
-                 "There must be a set current NSGraphicsContext")
-    let rects = map { $0.0 }
-    let colors = map { $0.1 }
-    let count = rects.count
-    guard count > 0 else { return }
-    rects.withUnsafeBufferPointer { rectBufferPointer in
-      colors.withUnsafeBufferPointer { colorBufferPointer in
-        guard let rectArray = rectBufferPointer.baseAddress else { return }
-        guard let colorArray = colorBufferPointer.baseAddress else { return }
-        __NSRectFillListWithColorsUsingOperation(
-            rectArray, colorArray, count, operation)
-      }
-    }
-  }
-}
-
-extension Sequence where Iterator.Element == (CGRect, gray: CGFloat) {
-  /// Fills this list of rects in the current NSGraphicsContext with that rect's
-  /// associated gray component value in the DeviceGray color space.
-  /// The compositing operation of the fill defaults to the context's
-  /// compositing operation, not necessarily using `.copy` like
-  /// `NSRectFillListWithGrays()`.
-  /// - precondition: There must be a set current NSGraphicsContext.
-  @available(swift 4)
-  public func fill(using operation: NSCompositingOperation =
-    NSGraphicsContext.current?.compositingOperation ?? .sourceOver) {
-    // NSRectFillListWithGrays does not have a variant taking an operation, but
-    // is added here for consistency with the other drawing operations.
-    guard let graphicsContext = NSGraphicsContext.current else {
-      fatalError("There must be a set current NSGraphicsContext")
-    }
-    let cgContext: CGContext
-    if #available(macOS 10.10, *) {
-      cgContext = graphicsContext.cgContext
-    } else {
-      cgContext = Unmanaged<CGContext>.fromOpaque(
-        graphicsContext.graphicsPort).takeUnretainedValue()
-    }
-    cgContext.saveGState()
-    forEach {
-      cgContext.setFillColor(gray: $0.gray, alpha: 1.0)
-      __NSRectFillUsingOperation($0.0, operation)
-    }
-    cgContext.restoreGState()
-  }
-}
-
-extension NSWindow.Depth {
-  @available(swift 4)
-  public static func bestDepth(
-    colorSpaceName: NSColorSpaceName,
-    bitsPerSample: Int,
-    bitsPerPixel: Int,
-    isPlanar: Bool
-    ) -> (NSWindow.Depth, isExactMatch: Bool) {
-    var isExactMatch: ObjCBool = false
-    let depth = __NSBestDepth(
-        colorSpaceName,
-        bitsPerSample, bitsPerPixel, isPlanar, &isExactMatch)
-    return (depth, isExactMatch: isExactMatch.boolValue)
-  }
-  @available(swift 4)
-  public static var availableDepths: [NSWindow.Depth] {
-    // __NSAvailableWindowDepths is NULL terminated, the length is not known up front
-    let depthsCArray = __NSAvailableWindowDepths()
-    var depths: [NSWindow.Depth] = []
-    var length = 0
-    var depth = depthsCArray[length]
-    while depth.rawValue != 0 {
-      depths.append(depth)
-      length += 1
-      depth = depthsCArray[length]
-    }
-    return depths
-  }
-}
-
-extension NSAnimationEffect {
-  // NOTE: older overlays called this class _CompletionHandlerDelegate.
-  // The two must coexist without a conflicting ObjC class name, so it
-  // was renamed. The old name must not be used in the new runtime.
-  private class __CompletionHandlerDelegate : NSObject {
-    var completionHandler: () -> Void = { }
-    @objc func animationEffectDidEnd(_ contextInfo: UnsafeMutableRawPointer?) {
-      completionHandler()
-    }
-  }
-  @available(swift 4)
-  public func show(centeredAt centerLocation: NSPoint, size: NSSize,
-                   completionHandler: @escaping () -> Void = { }) {
-    let delegate = __CompletionHandlerDelegate()
-    delegate.completionHandler = completionHandler
-    // Note that the delegate of `__NSShowAnimationEffect` is retained for the
-    // duration of the animation.
-    __NSShowAnimationEffect(
-        self,
-        centerLocation,
-        size,
-        delegate,
-        #selector(__CompletionHandlerDelegate.animationEffectDidEnd(_:)),
-        nil)
-  }
-}
-
-extension NSSound {
-  @available(swift 4)
-  public static func beep() {
-    __NSBeep()
-  }
-}
diff --git a/stdlib/public/Darwin/AppKit/NSOpenGL.swift b/stdlib/public/Darwin/AppKit/NSOpenGL.swift
deleted file mode 100644
index 02f967dae5fef..0000000000000
--- a/stdlib/public/Darwin/AppKit/NSOpenGL.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import AppKit
-
-extension NSOpenGLGlobalOption {
-  @available(swift 4)
-  public var globalValue: GLint {
-    get {
-      var value: GLint = 0
-      __NSOpenGLGetOption(self, &value)
-      return value
-    }
-    set {
-      __NSOpenGLSetOption(self, newValue)
-    }
-  }
-}
-
-extension NSOpenGLContext {
-  @available(swift 4)
-  public static var openGLVersion: (major: GLint, minor: GLint) {
-    var major: GLint = 0
-    var minor: GLint = 0
-    __NSOpenGLGetVersion(&major, &minor)
-    return (major: major, minor: minor)
-  }
-}
diff --git a/stdlib/public/Darwin/AssetsLibrary/ALAssetsLibrary.swift b/stdlib/public/Darwin/AssetsLibrary/ALAssetsLibrary.swift
deleted file mode 100644
index bad33f5eadced..0000000000000
--- a/stdlib/public/Darwin/AssetsLibrary/ALAssetsLibrary.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import AssetsLibrary // Clang module
-
-extension ALAssetsLibrary { 
-  @available(iOS, deprecated: 9.0)
-  @nonobjc
-  public func enumerateGroupsWithTypes(_ types: UInt32,
-      usingBlock enumerationBlock: ALAssetsLibraryGroupsEnumerationResultsBlock!,
-      failureBlock: ALAssetsLibraryAccessFailureBlock!) {
-    var types = types
-    if types == ALAssetsGroupAll {
-      types = ALAssetsGroupLibrary | ALAssetsGroupAlbum | ALAssetsGroupEvent | 
-              ALAssetsGroupFaces | ALAssetsGroupSavedPhotos | 
-              ALAssetsGroupPhotoStream
-    }
-    return enumerateGroups(
-      withTypes: ALAssetsGroupType(types),
-      using: enumerationBlock, 
-      failureBlock: failureBlock)
-  }
-}
diff --git a/stdlib/public/Darwin/AssetsLibrary/CMakeLists.txt b/stdlib/public/Darwin/AssetsLibrary/CMakeLists.txt
deleted file mode 100644
index 4f893f26a514f..0000000000000
--- a/stdlib/public/Darwin/AssetsLibrary/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  ALAssetsLibrary.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS AssetsLibrary
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_ASSETSLIBRARY_IOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CMakeLists.txt b/stdlib/public/Darwin/CMakeLists.txt
index 3e2846d44445f..b8be8dfc71188 100644
--- a/stdlib/public/Darwin/CMakeLists.txt
+++ b/stdlib/public/Darwin/CMakeLists.txt
@@ -14,51 +14,12 @@ if(SWIFT_BUILD_STATIC_SDK_OVERLAY)
 endif()
 
 set(all_overlays
-  Accelerate
-  AppKit
-  ARKit
-  AssetsLibrary
-  AVFoundation
-  CallKit
-  CloudKit
-  Compression
-  Contacts
-  CoreAudio
-  CoreData
   CoreFoundation
   CoreGraphics
-  CoreImage
-  CoreLocation
-  CoreMedia
-  CryptoTokenKit
   Dispatch
   Foundation
-  GameplayKit
-  GLKit
-  HomeKit
-  IOKit
-  Intents
-  MapKit
-  MediaPlayer
-  Metal
-  MetalKit
-  ModelIO
-  NaturalLanguage
-  Network
   ObjectiveC
-  OpenCL
-  os
-  Photos
-  QuartzCore
-  SafariServices
-  SceneKit
-  simd
-  SpriteKit
-  UIKit
-  Vision
-  WatchKit
   XCTest
-  XPC
 )
 
 if(DEFINED SWIFT_OVERLAY_TARGETS)
diff --git a/stdlib/public/Darwin/CallKit/CMakeLists.txt b/stdlib/public/Darwin/CallKit/CMakeLists.txt
deleted file mode 100644
index f44e1df43457f..0000000000000
--- a/stdlib/public/Darwin/CallKit/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCallKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CXProviderConfiguration.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS IOS IOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK CallKit
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_CALLKIT_IOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CallKit/CXProviderConfiguration.swift b/stdlib/public/Darwin/CallKit/CXProviderConfiguration.swift
deleted file mode 100644
index bb58f43d5dc76..0000000000000
--- a/stdlib/public/Darwin/CallKit/CXProviderConfiguration.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CallKit
-import Foundation
-
-@available(iOS 10.0, *)
-extension CXProviderConfiguration {
-  @nonobjc
-  public final var supportedHandleTypes: Set<CXHandle.HandleType> {
-    get {
-      return Set(__supportedHandleTypes.map {
-        CXHandle.HandleType(rawValue: $0.intValue)!
-      })
-    }
-    set {
-      __supportedHandleTypes =
-        Set(newValue.lazy.map { $0.rawValue as NSNumber })
-    }
-  }
-}
diff --git a/stdlib/public/Darwin/CloudKit/CKError.swift b/stdlib/public/Darwin/CloudKit/CKError.swift
deleted file mode 100644
index eb280b9a6e7cc..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKError.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit
-import Foundation
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKError {
-  /// Retrieve partial error results associated by item ID.
-  public var partialErrorsByItemID: [AnyHashable: Error]? {
-    return userInfo[CKPartialErrorsByItemIDKey] as? [AnyHashable: NSError]
-             as [AnyHashable: Error]?
-  }
-
-  /// The original CKRecord object that you used as the basis for
-  /// making your changes.
-  public var ancestorRecord: CKRecord? {
-    return userInfo[CKRecordChangedErrorAncestorRecordKey] as? CKRecord
-  }
-
-  /// The CKRecord object that was found on the server. Use this
-  /// record as the basis for merging your changes.
-  public var serverRecord: CKRecord? {
-    return userInfo[CKRecordChangedErrorServerRecordKey] as? CKRecord
-  }
-
-  /// The CKRecord object that you tried to save. This record is based
-  /// on the record in the CKRecordChangedErrorAncestorRecordKey key
-  /// but contains the additional changes you made.
-  public var clientRecord: CKRecord? {
-    return userInfo[CKRecordChangedErrorClientRecordKey] as? CKRecord
-  }
-
-  /// The number of seconds after which you may retry a request. This
-  /// key may be included in an error of type
-  /// `CKErrorServiceUnavailable` or `CKErrorRequestRateLimited`.
-  public var retryAfterSeconds: Double? {
-    return userInfo[CKErrorRetryAfterKey] as? Double
-  }
-}
diff --git a/stdlib/public/Darwin/CloudKit/CKFetchRecordZoneChangesOperation.swift b/stdlib/public/Darwin/CloudKit/CKFetchRecordZoneChangesOperation.swift
deleted file mode 100644
index 1b146b38b3b98..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKFetchRecordZoneChangesOperation.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)
-extension CKFetchRecordZoneChangesOperation.ZoneConfiguration {
-    /**
-     Declares which user-defined keys should be fetched and added to the resulting CKRecords.
-     
-     If nil, declares the entire record should be downloaded. If set to an empty array, declares that no user fields should be downloaded.
-     Defaults to nil.
-     */
-    @available(swift 4.2)
-    public var desiredKeys: [CKRecord.FieldKey]? {
-        get { return self.__desiredKeys }
-        set { self.__desiredKeys = newValue }
-    }
-    
-    @available(swift 4.2)
-    public convenience init(previousServerChangeToken: CKServerChangeToken? = nil, resultsLimit: Int? = nil, desiredKeys: [CKRecord.FieldKey]? = nil) {
-        self.init()
-        if let previousServerChangeToken = previousServerChangeToken {
-            self.previousServerChangeToken = previousServerChangeToken
-        }
-        if let resultsLimit = resultsLimit {
-            self.resultsLimit = resultsLimit
-        }
-        if let desiredKeys = desiredKeys {
-            self.desiredKeys = desiredKeys
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/CloudKit/CKRecord.swift b/stdlib/public/Darwin/CloudKit/CKRecord.swift
deleted file mode 100644
index 1438b03756d8a..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKRecord.swift
+++ /dev/null
@@ -1,74 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit
-
-// MARK: - Iterate over records
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-public struct CKRecordKeyValueIterator : IteratorProtocol {
-    private var keyArray: [CKRecord.FieldKey]
-    private var record: CKRecord
-    private var index: Array<CKRecord.FieldKey>.Index
-    
-    fileprivate init(_ record: CKRecord) {
-        self.record = record
-        keyArray = record.allKeys()
-        index = keyArray.startIndex
-    }
-
-    public mutating func next() -> (CKRecord.FieldKey, CKRecordValueProtocol)? {
-        var key: CKRecord.FieldKey? = nil
-        var objcValue: __CKRecordObjCValue? = nil
-        while objcValue == nil {
-            guard index < keyArray.endIndex else { return nil }
-            key = keyArray[index]
-            objcValue = record[key!]
-            index = index.advanced(by: 1)
-        }
-        
-        let swiftValue = objcValue!.asSwiftNativeValue()
-
-        return (key!, swiftValue)
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord : Sequence {
-    public func makeIterator() -> CKRecordKeyValueIterator {
-        return CKRecordKeyValueIterator(self)
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord {
-    public typealias RecordType = String
-    public typealias FieldKey = String
-
-    @available(swift 4.2)
-    public enum SystemType {
-        public static let userRecord: CKRecord.RecordType = __CKRecordTypeUserRecord
-        @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-        public static let share: CKRecord.RecordType = __CKRecordTypeShare
-    }
-    
-    @available(swift 4.2)
-    public enum SystemFieldKey {
-        @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-        public static let parent: CKRecord.FieldKey = __CKRecordParentKey
-        @available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-        public static let share: CKRecord.FieldKey = __CKRecordShareKey
-    }
-}
-
diff --git a/stdlib/public/Darwin/CloudKit/CKRecordValue.swift b/stdlib/public/Darwin/CloudKit/CKRecordValue.swift
deleted file mode 100644
index 4ff765b5e2913..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKRecordValue.swift
+++ /dev/null
@@ -1,288 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit
-
-// __CKRecordObjCValue - an ObjC object that ObjectiveC clients use as CKRecord values
-// CKRecordValueProtocol - a struct or class used only by Swift clients as CKRecord values
-// CKRecordValueConvertible - an ObjectiveC object that should be converted to a native Swift type before being used in Swift clients.
-// CKObjCRecordValueConvertible - a Swift struct or object that should be converted to a CKRecordObjCValue when set on a CKRecord
-
-/*                      CKRecordValueProtocol    CKObjCRecordValueConvertible
-              __CKRecordObjCValue    CKRecordValueConvertible
-----------------|-----------|-----------|-----------|-----------
-   String       |           |     X     |           |     X
-   Date         |           |     X     |           |     X
-   Data         |           |     X     |           |     X
-   Bool         |           |     X     |           |     X
-   Int          |           |     X     |           |     X
-   UInt         |           |     X     |           |     X
-   Float        |           |     X     |           |     X
-   Double       |           |     X     |           |     X
-   [U]Int8 et al|           |     X     |           |     X
-   Int64        |           |     X     |           |     X
-   Array        |           |     X     |           |     X
-   NSString     |     X     |     X     |     X     |
-   NSDate       |     X     |     X     |     X     |
-   NSData       |     X     |     X     |     X     |
-   NSNumber     |     X     |     X     |     X     |
-   NSArray      |     X     |     X     |     X     |
-   CKReference  |     X     |     X     |           |
-     aka CKRecord.Reference
-   CKAsset      |     X     |     X     |           |
-   CLLocation   |     X     |     X     |           |
-
- */
-
-// MARK: - Protocols for bridging record value types
-
-/// Anything that can be a record value in Swift.
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-public protocol CKRecordValueProtocol {}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-public typealias CKRecordValue = __CKRecordObjCValue
-
-// A Swift data type that is convertible to and from a __CKRecordObjCValue
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-private protocol CKObjCRecordValueConvertible : CKRecordValueProtocol {
-    // Convert to __CKRecordObjCValue
-    func objcRecordValue() -> __CKRecordObjCValue
-    // Convert from __CKRecordObjCValue
-    static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Self
-}
-
-// An ObjC data type that is more naturally represented as a native Swift type when pulled from a CKRecord
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-internal protocol CKRecordValueConvertible : __CKRecordObjCValue {
-    // Convert to CKRecordValueProtocols
-    func swiftNativeValue() -> CKRecordValueProtocol
-}
-
-// MARK: - Converting between record value types
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension __CKRecordObjCValue {
-    internal func asSwiftNativeValue() -> CKRecordValueProtocol {
-        let swiftValue: CKRecordValueProtocol
-        if let convertibleObjcRecordValue = self as? CKRecordValueConvertible {
-            swiftValue = convertibleObjcRecordValue.swiftNativeValue()
-        } else {
-            swiftValue = self as! CKRecordValueProtocol
-        }
-        return swiftValue
-    }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecordValueProtocol {
-    fileprivate func asObjCRecordValue() -> __CKRecordObjCValue {
-        let objcValue: __CKRecordObjCValue
-        if let convertibleSwiftRecordValue = self as? CKObjCRecordValueConvertible {
-            objcValue = convertibleSwiftRecordValue.objcRecordValue()
-        } else {
-            objcValue = self as! __CKRecordObjCValue
-        }
-        return objcValue
-    }
-}
-
-// MARK: - Get and Set RecordValues on records
-
-@available(macOS 10.11, iOS 9.0, watchOS 3.0, *)
-extension CKRecordKeyValueSetting {
-    @nonobjc
-    public subscript<T:CKRecordValueProtocol>(key: CKRecord.FieldKey) -> T? {
-        get {
-            if let objcValue: __CKRecordObjCValue = self.object(forKey: key) {
-                /* I'd really like to do this statically, by implementing a separate subscript that takes <T:CKObjCRecordValueConvertible>.  But that doesn't seem to work: <rdar://problem/32911583> Can't overload subscript generics with inherited protocols in protocol extension */
-                if let ConvertibleT = T.self as? CKObjCRecordValueConvertible.Type {
-                    return (ConvertibleT.fromObjcRecordValue(objcValue) as! T)
-                } else {
-                    return (objcValue.asSwiftNativeValue() as! T)
-                }
-            }
-            return nil
-        }
-        set {
-            self[key] = newValue?.asObjCRecordValue()
-        }
-    }
-
-    @nonobjc
-    public subscript(key: CKRecord.FieldKey) -> CKRecordValueProtocol? {
-        get {
-            if let objcValue: __CKRecordObjCValue = self.object(forKey: key) {
-                return objcValue.asSwiftNativeValue()
-            }
-            return nil
-        }
-        set {
-            self[key] = newValue?.asObjCRecordValue()
-        }
-    }
-}
-
-// MARK: - CKRecord Value Protocol conformance
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKObjCRecordValueConvertible {
-    static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Self {
-        return objcRecordValue as! Self
-    }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension String : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return self as NSString }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Date : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return self as NSDate }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Data : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return self as NSData }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Bool : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Bool { return (objcRecordValue as! NSNumber).boolValue }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Double : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Double { return (objcRecordValue as! NSNumber).doubleValue }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Int : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Int { return (objcRecordValue as! NSNumber).intValue }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension UInt :CKRecordValueProtocol,  CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> UInt { return (objcRecordValue as! NSNumber).uintValue }
-}
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Int8 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Int8 { return (objcRecordValue as! NSNumber).int8Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension UInt8 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> UInt8 { return (objcRecordValue as! NSNumber).uint8Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Int16 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Int16 { return (objcRecordValue as! NSNumber).int16Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension UInt16 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> UInt16 { return (objcRecordValue as! NSNumber).uint16Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Int32 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Int32 { return (objcRecordValue as! NSNumber).int32Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension UInt32 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> UInt32 { return (objcRecordValue as! NSNumber).uint32Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Int64 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Int64 { return (objcRecordValue as! NSNumber).int64Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension UInt64 : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> UInt64 { return (objcRecordValue as! NSNumber).uint64Value }
-}
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Float : CKRecordValueProtocol, CKObjCRecordValueConvertible {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue { return NSNumber(value: self) }
-    fileprivate static func fromObjcRecordValue(_ objcRecordValue: __CKRecordObjCValue) -> Float { return (objcRecordValue as! NSNumber).floatValue }
-}
-
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension Array : CKRecordValueProtocol, CKObjCRecordValueConvertible where Element: CKRecordValueProtocol  {
-    fileprivate func objcRecordValue() -> __CKRecordObjCValue {
-        let retVal = NSMutableArray()
-        self.forEach { retVal.add($0.asObjCRecordValue()) }
-        return retVal
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension NSString : CKRecordValueProtocol, CKRecordValueConvertible {
-    internal func swiftNativeValue() -> CKRecordValueProtocol { return self as String }
-}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension NSDate : CKRecordValueProtocol, CKRecordValueConvertible {
-    internal func swiftNativeValue() -> CKRecordValueProtocol { return self as Date }
-}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension NSData : CKRecordValueProtocol, CKRecordValueConvertible {
-    internal func swiftNativeValue() -> CKRecordValueProtocol { return self as Data }
-}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension NSNumber: CKRecordValueProtocol, CKRecordValueConvertible {
-    internal func swiftNativeValue() -> CKRecordValueProtocol {
-        // All numbers come back as Int64 or Double, matching our protobuf conversion
-        // In some cases (record accessor methods) we have more type info, and can be smarter.  But not here.
-        if CFNumberIsFloatType(self) {
-            return self.doubleValue
-        } else {
-            return self.int64Value
-        }
-    }
-}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension NSArray : CKRecordValueProtocol, CKRecordValueConvertible {
-    internal func swiftNativeValue() -> CKRecordValueProtocol {
-        var retVal = [CKRecordValueProtocol]()
-        for element in self {
-            let objcRecordValue = element as! __CKRecordObjCValue
-            let swiftValue = objcRecordValue.asSwiftNativeValue()
-            retVal.append(swiftValue)
-        }
-        return retVal as CKRecordValueProtocol
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord.Reference : CKRecordValueProtocol {}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKAsset : CKRecordValueProtocol {}
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CLLocation : CKRecordValueProtocol {}
-
-
diff --git a/stdlib/public/Darwin/CloudKit/CKRecordZone_ID.swift b/stdlib/public/Darwin/CloudKit/CKRecordZone_ID.swift
deleted file mode 100644
index 59eeb9d8c17e2..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKRecordZone_ID.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecordZone.ID {
-    /**
-     - parameter zoneName: Zone names must be 255 characters or less. Most UTF-8 characters are valid.  Defaults to CKRecordZone.ID.defaultZoneName
-     - parameter ownerName: defaults to CurrentUserDefaultName
-     */
-    public convenience init(zoneName: String = CKRecordZone.ID.defaultZoneName, ownerName: String = "__defaultOwner__") {
-        // CKCurrentUserDefaultName would be preferable to __defaultOwner__, but that only came around in macOS 10.12 and friends.
-        self.init(__zoneName: zoneName, ownerName: ownerName)
-    }
-    
-    public static let `default` = CKRecordZone.ID(zoneName: CKRecordZone.ID.defaultZoneName, ownerName: "__defaultOwner__")
-    // CKCurrentUserDefaultName would be preferable to __defaultOwner__, but that only came around in macOS 10.12 and friends.
-    public static let defaultZoneName = __CKRecordZoneDefaultName
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKRecordZone.ID.defaultZoneName")
-public let CKRecordZoneDefaultName: String = __CKRecordZoneDefaultName
-
-
diff --git a/stdlib/public/Darwin/CloudKit/CKRecord_ID.swift b/stdlib/public/Darwin/CloudKit/CKRecord_ID.swift
deleted file mode 100644
index aecb5b2e2f1c2..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKRecord_ID.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-/// A class coupling a record name and a record zone id
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord.ID {
-    /**
-     - parameter recordName: CKRecord names must be 255 characters or less. Most UTF-8 characters are valid.  Defaults to UUID().uuidString
-     - parameter zoneID: defaults to the default record zone id
-     */
-    @available(swift 4.2)
-    public convenience init(recordName: String = UUID().uuidString, zoneID: CKRecordZone.ID = CKRecordZone.ID.default) {
-        self.init(__recordName: recordName, zoneID: zoneID)
-    }
-}
diff --git a/stdlib/public/Darwin/CloudKit/CKRecord_Reference.swift b/stdlib/public/Darwin/CloudKit/CKRecord_Reference.swift
deleted file mode 100644
index e8a0240f9d318..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKRecord_Reference.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord.Reference {
-    /// TODO: replace this with a .apinotes entry once there's a fix for 39261783
-    @available(swift 4.2)
-    public typealias Action = CKRecord_Reference_Action
-}
-
diff --git a/stdlib/public/Darwin/CloudKit/CKShare.swift b/stdlib/public/Darwin/CloudKit/CKShare.swift
deleted file mode 100644
index 51409a3182b34..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKShare.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-extension CKShare {
-    @available(swift 4.2)
-    public enum SystemFieldKey {
-        public static let title: CKRecord.FieldKey = __CKShareTitleKey
-        public static let thumbnailImageData: CKRecord.FieldKey = __CKShareThumbnailImageDataKey
-        public static let shareType: CKRecord.FieldKey = __CKShareTypeKey
-    }
-}
-
diff --git a/stdlib/public/Darwin/CloudKit/CKShare_Participant.swift b/stdlib/public/Darwin/CloudKit/CKShare_Participant.swift
deleted file mode 100644
index bacd8c710c482..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKShare_Participant.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-extension CKShare.Participant {
-    /// TODO: replace these with a .apinotes entry once there's a fix for 39261783
-    @available(swift 4.2)
-    public typealias AcceptanceStatus = CKShare_Participant_AcceptanceStatus
-
-    @available(swift 4.2)
-    public typealias Permission = CKShare_Participant_Permission
-
-    @available(swift 4.2)
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)
-    public typealias Role = CKShare_Participant_Role
-
-    @available(swift 4.2)
-    @available(macOS, deprecated: 10.14, renamed: "CKShare.Participant.Role")
-    @available(iOS, deprecated: 12.0, renamed: "CKShare.Participant.Role")
-    @available(tvOS, deprecated: 12.0, renamed: "CKShare.Participant.Role")
-    @available(watchOS, deprecated: 5.0, renamed: "CKShare.Participant.Role")
-    public typealias ParticipantType = CKShare_Participant_ParticipantType
-}
diff --git a/stdlib/public/Darwin/CloudKit/CKSubscription_NotificationInfo.swift b/stdlib/public/Darwin/CloudKit/CKSubscription_NotificationInfo.swift
deleted file mode 100644
index 24e85cf7a0bc4..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CKSubscription_NotificationInfo.swift
+++ /dev/null
@@ -1,134 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-#if !os(watchOS)
-
-/**
- The payload of a push notification delivered in the UIApplication `application:didReceiveRemoteNotification:` delegate method contains information about the firing subscription.
- 
- Use `Notification(fromRemoteNotificationDictionary:)` to parse that payload.
- On tvOS, alerts, badges, sounds, and categories are not handled in push notifications. However, Subscriptions remain available to help you avoid polling the server.
- */
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKSubscription.NotificationInfo {
-    /// A list of field names to take from the matching record that is used as substitution variables in a formatted alert string.
-    #if !os(tvOS)
-
-    @available(tvOS, unavailable)
-    @available(swift 4.2)
-    public var alertLocalizationArgs: [CKRecord.FieldKey]? {
-        get { return self.__alertLocalizationArgs }
-        set { self.__alertLocalizationArgs = newValue }
-    }
-    
-    /// A list of field names to take from the matching record that is used as substitution variables in a formatted title string.
-    @available(macOS 10.13, iOS 11.0, *) @available(tvOS, unavailable)
-    @available(swift 4.2)
-    public var titleLocalizationArgs: [CKRecord.FieldKey]? {
-        get { return self.__titleLocalizationArgs }
-        set { self.__titleLocalizationArgs = newValue }
-    }
-    
-    /// A list of field names to take from the matching record that is used as substitution variables in a formatted subtitle string.
-    @available(macOS 10.13, iOS 11.0, *) @available(tvOS, unavailable)
-    @available(swift 4.2)
-    public var subtitleLocalizationArgs: [CKRecord.FieldKey]? {
-        get { return self.__subtitleLocalizationArgs }
-        set { self.__subtitleLocalizationArgs = newValue }
-    }
-    
-    #endif // !os(tvOS)
-    
-    /**
-     A list of keys from the matching record to include in the notification payload.
-     
-     Only some keys are allowed.  The value types associated with those keys on the server must be one of these classes:
-     - CKRecord.Reference
-     - CLLocation
-     - NSDate
-     - NSNumber
-     - NSString
-     */
-    @available(swift 4.2)
-    public var desiredKeys: [CKRecord.FieldKey]? {
-        get { return self.__desiredKeys }
-        set { self.__desiredKeys = newValue }
-    }
-    
-    public convenience init(alertBody: String? = nil,
-                            alertLocalizationKey: String? = nil,
-                            alertLocalizationArgs: [CKRecord.FieldKey] = [],
-                            title: String? = nil,
-                            titleLocalizationKey: String? = nil,
-                            titleLocalizationArgs: [CKRecord.FieldKey] = [],
-                            subtitle: String? = nil,
-                            subtitleLocalizationKey: String? = nil,
-                            subtitleLocalizationArgs: [CKRecord.FieldKey] = [],
-                            alertActionLocalizationKey: String? = nil,
-                            alertLaunchImage: String? = nil,
-                            soundName: String? = nil,
-                            desiredKeys: [CKRecord.FieldKey] = [],
-                            shouldBadge: Bool = false,
-                            shouldSendContentAvailable: Bool = false,
-                            shouldSendMutableContent: Bool = false,
-                            category: String? = nil,
-                            collapseIDKey: String? = nil) {
-        
-        self.init()
-        
-        #if !os(tvOS)
-        do {
-            self.alertBody = alertBody
-            self.alertLocalizationKey = alertLocalizationKey
-            self.alertLocalizationArgs = alertLocalizationArgs
-        
-            if #available(macOS 10.13, iOS 11.0, *) {
-                self.title = title
-                self.titleLocalizationKey = titleLocalizationKey
-                self.titleLocalizationArgs = titleLocalizationArgs
-                self.subtitle = subtitle
-                self.subtitleLocalizationKey = subtitleLocalizationKey
-                self.subtitleLocalizationArgs = subtitleLocalizationArgs
-            }
-        
-            self.alertActionLocalizationKey = alertActionLocalizationKey
-            self.alertLaunchImage = alertLaunchImage
-            self.soundName = soundName
-        }
-        #endif // !os(tvOS)
-        
-        self.desiredKeys = desiredKeys
-        
-        if #available(tvOS 10.0, *) {
-            self.shouldBadge = shouldBadge
-        }
-        self.shouldSendContentAvailable = shouldSendContentAvailable
-        if #available(macOS 10.13, iOS 11.0, tvOS 11.0, *) {
-            self.shouldSendMutableContent = shouldSendMutableContent
-        }
-        #if !os(tvOS)
-        do {
-            if #available(macOS 10.11, iOS 9.0, *) {
-                self.category = category
-            }
-        }
-        #endif // !os(tvOS)
-        if #available(macOS 10.13, iOS 11.0, tvOS 11.0, *) {
-            self.collapseIDKey = collapseIDKey
-        }
-    }
-}
-
-#endif // !os(watchOS)
diff --git a/stdlib/public/Darwin/CloudKit/CMakeLists.txt b/stdlib/public/Darwin/CloudKit/CMakeLists.txt
deleted file mode 100644
index 4b48d3c53d18c..0000000000000
--- a/stdlib/public/Darwin/CloudKit/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCloudKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  NestedNames.swift
-  TypealiasStrings.swift
-  CKError.swift
-  CKFetchRecordZoneChangesOperation.swift
-  CKRecord.swift
-  CKRecordZone_ID.swift
-  CKRecord_ID.swift
-  CKRecord_Reference.swift
-  CKShare.swift
-  CKShare_Participant.swift
-  CKSubscription_NotificationInfo.swift
-  CKRecordValue.swift
-  DefaultParameters.swift
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation CoreLocation XPC CoreFoundation ObjectiveC # auto-updated
-    os XPC
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-    os
-  FRAMEWORK_DEPENDS_WEAK CloudKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_CLOUDKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_CLOUDKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_CLOUDKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_CLOUDKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CloudKit/DefaultParameters.swift b/stdlib/public/Darwin/CloudKit/DefaultParameters.swift
deleted file mode 100644
index b4628faa87ab6..0000000000000
--- a/stdlib/public/Darwin/CloudKit/DefaultParameters.swift
+++ /dev/null
@@ -1,87 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)
-extension CKFetchRecordZoneChangesOperation {
-    @available(swift 4.2)
-    public convenience init(recordZoneIDs: [CKRecordZone.ID]? = nil, configurationsByRecordZoneID: [CKRecordZone.ID: ZoneConfiguration]? = nil) {
-        self.init()
-        self.recordZoneIDs = recordZoneIDs
-        self.configurationsByRecordZoneID = configurationsByRecordZoneID
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKModifyRecordZonesOperation {
-    @available(swift 4.2)
-    public convenience init(recordZonesToSave: [CKRecordZone]? = nil, recordZoneIDsToDelete: [CKRecordZone.ID]? = nil) {
-        self.init()
-        self.recordZonesToSave = recordZonesToSave
-        self.recordZoneIDsToDelete = recordZoneIDsToDelete
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKModifyRecordsOperation {
-    @available(swift 4.2)
-    public convenience init(recordsToSave: [CKRecord]? = nil, recordIDsToDelete: [CKRecord.ID]? = nil) {
-        self.init()
-        self.recordsToSave = recordsToSave
-        self.recordIDsToDelete = recordIDsToDelete
-    }
-}
-
-#if !os(watchOS)
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKModifySubscriptionsOperation {
-    @available(swift 4.2)
-    public convenience init(subscriptionsToSave: [CKSubscription]? = nil, subscriptionIDsToDelete: [CKSubscription.ID]? = nil) {
-        self.init()
-        self.subscriptionsToSave = subscriptionsToSave
-        self.__subscriptionIDsToDelete = subscriptionIDsToDelete
-    }
-}
-
-#endif // os(watchOS)
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord {
-    @available(swift, introduced: 4.2, deprecated: 4.2, message: "Use init(recordType:recordID:) + CKRecord.ID(zoneID:) instead")
-    public convenience init(recordType: CKRecord.RecordType, zoneID: CKRecordZone.ID) {
-        self.init(recordType: recordType, recordID: CKRecord.ID(zoneID: zoneID))
-    }
-    @available(swift 4.2)
-    public convenience init(recordType: CKRecord.RecordType, recordID: CKRecord.ID = CKRecord.ID()) {
-        self.init(__recordType: recordType, recordID: recordID)
-    }
-}
-
-#if !os(watchOS)
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *) @available(watchOS, unavailable)
-extension CKQuerySubscription {
-    @available(swift 4.2)
-    public convenience init(recordType: CKRecord.RecordType, predicate: NSPredicate, subscriptionID: CKSubscription.ID = UUID().uuidString, options querySubscriptionOptions: CKQuerySubscription.Options = []) {
-        self.init(__recordType: recordType, predicate: predicate, subscriptionID: subscriptionID, options: querySubscriptionOptions)
-    }
-}
-
-#endif // !os(watchOS)
diff --git a/stdlib/public/Darwin/CloudKit/NestedNames.swift b/stdlib/public/Darwin/CloudKit/NestedNames.swift
deleted file mode 100644
index dd83f245ed28c..0000000000000
--- a/stdlib/public/Darwin/CloudKit/NestedNames.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-// Work arounds for 39295365, 39261783
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKContainer {
-    @available(swift 4.2)
-    public enum Application {
-        public typealias Permissions = CKContainer_Application_Permissions
-        public typealias PermissionStatus = CKContainer_Application_PermissionStatus
-        public typealias PermissionBlock = CKContainer_Application_PermissionBlock
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKOperation {
-    @available(swift 4.2)
-    public typealias ID = String
-}
-
-#if os(watchOS)
-
-@available(watchOS 3.0, *)
-public enum CKSubscription {}
-
-#endif // os(watchOS)
-
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKSubscription {
-    @available(swift 4.2)
-    public typealias ID = String
-}
diff --git a/stdlib/public/Darwin/CloudKit/TypealiasStrings.swift b/stdlib/public/Darwin/CloudKit/TypealiasStrings.swift
deleted file mode 100644
index 8995cdbb07054..0000000000000
--- a/stdlib/public/Darwin/CloudKit/TypealiasStrings.swift
+++ /dev/null
@@ -1,336 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CloudKit // Clang module
-
-@nonobjc
-@available(macOS 10.12, iOS 9.3, tvOS 9.2, watchOS 3.0, *)
-extension CKContainer {
-     /**
-     If a long lived operation is cancelled or finishes completely it is no longer returned by this call.
-     */
-    @available(swift 4.2)
-    public func fetchAllLongLivedOperationIDs(completionHandler: @escaping ([CKOperation.ID]?, Error?) -> Void) {
-        self.__fetchAllLongLivedOperationIDs(completionHandler: completionHandler)
-    }
-     /**
-     Long lived CKOperations returned by this call must be started on an operation queue.
-     Remember to set the callback blocks before starting the operation.
-     If an operation has already completed against the server, and is subsequently resumed, that operation will replay all of its callbacks from the start of the operation, but the request will not be re-sent to the server.
-     If a long lived operation is cancelled or finishes completely it is no longer returned by this call.
-     */
-    @available(swift 4.2)
-    public func fetchLongLivedOperation(withID operationID: CKOperation.ID, completionHandler: @escaping (CKOperation?, Error?) -> Void) {
-        self.__fetchLongLivedOperation(withID: operationID, completionHandler: completionHandler)
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 9.3, tvOS 9.2, watchOS 3.0, *)
-extension CKOperation {
-    /** This is an identifier unique to this CKOperation.
-     
-     This value is chosen by the system, and will be unique to this instance of a CKOperation.  This identifier will be sent to Apple's servers, and can be used to identify any server-side logging associated with this operation.
-     */
-    @available(swift 4.2)
-    public var operationID: CKOperation.ID {
-        get { return self.__operationID }
-    }
-}
-
-#if !os(watchOS)
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKModifySubscriptionsOperation {
-    @available(swift 4.2)
-    public var subscriptionIDsToDelete: [CKSubscription.ID]? {
-        get { return self.__subscriptionIDsToDelete }
-        set { self.__subscriptionIDsToDelete = newValue }
-    }
-    /** This block is called when the operation completes.
-     
-     The Operation.completionBlock will also be called if both are set.
-     If the error is `CKErrorPartialFailure`, the error's userInfo dictionary contains a dictionary of subscriptionIDs to errors keyed off of `CKPartialErrorsByItemIDKey`.
-     */
-    @available(swift 4.2)
-    public var modifySubscriptionsCompletionBlock: (([CKSubscription]?, [CKSubscription.ID]?, Error?) -> Void)? {
-        get { return self.__modifySubscriptionsCompletionBlock }
-        set { self.__modifySubscriptionsCompletionBlock = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKFetchSubscriptionsOperation {
-    @available(swift 4.2)
-    public convenience init(subscriptionIDs: [CKSubscription.ID]) {
-        self.init(__subscriptionIDs: subscriptionIDs)
-    }
-    
-    @available(swift 4.2)
-    public var subscriptionIDs: [CKSubscription.ID]? {
-        get { return self.__subscriptionIDs }
-        set { self.__subscriptionIDs = newValue }
-    }
-    /** This block is called when the operation completes.
-     
-     The Operation.completionBlock will also be called if both are set.
-     If the error is `CKErrorPartialFailure`, the error's userInfo dictionary contains a dictionary of subscriptionID to errors keyed off of `CKPartialErrorsByItemIDKey`.
-     */
-    @available(swift 4.2)
-    public var fetchSubscriptionCompletionBlock: (([CKSubscription.ID : CKSubscription]?, Error?) -> Void)? {
-        get { return self.__fetchSubscriptionCompletionBlock }
-        set { self.__fetchSubscriptionCompletionBlock = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKDatabase {
-    @available(swift 4.2)
-    public func fetch(withSubscriptionID subscriptionID: CKSubscription.ID, completionHandler: @escaping (CKSubscription?, Error?) -> Void) {
-        self.__fetch(withSubscriptionID: subscriptionID, completionHandler: completionHandler)
-    }
-    @available(swift 4.2)
-    public func delete(withSubscriptionID subscriptionID: CKSubscription.ID, completionHandler: @escaping (String?, Error?) -> Void) {
-        self.__delete(withSubscriptionID: subscriptionID, completionHandler: completionHandler)
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, *) @available(watchOS, unavailable)
-extension CKSubscription {
-    @available(swift 4.2)
-    public var subscriptionID: CKSubscription.ID {
-        get { return self.__subscriptionID }
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *) @available(watchOS, unavailable)
-extension CKQuerySubscription {
-    /// The record type that this subscription watches
-    @available(swift 4.2)
-    public var recordType: CKRecord.RecordType? {
-        get { return self.__recordType }
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *) @available(watchOS, unavailable)
-extension CKRecordZoneSubscription {
-    @available(swift 4.2)
-    public convenience init(zoneID: CKRecordZone.ID, subscriptionID: CKSubscription.ID) {
-        self.init(__zoneID: zoneID, subscriptionID: subscriptionID)
-    }
-    /// Optional property. If set, a zone subscription is scoped to record changes for this record type
-    @available(swift 4.2)
-    public var recordType: CKRecord.RecordType? {
-        get { return self.__recordType }
-        set { self.__recordType = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *) @available(watchOS, unavailable)
-extension CKDatabaseSubscription {
-    @available(swift 4.2)
-    public convenience init(subscriptionID: CKSubscription.ID) {
-        self.init(__subscriptionID: subscriptionID)
-    }
-    /// Optional property. If set, a database subscription is scoped to record changes for this record type
-    @available(swift 4.2)
-    public var recordType: CKRecord.RecordType? {
-        get { return self.__recordType }
-        set { self.__recordType = newValue }
-    }
-}
-
-#endif // !os(watchOS)
-
-@nonobjc
-@available(macOS 10.11, iOS 9.0, watchOS 3.0, *)
-extension CKNotification {
-    /// The ID of the subscription that caused this notification to fire
-    @available(swift 4.2)
-    public var subscriptionID: CKSubscription.ID? {
-        get { return self.__subscriptionID }
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-extension CKFetchRecordZoneChangesOperation {
-    @available(swift 4.2)
-    public var recordWithIDWasDeletedBlock: ((CKRecord.ID, CKRecord.RecordType) -> Void)? {
-        get { return self.__recordWithIDWasDeletedBlock }
-        set { self.__recordWithIDWasDeletedBlock = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKQuery {
-    /// Use `NSPredicate(value: true)` if you want to query for all records of a given type.
-    @available(swift 4.2)
-    public convenience init(recordType: CKRecord.RecordType, predicate: NSPredicate) {
-        self.init(__recordType: recordType, predicate: predicate)
-    }
-    @available(swift 4.2)
-    public var recordType: CKRecord.RecordType {
-        get { return self.__recordType }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKRecord {
-    @available(swift 4.2)
-    public var recordType: CKRecord.RecordType {
-        get { return self.__recordType }
-    }
-    /** In addition to `object(forKey:)` and `setObject(_:forKey:)`, dictionary-style subscripting (`record[key]` and `record[key] = value`) can be used to get and set values.
-     Acceptable value object classes are:
-     - String
-     - Date
-     - Data
-     - Bool
-     - Int
-     - UInt
-     - Float
-     - Double
-     - [U]Int8 et al
-     - CKReference / Record.Reference
-     - CKAsset
-     - CLLocation
-     - NSData
-     - NSDate
-     - NSNumber
-     - NSString
-     - Array and/or NSArray containing objects of any of the types above
-     
-     Any other classes will result in an exception with name `NSInvalidArgumentException`.
-     
-     Field keys starting with '_' are reserved. Attempting to set a key prefixed with a '_' will result in an error.
-     
-     Key names roughly match C variable name restrictions. They must begin with an ASCII letter and can contain ASCII letters and numbers and the underscore character.
-     The maximum key length is 255 characters.
-     */
-    @available(swift 4.2)
-    public func object(forKey key: CKRecord.FieldKey) -> __CKRecordObjCValue? {
-        return self.__object(forKey: key)
-    }
-    @available(swift 4.2)
-    public func setObject(_ object: __CKRecordObjCValue?, forKey key: CKRecord.FieldKey) {
-        self.__setObject(object, forKey: key)
-    }
-    @available(swift 4.2)
-    public subscript(key: CKRecord.FieldKey) -> __CKRecordObjCValue? {
-        get { return self.object(forKey: key) }
-        set { self.setObject(newValue, forKey: key) }
-    }
-    @available(swift 4.2)
-    public func allKeys() -> [CKRecord.FieldKey] {
-        return self.__allKeys()
-    }
-    /// A list of keys that have been modified on the local CKRecord instance
-    @available(swift 4.2)
-    public func changedKeys() -> [CKRecord.FieldKey] {
-        return self.__changedKeys()
-    }
-}
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-extension CKFetchShareMetadataOperation {
-    /** Declares which user-defined keys should be fetched and added to the resulting `rootRecord`.
-     
-     Only consulted if `shouldFetchRootRecord` is YES.
-     If nil, declares the entire root record should be downloaded. If set to an empty array, declares that no user fields should be downloaded.
-     Defaults to nil.
-     */
-    @available(swift 4.2)
-    public var rootRecordDesiredKeys: [CKRecord.FieldKey]? {
-        get { return self.__rootRecordDesiredKeys }
-        set { self.__rootRecordDesiredKeys = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKFetchRecordsOperation {
-    /** Declares which user-defined keys should be fetched and added to the resulting CKRecords.
-     
-     If nil, declares the entire record should be downloaded. If set to an empty array, declares that no user fields should be downloaded.
-     Defaults to nil.
-     */
-    @available(swift 4.2)
-    public var desiredKeys: [CKRecord.FieldKey]? {
-        get { return self.__desiredKeys }
-        set { self.__desiredKeys = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-extension CKQueryOperation {
-    /** Declares which user-defined keys should be fetched and added to the resulting CKRecords.
-     
-     If nil, declares the entire record should be downloaded. If set to an empty array, declares that no user fields should be downloaded.
-     Defaults to nil.
-     */
-    @available(swift 4.2)
-    public var desiredKeys: [CKRecord.FieldKey]? {
-        get { return self.__desiredKeys }
-        set { self.__desiredKeys = newValue }
-    }
-}
-
-@nonobjc
-@available(macOS 10.10, iOS 8.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKRecord.SystemType.userRecord")
-public let CKRecordTypeUserRecord: String = __CKRecordTypeUserRecord
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKRecord.SystemFieldKey.parent")
-public let CKRecordParentKey: String = __CKRecordParentKey
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKRecord.SystemFieldKey.share")
-public let CKRecordShareKey: String = __CKRecordShareKey
-
-
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKRecord.SystemType.share")
-public let CKRecordTypeShare: String = __CKRecordTypeShare
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKShare.SystemFieldKey.title")
-public let CKShareTitleKey: String = __CKShareTitleKey
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKShare.SystemFieldKey.thumbnailImageData")
-public let CKShareThumbnailImageDataKey: String = __CKShareThumbnailImageDataKey
-
-@nonobjc
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
-@available(swift, obsoleted: 4.2, renamed: "CKShare.SystemFieldKey.shareType")
-public let CKShareTypeKey: String = __CKShareTypeKey
-
-
diff --git a/stdlib/public/Darwin/Compression/CMakeLists.txt b/stdlib/public/Darwin/Compression/CMakeLists.txt
deleted file mode 100644
index f9447f6fadedf..0000000000000
--- a/stdlib/public/Darwin/Compression/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCompression ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  Compression.swift
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-lcompression"
-  SWIFT_MODULE_DEPENDS_OSX Darwin # auto-updated
-    Foundation # Imported in Swift
-  SWIFT_MODULE_DEPENDS_IOS Darwin # auto-updated
-    Foundation # Imported in Swift
-  SWIFT_MODULE_DEPENDS_TVOS Darwin # auto-updated
-    Foundation # Imported in Swift
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin # auto-updated
-    Foundation # Imported in Swift
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_COMPRESSION_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_COMPRESSION_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_COMPRESSION_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_COMPRESSION_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Compression/Compression.swift b/stdlib/public/Darwin/Compression/Compression.swift
deleted file mode 100644
index 9e6799aaf712f..0000000000000
--- a/stdlib/public/Darwin/Compression/Compression.swift
+++ /dev/null
@@ -1,394 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Darwin
-import Foundation
-@_exported import Compression
-
-/// Compression algorithms, wraps the C API constants.
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-public enum Algorithm: CaseIterable, RawRepresentable {
-
-  /// LZFSE
-  case lzfse
-
-  /// Deflate (conforming to RFC 1951)
-  case zlib
-
-  /// LZ4 with simple frame encapsulation
-  case lz4
-
-  /// LZMA in a XZ container
-  case lzma
-
-  public init?(rawValue: compression_algorithm) {
-    switch rawValue {
-    case COMPRESSION_LZFSE: self = .lzfse
-    case COMPRESSION_ZLIB: self = .zlib
-    case COMPRESSION_LZ4: self = .lz4
-    case COMPRESSION_LZMA: self = .lzma
-    default: return nil
-    }
-  }
-
-  public var rawValue: compression_algorithm {
-    switch self {
-    case .lzfse: return COMPRESSION_LZFSE
-    case .zlib: return COMPRESSION_ZLIB
-    case .lz4: return COMPRESSION_LZ4
-    case .lzma: return COMPRESSION_LZMA
-    }
-  }
-}
-
-/// Compression filter direction of operation, compress/decompress
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-public enum FilterOperation: RawRepresentable {
-
-  /// Compress raw data to a compressed payload
-  case compress
-
-  /// Decompress a compressed payload to raw data
-  case decompress
-
-  public init?(rawValue: compression_stream_operation) {
-    switch rawValue {
-    case COMPRESSION_STREAM_ENCODE: self = .compress
-    case COMPRESSION_STREAM_DECODE: self = .decompress
-    default: return nil
-    }
-  }
-
-  public var rawValue: compression_stream_operation {
-    switch self {
-    case .compress: return COMPRESSION_STREAM_ENCODE
-    case .decompress: return COMPRESSION_STREAM_DECODE
-    }
-  }
-}
-
-/// Compression errors
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-public enum FilterError: Error {
-
-  /// Filter failed to initialize,
-  /// or invalid internal state,
-  /// or invalid parameters
-  case invalidState
-
-  /// Invalid data in a call to compression_stream_process,
-  /// or non-empty write after an output filter has been finalized
-  case invalidData
-}
-
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-extension compression_stream {
-
-  /// Initialize a compression_stream struct
-  ///
-  /// - Parameter operation: direction of operation
-  /// - Parameter algorithm: compression algorithm
-  ///
-  /// - Throws: `FilterError.invalidState` if `algorithm` is not supported
-  ///           by the Compression stream API
-  ///
-  internal init(operation: FilterOperation, algorithm: Algorithm) throws {
-    self.init(dst_ptr: UnsafeMutablePointer<UInt8>(bitPattern: -1)!,
-              dst_size: 0,
-              src_ptr: UnsafeMutablePointer<UInt8>(bitPattern: -1)!,
-              src_size: 0,
-              state: nil)
-    let status = compression_stream_init(&self, operation.rawValue, algorithm.rawValue)
-    guard status == COMPRESSION_STATUS_OK else { throw FilterError.invalidState }
-  }
-}
-
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-public class OutputFilter {
-  private var _stream: compression_stream
-  private var _buf: UnsafeMutablePointer<UInt8>
-  private let _bufCapacity: Int
-  private let _writeFunc: (Data?) throws -> Void
-  private var _finalized: Bool = false
-
-  /// Initialize an output filter
-  ///
-  /// - Parameters:
-  /// - operation: direction of operation
-  /// - algorithm: compression algorithm
-  /// - bufferCapacity: capacity of the internal data buffer
-  /// - writeFunc: called to write the processed data
-  ///
-  /// - Throws: `FilterError.invalidState` if stream initialization failed
-  public init(
-    _ operation: FilterOperation,
-    using algorithm: Algorithm,
-    bufferCapacity: Int = 65536,
-    writingTo writeFunc: @escaping (Data?) throws -> Void
-  ) throws {
-    _stream = try compression_stream(operation: operation, algorithm: algorithm)
-    _buf = UnsafeMutablePointer<UInt8>.allocate(capacity: bufferCapacity)
-    _bufCapacity = bufferCapacity
-    _writeFunc = writeFunc
-  }
-
-  /// Send data to output filter
-  ///
-  /// Processed output will be sent to the output closure.
-  /// A call with empty/nil data is interpreted as finalize().
-  /// Writing non empty/nil data to a finalized stream is an error.
-  ///
-  /// - Parameter data: data to process
-  ///
-  /// - Throws:
-  /// `FilterError.invalidData` if an error occurs during processing,
-  /// or if `data` is not empty/nil, and the filter is the finalized state
-  public func write<D : DataProtocol>(_ data: D?) throws {
-    // Finalize if data is empty/nil
-    if data == nil || data!.isEmpty { try finalize() ; return }
-
-    // Fail if already finalized
-    if _finalized { throw FilterError.invalidData }
-
-    // Process all incoming data
-    for region in data!.regions {
-      try region.withUnsafeBytes { (raw_src_ptr: UnsafeRawBufferPointer) in
-        _stream.src_size = region.count
-        _stream.src_ptr = raw_src_ptr.baseAddress!.assumingMemoryBound(to: UInt8.self)
-        while (_stream.src_size > 0) { _ = try _process(finalizing: false) }
-      }
-    }
-  }
-
-  /// Finalize the stream, i.e. flush all data remaining in the stream
-  ///
-  /// Processed output will be sent to the output closure.
-  /// When all output has been sent, the writingTo closure is called one last time with nil data.
-  /// Once the stream is finalized, writing non empty/nil data to the stream will throw an exception.
-  ///
-  /// - Throws: `FilterError.invalidData` if an error occurs during processing
-  public func finalize() throws {
-    // Do nothing if already finalized
-    if _finalized { return }
-
-    // Finalize stream
-    _stream.src_size = 0
-    var status = COMPRESSION_STATUS_OK
-    while (status != COMPRESSION_STATUS_END) { status = try _process(finalizing: true) }
-
-    // Update state
-    _finalized = true
-
-    // Notify end of stream
-    try _writeFunc(nil)
-  }
-
-  // Cleanup resources.  The filter is finalized now if it was not finalized yet.
-  deinit {
-    // Finalize now if not done earlier
-    try? finalize()
-
-    // Cleanup
-    _buf.deallocate()
-    compression_stream_destroy(&_stream)
-  }
-
-  // Call compression_stream_process with current src, and dst set to _buf, then write output to the closure
-  // Return status
-  private func _process(finalizing finalize: Bool) throws -> compression_status {
-    // Process current input, and write to buf
-    _stream.dst_ptr = _buf
-    _stream.dst_size = _bufCapacity
-
-    let status = compression_stream_process(&_stream, (finalize ? Int32(COMPRESSION_STREAM_FINALIZE.rawValue) : 0))
-    guard status != COMPRESSION_STATUS_ERROR else { throw FilterError.invalidData }
-
-    // Number of bytes written to buf
-    let writtenBytes = _bufCapacity - _stream.dst_size
-
-    // Write output
-    if writtenBytes > 0 {
-      let outData = Data(bytesNoCopy: _buf, count: writtenBytes, deallocator: .none)
-      try _writeFunc(outData)
-    }
-
-    return status
-  }
-
-}
-
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-public class InputFilter<D: DataProtocol> {
-
-  // Internal buffer to read bytes from a DataProtocol implementation
-  private class InputFilterBuffer<D: DataProtocol> {
-    private var _data: D // current input data
-    private var _remaining: Int // total bytes remaining to process in _data
-    private var _regionIndex: D.Regions.Index // region being read in _data
-    private var _regionRemaining: Int // remaining bytes to read in region being read in _data
-
-    public init(_ data: D) throws {
-      _data = data
-      _remaining = _data.count
-      _regionRemaining = 0
-      _regionIndex = _data.regions.startIndex
-      if _regionIndex != _data.regions.endIndex { _regionRemaining = _data.regions[_regionIndex].count }
-      // Advance to first non-zero region
-      try advance(by: 0)
-    }
-
-    // Return number of remaining bytes
-    public func remaining() -> Int { return _remaining }
-
-    // Call f with a buffer to the remaining bytes of the current contiguous region
-    public func withUnsafeBytes<R>(_ body: (UnsafeRawBufferPointer) throws -> R) rethrows -> R? {
-      if _remaining == 0 {
-        return try body(UnsafeRawBufferPointer(start: nil, count: 0))
-      } else {
-        let r = _data.regions[_regionIndex]
-        return try r.withUnsafeBytes { (region_buf: UnsafeRawBufferPointer) in
-          let src_buf = UnsafeRawBufferPointer(
-            start: region_buf.baseAddress!.assumingMemoryBound(to: UInt8.self) + region_buf.count - _regionRemaining,
-            count: _regionRemaining)
-          return try body(src_buf)
-        }
-      }
-    }
-
-    // Consume n bytes in the current region (n can be 0, up to _regionRemaining), and move to next non-empty region if needed
-    // post-condition: _remaining == 0 || _regionRemaining > 0
-    public func advance(by n: Int) throws {
-
-      // Sanity checks
-      if n > _regionRemaining { throw FilterError.invalidState } // invalid n
-
-      // Update counters
-      _regionRemaining -= n
-      _remaining -= n
-
-      // Move to next non-empty region if we are done with the current one
-      let r = _data.regions
-      while _regionRemaining == 0 {
-        r.formIndex(after: &_regionIndex)
-        if _regionIndex == r.endIndex { break }
-        _regionRemaining = r[_regionIndex].count
-      }
-
-      // Sanity checks
-      if _remaining != 0 && _regionRemaining == 0 { throw FilterError.invalidState }
-    }
-  }
-
-  private let _readCapacity: Int // size to use when calling _readFunc
-  private let _readFunc: (Int) throws -> D? // caller-provided read function
-  private var _stream: compression_stream
-  private var _buf: InputFilterBuffer<D>? = nil // input
-  private var _eofReached: Bool = false // did we read end-of-file from the input?
-  private var _endReached: Bool = false // did we reach end-of-file from the decoder stream?
-
-  /// Initialize an input filter
-  ///
-  /// - Parameters:
-  /// - operation: direction of operation
-  /// - algorithm: compression algorithm
-  /// - bufferCapacity: capacity of the internal data buffer
-  /// - readFunc: called to read the input data
-  ///
-  /// - Throws: `FilterError.invalidState` if filter initialization failed
-  public init(
-    _ operation: FilterOperation,
-    using algorithm: Algorithm,
-    bufferCapacity: Int = 65536,
-    readingFrom readFunc: @escaping (Int) throws -> D?
-  ) throws {
-    _stream = try compression_stream(operation: operation, algorithm: algorithm)
-    _readCapacity = bufferCapacity
-    _readFunc = readFunc
-  }
-
-  /// Read processed data from the filter
-  ///
-  /// Input data, when needed, is obtained from the input closure
-  /// When the input closure returns a nil or empty Data object, the filter will be
-  /// finalized, and after all processed data has been read, readData will return nil
-  /// to signal end of input
-  ///
-  /// - Parameter count: max number of bytes to read from the filter
-  ///
-  /// - Returns: a new Data object containing at most `count` output bytes, or nil if no more data is available
-  ///
-  /// - Throws:
-  /// `FilterError.invalidData` if an error occurs during processing
-  public func readData(ofLength count: Int) throws -> Data? {
-    // Sanity check
-    precondition(count > 0, "number of bytes to read can't be 0")
-
-    // End reached, return early, nothing to do
-    if _endReached { return nil }
-
-    // Allocate result
-    var result = Data(count: count)
-
-    try result.withUnsafeMutableBytes { (dst_ptr: UnsafeMutablePointer<UInt8>) in
-
-      // Write to result until full, or end reached
-      _stream.dst_size = count
-      _stream.dst_ptr = dst_ptr
-
-      while _stream.dst_size > 0 && !_endReached {
-
-        // Refill _buf if needed, and EOF was not yet read
-        if (_buf?.remaining() ?? 0) == 0 && !_eofReached {
-          let data = try _readFunc(_readCapacity) // may be nil, or empty
-          if data?.count ?? 0 == 0 { // nil or empty -> EOF
-            _eofReached = true
-            _buf = nil
-          } else {
-            _buf = try InputFilterBuffer(data!)
-          }
-        }
-
-        // Process some data
-        if let buf = _buf {
-          try buf.withUnsafeBytes { (src_buf: UnsafeRawBufferPointer) in
-            // Point to buffer
-            _stream.src_ptr = src_buf.baseAddress!.assumingMemoryBound(to: UInt8.self)
-            _stream.src_size = src_buf.count
-            let status = compression_stream_process(&_stream, (_eofReached ? Int32(COMPRESSION_STREAM_FINALIZE.rawValue) : 0))
-            guard status != COMPRESSION_STATUS_ERROR else { throw FilterError.invalidData }
-            if status == COMPRESSION_STATUS_END { _endReached = true }
-            // Advance by the number of consumed bytes
-            let consumed = src_buf.count - _stream.src_size
-            try buf.advance(by: consumed)
-          }
-        } else {
-          // No data available, process until END reached
-          let status = compression_stream_process(&_stream, (_eofReached ? Int32(COMPRESSION_STREAM_FINALIZE.rawValue) : 0))
-          guard status != COMPRESSION_STATUS_ERROR else { throw FilterError.invalidData }
-          if status == COMPRESSION_STATUS_END { _endReached = true }
-        }
-
-      } // _stream.dst_size > 0 && !_endReached
-
-    } // result.withUnsafeMutableBytes
-
-    // Update actual size
-    result.count = count - _stream.dst_size
-    return result
-  }
-
-  // Cleanup resources
-  deinit {
-    compression_stream_destroy(&_stream)
-  }
-
-}
diff --git a/stdlib/public/Darwin/Contacts/CMakeLists.txt b/stdlib/public/Darwin/Contacts/CMakeLists.txt
deleted file mode 100644
index a642d91383ebe..0000000000000
--- a/stdlib/public/Darwin/Contacts/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftContacts ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CNError.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK Contacts
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_CONTACTS_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_CONTACTS_IOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_CONTACTS_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Contacts/CNError.swift b/stdlib/public/Darwin/Contacts/CNError.swift
deleted file mode 100644
index ad0b71dcd020b..0000000000000
--- a/stdlib/public/Darwin/Contacts/CNError.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Contacts
-import Foundation
-
-@available(macOS 10.11, iOS 9.0, *)
-extension CNError {
-  /// One or more CNContact, CNGroup or CNContainer objects for which
-  /// the error applies.
-  public var affectedRecords: [AnyObject]? {
-    return userInfo[CNErrorUserInfoAffectedRecordsKey] as? [AnyObject]
-  }
-
-  /// The record identifiers to which this error applies.
-  public var affectedRecordIdentifiers: [String]? {
-    return userInfo[CNErrorUserInfoAffectedRecordIdentifiersKey] as? [String]
-  }
-
-  /// The key paths associated with a given error. For validation
-  /// errors this will contain key paths to specific object
-  /// properties.
-  public var keyPaths: [String]? {
-    return userInfo[CNErrorUserInfoKeyPathsKey] as? [String]
-  }
-}
diff --git a/stdlib/public/Darwin/CoreAudio/CMakeLists.txt b/stdlib/public/Darwin/CoreAudio/CMakeLists.txt
deleted file mode 100644
index 5e725ee15a597..0000000000000
--- a/stdlib/public/Darwin/CoreAudio/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCoreAudio ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CoreAudio.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS CoreAudio
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_COREAUDIO_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREAUDIO_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREAUDIO_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREAUDIO_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CoreAudio/CoreAudio.swift b/stdlib/public/Darwin/CoreAudio/CoreAudio.swift
deleted file mode 100644
index afab53f9b6e07..0000000000000
--- a/stdlib/public/Darwin/CoreAudio/CoreAudio.swift
+++ /dev/null
@@ -1,168 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreAudio // Clang module
-
-extension UnsafeBufferPointer {
-  /// Initialize an `UnsafeBufferPointer<Element>` from an `AudioBuffer`.
-  /// Binds the buffer's memory type to `Element`.
-  public init(_ audioBuffer: AudioBuffer) {
-    let count = Int(audioBuffer.mDataByteSize) / MemoryLayout<Element>.stride
-    let elementPtr = audioBuffer.mData?.bindMemory(
-      to: Element.self, capacity: count)
-    self.init(start: elementPtr, count: count)
-  }
-}
-
-extension UnsafeMutableBufferPointer {
-  /// Initialize an `UnsafeMutableBufferPointer<Element>` from an
-  /// `AudioBuffer`.
-  public init(_ audioBuffer: AudioBuffer) {
-    let count = Int(audioBuffer.mDataByteSize) / MemoryLayout<Element>.stride
-    let elementPtr = audioBuffer.mData?.bindMemory(
-      to: Element.self, capacity: count)
-    self.init(start: elementPtr, count: count)
-  }
-}
-
-extension AudioBuffer {
-  /// Initialize an `AudioBuffer` from an
-  /// `UnsafeMutableBufferPointer<Element>`.
-  public init<Element>(
-    _ typedBuffer: UnsafeMutableBufferPointer<Element>,
-    numberOfChannels: Int
-  ) {
-    let byteSize = typedBuffer.count * MemoryLayout<Element>.stride
-    self.init(mNumberChannels: UInt32(numberOfChannels),
-              mDataByteSize: UInt32(byteSize),
-              mData: UnsafeMutableRawPointer(typedBuffer.baseAddress))
-  }
-}
-
-extension AudioBufferList {
-  /// - Returns: the size in bytes of an `AudioBufferList` that can hold up to
-  ///   `maximumBuffers` `AudioBuffer`s.
-  public static func sizeInBytes(maximumBuffers: Int) -> Int {
-    precondition(maximumBuffers >= 1,
-      "AudioBufferList should contain at least one AudioBuffer")
-    return MemoryLayout<AudioBufferList>.size +
-      (maximumBuffers - 1) * MemoryLayout<AudioBuffer>.stride
-  }
-
-  /// Allocate an `AudioBufferList` with a capacity for the specified number of
-  /// `AudioBuffer`s.
-  ///
-  /// The `count` property of the new `AudioBufferList` is initialized to
-  /// `maximumBuffers`.
-  ///
-  /// The memory should be freed with `free()`.
-  public static func allocate(maximumBuffers: Int)
-    -> UnsafeMutableAudioBufferListPointer {
-    let byteSize = sizeInBytes(maximumBuffers: maximumBuffers)
-    let ablMemory = calloc(byteSize, 1)
-    precondition(ablMemory != nil,
-      "failed to allocate memory for an AudioBufferList")
-
-    let listPtr = ablMemory!.bindMemory(to: AudioBufferList.self, capacity: 1)
-    (ablMemory! + MemoryLayout<AudioBufferList>.stride).bindMemory(
-      to: AudioBuffer.self, capacity: maximumBuffers)
-    let abl = UnsafeMutableAudioBufferListPointer(listPtr)
-    abl.count = maximumBuffers
-    return abl
-  }
-}
-
-/// A wrapper for a pointer to an `AudioBufferList`.
-///
-/// Like `UnsafeMutablePointer`, this type provides no automated memory
-/// management and the user must therefore take care to allocate and free
-/// memory appropriately.
-public struct UnsafeMutableAudioBufferListPointer {
-  /// Construct from an `AudioBufferList` pointer.
-  public init(_ p: UnsafeMutablePointer<AudioBufferList>) {
-    unsafeMutablePointer = p
-  }
-
-  /// Construct from an `AudioBufferList` pointer.
-  public init?(_ p: UnsafeMutablePointer<AudioBufferList>?) {
-    guard let unwrapped = p else { return nil }
-    self.init(unwrapped)
-  }
-
-  /// The number of `AudioBuffer`s in the `AudioBufferList`
-  /// (`mNumberBuffers`).
-  public var count: Int {
-    get {
-      return Int(unsafeMutablePointer.pointee.mNumberBuffers)
-    }
-    nonmutating set(newValue) {
-      unsafeMutablePointer.pointee.mNumberBuffers = UInt32(newValue)
-    }
-  }
-
-  /// The pointer to the first `AudioBuffer` in this `AudioBufferList`.
-  internal var _audioBuffersPointer: UnsafeMutablePointer<AudioBuffer> {
-    // AudioBufferList has one AudioBuffer in a "flexible array member".
-    // Position the pointer after that, and skip one AudioBuffer back.  This
-    // brings us to the start of AudioBuffer array.
-    let rawPtr = UnsafeMutableRawPointer(unsafeMutablePointer + 1)
-    return rawPtr.assumingMemoryBound(to: AudioBuffer.self) - 1
-  }
-
-  // FIXME: the properties 'unsafePointer' and 'unsafeMutablePointer' should be
-  // initializers on UnsafePointer and UnsafeMutablePointer, but we don't want
-  // to allow any UnsafePointer<Element> to be initializable from an
-  // UnsafeMutableAudioBufferListPointer, only UnsafePointer<AudioBufferList>.
-  // We need constrained extensions for that.  rdar://17821143
-
-  /// The pointer to the wrapped `AudioBufferList`.
-  public var unsafePointer: UnsafePointer<AudioBufferList> {
-    return UnsafePointer(unsafeMutablePointer)
-  }
-
-  /// The pointer to the wrapped `AudioBufferList`.
-  public var unsafeMutablePointer: UnsafeMutablePointer<AudioBufferList>
-}
-
-extension UnsafeMutableAudioBufferListPointer
-  : MutableCollection, RandomAccessCollection {
-
-  public typealias Element = AudioBuffer
-  public typealias Index = Int
-  public typealias Indices = Range<Int>
-
-  /// Always zero, which is the index of the first `AudioBuffer`.
-  public var startIndex: Int {
-    return 0
-  }
-
-  /// The "past the end" position; always identical to `count`.
-  public var endIndex: Int {
-    return count
-  }
-
-  /// Access an indexed `AudioBuffer` (`mBuffers[i]`).
-  @_borrowed
-  public subscript(index: Index) -> Element {
-    _read {
-      precondition(index >= 0 && index < self.count,
-        "subscript index out of range")
-      yield ((_audioBuffersPointer + index).pointee)
-    }
-    nonmutating _modify {
-      precondition(index >= 0 && index < self.count,
-        "subscript index out of range")
-      yield (&(_audioBuffersPointer + index).pointee)
-    }
-  }
-}
-
diff --git a/stdlib/public/Darwin/CoreData/CMakeLists.txt b/stdlib/public/Darwin/CoreData/CMakeLists.txt
deleted file mode 100644
index ad6f6ba7703a1..0000000000000
--- a/stdlib/public/Darwin/CoreData/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCoreData ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CocoaError.swift
-  NSManagedObjectContext.swift
-  CoreData.mm
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS CoreData
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_COREDATA_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREDATA_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREDATA_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREDATA_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CoreData/CocoaError.swift b/stdlib/public/Darwin/CoreData/CocoaError.swift
deleted file mode 100644
index 0f4126c3b05bd..0000000000000
--- a/stdlib/public/Darwin/CoreData/CocoaError.swift
+++ /dev/null
@@ -1,829 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreData
-import Foundation
-
-// Code constants
-extension CocoaError.Code {
-  public static var managedObjectValidation: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1550)
-  }
-  public static var validationMultipleErrors: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1560)
-  }
-  public static var validationMissingMandatoryProperty: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1570)
-  }
-  public static var validationRelationshipLacksMinimumCount: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1580)
-  }
-  public static var validationRelationshipExceedsMaximumCount: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1590)
-  }
-  public static var validationRelationshipDeniedDelete: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1600)
-  }
-  public static var validationNumberTooLarge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1610)
-  }
-  public static var validationNumberTooSmall: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1620)
-  }
-  public static var validationDateTooLate: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1630)
-  }
-  public static var validationDateTooSoon: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1640)
-  }
-  public static var validationInvalidDate: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1650)
-  }
-  public static var validationStringTooLong: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1660)
-  }
-  public static var validationStringTooShort: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1670)
-  }
-  public static var validationStringPatternMatching: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1680)
-  }
-  public static var managedObjectContextLocking: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132000)
-  }
-  public static var persistentStoreCoordinatorLocking: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132010)
-  }
-  public static var managedObjectReferentialIntegrity: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133000)
-  }
-  public static var managedObjectExternalRelationship: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133010)
-  }
-  public static var managedObjectMerge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133020)
-  }
-  public static var managedObjectConstraintMerge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133021)
-  }
-  public static var persistentStoreInvalidType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134000)
-  }
-  public static var persistentStoreTypeMismatch: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134010)
-  }
-  public static var persistentStoreIncompatibleSchema: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134020)
-  }
-  public static var persistentStoreSave: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134030)
-  }
-  public static var persistentStoreIncompleteSave: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134040)
-  }
-  public static var persistentStoreSaveConflicts: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134050)
-  }
-  public static var coreData: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134060)
-  }
-  public static var persistentStoreOperation: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134070)
-  }
-  public static var persistentStoreOpen: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134080)
-  }
-  public static var persistentStoreTimeout: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134090)
-  }
-  public static var persistentStoreUnsupportedRequestType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134091)
-  }
-  public static var persistentStoreIncompatibleVersionHash: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134100)
-  }
-  public static var migration: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134110)
-  }
-  public static var migrationCancelled: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134120)
-  }
-  public static var migrationMissingSourceModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134130)
-  }
-  public static var migrationMissingMappingModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134140)
-  }
-  public static var migrationManagerSourceStore: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134150)
-  }
-  public static var migrationManagerDestinationStore: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134160)
-  }
-  public static var entityMigrationPolicy: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134170)
-  }
-  public static var sqlite: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134180)
-  }
-  public static var inferredMappingModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134190)
-  }
-  public static var externalRecordImport: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134200)
-  }
-}
-
-// Code constants with names deprecated late in Swift 3
-extension CocoaError.Code {
-  @available(*, deprecated, renamed: "managedObjectValidation")
-  public static var managedObjectValidationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1550)
-  }
-  @available(*, deprecated, renamed: "validationMultipleErrors")
-  public static var validationMultipleErrorsError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1560)
-  }
-  @available(*, deprecated, renamed: "validationMissingMandatoryProperty")
-  public static var validationMissingMandatoryPropertyError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1570)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipLacksMinimumCount")
-  public static var validationRelationshipLacksMinimumCountError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1580)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipExceedsMaximumCount")
-  public static var validationRelationshipExceedsMaximumCountError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1590)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipDeniedDelete")
-  public static var validationRelationshipDeniedDeleteError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1600)
-  }
-  @available(*, deprecated, renamed: "validationNumberTooLarge")
-  public static var validationNumberTooLargeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1610)
-  }
-  @available(*, deprecated, renamed: "validationNumberTooSmall")
-  public static var validationNumberTooSmallError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1620)
-  }
-  @available(*, deprecated, renamed: "validationDateTooLate")
-  public static var validationDateTooLateError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1630)
-  }
-  @available(*, deprecated, renamed: "validationDateTooSoon")
-  public static var validationDateTooSoonError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1640)
-  }
-  @available(*, deprecated, renamed: "validationInvalidDate")
-  public static var validationInvalidDateError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1650)
-  }
-  @available(*, deprecated, renamed: "validationStringTooLong")
-  public static var validationStringTooLongError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1660)
-  }
-  @available(*, deprecated, renamed: "validationStringTooShort")
-  public static var validationStringTooShortError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1670)
-  }
-  @available(*, deprecated, renamed: "validationStringPatternMatching")
-  public static var validationStringPatternMatchingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1680)
-  }
-  @available(*, deprecated, renamed: "managedObjectContextLocking")
-  public static var managedObjectContextLockingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132000)
-  }
-  @available(*, deprecated, renamed: "persistentStoreCoordinatorLocking")
-  public static var persistentStoreCoordinatorLockingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132010)
-  }
-  @available(*, deprecated, renamed: "managedObjectReferentialIntegrity")
-  public static var managedObjectReferentialIntegrityError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133000)
-  }
-  @available(*, deprecated, renamed: "managedObjectExternalRelationship")
-  public static var managedObjectExternalRelationshipError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133010)
-  }
-  @available(*, deprecated, renamed: "managedObjectMerge")
-  public static var managedObjectMergeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133020)
-  }
-  @available(*, deprecated, renamed: "managedObjectConstraintMerge")
-  public static var managedObjectConstraintMergeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133021)
-  }
-  @available(*, deprecated, renamed: "persistentStoreInvalidType")
-  public static var persistentStoreInvalidTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134000)
-  }
-  @available(*, deprecated, renamed: "persistentStoreTypeMismatch")
-  public static var persistentStoreTypeMismatchError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134010)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompatibleSchema")
-  public static var persistentStoreIncompatibleSchemaError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134020)
-  }
-  @available(*, deprecated, renamed: "persistentStoreSave")
-  public static var persistentStoreSaveError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134030)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompleteSave")
-  public static var persistentStoreIncompleteSaveError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134040)
-  }
-  @available(*, deprecated, renamed: "persistentStoreSaveConflicts")
-  public static var persistentStoreSaveConflictsError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134050)
-  }
-  @available(*, deprecated, renamed: "coreData")
-  public static var coreDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134060)
-  }
-  @available(*, deprecated, renamed: "persistentStoreOperation")
-  public static var persistentStoreOperationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134070)
-  }
-  @available(*, deprecated, renamed: "persistentStoreOpen")
-  public static var persistentStoreOpenError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134080)
-  }
-  @available(*, deprecated, renamed: "persistentStoreTimeout")
-  public static var persistentStoreTimeoutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134090)
-  }
-  @available(*, deprecated, renamed: "persistentStoreUnsupportedRequestType")
-  public static var persistentStoreUnsupportedRequestTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134091)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompatibleVersionHash")
-  public static var persistentStoreIncompatibleVersionHashError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134100)
-  }
-  @available(*, deprecated, renamed: "migration")
-  public static var migrationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134110)
-  }
-  @available(*, deprecated, renamed: "migrationCancelled")
-  public static var migrationCancelledError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134120)
-  }
-  @available(*, deprecated, renamed: "migrationMissingSourceModel")
-  public static var migrationMissingSourceModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134130)
-  }
-  @available(*, deprecated, renamed: "migrationMissingMappingModel")
-  public static var migrationMissingMappingModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134140)
-  }
-  @available(*, deprecated, renamed: "migrationManagerSourceStore")
-  public static var migrationManagerSourceStoreError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134150)
-  }
-  @available(*, deprecated, renamed: "migrationManagerDestinationStore")
-  public static var migrationManagerDestinationStoreError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134160)
-  }
-  @available(*, deprecated, renamed: "entityMigrationPolicy")
-  public static var entityMigrationPolicyError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134170)
-  }
-  @available(*, deprecated, renamed: "sqlite")
-  public static var sqliteError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134180)
-  }
-  @available(*, deprecated, renamed: "inferredMappingModel")
-  public static var inferredMappingModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134190)
-  }
-  @available(*, deprecated, renamed: "externalRecordImport")
-  public static var externalRecordImportError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134200)
-  }
-}
-
-// Code constants
-extension CocoaError {
-  public static var managedObjectValidation: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1550)
-  }
-  public static var validationMultipleErrors: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1560)
-  }
-  public static var validationMissingMandatoryProperty: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1570)
-  }
-  public static var validationRelationshipLacksMinimumCount: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1580)
-  }
-  public static var validationRelationshipExceedsMaximumCount: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1590)
-  }
-  public static var validationRelationshipDeniedDelete: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1600)
-  }
-  public static var validationNumberTooLarge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1610)
-  }
-  public static var validationNumberTooSmall: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1620)
-  }
-  public static var validationDateTooLate: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1630)
-  }
-  public static var validationDateTooSoon: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1640)
-  }
-  public static var validationInvalidDate: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1650)
-  }
-  public static var validationStringTooLong: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1660)
-  }
-  public static var validationStringTooShort: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1670)
-  }
-  public static var validationStringPatternMatching: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1680)
-  }
-  public static var managedObjectContextLocking: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132000)
-  }
-  public static var persistentStoreCoordinatorLocking: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132010)
-  }
-  public static var managedObjectReferentialIntegrity: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133000)
-  }
-  public static var managedObjectExternalRelationship: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133010)
-  }
-  public static var managedObjectMerge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133020)
-  }
-  public static var managedObjectConstraintMerge: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133021)
-  }
-  public static var persistentStoreInvalidType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134000)
-  }
-  public static var persistentStoreTypeMismatch: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134010)
-  }
-  public static var persistentStoreIncompatibleSchema: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134020)
-  }
-  public static var persistentStoreSave: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134030)
-  }
-  public static var persistentStoreIncompleteSave: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134040)
-  }
-  public static var persistentStoreSaveConflicts: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134050)
-  }
-  public static var coreData: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134060)
-  }
-  public static var persistentStoreOperation: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134070)
-  }
-  public static var persistentStoreOpen: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134080)
-  }
-  public static var persistentStoreTimeout: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134090)
-  }
-  public static var persistentStoreUnsupportedRequestType: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134091)
-  }
-  public static var persistentStoreIncompatibleVersionHash: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134100)
-  }
-  public static var migration: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134110)
-  }
-  public static var migrationCancelled: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134120)
-  }
-  public static var migrationMissingSourceModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134130)
-  }
-  public static var migrationMissingMappingModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134140)
-  }
-  public static var migrationManagerSourceStore: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134150)
-  }
-  public static var migrationManagerDestinationStore: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134160)
-  }
-  public static var entityMigrationPolicy: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134170)
-  }
-  public static var sqlite: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134180)
-  }
-  public static var inferredMappingModel: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134190)
-  }
-  public static var externalRecordImport: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134200)
-  }
-}
-
-// Code constants with names deprecated late in Swift 3
-extension CocoaError {
-  @available(*, deprecated, renamed: "managedObjectValidation")
-  public static var managedObjectValidationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1550)
-  }
-  @available(*, deprecated, renamed: "validationMultipleErrors")
-  public static var validationMultipleErrorsError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1560)
-  }
-  @available(*, deprecated, renamed: "validationMissingMandatoryProperty")
-  public static var validationMissingMandatoryPropertyError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1570)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipLacksMinimumCount")
-  public static var validationRelationshipLacksMinimumCountError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1580)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipExceedsMaximumCount")
-  public static var validationRelationshipExceedsMaximumCountError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1590)
-  }
-  @available(*, deprecated, renamed: "validationRelationshipDeniedDelete")
-  public static var validationRelationshipDeniedDeleteError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1600)
-  }
-  @available(*, deprecated, renamed: "validationNumberTooLarge")
-  public static var validationNumberTooLargeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1610)
-  }
-  @available(*, deprecated, renamed: "validationNumberTooSmall")
-  public static var validationNumberTooSmallError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1620)
-  }
-  @available(*, deprecated, renamed: "validationDateTooLate")
-  public static var validationDateTooLateError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1630)
-  }
-  @available(*, deprecated, renamed: "validationDateTooSoon")
-  public static var validationDateTooSoonError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1640)
-  }
-  @available(*, deprecated, renamed: "validationInvalidDate")
-  public static var validationInvalidDateError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1650)
-  }
-  @available(*, deprecated, renamed: "validationStringTooLong")
-  public static var validationStringTooLongError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1660)
-  }
-  @available(*, deprecated, renamed: "validationStringTooShort")
-  public static var validationStringTooShortError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1670)
-  }
-  @available(*, deprecated, renamed: "validationStringPatternMatching")
-  public static var validationStringPatternMatchingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 1680)
-  }
-  @available(*, deprecated, renamed: "managedObjectContextLocking")
-  public static var managedObjectContextLockingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132000)
-  }
-  @available(*, deprecated, renamed: "persistentStoreCoordinatorLocking")
-  public static var persistentStoreCoordinatorLockingError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 132010)
-  }
-  @available(*, deprecated, renamed: "managedObjectReferentialIntegrity")
-  public static var managedObjectReferentialIntegrityError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133000)
-  }
-  @available(*, deprecated, renamed: "managedObjectExternalRelationship")
-  public static var managedObjectExternalRelationshipError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133010)
-  }
-  @available(*, deprecated, renamed: "managedObjectMerge")
-  public static var managedObjectMergeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133020)
-  }
-  @available(*, deprecated, renamed: "managedObjectConstraintMerge")
-  public static var managedObjectConstraintMergeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 133021)
-  }
-  @available(*, deprecated, renamed: "persistentStoreInvalidType")
-  public static var persistentStoreInvalidTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134000)
-  }
-  @available(*, deprecated, renamed: "persistentStoreTypeMismatch")
-  public static var persistentStoreTypeMismatchError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134010)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompatibleSchema")
-  public static var persistentStoreIncompatibleSchemaError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134020)
-  }
-  @available(*, deprecated, renamed: "persistentStoreSave")
-  public static var persistentStoreSaveError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134030)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompleteSave")
-  public static var persistentStoreIncompleteSaveError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134040)
-  }
-  @available(*, deprecated, renamed: "persistentStoreSaveConflicts")
-  public static var persistentStoreSaveConflictsError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134050)
-  }
-  @available(*, deprecated, renamed: "coreData")
-  public static var coreDataError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134060)
-  }
-  @available(*, deprecated, renamed: "persistentStoreOperation")
-  public static var persistentStoreOperationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134070)
-  }
-  @available(*, deprecated, renamed: "persistentStoreOpen")
-  public static var persistentStoreOpenError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134080)
-  }
-  @available(*, deprecated, renamed: "persistentStoreTimeout")
-  public static var persistentStoreTimeoutError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134090)
-  }
-  @available(*, deprecated, renamed: "persistentStoreUnsupportedRequestType")
-  public static var persistentStoreUnsupportedRequestTypeError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134091)
-  }
-  @available(*, deprecated, renamed: "persistentStoreIncompatibleVersionHash")
-  public static var persistentStoreIncompatibleVersionHashError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134100)
-  }
-  @available(*, deprecated, renamed: "migration")
-  public static var migrationError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134110)
-  }
-  @available(*, deprecated, renamed: "migrationCancelled")
-  public static var migrationCancelledError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134120)
-  }
-  @available(*, deprecated, renamed: "migrationMissingSourceModel")
-  public static var migrationMissingSourceModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134130)
-  }
-  @available(*, deprecated, renamed: "migrationMissingMappingModel")
-  public static var migrationMissingMappingModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134140)
-  }
-  @available(*, deprecated, renamed: "migrationManagerSourceStore")
-  public static var migrationManagerSourceStoreError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134150)
-  }
-  @available(*, deprecated, renamed: "migrationManagerDestinationStore")
-  public static var migrationManagerDestinationStoreError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134160)
-  }
-  @available(*, deprecated, renamed: "entityMigrationPolicy")
-  public static var entityMigrationPolicyError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134170)
-  }
-  @available(*, deprecated, renamed: "sqlite")
-  public static var sqliteError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134180)
-  }
-  @available(*, deprecated, renamed: "inferredMappingModel")
-  public static var inferredMappingModelError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134190)
-  }
-  @available(*, deprecated, renamed: "externalRecordImport")
-  public static var externalRecordImportError: CocoaError.Code {
-    return CocoaError.Code(rawValue: 134200)
-  }
-}
-
-extension CocoaError {
-  /// Object that failed to validate for a validation error.
-  public var validationObject: Any? {
-    return userInfo[NSValidationObjectErrorKey]
-  }
-
-  /// Key that failed to validate for a validation error.
-  public var validationKey: String? {
-    return userInfo[NSValidationKeyErrorKey] as? String
-  }
-
-  /// For predicate-based validation, the predicate for the condition
-  /// that failed to validate.
-  public var validationPredicate: NSPredicate? {
-    return userInfo[NSValidationPredicateErrorKey] as? NSPredicate
-  }
-
-  /// The value for the key that failed to validate for a validation
-  /// error.
-  public var validationValue: Any? {
-    return userInfo[NSValidationValueErrorKey]
-  }
-
-  /// Stores prompting an error.
-  public var affectedStores: [AnyObject]? {
-    return userInfo[NSAffectedStoresErrorKey] as? [AnyObject]
-  }
-
-  /// Objects prompting an error.
-  public var affectedObjects: [AnyObject]? {
-    return userInfo[NSAffectedObjectsErrorKey] as? [AnyObject]
-  }
-
-  /// The conflicts that arise from a persistent store.
-  public var persistentStoreSaveConflicts: [NSMergeConflict]? {
-    return userInfo[NSPersistentStoreSaveConflictsErrorKey] as? [NSMergeConflict]
-  }
-}
-
-// Swift 2 names of code constants, removed from Swift 3
-extension CocoaError {
-  @available(*, unavailable, renamed: "managedObjectValidation")
-  public static var ManagedObjectValidationError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationMultipleErrors")
-  public static var ValidationMultipleErrorsError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationMissingMandatoryProperty")
-  public static var ValidationMissingMandatoryPropertyError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationRelationshipLacksMinimumCount")
-  public static var ValidationRelationshipLacksMinimumCountError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationRelationshipExceedsMaximumCount")
-  public static var ValidationRelationshipExceedsMaximumCountError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationRelationshipDeniedDelete")
-  public static var ValidationRelationshipDeniedDeleteError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationNumberTooLarge")
-  public static var ValidationNumberTooLargeError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationNumberTooSmall")
-  public static var ValidationNumberTooSmallError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationDateTooLate")
-  public static var ValidationDateTooLateError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationDateTooSoon")
-  public static var ValidationDateTooSoonError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationInvalidDate")
-  public static var ValidationInvalidDateError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationStringTooLong")
-  public static var ValidationStringTooLongError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationStringTooShort")
-  public static var ValidationStringTooShortError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "validationStringPatternMatching")
-  public static var ValidationStringPatternMatchingError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "managedObjectContextLocking")
-  public static var ManagedObjectContextLockingError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreCoordinatorLocking")
-  public static var PersistentStoreCoordinatorLockingError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "managedObjectReferentialIntegrity")
-  public static var ManagedObjectReferentialIntegrityError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "managedObjectExternalRelationship")
-  public static var ManagedObjectExternalRelationshipError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "managedObjectMerge")
-  public static var ManagedObjectMergeError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "managedObjectConstraintMerge")
-  public static var ManagedObjectConstraintMergeError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreInvalidType")
-  public static var PersistentStoreInvalidTypeError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreTypeMismatch")
-  public static var PersistentStoreTypeMismatchError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreIncompatibleSchema")
-  public static var PersistentStoreIncompatibleSchemaError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreSave")
-  public static var PersistentStoreSaveError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreIncompleteSave")
-  public static var PersistentStoreIncompleteSaveError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreSaveConflicts")
-  public static var PersistentStoreSaveConflictsError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "coreData")
-  public static var CoreDataError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreOperation")
-  public static var PersistentStoreOperationError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreOpen")
-  public static var PersistentStoreOpenError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreTimeout")
-  public static var PersistentStoreTimeoutError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreUnsupportedRequestType")
-  public static var PersistentStoreUnsupportedRequestTypeError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "persistentStoreIncompatibleVersionHash")
-  public static var PersistentStoreIncompatibleVersionHashError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migration")
-  public static var MigrationError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migrationCancelled")
-  public static var MigrationCancelledError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migrationMissingSourceModel")
-  public static var MigrationMissingSourceModelError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migrationMissingMappingModel")
-  public static var MigrationMissingMappingModelError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migrationManagerSourceStore")
-  public static var MigrationManagerSourceStoreError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "migrationManagerDestinationStore")
-  public static var MigrationManagerDestinationStoreError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "entityMigrationPolicy")
-  public static var EntityMigrationPolicyError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "sqlite")
-  public static var SQLiteError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "inferredMappingModel")
-  public static var InferredMappingModelError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-  @available(*, unavailable, renamed: "externalRecordImport")
-  public static var ExternalRecordImportError: CocoaError.Code {
-    fatalError("unavailable accessor can't be called")
-  }
-}
diff --git a/stdlib/public/Darwin/CoreData/CoreData.mm b/stdlib/public/Darwin/CoreData/CoreData.mm
deleted file mode 100644
index 44397674b8798..0000000000000
--- a/stdlib/public/Darwin/CoreData/CoreData.mm
+++ /dev/null
@@ -1,28 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#import <CoreData/CoreData.h>
-
-// Make sure -conformsToProtocol: checks succeed even on older OSs.
-// This only works because NSFetchRequestResult doesn't have any method
-// requirements.
-
-#define CONFORMS_TO_NSFETCHREQUESTRESULT(TYPE) \
-@interface TYPE (_SwiftNSFetchRequestResult) <NSFetchRequestResult> \
-@end \
-@implementation TYPE (_SwiftNSFetchRequestResult) \
-@end
-
-CONFORMS_TO_NSFETCHREQUESTRESULT(NSNumber)
-CONFORMS_TO_NSFETCHREQUESTRESULT(NSDictionary)
-CONFORMS_TO_NSFETCHREQUESTRESULT(NSManagedObject)
-CONFORMS_TO_NSFETCHREQUESTRESULT(NSManagedObjectID)
diff --git a/stdlib/public/Darwin/CoreData/NSManagedObjectContext.swift b/stdlib/public/Darwin/CoreData/NSManagedObjectContext.swift
deleted file mode 100644
index e37c0609f7850..0000000000000
--- a/stdlib/public/Darwin/CoreData/NSManagedObjectContext.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreData
-import Foundation
-
-extension NSManagedObjectContext {
-  public func fetch<T>(_ request: NSFetchRequest<T>) throws -> [T] {
-    return try fetch(unsafeDowncast(request, to: NSFetchRequest<NSFetchRequestResult>.self)) as! [T]
-  }
-
-  public func count<T>(for request: NSFetchRequest<T>) throws -> Int {
-    return try count(for: unsafeDowncast(request, to: NSFetchRequest<NSFetchRequestResult>.self))
-  }
-}
diff --git a/stdlib/public/Darwin/CoreGraphics/CGFloat.swift.gyb b/stdlib/public/Darwin/CoreGraphics/CGFloat.swift.gyb
index 0671d3c846e3b..e682a99cdd02d 100644
--- a/stdlib/public/Darwin/CoreGraphics/CGFloat.swift.gyb
+++ b/stdlib/public/Darwin/CoreGraphics/CGFloat.swift.gyb
@@ -61,9 +61,13 @@ public struct CGFloat {
 }
 
 extension CGFloat : SignedNumeric {
+  @_alwaysEmitIntoClient // availability
+  public init<T: BinaryInteger>(_ source: T) {
+    self.native = NativeType(source)
+  }
 
   @_transparent
-  public init?<T : BinaryInteger>(exactly source: T) {
+  public init?<T: BinaryInteger>(exactly source: T) {
     guard let native = NativeType(exactly: source) else { return nil }
     self.native = native
   }
@@ -72,7 +76,6 @@ extension CGFloat : SignedNumeric {
   public var magnitude: CGFloat {
     return CGFloat(native.magnitude)
   }
-
 }
 
 extension CGFloat : BinaryFloatingPoint {
diff --git a/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt b/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt
index 9a6c20b10662a..a424ca4218150 100644
--- a/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt
+++ b/stdlib/public/Darwin/CoreGraphics/CMakeLists.txt
@@ -12,7 +12,7 @@ add_swift_target_library(swiftCoreGraphics ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYP
 
   SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch IOKit CoreFoundation ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
   SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
   SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
   SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
diff --git a/stdlib/public/Darwin/CoreImage/CMakeLists.txt b/stdlib/public/Darwin/CoreImage/CMakeLists.txt
deleted file mode 100644
index 39d7f0d54b97a..0000000000000
--- a/stdlib/public/Darwin/CoreImage/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCoreImage ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CoreImage.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Metal Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_OSX QuartzCore
-  FRAMEWORK_DEPENDS_IOS_TVOS CoreImage
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_COREIMAGE_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREIMAGE_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREIMAGE_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CoreImage/CoreImage.swift b/stdlib/public/Darwin/CoreImage/CoreImage.swift
deleted file mode 100644
index 7f9bfa6599300..0000000000000
--- a/stdlib/public/Darwin/CoreImage/CoreImage.swift
+++ /dev/null
@@ -1,60 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import CoreImage  // Clang module
-
-extension CIFilter {
-#if os(macOS)
-  // - (CIImage *)apply:(CIKernel *)k, ...
-  // @objc(apply:arguments:options:)
-  // func apply(_ k: CIKernel,
-  //            arguments args: [AnyObject]?,
-  //            options dict: Dictionary<NSObject, AnyObject>?) -> CIImage?
-  func apply(_ k: CIKernel, args: [AnyObject], options: (String, AnyObject)...) -> CIImage? {
-    var dict = [String : AnyObject](minimumCapacity: options.count)
-    for (key, value) in options {
-      dict[key] = value
-    }
-    return self.apply(k, arguments: args, options: dict)
-  }
-#endif
-
-  @available(iOS, introduced: 8.0)
-  @available(macOS, introduced: 10.10)
-  convenience init?(
-    name: String, elements: (String, AnyObject)...
-  ) {
-    var dict = [String : AnyObject](minimumCapacity: elements.count)
-    for (key, value) in elements {
-      dict[key] = value
-    }
-    self.init(name: name, parameters: dict)
-  }
-}
-
-#if os(macOS)
-extension CISampler {
-  // - (id)initWithImage:(CIImage *)im keysAndValues:key0, ...;
-  convenience init(im: CIImage, elements: (String, Any)...) {
-    var dict = [AnyHashable : Any](minimumCapacity: elements.count)
-    for (key, value) in elements {
-      dict[key] = value
-    }
-
-    // @objc(initWithImage:options:)
-    //   init(image im: CIImage,
-    //        options dict: NSDictionary?)
-    self.init(image: im, options: dict)
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/CoreLocation/CLError.swift b/stdlib/public/Darwin/CoreLocation/CLError.swift
deleted file mode 100644
index cd96095f0660b..0000000000000
--- a/stdlib/public/Darwin/CoreLocation/CLError.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreLocation
-import Foundation
-
-#if os(iOS)
-extension CLError {
-  /// In a regionMonitoringResponseDelayed error, the region that the
-  /// location services can more effectively monitor.
-  public var alternateRegion: CLRegion? {
-    return userInfo[kCLErrorUserInfoAlternateRegionKey] as? CLRegion
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/CoreLocation/CMakeLists.txt b/stdlib/public/Darwin/CoreLocation/CMakeLists.txt
deleted file mode 100644
index 82fbc9b451a43..0000000000000
--- a/stdlib/public/Darwin/CoreLocation/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCoreLocation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CLError.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    NSValue.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS CoreLocation
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_CORELOCATION_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_CORELOCATION_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_CORELOCATION_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_CORELOCATION_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CoreLocation/NSValue.swift.gyb b/stdlib/public/Darwin/CoreLocation/NSValue.swift.gyb
deleted file mode 100644
index a0170bff414ee..0000000000000
--- a/stdlib/public/Darwin/CoreLocation/NSValue.swift.gyb
+++ /dev/null
@@ -1,38 +0,0 @@
-@_exported import CoreLocation
-import Foundation
-
-%{
-from gyb_foundation_support import \
-  ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods
-}%
-
-// Get the ObjC type used by -[NSValue valueWithMKCoordinate:]
-// to instantiate the resulting NSValue objects, in case these get changed
-// in the future. This is extra tricky because MapKit *might not be loaded*,
-// in which case we need to fall back to the static @encode string.
-private let CLLocationCoordinate2DInNSValueObjCType: UnsafePointer<CChar> = {
-  let factorySel = Selector(("valueWithMKCoordinate:"))
-  guard let opaqueFactoryMethod = NSValue.method(for: factorySel) else {
-    return _getObjCTypeEncoding(CLLocationCoordinate2D.self)
-  }
-  typealias FactoryMethodType =
-      @convention(c) (AnyClass, Selector, CLLocationCoordinate2D) -> NSValue
-  let factoryMethod =
-      unsafeBitCast(opaqueFactoryMethod, to: FactoryMethodType.self)
-  return factoryMethod(NSValue.self, factorySel, .init()).objCType
-}()
-
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="CLLocationCoordinate2D",
-  initializer="""{
-    var addressableValue = $0
-    return NSValue(bytes: &addressableValue,
-                   objCType: CLLocationCoordinate2DInNSValueObjCType)
-  }""",
-  getter="""{
-    var result = CLLocationCoordinate2D()
-    $0.getValue(&result)
-    return result
-  }""",
-  objCType="{ _ in CLLocationCoordinate2DInNSValueObjCType }",
-) }
diff --git a/stdlib/public/Darwin/CoreMedia/CMTime.swift b/stdlib/public/Darwin/CoreMedia/CMTime.swift
deleted file mode 100644
index bf515ae4649f0..0000000000000
--- a/stdlib/public/Darwin/CoreMedia/CMTime.swift
+++ /dev/null
@@ -1,134 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreMedia // Clang module
-
-extension CMTime {
-  public init(seconds: Double, preferredTimescale: CMTimeScale) {
-    self = CMTimeMakeWithSeconds(seconds, preferredTimescale: preferredTimescale)
-  }
-
-  public init(value: CMTimeValue, timescale: CMTimeScale) {
-    self = CMTimeMake(value: value, timescale: timescale)
-  }
-}
-
-// CMTIME_IS_VALID
-// CMTIME_IS_INVALID
-// CMTIME_IS_POSITIVEINFINITY
-// CMTIME_IS_NEGATIVEINFINITY
-// CMTIME_IS_INDEFINITE
-// CMTIME_IS_NUMERIC
-// CMTIME_HAS_BEEN_ROUNDED
-// CMTimeGetSeconds
-// CMTimeConvertScale
-extension CMTime {
-  public var isValid: Bool {
-    return self.flags.contains(.valid)
-  }
-
-  public var isPositiveInfinity: Bool {
-    return self.isValid &&
-      self.flags.contains(.positiveInfinity)
-  }
-
-  public var isNegativeInfinity: Bool {
-    return self.isValid &&
-      self.flags.contains(.negativeInfinity)
-  }
-
-  public var isIndefinite: Bool {
-    return self.isValid &&
-      self.flags.contains(.indefinite)
-  }
-
-  public var isNumeric: Bool {
-    return
-      self.flags.intersection([.valid, .impliedValueFlagsMask]) == .valid
-  }
-
-  public var hasBeenRounded: Bool {
-    return self.isNumeric &&
-      self.flags.contains(.hasBeenRounded)
-  }
-
-  public var seconds: Double {
-    return CMTimeGetSeconds(self)
-  }
-
-  public func convertScale(_ newTimescale: Int32, method: CMTimeRoundingMethod)
-    -> CMTime {
-    return CMTimeConvertScale(self, timescale: newTimescale, method: method)
-  }
-}
-
-public func CMTIME_IS_VALID(_ time: CMTime) -> Bool {
-  return time.isValid
-}
-
-public func CMTIME_IS_INVALID(_ time: CMTime) -> Bool {
-  return !time.isValid
-}
-
-public func CMTIME_IS_POSITIVEINFINITY(_ time: CMTime) -> Bool {
-  return time.isPositiveInfinity
-}
-
-public func CMTIME_IS_NEGATIVEINFINITY(_ time: CMTime) -> Bool {
-  return time.isNegativeInfinity
-}
-
-public func CMTIME_IS_INDEFINITE(_ time: CMTime) -> Bool {
-  return time.isIndefinite
-}
-
-public func CMTIME_IS_NUMERIC(_ time: CMTime) -> Bool {
-  return time.isNumeric
-}
-
-public func CMTIME_HAS_BEEN_ROUNDED(_ time: CMTime) -> Bool {
-  return time.hasBeenRounded
-}
-
-extension CMTime {
-  // CMTimeAdd
-  public static func + (addend1: CMTime, addend2: CMTime) -> CMTime {
-    return CMTimeAdd(addend1, addend2)
-  }
-  
-  // CMTimeSubtract
-  public static func - (minuend: CMTime, subtrahend: CMTime) -> CMTime {
-    return CMTimeSubtract(minuend, subtrahend)
-  }
-}
-
-// CMTimeCompare
-extension CMTime : Equatable, Comparable {
-  public static func < (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) < 0
-  }
-  public static func <= (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) <= 0
-  }
-  public static func > (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) > 0
-  }
-  public static func >= (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) >= 0
-  }
-  public static func == (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) == 0
-  }
-  public static func != (time1: CMTime, time2: CMTime) -> Bool {
-    return CMTimeCompare(time1, time2) != 0
-  }
-}
diff --git a/stdlib/public/Darwin/CoreMedia/CMTimeRange.swift b/stdlib/public/Darwin/CoreMedia/CMTimeRange.swift
deleted file mode 100644
index 66ffb62265fbe..0000000000000
--- a/stdlib/public/Darwin/CoreMedia/CMTimeRange.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CoreMedia // Clang module
-
-// CMTIMERANGE_IS_VALID
-// CMTIMERANGE_IS_INVALID
-// CMTIMERANGE_IS_INDEFINITE
-// CMTIMERANGE_IS_EMPTY
-// CMTimeRangeGetEnd
-// CMTimeRangeGetUnion
-// CMTimeRangeGetIntersection
-// CMTimeRangeContainsTime
-// CMTimeRangeContainsTimeRange
-// CMTimeRangeFromTimeToTime
-extension CMTimeRange {
-  public init(start: CMTime, end: CMTime) {
-    self = CMTimeRangeFromTimeToTime(start: start, end: end)
-  }
-
-  public var isValid: Bool {
-    return self.start.isValid &&
-      self.duration.isValid &&
-      (self.duration.epoch == 0) &&
-      (self.duration.value >= 0)
-  }
-
-  public var isIndefinite: Bool {
-    return self.isValid &&
-      (self.start.isIndefinite || self.duration.isIndefinite)
-  }
-
-  public var isEmpty: Bool {
-    return self.isValid && (self.duration == .zero)
-  }
-
-  public var end: CMTime {
-    return CMTimeRangeGetEnd(self)
-  }
-
-  public func union(_ otherRange: CMTimeRange) -> CMTimeRange {
-    return CMTimeRangeGetUnion(self, otherRange: otherRange)
-  }
-  public func intersection(_ otherRange: CMTimeRange) -> CMTimeRange {
-    return CMTimeRangeGetIntersection(self, otherRange: otherRange)
-  }
-  public func containsTime(_ time: CMTime) -> Bool {
-    return CMTimeRangeContainsTime(self, time: time)
-  }
-  public func containsTimeRange(_ range: CMTimeRange) -> Bool {
-    return CMTimeRangeContainsTimeRange(self, otherRange: range)
-  }
-}
-
-public func CMTIMERANGE_IS_VALID (_ range: CMTimeRange) -> Bool {
-  return range.isValid
-}
-public func CMTIMERANGE_IS_INVALID (_ range: CMTimeRange) -> Bool {
-  return !range.isValid
-}
-public func CMTIMERANGE_IS_INDEFINITE (_ range: CMTimeRange) -> Bool {
-  return range.isIndefinite
-}
-public func CMTIMERANGE_IS_EMPTY (_ range: CMTimeRange) -> Bool {
-  return range.isEmpty
-}
-
-// CMTimeRangeEqual
-extension CMTimeRange : Equatable {
-  public static func == (range1: CMTimeRange, range2: CMTimeRange) -> Bool {
-    return CMTimeRangeEqual(range1, range2)
-  }
-  
-  public static func != (range1: CMTimeRange, range2: CMTimeRange) -> Bool {
-    return !CMTimeRangeEqual(range1, range2)
-  }  
-}
diff --git a/stdlib/public/Darwin/CoreMedia/CMakeLists.txt b/stdlib/public/Darwin/CoreMedia/CMakeLists.txt
deleted file mode 100644
index 1b9e50c1f0d2d..0000000000000
--- a/stdlib/public/Darwin/CoreMedia/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCoreMedia ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  CMTime.swift
-  CMTimeRange.swift
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Metal Dispatch IOKit Foundation XPC CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation CoreAudio ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS CoreMedia
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_COREMEDIA_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREMEDIA_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_COREMEDIA_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CryptoTokenKit/CMakeLists.txt b/stdlib/public/Darwin/CryptoTokenKit/CMakeLists.txt
deleted file mode 100644
index 779d2968ff1ab..0000000000000
--- a/stdlib/public/Darwin/CryptoTokenKit/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftCryptoTokenKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  TKSmartCard.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS CryptoTokenKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_CRYPTOTOKENKIT_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/CryptoTokenKit/TKSmartCard.swift b/stdlib/public/Darwin/CryptoTokenKit/TKSmartCard.swift
deleted file mode 100644
index d6756b81b65e0..0000000000000
--- a/stdlib/public/Darwin/CryptoTokenKit/TKSmartCard.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import CryptoTokenKit
-
-import Foundation
-
-@available(macOS 10.10, *)
-extension TKSmartCard {
-  public func send(ins: UInt8, p1: UInt8, p2: UInt8, data: Data? = nil,
-    le: Int? = nil, reply: @escaping (Data?, UInt16, Error?) -> Void) {
-
-    self.__sendIns(ins, p1: p1, p2: p2, data: data,
-      le: le.map { NSNumber(value: $0) }, reply: reply)
-  }
-
-  @available(macOS 10.12, *)
-  public func send(ins: UInt8, p1: UInt8, p2: UInt8, data: Data? = nil,
-    le: Int? = nil) throws -> (sw: UInt16, response: Data) {
-
-    var sw: UInt16 = 0
-    let response = try self.__sendIns(ins, p1: p1, p2: p2, data: data,
-      le: le.map { NSNumber(value: $0) }, sw: &sw)
-    return (sw: sw, response: response)
-  }
-
-  @available(macOS 10.12, *)
-  public func withSession<T>(_ body: @escaping () throws -> T) throws -> T {
-    var result: T?
-    try self.__inSession(executeBlock: {
-      (errorPointer: NSErrorPointer) -> Bool in
-      do {
-        result = try body()
-        return true
-      } catch let error as NSError {
-        errorPointer?.pointee = error
-        return false
-      }
-    })
-
-    // it is safe to force unwrap the result here, as the self.__inSession
-    // function rethrows the errors which happened inside the block
-    return result!
-  }
-}
diff --git a/stdlib/public/Darwin/Foundation/CMakeLists.txt b/stdlib/public/Darwin/Foundation/CMakeLists.txt
index 8f19f213dc525..4b489d06a297e 100644
--- a/stdlib/public/Darwin/Foundation/CMakeLists.txt
+++ b/stdlib/public/Darwin/Foundation/CMakeLists.txt
@@ -83,7 +83,7 @@ add_swift_target_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "-Xllvm" "-sil-inline-generics" "-Xllvm" "-sil-partial-specialization" "${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
 
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit XPC CoreFoundation ObjectiveC # auto-updated
+  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch CoreFoundation ObjectiveC # auto-updated
     CoreGraphics # imported in Swift
   SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
     CoreGraphics # imported in Swift
diff --git a/stdlib/public/Darwin/GLKit/CMakeLists.txt b/stdlib/public/Darwin/GLKit/CMakeLists.txt
deleted file mode 100644
index 52561c9158b08..0000000000000
--- a/stdlib/public/Darwin/GLKit/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftGLKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    GLKMath.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit simd Foundation CoreData QuartzCore AppKit ModelIO XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS GLKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_GLKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_GLKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_GLKIT_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/GLKit/GLKMath.swift.gyb b/stdlib/public/Darwin/GLKit/GLKMath.swift.gyb
deleted file mode 100644
index da60e05f527db..0000000000000
--- a/stdlib/public/Darwin/GLKit/GLKMath.swift.gyb
+++ /dev/null
@@ -1,64 +0,0 @@
-//===----------------------------------------------------------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-// GLKit overlays for Swift
-//===----------------------------------------------------------------------===//
-
-@_exported import GLKit // Clang module
-
-// The GLKit headers provide a fairly complete set of types and operations
-// that Swift's importer is now able to present in Swift. However, Swift
-// still doesn't know yet how to natively expose the elements of these types.
-// This overlay generates Swift accessors for the GLKit matrix and vector
-// types.
-
-// Do dirty pointer manipulations to index an opaque struct like an array.
-@inlinable // FIXME(inline-always)
-@inline(__always)
-public func _indexHomogeneousValue<TTT, T>(_ aggregate: UnsafePointer<TTT>,
-                                           _ index: Int) -> T {
-  return UnsafeRawPointer(aggregate).load(
-    fromByteOffset: index * MemoryLayout<T>.stride, as: T.self)
-}
-
-%{
-def defineSubscript(Type, limit):
-  return """
-  @inlinable // FIXME(inline-always)
-  public subscript(i: Int) -> Float {{
-    @inline(__always)
-    get {{
-      precondition(i >= 0, "Negative {0} index out of range")
-      precondition(i < {1}, "{0} index out of range")
-
-      // We can't derive an UnsafePointer from a let binding. Lame.
-      var clone = self
-      return _indexHomogeneousValue(&clone, i)
-    }}
-  }}
-  """.format(Type, limit)
-}%
-
-% for size in [2, 3, 4]:
-
-extension GLKMatrix${size} {
-  ${ defineSubscript("GLKMatrix" + str(size), size * size) }
-}
-
-extension GLKVector${size} {
-  ${ defineSubscript("GLKVector" + str(size), size) }
-}
-
-% end
-
-extension GLKQuaternion {
-  ${ defineSubscript("GLKQuaternion", 4) }
-}
diff --git a/stdlib/public/Darwin/GameplayKit/CMakeLists.txt b/stdlib/public/Darwin/GameplayKit/CMakeLists.txt
deleted file mode 100644
index 5cfd0e1b1498e..0000000000000
--- a/stdlib/public/Darwin/GameplayKit/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftGameplayKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  GameplayKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit GLKit SceneKit simd Foundation CoreData SpriteKit QuartzCore AppKit ModelIO XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit SceneKit simd Foundation SpriteKit QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit SceneKit simd Foundation SpriteKit QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK GameplayKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_GAMEPLAYKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_GAMEPLAYKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_GAMEPLAYKIT_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/GameplayKit/GameplayKit.swift b/stdlib/public/Darwin/GameplayKit/GameplayKit.swift
deleted file mode 100644
index 5fcf3d65aa684..0000000000000
--- a/stdlib/public/Darwin/GameplayKit/GameplayKit.swift
+++ /dev/null
@@ -1,94 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import GameplayKit // Clang module
-import CoreGraphics
-import simd
-
-
-@available(iOS, introduced: 9.0)
-@available(macOS, introduced: 10.11)
-@available(tvOS, introduced: 9.0)
-extension GKPath {
-  /// Creates a path from an array of points
-  /// - Parameter points: an array of SIMD2<Float> points to make a path from
-  /// - Parameter radius: radius of the path to create
-  /// - Parameter cyclical: if the path is of a cycle that loops back on itself
-  public convenience init(points: [SIMD2<Float>], radius: Float, cyclical: Bool) {
-    var variablePoints = points
-    self.init(__points: &variablePoints, count: points.count, radius: radius, cyclical: cyclical)
-  }
-}
-
-
-@available(iOS, introduced: 10.0)
-@available(macOS, introduced: 10.12)
-@available(tvOS, introduced: 10.0)
-extension GKPath {
-  /// Creates a path from an array of points
-  /// - Parameter points: an array of SIMD3<Float> points to make a path from
-  /// - Parameter radius: the radius of the path to create
-  /// - Parameter cyclical: if the path is of a cycle that loops back on itself
-  public convenience init(points: [SIMD3<Float>], radius: Float, cyclical: Bool) {
-    var variablePoints = points
-    self.init(__float3Points: &variablePoints, count: points.count, radius: radius, cyclical: cyclical)
-  }
-}
-
-@available(iOS, introduced: 9.0)
-@available(macOS, introduced: 10.11)
-@available(tvOS, introduced: 9.0)
-extension GKPolygonObstacle {
-  /// Creates a polygon obstacle with an array of points.
-  /// - Parameter points: array of points in counter-clockwise order that are the vertices of a convex polygon
-  public convenience init(points: [SIMD2<Float>]) {
-    var variablePoints = points
-    self.init(__points: &variablePoints, count: points.count)
-  }
-}
-
-@available(iOS, introduced: 9.0)
-@available(macOS, introduced: 10.11)
-@available(tvOS, introduced: 9.0)
-extension GKEntity {
-  /// Gets the component of the indicated class.  Returns nil if entity does not have this component
-  /// - Parameter ofType: the type of the component you want to get
-  public func component<ComponentType : GKComponent>(ofType componentClass: ComponentType.Type) -> ComponentType? {
-     return self.__component(for: componentClass) as? ComponentType
-  }
-  /// Removes the component of the indicates class from this entity
-  /// - Parameter ofType: the type of component you want to remove
-  public func removeComponent<ComponentType : GKComponent>(ofType componentClass: ComponentType.Type) {
-     self.__removeComponent(for: componentClass)
-  }
-}
-
-@objc
-internal protocol _SwiftGKStateMachineLike {
-  @objc(stateForClass:)
-  func state(forClass: AnyClass) -> AnyObject?
-}
-
-@available(iOS, introduced: 9.0)
-@available(macOS, introduced: 10.11)
-@available(tvOS, introduced: 9.0)
-extension GKStateMachine {
-  /// Gets the state of the indicated class.  Returns nil if the state machine does not have this state.
-  /// - Parameter forClass: the type of the state you want to get
-  public func state<StateType : GKState>(
-    forClass stateClass: StateType.Type) -> StateType? {
-    // FIXME: GameplayKit marked state(forClass:) unavailable, which means we
-    // can't use it from SwiftPrivate. Bounce through perform(_:with:) instead.
-    return self.perform(#selector(_SwiftGKStateMachineLike.state(forClass:)), with: stateClass)?.takeUnretainedValue() as! StateType?
-  }
-}
-
diff --git a/stdlib/public/Darwin/HomeKit/CMakeLists.txt b/stdlib/public/Darwin/HomeKit/CMakeLists.txt
deleted file mode 100644
index ede6485160dfd..0000000000000
--- a/stdlib/public/Darwin/HomeKit/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftHomeKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  HomeKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch Foundation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch Foundation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-    UIKit # required in some configurations but not found by tool
-  FRAMEWORK_DEPENDS_WEAK HomeKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_HOMEKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_HOMEKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_HOMEKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_HOMEKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/HomeKit/HomeKit.swift b/stdlib/public/Darwin/HomeKit/HomeKit.swift
deleted file mode 100644
index 4123dde3c116c..0000000000000
--- a/stdlib/public/Darwin/HomeKit/HomeKit.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import HomeKit
-import Foundation
-
-@available(iOS 8.0, watchOS 2.0, tvOS 10.0, *)
-public let HMCharacteristicPropertySupportsEventNotification = Notification.Name.HMCharacteristicPropertySupportsEvent.rawValue
diff --git a/stdlib/public/Darwin/IOKit/CMakeLists.txt b/stdlib/public/Darwin/IOKit/CMakeLists.txt
deleted file mode 100644
index 65bad41b37b72..0000000000000
--- a/stdlib/public/Darwin/IOKit/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftIOKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  IOReturn.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS IOKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_IOKIT_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/IOKit/IOReturn.swift b/stdlib/public/Darwin/IOKit/IOReturn.swift
deleted file mode 100644
index 3c3eeb64f7fe1..0000000000000
--- a/stdlib/public/Darwin/IOKit/IOReturn.swift
+++ /dev/null
@@ -1,125 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import IOKit
-
-/// General error
-public var kIOReturnError: IOReturn            { return iokit_common_err(0x2bc) }
-/// Can't allocate memory
-public var kIOReturnNoMemory: IOReturn         { return iokit_common_err(0x2bd) }
-/// Resource shortage
-public var kIOReturnNoResources: IOReturn      { return iokit_common_err(0x2be) }
-/// Error during IPC
-public var kIOReturnIPCError: IOReturn         { return iokit_common_err(0x2bf) }
-/// No such device
-public var kIOReturnNoDevice: IOReturn         { return iokit_common_err(0x2c0) }
-/// Privilege violation
-public var kIOReturnNotPrivileged: IOReturn    { return iokit_common_err(0x2c1) }
-/// Invalid argument
-public var kIOReturnBadArgument: IOReturn      { return iokit_common_err(0x2c2) }
-/// Device read locked
-public var kIOReturnLockedRead: IOReturn       { return iokit_common_err(0x2c3) }
-/// Device write locked
-public var kIOReturnLockedWrite: IOReturn      { return iokit_common_err(0x2c4) }
-/// Exclusive access and device already open
-public var kIOReturnExclusiveAccess: IOReturn  { return iokit_common_err(0x2c5) }
-/// Sent/received messages had different msg_id
-public var kIOReturnBadMessageID: IOReturn     { return iokit_common_err(0x2c6) }
-/// Unsupported function
-public var kIOReturnUnsupported: IOReturn      { return iokit_common_err(0x2c7) }
-/// Misc. VM failure
-public var kIOReturnVMError: IOReturn          { return iokit_common_err(0x2c8) }
-/// Internal error
-public var kIOReturnInternalError: IOReturn    { return iokit_common_err(0x2c9) }
-/// General I/O error
-public var kIOReturnIOError: IOReturn          { return iokit_common_err(0x2ca) }
-/// Can't acquire lock
-public var kIOReturnCannotLock: IOReturn       { return iokit_common_err(0x2cc) }
-/// Device not open
-public var kIOReturnNotOpen: IOReturn          { return iokit_common_err(0x2cd) }
-/// Read not supported
-public var kIOReturnNotReadable: IOReturn      { return iokit_common_err(0x2ce) }
-/// Write not supported
-public var kIOReturnNotWritable: IOReturn      { return iokit_common_err(0x2cf) }
-/// Alignment error
-public var kIOReturnNotAligned: IOReturn       { return iokit_common_err(0x2d0) }
-/// Media error
-public var kIOReturnBadMedia: IOReturn         { return iokit_common_err(0x2d1) }
-/// Device(s) still open
-public var kIOReturnStillOpen: IOReturn        { return iokit_common_err(0x2d2) }
-/// RLD failure
-public var kIOReturnRLDError: IOReturn         { return iokit_common_err(0x2d3) }
-/// DMA failure
-public var kIOReturnDMAError: IOReturn         { return iokit_common_err(0x2d4) }
-/// Device busy
-public var kIOReturnBusy: IOReturn             { return iokit_common_err(0x2d5) }
-/// I/O timeout
-public var kIOReturnTimeout: IOReturn          { return iokit_common_err(0x2d6) }
-/// Device offline
-public var kIOReturnOffline: IOReturn          { return iokit_common_err(0x2d7) }
-/// Not ready
-public var kIOReturnNotReady: IOReturn         { return iokit_common_err(0x2d8) }
-/// Device not attached
-public var kIOReturnNotAttached: IOReturn      { return iokit_common_err(0x2d9) }
-/// No DMA channels left
-public var kIOReturnNoChannels: IOReturn       { return iokit_common_err(0x2da) }
-/// No space for data
-public var kIOReturnNoSpace: IOReturn          { return iokit_common_err(0x2db) }
-/// Port already exists
-public var kIOReturnPortExists: IOReturn       { return iokit_common_err(0x2dd) }
-/// Can't wire down physical memory
-public var kIOReturnCannotWire: IOReturn       { return iokit_common_err(0x2de) }
-/// No interrupt attached
-public var kIOReturnNoInterrupt: IOReturn      { return iokit_common_err(0x2df) }
-/// No DMA frames enqueued
-public var kIOReturnNoFrames: IOReturn         { return iokit_common_err(0x2e0) }
-/// Oversized msg received on interrupt port
-public var kIOReturnMessageTooLarge: IOReturn  { return iokit_common_err(0x2e1) }
-/// Not permitted
-public var kIOReturnNotPermitted: IOReturn     { return iokit_common_err(0x2e2) }
-/// No power to device
-public var kIOReturnNoPower: IOReturn          { return iokit_common_err(0x2e3) }
-/// Media not present
-public var kIOReturnNoMedia: IOReturn          { return iokit_common_err(0x2e4) }
-/// media not formatted
-public var kIOReturnUnformattedMedia: IOReturn { return iokit_common_err(0x2e5) }
-/// No such mode
-public var kIOReturnUnsupportedMode: IOReturn  { return iokit_common_err(0x2e6) }
-/// Data underrun
-public var kIOReturnUnderrun: IOReturn         { return iokit_common_err(0x2e7) }
-/// Data overrun
-public var kIOReturnOverrun: IOReturn          { return iokit_common_err(0x2e8) }
-/// The device is not working properly
-public var kIOReturnDeviceError: IOReturn      { return iokit_common_err(0x2e9) }
-/// A completion routine is required
-public var kIOReturnNoCompletion: IOReturn     { return iokit_common_err(0x2ea) }
-/// Operation aborted
-public var kIOReturnAborted: IOReturn          { return iokit_common_err(0x2eb) }
-/// Bus bandwidth would be exceeded
-public var kIOReturnNoBandwidth: IOReturn      { return iokit_common_err(0x2ec) }
-/// Device not responding
-public var kIOReturnNotResponding: IOReturn    { return iokit_common_err(0x2ed) }
-/// Isochronous I/O request for distant past
-public var kIOReturnIsoTooOld: IOReturn        { return iokit_common_err(0x2ee) }
-/// Isochronous I/O request for distant future
-public var kIOReturnIsoTooNew: IOReturn        { return iokit_common_err(0x2ef) }
-/// Data was not found
-public var kIOReturnNotFound: IOReturn         { return iokit_common_err(0x2f0) }
-/// Should never be seen
-public var kIOReturnInvalid: IOReturn          { return iokit_common_err(0x1) }
-
-internal let SYS_IOKIT        = UInt32((0x38 & 0x3f) << 26)
-internal let SUB_IOKIT_COMMON = UInt32((0 & 0xfff) << 14)
-
-internal func iokit_common_err(_ value: UInt32) -> IOReturn {
-  return IOReturn(bitPattern: SYS_IOKIT | SUB_IOKIT_COMMON | value)
-}
diff --git a/stdlib/public/Darwin/Intents/CMakeLists.txt b/stdlib/public/Darwin/Intents/CMakeLists.txt
deleted file mode 100644
index 6ad05a3529033..0000000000000
--- a/stdlib/public/Darwin/Intents/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftIntents ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  INBooleanResolutionResult.swift
-  INCallRecord.swift
-  INDoubleResolutionResult.swift
-  INGetCarLockStatusIntentResponse.swift
-  INGetCarPowerLevelStatusIntentResponse.swift
-  INIntegerResolutionResult.swift
-  INIntent.swift
-  INNotebookItemTypeResolutionResult.swift
-  INParameter.swift
-  INPlayMediaIntent.swift
-  INRequestRideIntent.swift
-  INRideOption.swift
-  INSaveProfileInCarIntent.swift
-  INSearchCallHistoryIntent.swift
-  INSearchForPhotosIntentResponse.swift
-  INSetCarLockStatusIntent.swift
-  INSetClimateSettingsInCarIntent.swift
-  INSetDefrosterSettingsInCarIntent.swift
-  INSetProfileInCarIntent.swift
-  INSetRadioStationIntent.swift
-  INSetSeatSettingsInCarIntent.swift
-  INShortcut.swift
-  INStartPhotoPlaybackIntentResponse.swift
-  INStartWorkoutIntent.swift
-  NSStringIntents.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation CoreLocation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK Intents
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_INTENTS_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_INTENTS_IOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Intents/INBooleanResolutionResult.swift b/stdlib/public/Darwin/Intents/INBooleanResolutionResult.swift
deleted file mode 100644
index 14abcfc6a3c24..0000000000000
--- a/stdlib/public/Darwin/Intents/INBooleanResolutionResult.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INBooleanResolutionResult {
-    @nonobjc public
-    static func confirmationRequired(with valueToConfirm: Bool?) -> Self {
-        let number = valueToConfirm.map { NSNumber(value: $0) }
-        return __confirmationRequiredWithValue(toConfirm: number)
-    }
-}
-#endif
-
diff --git a/stdlib/public/Darwin/Intents/INCallRecord.swift b/stdlib/public/Darwin/Intents/INCallRecord.swift
deleted file mode 100644
index f26d7ee16bc1f..0000000000000
--- a/stdlib/public/Darwin/Intents/INCallRecord.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 11.0, watchOS 4.0, *)
-extension INCallRecord {
-  @nonobjc
-  public convenience init(
-      identifier: String,
-      dateCreated: Date? = nil,
-      caller: INPerson? = nil,
-      callRecordType: INCallRecordType,
-      callCapability: INCallCapability,
-      callDuration: Double?  = nil,
-      unseen: Bool? = nil
-  ) {
-    self.init(__identifier: identifier,
-      dateCreated: dateCreated,
-      caller: caller,
-      callRecordType: callRecordType,
-      callCapability: callCapability,
-      callDuration: callDuration.map { NSNumber(value: $0) },
-      unseen: unseen.map { NSNumber(value: $0) })
-  }
-
-  @nonobjc
-  public final var callDuration: Double? {
-    return __callDuration?.doubleValue
-  }
-
-  @nonobjc
-  public final var unseen: Bool? {
-    return __unseen?.boolValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INDoubleResolutionResult.swift b/stdlib/public/Darwin/Intents/INDoubleResolutionResult.swift
deleted file mode 100644
index c8d37293eb4d5..0000000000000
--- a/stdlib/public/Darwin/Intents/INDoubleResolutionResult.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INDoubleResolutionResult {
-    @nonobjc public
-    static func confirmationRequired(with valueToConfirm: Double?) -> Self {
-        let number = valueToConfirm.map { NSNumber(value: $0) }
-        return __confirmationRequiredWithValue(toConfirm: number)
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INGetCarLockStatusIntentResponse.swift b/stdlib/public/Darwin/Intents/INGetCarLockStatusIntentResponse.swift
deleted file mode 100644
index 3e8df8e831a9d..0000000000000
--- a/stdlib/public/Darwin/Intents/INGetCarLockStatusIntentResponse.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.3, watchOS 3.2, *)
-extension INGetCarLockStatusIntentResponse {
-    @nonobjc
-    public final var locked: Bool? {
-        get {
-            return __locked?.boolValue
-        }
-        set(newLocked) {
-            __locked = newLocked.map { NSNumber(value: $0) }
-        }
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INGetCarPowerLevelStatusIntentResponse.swift b/stdlib/public/Darwin/Intents/INGetCarPowerLevelStatusIntentResponse.swift
deleted file mode 100644
index 0d1f3a1cbb558..0000000000000
--- a/stdlib/public/Darwin/Intents/INGetCarPowerLevelStatusIntentResponse.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.3, watchOS 3.2, *)
-extension INGetCarPowerLevelStatusIntentResponse {
-    @nonobjc
-    public final var fuelPercentRemaining: Float? {
-        get {
-            return __fuelPercentRemaining?.floatValue
-        }
-        set(newPercent) {
-            __fuelPercentRemaining = newPercent.map { NSNumber(value: $0) }
-        }
-    }
-
-    @nonobjc
-    public final var chargePercentRemaining: Float? {
-        get {
-            return __chargePercentRemaining?.floatValue
-        }
-        set(newPercent) {
-            __chargePercentRemaining = newPercent.map { NSNumber(value: $0) }
-        }
-    }
-
-    @nonobjc
-    @available(iOS 12.0, watchOS 5.0, *)
-    public final var charging: Bool? {
-        get {
-            return __charging?.boolValue
-        }
-        set(newCharging) {
-            __charging = newCharging.map { NSNumber(value: $0) }
-        }
-    }
-
-    @nonobjc
-    @available(iOS 12.0, watchOS 5.0, *)
-    public final var minutesToFull: Int? {
-        get {
-            return __minutesToFull?.intValue
-        }
-        set(newMinutesToFull) {
-            __minutesToFull = newMinutesToFull.map { NSNumber(value: $0) }
-        }
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INIntegerResolutionResult.swift b/stdlib/public/Darwin/Intents/INIntegerResolutionResult.swift
deleted file mode 100644
index c28e3ae8482da..0000000000000
--- a/stdlib/public/Darwin/Intents/INIntegerResolutionResult.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INIntegerResolutionResult {
-    @nonobjc public
-    static func confirmationRequired(with valueToConfirm: Int?) -> Self {
-        let number = valueToConfirm.map { NSNumber(value: $0) }
-        return __confirmationRequiredWithValue(toConfirm: number)
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INIntent.swift b/stdlib/public/Darwin/Intents/INIntent.swift
deleted file mode 100644
index a93c1c7bb478b..0000000000000
--- a/stdlib/public/Darwin/Intents/INIntent.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-
-public protocol _INIntentSetImageKeyPath { }
-
-extension _INIntentSetImageKeyPath {
-    
-    @available(iOS 12.0, watchOS 5.0, *)
-    public func setImage<Value>(_ image: INImage?, forParameterNamed parameterName: KeyPath<Self, Value>) {
-        if let keyPathString = parameterName._kvcKeyPathString {
-            (self as! INIntent).__setImage(image, forParameterNamed: keyPathString)
-        }
-    }
-    
-    @available(iOS 12.0, watchOS 5.0, *)
-    public func image<Value>(forParameterNamed parameterName: KeyPath<Self, Value>) -> INImage? {
-        if let keyPathString = parameterName._kvcKeyPathString {
-            return (self as! INIntent).__image(forParameterNamed: keyPathString)
-        } else {
-            return nil
-        }
-    }
-}
-
-@available(iOS 10.0, watchOS 3.2, *)
-extension INIntent : _INIntentSetImageKeyPath { }
-
-#endif
diff --git a/stdlib/public/Darwin/Intents/INNotebookItemTypeResolutionResult.swift b/stdlib/public/Darwin/Intents/INNotebookItemTypeResolutionResult.swift
deleted file mode 100644
index f5df3d2235439..0000000000000
--- a/stdlib/public/Darwin/Intents/INNotebookItemTypeResolutionResult.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 11.0, watchOS 4.0, *)
-extension INNotebookItemTypeResolutionResult {
-    @nonobjc public
-    static func disambiguation(with notebookItemTypesToDisambiguate: [INNotebookItemType]) -> Self {
-        let numbers = notebookItemTypesToDisambiguate.map { NSNumber(value: $0.rawValue) }
-        return __disambiguationWithNotebookItemTypes(toDisambiguate: numbers)
-    }
-}
-#endif
-
diff --git a/stdlib/public/Darwin/Intents/INParameter.swift b/stdlib/public/Darwin/Intents/INParameter.swift
deleted file mode 100644
index 123426b8eeef9..0000000000000
--- a/stdlib/public/Darwin/Intents/INParameter.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 11.0, *)
-extension INParameter {
-  @nonobjc
-  public convenience init?<Root, Value>(keyPath: KeyPath<Root, Value>) {
-    if let aClass = Root.self as? AnyClass,
-       let keyPathString = keyPath._kvcKeyPathString {
-      self.init(for: aClass, keyPath: keyPathString)
-    } else {
-      return nil
-    }
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INPlayMediaIntent.swift b/stdlib/public/Darwin/Intents/INPlayMediaIntent.swift
deleted file mode 100644
index e9e010d8d27fc..0000000000000
--- a/stdlib/public/Darwin/Intents/INPlayMediaIntent.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 12.0, watchOS 5.0, *)
-extension INPlayMediaIntent {
-  @nonobjc
-  public convenience init(
-      mediaItems: [INMediaItem]? = nil,
-      mediaContainer: INMediaItem? = nil,
-      playShuffled: Bool? = nil,
-      playbackRepeatMode: INPlaybackRepeatMode = .unknown,
-      resumePlayback: Bool? = nil
-  ) {
-    self.init(__mediaItems: mediaItems,
-      mediaContainer: mediaContainer,
-      playShuffled: playShuffled.map { NSNumber(value: $0) },
-      playbackRepeatMode: playbackRepeatMode,
-      resumePlayback: resumePlayback.map { NSNumber(value: $0) })
-  }
-
-  @nonobjc
-  public final var playShuffled: Bool? {
-    return __playShuffled?.boolValue
-  }
-
-  @nonobjc
-  public final var resumePlayback: Bool? {
-    return __resumePlayback?.boolValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INRequestRideIntent.swift b/stdlib/public/Darwin/Intents/INRequestRideIntent.swift
deleted file mode 100644
index 7819d03415dfc..0000000000000
--- a/stdlib/public/Darwin/Intents/INRequestRideIntent.swift
+++ /dev/null
@@ -1,53 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INRequestRideIntent {
-  @nonobjc
-  public convenience init(
-    pickupLocation: CLPlacemark? = nil,
-    dropOffLocation: CLPlacemark? = nil,
-    rideOptionName: INSpeakableString? = nil,
-    partySize: Int? = nil,
-    paymentMethod: INPaymentMethod? = nil,
-    scheduledPickupTime: INDateComponentsRange? = nil
-  ) {
-    if #available(iOS 10.3, *) {
-      self.init(__pickupLocation: pickupLocation,
-        dropOffLocation: dropOffLocation,
-        rideOptionName: rideOptionName,
-        partySize: partySize.map { NSNumber(value: $0) },
-        paymentMethod: paymentMethod,
-        scheduledPickupTime: scheduledPickupTime)
-    } else {
-#if os(iOS)
-      self.init(__pickupLocation: pickupLocation,
-        dropOffLocation: dropOffLocation,
-        rideOptionName: rideOptionName,
-        partySize: partySize.map { NSNumber(value: $0) },
-        paymentMethod: paymentMethod)
-#else
-      fatalError("The initializer is not available")
-#endif
-    }
-  }
-
-  @nonobjc
-  public final var partySize: Int? {
-    return __partySize?.intValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INRideOption.swift b/stdlib/public/Darwin/Intents/INRideOption.swift
deleted file mode 100644
index 194756d173cef..0000000000000
--- a/stdlib/public/Darwin/Intents/INRideOption.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-
-@available(iOS 10.0, watchOS 3.2, *)
-extension INRideOption {
-  @available(iOS 10.0, watchOS 3.2, *)
-  @available(swift, obsoleted: 4)
-  @nonobjc
-  public var usesMeteredFare: NSNumber? {
-    get {
-      return __usesMeteredFare
-    }
-    set(newUsesMeteredFare) {
-      __usesMeteredFare = newUsesMeteredFare
-    }
-  }
-
-  @available(iOS 10.0, watchOS 3.2, *)
-  @available(swift, introduced: 4.0)
-  @nonobjc
-  public var usesMeteredFare: Bool? {
-    get {
-      return __usesMeteredFare?.boolValue
-    }
-    set(newUsesMeteredFare) {
-      __usesMeteredFare = newUsesMeteredFare.map { NSNumber(value: $0) }
-    }
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSaveProfileInCarIntent.swift b/stdlib/public/Darwin/Intents/INSaveProfileInCarIntent.swift
deleted file mode 100644
index d55103a64afd3..0000000000000
--- a/stdlib/public/Darwin/Intents/INSaveProfileInCarIntent.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 10.0, *)
-extension INSaveProfileInCarIntent {
-  @nonobjc
-  public convenience init(
-    profileNumber: Int? = nil, profileLabel: String? = nil
-  ) {
-    self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) },
-      profileLabel: profileLabel)
-  }
-
-  @nonobjc  
-  public final var profileNumber: Int? {
-    return __profileNumber?.intValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSearchCallHistoryIntent.swift b/stdlib/public/Darwin/Intents/INSearchCallHistoryIntent.swift
deleted file mode 100644
index cc34ede9a219d..0000000000000
--- a/stdlib/public/Darwin/Intents/INSearchCallHistoryIntent.swift
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INSearchCallHistoryIntent {
-  @available(iOS 11.0, watchOS 4.0, *)
-  @nonobjc
-  public convenience init(
-    dateCreated: INDateComponentsRange? = nil,
-    recipient: INPerson? = nil,
-    callCapabilities: INCallCapabilityOptions,
-    callTypes: INCallRecordTypeOptions,
-    unseen: Bool? = nil
-  ) {
-    self.init(__dateCreated: dateCreated,
-      recipient: recipient,
-      callCapabilities: callCapabilities,
-      callTypes: callTypes,
-      unseen: unseen.map { NSNumber(value: $0) })
-  }
-
-  @available(iOS 11.0, watchOS 4.0, *)
-  @nonobjc
-  public final var unseen: Bool? {
-    return __unseen?.boolValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSearchForPhotosIntentResponse.swift b/stdlib/public/Darwin/Intents/INSearchForPhotosIntentResponse.swift
deleted file mode 100644
index 64328219dabf7..0000000000000
--- a/stdlib/public/Darwin/Intents/INSearchForPhotosIntentResponse.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INSearchForPhotosIntentResponse {
-  @nonobjc
-  public final var searchResultsCount: Int? {
-    get {
-      return __searchResultsCount?.intValue
-    }
-    set {
-      __searchResultsCount = newValue.map { NSNumber(value: $0) }
-    }
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetCarLockStatusIntent.swift b/stdlib/public/Darwin/Intents/INSetCarLockStatusIntent.swift
deleted file mode 100644
index 39f7645edd5f4..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetCarLockStatusIntent.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.3, watchOS 3.2, *)
-extension INSetCarLockStatusIntent {
-    @nonobjc
-    public convenience init(locked: Bool?, carName: INSpeakableString?) {
-        self.init(__locked:locked as NSNumber?, carName:carName)
-    }
-
-    @nonobjc
-    public final var locked: Bool? {
-        return __locked?.boolValue
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetClimateSettingsInCarIntent.swift b/stdlib/public/Darwin/Intents/INSetClimateSettingsInCarIntent.swift
deleted file mode 100644
index 06d678435d426..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetClimateSettingsInCarIntent.swift
+++ /dev/null
@@ -1,106 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 10.0, *)
-extension INSetClimateSettingsInCarIntent {
-    
-    @nonobjc
-    @available(iOS 12.0, *)
-    public convenience init(
-        enableFan: Bool? = nil,
-        enableAirConditioner: Bool? = nil,
-        enableClimateControl: Bool? = nil,
-        enableAutoMode: Bool? = nil,
-        airCirculationMode: INCarAirCirculationMode = .unknown,
-        fanSpeedIndex: Int? = nil,
-        fanSpeedPercentage: Double? = nil,
-        relativeFanSpeedSetting: INRelativeSetting = .unknown,
-        temperature: Measurement<UnitTemperature>? = nil,
-        relativeTemperatureSetting: INRelativeSetting = .unknown,
-        climateZone: INCarSeat = .unknown,
-        carName: INSpeakableString? = nil) {
-        self.init(__enableFan: enableFan.map { NSNumber(value: $0) },
-                      enableAirConditioner: enableAirConditioner.map { NSNumber(value: $0) },
-                      enableClimateControl: enableClimateControl.map { NSNumber(value: $0) },
-                      enableAutoMode: enableAutoMode.map { NSNumber(value: $0) },
-                      airCirculationMode: airCirculationMode,
-                      fanSpeedIndex: fanSpeedIndex.map { NSNumber(value: $0) },
-                      fanSpeedPercentage: fanSpeedPercentage.map { NSNumber(value: $0) },
-                      relativeFanSpeedSetting: relativeFanSpeedSetting,
-                      temperature: temperature,
-                      relativeTemperatureSetting: relativeTemperatureSetting,
-                      climateZone: climateZone,
-                      carName: carName)
-    }
-    
-    @nonobjc
-    @available(iOS, obsoleted: 12.0)
-    public convenience init(
-        enableFan: Bool? = nil,
-        enableAirConditioner: Bool? = nil,
-        enableClimateControl: Bool? = nil,
-        enableAutoMode: Bool? = nil,
-        airCirculationMode: INCarAirCirculationMode = .unknown,
-        fanSpeedIndex: Int? = nil,
-        fanSpeedPercentage: Double? = nil,
-        relativeFanSpeedSetting: INRelativeSetting = .unknown,
-        temperature: Measurement<UnitTemperature>? = nil,
-        relativeTemperatureSetting: INRelativeSetting = .unknown,
-        climateZone: INCarSeat = .unknown) {
-        self.init(__enableFan: enableFan.map { NSNumber(value: $0) },
-                  enableAirConditioner: enableAirConditioner.map { NSNumber(value: $0) },
-                  enableClimateControl: enableClimateControl.map { NSNumber(value: $0) },
-                  enableAutoMode: enableAutoMode.map { NSNumber(value: $0) },
-                  airCirculationMode: airCirculationMode,
-                  fanSpeedIndex: fanSpeedIndex.map { NSNumber(value: $0) },
-                  fanSpeedPercentage: fanSpeedPercentage.map { NSNumber(value: $0) },
-                  relativeFanSpeedSetting: relativeFanSpeedSetting,
-                  temperature: temperature,
-                  relativeTemperatureSetting: relativeTemperatureSetting,
-                  climateZone: climateZone)
-    }
-    
-    @nonobjc
-    public final var enableFan: Bool? {
-        return __enableFan?.boolValue
-    }
-    
-    @nonobjc
-    public final var enableAirConditioner: Bool? {
-        return __enableAirConditioner?.boolValue
-    }
-    
-    @nonobjc
-    public final var enableClimateControl: Bool? {
-        return __enableClimateControl?.boolValue
-    }
-    
-    @nonobjc
-    public final var enableAutoMode: Bool? {
-        return __enableAutoMode?.boolValue
-    }
-    
-    @nonobjc
-    public final var fanSpeedIndex: Int? {
-        return __fanSpeedIndex?.intValue
-    }
-    
-    @nonobjc
-    public final var fanSpeedPercentage: Double? {
-        return __fanSpeedPercentage?.doubleValue
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetDefrosterSettingsInCarIntent.swift b/stdlib/public/Darwin/Intents/INSetDefrosterSettingsInCarIntent.swift
deleted file mode 100644
index 8eaa1a42bc162..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetDefrosterSettingsInCarIntent.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 10.0, *)
-extension INSetDefrosterSettingsInCarIntent {
-    
-    @nonobjc
-    @available(iOS 12.0, *)
-    public convenience init(
-        enable: Bool? = nil, defroster: INCarDefroster = .unknown, carName: INSpeakableString? = nil
-        ) {
-        self.init(__enable: enable.map { NSNumber(value: $0) },
-                  defroster: defroster,
-                  carName: carName)
-    }
-    
-    @nonobjc
-    @available(iOS, obsoleted: 12.0)
-    public convenience init(
-        enable: Bool? = nil, defroster: INCarDefroster = .unknown
-        ) {
-        self.init(__enable: enable.map { NSNumber(value: $0) },
-                  defroster: defroster)
-    }
-    
-    @nonobjc
-    public final var enable: Bool? {
-        return __enable?.boolValue
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetProfileInCarIntent.swift b/stdlib/public/Darwin/Intents/INSetProfileInCarIntent.swift
deleted file mode 100644
index 06525e7993838..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetProfileInCarIntent.swift
+++ /dev/null
@@ -1,147 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@nonobjc
-@available(iOS 10.0, *)
-extension INSetProfileInCarIntent {
-
-    @available(iOS 12.0, *)
-    public convenience init(profileNumber: Int? = nil, profileName: String? = nil, isDefaultProfile: Bool? = nil, carName: INSpeakableString? = nil) {
-        self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileName, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) }, carName: carName)
-    }
-
-    @available(iOS, introduced: 11.0, obsoleted: 12.0)
-    public convenience init(profileNumber: Int? = nil, profileName: String? = nil, isDefaultProfile: Bool? = nil) {
-        self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileName, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: nil, profileName: nil, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: nil, profileLabel: nil, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileLabel: String?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: nil, profileName: profileLabel, defaultProfile: nil)
-        }
-        else {
-            self.init(__profileNumber: nil, profileLabel: profileLabel, defaultProfile: nil)
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileLabel: String?, defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: nil, profileName: profileLabel, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: nil, profileLabel: profileLabel, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileLabel: String?, isDefaultProfile: Bool?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: nil, profileName: profileLabel, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: nil, profileLabel: profileLabel, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileName: String?, defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: nil, profileName: profileName, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: nil, profileLabel: profileName, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileNumber: Int?, defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: nil, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileLabel: nil, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileNumber: Int?, profileLabel: String?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileLabel, defaultProfile: nil)
-        }
-        else {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileLabel: profileLabel, defaultProfile: nil)
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileNumber: Int?, profileLabel: String?, defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileLabel, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileLabel: profileLabel, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileNumber: Int?, profileLabel: String?, isDefaultProfile: Bool?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileLabel, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileLabel: profileLabel, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS, deprecated: 11.0, renamed: "init(profileNumber:profileName:isDefaultProfile:)")
-    public convenience init(profileNumber: Int?, profileName: String?, defaultProfile: Int?) {
-        if #available(iOS 10.3, *) {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileName, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-        else {
-            self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileLabel: profileName, defaultProfile: defaultProfile.map { NSNumber(value: $0) })
-        }
-    }
-
-    @available(iOS 10.0, *)
-    public var isDefaultProfile: Bool? {
-        return __defaultProfile?.boolValue
-    }
-
-    @available(swift, deprecated: 3.2, obsoleted: 4.0,
-      message: "Please use isDefaultProfile instead")
-    public var defaultProfile: Int? {
-      return __defaultProfile?.intValue
-    }
-
-    @available(iOS 10.0, *)
-    public final var profileNumber: Int? {
-        return __profileNumber?.intValue
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetRadioStationIntent.swift b/stdlib/public/Darwin/Intents/INSetRadioStationIntent.swift
deleted file mode 100644
index bfdab48951930..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetRadioStationIntent.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 10.0, *)
-extension INSetRadioStationIntent {
-  @nonobjc
-  public convenience init(
-    radioType: INRadioType = .unknown,
-    frequency: Double? = nil,
-    stationName: String? = nil,
-    channel: String? = nil,
-    presetNumber: Int? = nil
-  ) {
-    self.init(__radioType: radioType,
-      frequency: frequency.map { NSNumber(value: $0) },
-      stationName: stationName,
-      channel: channel,
-      presetNumber: presetNumber.map { NSNumber(value: $0) })
-  }
-
-  @nonobjc
-  public final var frequency: Double? {
-    return __frequency?.doubleValue
-  }
-
-  @nonobjc
-  public final var presetNumber: Int? {
-    return __presetNumber?.intValue
-  }
-
-}
-
-#endif
diff --git a/stdlib/public/Darwin/Intents/INSetSeatSettingsInCarIntent.swift b/stdlib/public/Darwin/Intents/INSetSeatSettingsInCarIntent.swift
deleted file mode 100644
index d694d33bfe948..0000000000000
--- a/stdlib/public/Darwin/Intents/INSetSeatSettingsInCarIntent.swift
+++ /dev/null
@@ -1,78 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS)
-@available(iOS 10.0, *)
-extension INSetSeatSettingsInCarIntent {
-    
-    @nonobjc
-    @available(iOS 12.0, *)
-    public convenience init(
-        enableHeating: Bool? = nil,
-        enableCooling: Bool? = nil,
-        enableMassage: Bool? = nil,
-        seat: INCarSeat = .unknown,
-        level: Int? = nil,
-        relativeLevel: INRelativeSetting = .unknown,
-        carName: INSpeakableString? = nil
-        ) {
-        self.init(__enableHeating: enableHeating.map { NSNumber(value: $0) },
-                  enableCooling: enableCooling.map { NSNumber(value: $0) },
-                  enableMassage: enableMassage.map { NSNumber(value: $0) },
-                  seat: seat,
-                  level: level.map { NSNumber(value: $0) },
-                  relativeLevel: relativeLevel,
-                  carName: carName)
-    }
-    
-    @nonobjc
-    @available(iOS, obsoleted: 12.0)
-    public convenience init(
-        enableHeating: Bool? = nil,
-        enableCooling: Bool? = nil,
-        enableMassage: Bool? = nil,
-        seat: INCarSeat = .unknown,
-        level: Int? = nil,
-        relativeLevel: INRelativeSetting = .unknown
-        ) {
-        self.init(__enableHeating: enableHeating.map { NSNumber(value: $0) },
-                  enableCooling: enableCooling.map { NSNumber(value: $0) },
-                  enableMassage: enableMassage.map { NSNumber(value: $0) },
-                  seat: seat,
-                  level: level.map { NSNumber(value: $0) },
-                  relativeLevel: relativeLevel)
-    }
-    
-    @nonobjc
-    public final var enableHeating: Bool? {
-        return __enableHeating?.boolValue
-    }
-    
-    @nonobjc
-    public final var enableCooling: Bool? {
-        return __enableCooling?.boolValue
-    }
-    
-    @nonobjc
-    public final var enableMassage: Bool? {
-        return __enableMassage?.boolValue
-    }
-    
-    @nonobjc
-    public final var level: Int? {
-        return __level?.intValue
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INShortcut.swift b/stdlib/public/Darwin/Intents/INShortcut.swift
deleted file mode 100644
index 069ac3db154ff..0000000000000
--- a/stdlib/public/Darwin/Intents/INShortcut.swift
+++ /dev/null
@@ -1,123 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-
-@available(iOS 12.0, watchOS 5.0, *)
-public enum INShortcut : ReferenceConvertible {
-  public typealias ReferenceType = INShortcutReference
-
-  case intent(INIntent)
-  case userActivity(NSUserActivity)
-
-  init(from objcShortcut: INShortcutReference) {
-    if let intent = objcShortcut.intent {
-      self = .intent(intent)
-    } else if let userActivity = objcShortcut.userActivity {
-      self = .userActivity(userActivity)
-    } else {
-      fatalError("INShortcutReference object must have either intent or userActivity")
-    }
-  }
-}
-
-// Convenience initializers, to mimic the ObjC initializer API
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut {
-  public init?(intent: INIntent) {
-    // use the ObjC initializer, to re-use its validation of the intent
-    guard let ref = INShortcutReference(intent: intent) else { return nil }
-    self.init(from: ref)
-  }
-  public init(userActivity: NSUserActivity) {
-    self = .userActivity(userActivity)
-  }
-}
-
-// Convenience properties, to mimic the ObjC API
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut {
-  public var intent: INIntent? {
-    guard case let .intent(intent) = self else { return nil }
-    return intent
-  }
-  public var userActivity: NSUserActivity? {
-    guard case let .userActivity(userActivity) = self else { return nil }
-    return userActivity
-  }
-}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut : CustomStringConvertible {
-  public var description: String {
-    return reference.description
-  }
-}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut : CustomDebugStringConvertible {
-  public var debugDescription: String {
-    return reference.debugDescription
-  }
-}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut : Hashable {
-  public func hash(into hasher: inout Hasher) {
-    reference.hash(into: &hasher)
-  }
-}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut : Equatable {}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut {
-  fileprivate var reference: INShortcutReference {
-    switch self {
-    case .intent(let intent):
-      return INShortcutReference(intent: intent)!
-    case .userActivity(let userActivity):
-      return INShortcutReference(userActivity: userActivity)
-    }
-  }
-}
-
-@available(iOS 12.0, watchOS 5.0, *)
-extension INShortcut : _ObjectiveCBridgeable {
-  @_semantics("convertToObjectiveC")
-  public func _bridgeToObjectiveC() -> INShortcutReference {
-    return self.reference
-  }
-
-  public static func _forceBridgeFromObjectiveC(_ source: INShortcutReference, result: inout INShortcut?) {
-    if !_conditionallyBridgeFromObjectiveC(source, result: &result) {
-      fatalError("Unable to bridge \(_ObjectiveCType.self) to \(self)")
-    }
-  }
-
-  public static func _conditionallyBridgeFromObjectiveC(_ source: INShortcutReference, result: inout INShortcut?) -> Bool {
-    result = INShortcut(from: source)
-    return true
-  }
-
-  @_effects(readonly)
-  public static func _unconditionallyBridgeFromObjectiveC(_ source: INShortcutReference?) -> INShortcut {
-    guard let src = source else { fatalError("Missing source") }
-    return INShortcut(from: src)
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/Intents/INStartPhotoPlaybackIntentResponse.swift b/stdlib/public/Darwin/Intents/INStartPhotoPlaybackIntentResponse.swift
deleted file mode 100644
index e6b417fdefe62..0000000000000
--- a/stdlib/public/Darwin/Intents/INStartPhotoPlaybackIntentResponse.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INStartPhotoPlaybackIntentResponse {
-  @nonobjc
-  public final var searchResultsCount: Int? {
-    get {
-      return __searchResultsCount?.intValue
-    }
-    set {
-      __searchResultsCount = newValue.map { NSNumber(value: $0) }
-    }
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/INStartWorkoutIntent.swift b/stdlib/public/Darwin/Intents/INStartWorkoutIntent.swift
deleted file mode 100644
index 3434eb060ae5e..0000000000000
--- a/stdlib/public/Darwin/Intents/INStartWorkoutIntent.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-#if os(iOS) || os(watchOS)
-@available(iOS 10.0, watchOS 3.2, *)
-extension INStartWorkoutIntent {
-  @nonobjc
-  public convenience init(
-      workoutName: INSpeakableString? = nil,
-      goalValue: Double? = nil,
-      workoutGoalUnitType: INWorkoutGoalUnitType = .unknown,
-      workoutLocationType: INWorkoutLocationType = .unknown,
-      isOpenEnded: Bool? = nil
-  ) {
-    self.init(__workoutName: workoutName,
-      goalValue: goalValue.map { NSNumber(value: $0) },
-      workoutGoalUnitType: workoutGoalUnitType,
-      workoutLocationType: workoutLocationType,
-      isOpenEnded: isOpenEnded.map { NSNumber(value: $0) })
-  }
-
-  @nonobjc
-  public final var goalValue: Double? {
-    return __goalValue?.doubleValue
-  }
-
-  @nonobjc
-  public final var isOpenEnded: Bool? {
-    return __isOpenEnded?.boolValue
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Intents/NSStringIntents.swift b/stdlib/public/Darwin/Intents/NSStringIntents.swift
deleted file mode 100644
index 9d6d00e9daa50..0000000000000
--- a/stdlib/public/Darwin/Intents/NSStringIntents.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Intents
-import Foundation
-
-extension NSString {
-    @available(OSX 10.14, iOS 12.0, watchOS 5.0, *)
-    public class func deferredLocalizedIntentsString(with format: String, _ args: CVarArg...) -> NSString {
-        return withVaList(args) {
-            self.__deferredLocalizedIntentsString(withFormat: format, fromTable: nil, arguments: $0) as NSString
-        }
-    }
-    
-    @available(OSX 10.14, iOS 12.0, watchOS 5.0, *)
-    public class func deferredLocalizedIntentsString(with format: String, table: String, _ args: CVarArg...) -> NSString {
-        return withVaList(args) {
-            self.__deferredLocalizedIntentsString(withFormat: format, fromTable: table, arguments: $0) as NSString
-        }
-    }
-    
-    @available(OSX 10.14, iOS 12.0, watchOS 5.0, *)
-    public class func deferredLocalizedIntentsString(with format: String, table: String, arguments: CVaListPointer) -> NSString {
-        return self.__deferredLocalizedIntentsString(withFormat: format, fromTable: table, arguments: arguments) as NSString
-    }
-}
diff --git a/stdlib/public/Darwin/MapKit/CMakeLists.txt b/stdlib/public/Darwin/MapKit/CMakeLists.txt
deleted file mode 100644
index 8b1ffc99bda59..0000000000000
--- a/stdlib/public/Darwin/MapKit/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftMapKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-
-  GYB_SOURCES
-    NSValue.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit Foundation CoreData CoreLocation QuartzCore AppKit XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch Foundation CoreLocation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch Foundation CoreLocation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics UIKit Dispatch Foundation CoreLocation CoreFoundation ObjectiveC # auto-updated
-    UIKit # required in some configurations but not found by tool
-  FRAMEWORK_DEPENDS MapKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_MAPKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_MAPKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_MAPKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_MAPKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/MapKit/NSValue.swift.gyb b/stdlib/public/Darwin/MapKit/NSValue.swift.gyb
deleted file mode 100644
index d6ec015102584..0000000000000
--- a/stdlib/public/Darwin/MapKit/NSValue.swift.gyb
+++ /dev/null
@@ -1,36 +0,0 @@
-@_exported import MapKit // Clang module
-import Foundation
-
-%{
-from gyb_foundation_support import \
-  ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods
-}%
-
-// Get the ObjC type used by -[NSValue valueWithMKCoordinateSpan:]
-// to instantiate the resulting NSValue objects, in case these get changed
-// in the future.
-@available(tvOS 9.2, *)
-private let MKCoordinateSpanInNSValueObjCType =
-  NSValue(mkCoordinateSpan: .init()).objCType
-
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="MKCoordinateSpan",
-  initializer="""{
-    guard #available(tvOS 9.2, *) else {
-      fatalError("MKCoordinateSpan is not supported on tvOS before tvOS 9.2")
-    }
-    return NSValue(mkCoordinateSpan: $0)
-  }""",
-  getter="""{
-    guard #available(tvOS 9.2, *) else {
-      fatalError("MKCoordinateSpan is not supported on tvOS before tvOS 9.2")
-    }
-    return $0.mkCoordinateSpanValue
-  }""",
-  objCType="""{ _ in
-    guard #available(tvOS 9.2, *) else {
-      fatalError("MKCoordinateSpan is not supported on tvOS before tvOS 9.2")
-    }
-    return MKCoordinateSpanInNSValueObjCType
-  }""",
-) }
diff --git a/stdlib/public/Darwin/MediaPlayer/CMakeLists.txt b/stdlib/public/Darwin/MediaPlayer/CMakeLists.txt
deleted file mode 100644
index 0700ae75b0d6b..0000000000000
--- a/stdlib/public/Darwin/MediaPlayer/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftMediaPlayer ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  MPMusicPlayerPlayParameters.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-L${sdk}/usr/lib/swift/"
-  TARGET_SDKS IOS IOS_SIMULATOR
-
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch simd Foundation AVFoundation CoreMedia QuartzCore CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_FROM_SDK CoreMIDI
-  FRAMEWORK_DEPENDS_WEAK MediaPlayer
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_MEDIAPLAYER_IOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/MediaPlayer/MPMusicPlayerPlayParameters.swift b/stdlib/public/Darwin/MediaPlayer/MPMusicPlayerPlayParameters.swift
deleted file mode 100644
index 566e769ab6a7c..0000000000000
--- a/stdlib/public/Darwin/MediaPlayer/MPMusicPlayerPlayParameters.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import MediaPlayer
-import Foundation
-
-@available(iOS 11.0, *)
-extension MPMusicPlayerPlayParameters: Codable {
-    public required convenience init(from decoder: Decoder) throws {
-        var playParametersDictionary: [String: Any] = [:]
-        let values = try decoder.container(keyedBy: CodingKeys.self)
-
-        if let id = try values.decodeIfPresent(String.self, forKey: .id) {
-            playParametersDictionary[CodingKeys.id.rawValue] = id
-        }
-        else if let id = try values.decodeIfPresent(Int64.self, forKey: .id) {
-            playParametersDictionary[CodingKeys.id.rawValue] = NSNumber(value: id)
-        }
-
-        if let kind = try values.decodeIfPresent(String.self, forKey: .kind) {
-            playParametersDictionary[CodingKeys.kind.rawValue] = kind
-        }
-
-        if let isLibrary = try values.decodeIfPresent(Bool.self, forKey: .isLibrary) {
-            playParametersDictionary[CodingKeys.isLibrary.rawValue] = NSNumber(value: isLibrary)
-        }
-
-        guard MPMusicPlayerPlayParameters(dictionary: playParametersDictionary) != nil else {
-            throw DecodingError.dataCorrupted(DecodingError.Context(codingPath: decoder.codingPath,
-                                                                    debugDescription: "Attempted to decode MPMusicPlayerPlayParameters from invalid playParams dictionary."))
-        }
-        self.init(dictionary: playParametersDictionary)!
-    }
-
-    public func encode(to encoder: Encoder) throws {
-        let playParametersDictionary = self.dictionary
-        var values = encoder.container(keyedBy: CodingKeys.self)
-
-        if let id = playParametersDictionary[CodingKeys.id.rawValue] as? String {
-            try values.encode(id, forKey: .id)
-        }
-        else if let id = playParametersDictionary[CodingKeys.id.rawValue] as? Int64 {
-            try values.encode(id, forKey: .id)
-        }
-
-        if let kind = playParametersDictionary[CodingKeys.kind.rawValue] as? String {
-            try values.encode(kind, forKey: .kind)
-        }
-
-        if let isLibrary = playParametersDictionary[CodingKeys.isLibrary.rawValue] as? Bool {
-            try values.encode(isLibrary, forKey: .isLibrary)
-        }
-    }
-
-    internal enum CodingKeys: String, CodingKey {
-        case id
-        case kind
-        case isLibrary
-    }
-}
diff --git a/stdlib/public/Darwin/Metal/CMakeLists.txt b/stdlib/public/Darwin/Metal/CMakeLists.txt
deleted file mode 100644
index eba6b8c1b7077..0000000000000
--- a/stdlib/public/Darwin/Metal/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftMetal ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-    Metal.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-    os
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-    os
-
-  FRAMEWORK_DEPENDS_WEAK Metal
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_METAL_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_METAL_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_METAL_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Metal/Metal.swift b/stdlib/public/Darwin/Metal/Metal.swift
deleted file mode 100644
index c1dd0847c693c..0000000000000
--- a/stdlib/public/Darwin/Metal/Metal.swift
+++ /dev/null
@@ -1,282 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Metal // Clang module
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLBlitCommandEncoder {
-    
-    public func fill(buffer: MTLBuffer, range: Range<Int>, value: UInt8) {
-        __fill(buffer, range: NSRange(location: range.lowerBound, length: range.count), value: value)
-    }
-
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func resetCommandsInBuffer(_ buffer: MTLIndirectCommandBuffer, range: Range<Int>) {
-        __resetCommands(in: buffer, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func copyIndirectCommandBuffer (_ buffer: MTLIndirectCommandBuffer, sourceRange: Range<Int>, destination: MTLIndirectCommandBuffer, destinationIndex: Int) {
-        __copy (buffer, sourceRange: NSRange(location: sourceRange.lowerBound, length: sourceRange.count),destination: destination, destinationIndex: destinationIndex)
-    }
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func optimizeIndirectCommandBuffer (_ buffer: MTLIndirectCommandBuffer, range: Range<Int>) {
-        __optimizeIndirectCommandBuffer(buffer, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLBuffer {
-    
-#if os(macOS)
-    @available(macOS, introduced: 10.11)
-    public func didModifyRange(_ range: Range<Int>) {
-        __didModifyRange(NSRange(location: range.lowerBound, length: range.count))
-    }
-#endif
-    
-    @available(macOS 10.12, iOS 10.0, tvOS 10.0, *)
-    public func addDebugMarker(_ marker: String, range: Range<Int>) {
-        __addDebugMarker(marker, range: NSRange(location: range.lowerBound, length: range.count))
-    }
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLComputeCommandEncoder {
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func useResources(_ resources: [MTLResource], usage: MTLResourceUsage) {
-        __use(resources, count: resources.count, usage: usage)
-    }
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func useHeaps(_ heaps: [MTLHeap]) {
-        __use(heaps, count: heaps.count)
-    }
-    
-    public func setBuffers(_ buffers: [MTLBuffer?], offsets: [Int], range: Range<Int>) {
-        __setBuffers(buffers, offsets: offsets, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setTextures(_ textures: [MTLTexture?], range: Range<Int>) {
-        __setTextures(textures, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setSamplerStates(_ samplers: [MTLSamplerState?], range: Range<Int>) {
-        __setSamplerStates(samplers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setSamplerStates(_ samplers: [MTLSamplerState?], lodMinClamps: [Float], lodMaxClamps: [Float], range: Range<Int>) {
-        __setSamplerStates(samplers, lodMinClamps: lodMinClamps, lodMaxClamps: lodMaxClamps, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func memoryBarrier(resources:[MTLResource]) {
-        __memoryBarrier(resources: resources, count: resources.count)
-    }
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLDevice {
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func getDefaultSamplePositions(sampleCount: Int) -> [MTLSamplePosition] {
-        return [MTLSamplePosition](unsafeUninitializedCapacity: sampleCount) { buf, initializedCount in
-            __getDefaultSamplePositions(buf.baseAddress!, count: sampleCount)
-            initializedCount = sampleCount
-        }
-    }
-}
-
-#if os(macOS)
-@available(swift 4)
-@available(macOS 10.13, *)
-public func MTLCopyAllDevicesWithObserver(handler: @escaping MTLDeviceNotificationHandler) -> (devices:[MTLDevice], observer:NSObject) {
-    var observer: NSObjectProtocol?
-    let devices = __MTLCopyAllDevicesWithObserver(&observer, handler)
-    // FIXME: The force cast here isn't great – ideally we would return the
-    // observer as an NSObjectProtocol.
-    return (devices, observer as! NSObject)
-}
-#endif
-
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *)
-extension MTLFunctionConstantValues {
-    
-    public func setConstantValues(_ values: UnsafeRawPointer, type: MTLDataType, range: Range<Int>) {
-        __setConstantValues(values, type: type, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-}
-
-@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-extension MTLArgumentEncoder {
-    
-    public func setBuffers(_ buffers: [MTLBuffer?], offsets: [Int], range: Range<Int>) {
-        __setBuffers(buffers, offsets: offsets, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setTextures(_ textures: [MTLTexture?], range: Range<Int>) {
-        __setTextures(textures, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setSamplerStates(_ samplers: [MTLSamplerState?], range: Range<Int>) {
-        __setSamplerStates(samplers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-
-    #if os(macOS)
-    @available(macOS 10.14, *)
-    public func setRenderPipelineStates(_ pipelines: [MTLRenderPipelineState?], range: Range<Int>) {
-        __setRenderPipelineStates(pipelines, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    #endif
-    
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func setIndirectCommandBuffers(_ buffers: [MTLIndirectCommandBuffer?], range: Range<Int>) {
-        __setIndirectCommandBuffers(buffers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLRenderCommandEncoder {
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func useResources(_ resources: [MTLResource], usage: MTLResourceUsage) {
-        __use(resources, count: resources.count, usage: usage)
-    }
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func useHeaps(_ heaps: [MTLHeap]) {
-        __use(heaps, count: heaps.count)
-    }
-
-#if os(macOS) || os(iOS)
-    @available(macOS 10.13, iOS 12.0, *)
-    public func setViewports(_ viewports: [MTLViewport]) {
-        __setViewports(viewports, count: viewports.count)
-    }
-    
-    @available(macOS 10.13, iOS 12.0, *)
-    public func setScissorRects(_ scissorRects: [MTLScissorRect]) {
-        __setScissorRects(scissorRects, count: scissorRects.count)
-    }
-#endif
-    
-    public func setVertexBuffers(_ buffers: [MTLBuffer?], offsets: [Int], range: Range<Int>) {
-        __setVertexBuffers(buffers, offsets: offsets, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setVertexTextures(_ textures: [MTLTexture?], range: Range<Int>) {
-        __setVertexTextures(textures, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setVertexSamplerStates(_ samplers: [MTLSamplerState?], range: Range<Int>) {
-        __setVertexSamplerStates(samplers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setVertexSamplerStates(_ samplers: [MTLSamplerState?], lodMinClamps: [Float], lodMaxClamps: [Float], range: Range<Int>) {
-        __setVertexSamplerStates(samplers, lodMinClamps: lodMinClamps, lodMaxClamps: lodMaxClamps, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-
-    public func setFragmentBuffers(_ buffers: [MTLBuffer?], offsets: [Int], range: Range<Int>) {
-        __setFragmentBuffers(buffers, offsets: offsets, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setFragmentTextures(_ textures: [MTLTexture?], range: Range<Int>) {
-        __setFragmentTextures(textures, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setFragmentSamplerStates(_ samplers: [MTLSamplerState?], range: Range<Int>) {
-        __setFragmentSamplerStates(samplers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    public func setFragmentSamplerStates(_ samplers: [MTLSamplerState?], lodMinClamps: [Float], lodMaxClamps: [Float], range: Range<Int>) {
-        __setFragmentSamplerStates(samplers, lodMinClamps: lodMinClamps, lodMaxClamps: lodMaxClamps, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-
-#if os(iOS)
-
-    @available(iOS 11.0, *)
-    public func setTileBuffers(_ buffers: [MTLBuffer?], offsets: [Int], range: Range<Int>) {
-        __setTileBuffers(buffers, offsets: offsets, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    @available(iOS 11.0, *)
-    public func setTileTextures(_ textures: [MTLTexture?], range: Range<Int>) {
-        __setTileTextures(textures, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    @available(iOS 11.0, *)
-    public func setTileSamplerStates(_ samplers: [MTLSamplerState?], range: Range<Int>) {
-        __setTileSamplerStates(samplers, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-    
-    @available(iOS 11.0, *)
-    public func setTileSamplerStates(_ samplers: [MTLSamplerState?], lodMinClamps: [Float], lodMaxClamps: [Float], range: Range<Int>) {
-        __setTileSamplerStates(samplers, lodMinClamps: lodMinClamps, lodMaxClamps: lodMaxClamps, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-#endif
-    
-#if os(macOS)
-    @available(macOS 10.14, *)
-    public func memoryBarrier(resources: [MTLResource], after: MTLRenderStages, before: MTLRenderStages) {
-        __memoryBarrier(resources: resources, count: resources.count, after: after, before: before)
-    }
-#endif
-
-    @available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-    public func executeCommandsInBuffer(_ buffer: MTLIndirectCommandBuffer, range: Range<Int>) {
-        __executeCommands(in: buffer, with: NSRange(location: range.lowerBound, length: range.count))
-    }
-
-    #if os(macOS)
-    @available(macOS 10.14, *)
-    public func executeCommandsInBuffer(_ buffer: MTLIndirectCommandBuffer, indirectBuffer indirectRangeBuffer: MTLBuffer, offset: Int) {
-        __executeCommands(in: buffer, indirectBuffer: indirectRangeBuffer, indirectBufferOffset: offset)
-    }
-    #endif
-}
-
-@available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-extension MTLIndirectCommandBuffer {
-    public func reset(_ range: Range<Int>) {
-        __reset(with: NSRange(location: range.lowerBound, length: range.count))
-    }
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLRenderPassDescriptor {
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func setSamplePositions(_ positions: [MTLSamplePosition]) {
-        __setSamplePositions(positions, count: positions.count)
-    }
-    
-    @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
-    public func getSamplePositions() -> [MTLSamplePosition] {
-        let numPositions = __getSamplePositions(nil, count: 0)
-        return [MTLSamplePosition](unsafeUninitializedCapacity: numPositions) { buf, initializedCount in
-            __getSamplePositions(buf.baseAddress!, count: numPositions)
-            initializedCount = numPositions
-        }
-    }
-    
-}
-
-@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
-extension MTLTexture {
-    
-    @available(macOS 10.11, iOS 9.0, tvOS 9.0, *)
-    public func makeTextureView(pixelFormat: MTLPixelFormat, textureType: MTLTextureType, levels levelRange: Range<Int>, slices sliceRange: Range<Int>) -> MTLTexture? {
-        return __newTextureView(with: pixelFormat, textureType: textureType, levels: NSRange(location: levelRange.lowerBound, length: levelRange.count), slices: NSRange(location: sliceRange.lowerBound, length: sliceRange.count))
-    }
-}
diff --git a/stdlib/public/Darwin/MetalKit/CMakeLists.txt b/stdlib/public/Darwin/MetalKit/CMakeLists.txt
deleted file mode 100644
index 652b592738132..0000000000000
--- a/stdlib/public/Darwin/MetalKit/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftMetalKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-    MetalKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit simd Foundation CoreData QuartzCore AppKit ModelIO XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  
-  FRAMEWORK_DEPENDS_WEAK MetalKit
-  FRAMEWORK_DEPENDS_WEAK Metal
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_METALKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_METALKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_METALKIT_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/MetalKit/MetalKit.swift b/stdlib/public/Darwin/MetalKit/MetalKit.swift
deleted file mode 100644
index 285302b0b64f9..0000000000000
--- a/stdlib/public/Darwin/MetalKit/MetalKit.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import MetalKit // Clang module
-
-@available(macOS 10.11, iOS 9.0, tvOS 9.0, *)
-extension MTKMesh {
-    public class func newMeshes(asset: MDLAsset, device: MTLDevice) throws -> (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh]) {
-        var modelIOMeshes: NSArray?
-        let metalKitMeshes = try MTKMesh.__newMeshes(from: asset, device: device, sourceMeshes: &modelIOMeshes)
-        return (modelIOMeshes: modelIOMeshes as! [MDLMesh], metalKitMeshes: metalKitMeshes)
-    }
-}
-
-@available(swift 4)
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *)
-public func MTKModelIOVertexDescriptorFromMetalWithError(_ metalDescriptor: MTLVertexDescriptor) throws -> MDLVertexDescriptor {
-    var error: NSError? = nil
-    let result = __MTKModelIOVertexDescriptorFromMetalWithError(metalDescriptor, &error)
-    if let error = error {
-        throw error
-    }
-    return result
-}
-
-@available(swift 4)
-@available(macOS 10.12, iOS 10.0, tvOS 10.0, *)
-public func MTKMetalVertexDescriptorFromModelIOWithError(_ modelIODescriptor: MDLVertexDescriptor) throws -> MTLVertexDescriptor? {
-    var error: NSError? = nil
-    let result = __MTKMetalVertexDescriptorFromModelIOWithError(modelIODescriptor, &error)
-    if let error = error {
-        throw error
-    }
-    return result
-}
diff --git a/stdlib/public/Darwin/ModelIO/CMakeLists.txt b/stdlib/public/Darwin/ModelIO/CMakeLists.txt
deleted file mode 100644
index b85d0e225e741..0000000000000
--- a/stdlib/public/Darwin/ModelIO/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftModelIO ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  ModelIO.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit simd Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreGraphics Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK ModelIO
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/ModelIO/ModelIO.swift b/stdlib/public/Darwin/ModelIO/ModelIO.swift
deleted file mode 100644
index 908f85214ee36..0000000000000
--- a/stdlib/public/Darwin/ModelIO/ModelIO.swift
+++ /dev/null
@@ -1,368 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import ModelIO
-import simd
-
-extension Array {
-    fileprivate init(
-        unsafeUninitializedCount count: Int,
-        initializedWith initializer: (UnsafeMutablePointer<Element>) -> Void
-    ) {
-        self.init(unsafeUninitializedCapacity: count) { buffer, initializedCount in
-            initializer(buffer.baseAddress!)
-            initializedCount = count
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLMatrix4x4Array {
-    @nonobjc public var float4x4Array: [float4x4] {
-        get {
-            let count = elementCount
-            return [float4x4](unsafeUninitializedCount: count) { ptr in
-                __getFloat4x4Array(ptr, maxCount: count)
-            }
-        }
-        set(array) {
-            __setFloat4x4(array, count: array.count)
-        }
-    }
-    
-    @nonobjc public var double4x4Array: [double4x4] {
-        get {
-            let count = elementCount
-            return [double4x4](unsafeUninitializedCount: count) { ptr in
-                __getDouble4x4Array(ptr, maxCount: count)
-            }
-        }
-        set(array) {
-            __setDouble4x4(array, count: array.count)
-        }
-    }
-}
-
-
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedValue {
-    @nonobjc public var times: [TimeInterval] {
-        get {
-            return [TimeInterval](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getTimes(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedScalarArray {
-    @nonobjc public func set(floatArray array:[Float], atTime time: TimeInterval){
-        __setFloat(array, count: array.count, atTime: time)
-    }
-
-    @nonobjc public func set(doubleArray array:[Double], atTime time: TimeInterval){
-        __setDouble(array, count: array.count, atTime: time)
-    }
-    
-    @nonobjc public func floatArray(atTime time: TimeInterval) -> [Float] {
-        return [Float](unsafeUninitializedCount: elementCount) { ptr in
-            __getFloat(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-
-    @nonobjc public func doubleArray(atTime time: TimeInterval) -> [Double] {
-        return [Double](unsafeUninitializedCount: elementCount) { ptr in
-            __getDouble(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-
-    @nonobjc public func reset(floatArray array:[Float], atTimes times: [TimeInterval]){
-        __reset(with: array, count: array.count, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(doubleArray array:[Double], atTimes times: [TimeInterval]){
-        __reset(with: array, count: array.count, atTimes: times, count: times.count)
-    }
-
-    @nonobjc public var floatArray: [Float] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [Float](unsafeUninitializedCount: count) { ptr in
-                __getFloat(ptr, maxCount: count)
-            }
-        }
-    }
-
-    @nonobjc public var doubleArray: [Double] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [Double](unsafeUninitializedCount: count) { ptr in
-                __getDouble(ptr, maxCount: count)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedVector3Array {
-    @nonobjc public func set(float3Array array:[SIMD3<Float>], atTime time: TimeInterval){
-        __setFloat3(array, count: array.count, atTime: time)
-    }
-    
-    @nonobjc public func set(double3Array array:[SIMD3<Double>], atTime time: TimeInterval){
-        __setDouble3(array, count: array.count, atTime: time)
-    }
-    
-    @nonobjc public func float3Array(atTime time: TimeInterval) -> [SIMD3<Float>] {
-        return [SIMD3<Float>](unsafeUninitializedCount: elementCount) { ptr in
-            __getFloat3Array(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-    
-    @nonobjc public func double3Array(atTime time: TimeInterval) -> [SIMD3<Double>] {
-        return [SIMD3<Double>](unsafeUninitializedCount: elementCount) { ptr in
-            __getDouble3Array(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-    
-    @nonobjc public func reset(float3Array array:[SIMD3<Float>], atTimes times: [TimeInterval]){
-        __reset(withFloat3Array: array, count: array.count, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(double3Array array:[SIMD3<Double>], atTimes times: [TimeInterval]){
-        __reset(withDouble3Array: array, count: array.count, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var float3Array: [SIMD3<Float>] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [SIMD3<Float>](unsafeUninitializedCount: count) { ptr in
-                __getFloat3Array(ptr, maxCount: count)
-            }
-        }
-    }
-    
-    @nonobjc public var double3Array: [SIMD3<Double>] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [SIMD3<Double>](unsafeUninitializedCount: count) { ptr in
-                __getDouble3Array(ptr, maxCount: count)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedQuaternionArray {
-    @nonobjc public func set(floatQuaternionArray array:[simd_quatf], atTime time: TimeInterval){
-        __setFloat(array, count: array.count, atTime: time)
-    }
-    
-    @nonobjc public func set(doubleQuaternionArray array:[simd_quatd], atTime time: TimeInterval){
-        __setDouble(array, count: array.count, atTime: time)
-    }
-    
-    @nonobjc public func floatQuaternionArray(atTime time: TimeInterval) -> [simd_quatf] {
-        return [simd_quatf](unsafeUninitializedCount: elementCount) { ptr in
-            __getFloat(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-
-    @nonobjc public func doubleQuaternionArray(atTime time: TimeInterval) -> [simd_quatd] {
-        return [simd_quatd](unsafeUninitializedCount: elementCount) { ptr in
-            __getDouble(ptr, maxCount: elementCount, atTime: time)
-        }
-    }
-
-    @nonobjc public func reset(floatQuaternionArray array:[simd_quatf], atTimes times: [TimeInterval]){
-        __reset(withFloat: array, count: array.count, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(doubleQuaternionArray array:[simd_quatd], atTimes times: [TimeInterval]){
-        __reset(withDouble: array, count: array.count, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var floatQuaternionArray : [simd_quatf] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [simd_quatf](unsafeUninitializedCount: count) { ptr in
-                __getFloat(ptr, maxCount: count)
-            }
-        }
-    }
-
-    @nonobjc public var doubleQuaternionArray: [simd_quatd] {
-        get {
-            let count = elementCount * timeSampleCount
-            return [simd_quatd](unsafeUninitializedCount: count) { ptr in
-                __getDouble(ptr, maxCount: count)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedScalar {
-    @nonobjc public func reset(floatArray array:[Float], atTimes times: [TimeInterval]){
-        __reset(withFloatArray: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(doubleArray array:[Double], atTimes times: [TimeInterval]){
-        __reset(withDoubleArray: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var floatArray: [Float] {
-        get {
-            return [Float](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getFloatArray(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-
-    @nonobjc public var doubleArray: [Double] {
-        get {
-            return [Double](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getDoubleArray(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedVector2 {
-    @nonobjc public func reset(float2Array array:[SIMD2<Float>], atTimes times: [TimeInterval]){
-        __reset(withFloat2Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(double2Array array:[SIMD2<Double>], atTimes times: [TimeInterval]){
-        __reset(withDouble2Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var float2Array: [SIMD2<Float>] {
-        get {
-            return [SIMD2<Float>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getFloat2Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-
-    @nonobjc public var double2Array: [SIMD2<Double>] {
-        get {
-            return [SIMD2<Double>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getDouble2Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedVector3 {
-    @nonobjc public func reset(float3Array array:[SIMD3<Float>], atTimes times: [TimeInterval]){
-        __reset(withFloat3Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(double3Array array:[SIMD3<Double>], atTimes times: [TimeInterval]){
-        __reset(withDouble3Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var float3Array: [SIMD3<Float>] {
-        get {
-            return [SIMD3<Float>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getFloat3Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-
-    @nonobjc public var double3Array: [SIMD3<Double>] {
-        get {
-            return [SIMD3<Double>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getDouble3Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedVector4 {
-    @nonobjc public func reset(float4Array array:[SIMD4<Float>], atTimes times: [TimeInterval]){
-        __reset(withFloat4Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(double4Array array:[SIMD4<Double>], atTimes times: [TimeInterval]){
-        __reset(withDouble4Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var float4Array: [SIMD4<Float>] {
-        get {
-            return [SIMD4<Float>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getFloat4Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-
-    @nonobjc public var double4Array: [SIMD4<Double>] {
-        get {
-            return [SIMD4<Double>](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getDouble4Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension MDLAnimatedMatrix4x4 {
-    @nonobjc public func reset(float4x4Array array:[float4x4], atTimes times: [TimeInterval]){
-        __reset(withFloat4x4Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public func reset(double4Array array:[double4x4], atTimes times: [TimeInterval]){
-        __reset(withDouble4x4Array: array, atTimes: times, count: times.count)
-    }
-    
-    @nonobjc public var float4x4Array: [float4x4] {
-        get {
-            return [float4x4](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getFloat4x4Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-    
-    @nonobjc public var double4x4Array: [double4x4] {
-        get {
-            return [double4x4](unsafeUninitializedCount: timeSampleCount) { ptr in
-                __getDouble4x4Array(ptr, maxCount: timeSampleCount)
-            }
-        }
-    }
-}
diff --git a/stdlib/public/Darwin/NaturalLanguage/CMakeLists.txt b/stdlib/public/Darwin/NaturalLanguage/CMakeLists.txt
deleted file mode 100644
index 47a1729894a0a..0000000000000
--- a/stdlib/public/Darwin/NaturalLanguage/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftNaturalLanguage ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  NLLanguageRecognizer.swift
-  NLTagger.swift
-  NLTokenizer.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreGraphics Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-
-  FRAMEWORK_DEPENDS_WEAK NaturalLanguage
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_NATURALLANGUAGE_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_NATURALLANGUAGE_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_NATURALLANGUAGE_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_NATURALLANGUAGE_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/NaturalLanguage/NLLanguageRecognizer.swift b/stdlib/public/Darwin/NaturalLanguage/NLLanguageRecognizer.swift
deleted file mode 100644
index 1ff503b9dbe48..0000000000000
--- a/stdlib/public/Darwin/NaturalLanguage/NLLanguageRecognizer.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import NaturalLanguage
-import Foundation
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension NLLanguageRecognizer {
-  @nonobjc
-  public var languageHints: [NLLanguage : Double] {
-    get {
-      return self.__languageHints.mapValues { $0.doubleValue }
-    }
-    set(newHints) {
-      self.__languageHints = newHints.mapValues { NSNumber(value: $0) }
-    }
-  }
-
-  @nonobjc
-  public func languageHypotheses(withMaximum maxHypotheses: Int) -> [NLLanguage : Double] {
-    return self.__languageHypotheses(withMaximum: maxHypotheses).mapValues { $0.doubleValue }
-  }
-}
diff --git a/stdlib/public/Darwin/NaturalLanguage/NLTagger.swift b/stdlib/public/Darwin/NaturalLanguage/NLTagger.swift
deleted file mode 100644
index 138d448ae0c4d..0000000000000
--- a/stdlib/public/Darwin/NaturalLanguage/NLTagger.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import NaturalLanguage
-import Foundation
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension NLTagger {
-  @nonobjc
-  public func tokenRange(at index: String.Index, unit: NLTokenUnit) -> Range<String.Index> {
-    let str = self.string ?? ""
-    let characterIndex = index.utf16Offset(in: str)
-    let nsrange = self.__tokenRange(at: characterIndex, unit: unit)
-    return Range(nsrange, in: str)!
-  }
-
-  @nonobjc
-  public func tag(at index: String.Index, unit: NLTokenUnit, scheme: NLTagScheme) -> (NLTag?, Range<String.Index>) {
-    let str = self.string ?? ""
-    let characterIndex = index.utf16Offset(in: str)
-    let rangePointer = NSRangePointer.allocate(capacity: 1)
-    rangePointer.initialize(to: NSMakeRange(0, 0))
-    let tag = self.__tag(at: characterIndex, unit: unit, scheme: scheme, tokenRange: rangePointer)
-    let range = Range(rangePointer.pointee, in: str)!
-    rangePointer.deallocate()
-    return (tag, range)
-  }
-  
-  @nonobjc
-  public func enumerateTags(in range: Range<String.Index>, unit: NLTokenUnit, scheme: NLTagScheme, options: NLTagger.Options = [], using block: (NLTag?, Range<String.Index>) -> Bool) {
-    guard let str = self.string else { return }
-    let nsrange = NSRange(range, in:str)
-    self.__enumerateTags(in: nsrange, unit: unit, scheme: scheme, options: options) { (tag, tokenNSRange, stop) in
-      if let tokenRange = Range(tokenNSRange, in: str) {
-        let keepGoing = block(tag, tokenRange)
-        if (!keepGoing) {
-          stop.pointee = true
-        }
-      }
-    }
-  }
-
-  @nonobjc
-  public func tags(in range: Range<String.Index>, unit: NLTokenUnit, scheme: NLTagScheme, options: NLTagger.Options = []) -> [(NLTag?, Range<String.Index>)] {
-    var array:[(NLTag?, Range<String.Index>)] = []
-    self.enumerateTags(in: range, unit: unit, scheme: scheme, options: options) { (tag, tokenRange) -> Bool in
-      array.append((tag, tokenRange))
-      return true
-    }
-    return array
-  }
-
-  @nonobjc
-  public func setLanguage(_ language: NLLanguage, range: Range<String.Index>) {
-    guard let str = self.string else { return }
-    let nsrange = NSRange(range, in: str)
-    self.__setLanguage(language, range: nsrange)
-  }
-  
-  @nonobjc
-  public func setOrthography(_ orthography: NSOrthography, range: Range<String.Index>) {
-    guard let str = self.string else { return }
-    let nsrange = NSRange(range, in: str)
-    self.__setOrthography(orthography, range: nsrange)
-  }
-}
diff --git a/stdlib/public/Darwin/NaturalLanguage/NLTokenizer.swift b/stdlib/public/Darwin/NaturalLanguage/NLTokenizer.swift
deleted file mode 100644
index ca8b337e31d3a..0000000000000
--- a/stdlib/public/Darwin/NaturalLanguage/NLTokenizer.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import NaturalLanguage
-import Foundation
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension NLTokenizer {
-  @nonobjc
-  public func tokenRange(at index: String.Index) -> Range<String.Index> {
-    let str = self.string ?? ""
-    let characterIndex = index.utf16Offset(in: str)
-    let nsrange = self.__tokenRange(at:characterIndex)
-    return Range(nsrange, in: str)!
-  }
-
-  @nonobjc
-  public func enumerateTokens(in range: Range<String.Index>, using block: (Range<String.Index>, NLTokenizer.Attributes) -> Bool) {
-    guard let str = self.string else { return }
-    let nsrange = NSRange(range, in: str)
-    self.__enumerateTokens(in: nsrange) { (tokenNSRange, attrs, stop) in
-      if let tokenRange = Range(tokenNSRange, in:str) {
-        let keepGoing = block(tokenRange, attrs)
-        if (!keepGoing) {
-          stop.pointee = true
-        }
-      }
-    }
-  }
-
-  @nonobjc
-  public func tokens(for range: Range<String.Index>) -> [Range<String.Index>] {
-    var array:[Range<String.Index>] = []
-    self.enumerateTokens(in: range) { (tokenRange, attrs) -> Bool in
-      array.append(tokenRange)
-      return true
-    }
-    return array
-  }
-}
diff --git a/stdlib/public/Darwin/Network/CMakeLists.txt b/stdlib/public/Darwin/Network/CMakeLists.txt
deleted file mode 100644
index 07d5e4daeb427..0000000000000
--- a/stdlib/public/Darwin/Network/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftNetwork ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  Network.swift
-  NWConnection.swift
-  NWEndpoint.swift
-  NWError.swift
-  NWListener.swift
-  NWParameters.swift
-  NWPath.swift
-  NWProtocolIP.swift
-  NWProtocol.swift
-  NWProtocolTCP.swift
-  NWProtocolTLS.swift
-  NWProtocolUDP.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR # WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-    Foundation # Imported in Swift
-  SWIFT_MODULE_DEPENDS_IOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-    Foundation # Imported in Swift
-  SWIFT_MODULE_DEPENDS_TVOS Darwin Dispatch CoreFoundation ObjectiveC # auto-updated
-    Foundation # Imported in Swift
-  # SWIFT_MODULE_DEPENDS_WATCHOS Darwin Dispatch Foundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK Network
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_NETWORK_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_NETWORK_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_NETWORK_TVOS}
-  # DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_NETWORK_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Network/NWConnection.swift b/stdlib/public/Darwin/Network/NWConnection.swift
deleted file mode 100644
index c0f2f7e8c9686..0000000000000
--- a/stdlib/public/Darwin/Network/NWConnection.swift
+++ /dev/null
@@ -1,573 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Dispatch
-import Foundation
-@_implementationOnly import _SwiftNetworkOverlayShims
-
-/// An NWConnection is an object that represents a bi-directional data pipe between
-/// a local endpoint and a remote endpoint.
-///
-/// A connection handles establishment of any transport, security, or application-level protocols
-/// required to transmit and receive user data. Multiple protocol instances may be attempted during
-/// the establishment phase of the connection.
-// NOTE: older overlays had Network.NWConnection as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network13_NWConnection is the
-// mangled name for Network._NWConnection.
-@_objcRuntimeName(_TtC7Network13_NWConnection)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public final class NWConnection : CustomDebugStringConvertible {
-
-	public var debugDescription: String {
-		return String("\(self.nw)")
-	}
-
-	/// States a connection may be in
-	public enum State : Equatable {
-		/// The initial state prior to start
-		case setup
-		/// Waiting connections have not yet been started, or do not have a viable network
-		case waiting(NWError)
-		/// Preparing connections are actively establishing the connection
-		case preparing
-		/// Ready connections can send and receive data
-		case ready
-		/// Failed connections are disconnected and can no longer send or receive data
-		case failed(NWError)
-		/// Cancelled connections have been invalidated by the client and will send no more events
-		case cancelled
-
-		internal init(_ nw: nw_connection_state_t, _ err: nw_error_t?) {
-			switch nw {
-			case Network.nw_connection_state_invalid:
-				self = .setup
-			case Network.nw_connection_state_waiting:
-				if let error = NWError(err) {
-					self = .waiting(error)
-				} else {
-					self = .waiting(NWError.posix(.ENETDOWN))
-				}
-			case Network.nw_connection_state_preparing:
-				self = .preparing
-			case Network.nw_connection_state_ready:
-				self = .ready
-			case Network.nw_connection_state_failed:
-				if let error = NWError(err) {
-					self = .failed(error)
-				} else {
-					self = .failed(NWError.posix(.EINVAL))
-				}
-			case Network.nw_connection_state_cancelled:
-				self = .cancelled
-			default:
-				self = .cancelled
-			}
-		}
-	}
-
-	internal let nw : nw_connection_t
-
-	private var _state = NWConnection.State.setup
-
-	/// Access the current state of the connection
-	public var state: NWConnection.State {
-		return _state
-	}
-
-	private var _stateUpdateHandler: ((_ state: NWConnection.State) -> Void)?
-
-	/// Set a block to be called when the connection's state changes, which may be called
-	/// multiple times until the connection is cancelled.
-	public var stateUpdateHandler: ((_ state: NWConnection.State) -> Void)? {
-		set {
-			self._stateUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_connection_set_state_changed_handler(self.nw) { (state, error) in
-					self._state = NWConnection.State(state, error)
-					newValue(self._state)
-				}
-			} else {
-				nw_connection_set_state_changed_handler(self.nw) { (state, error) in
-					self._state = NWConnection.State(state, error)
-				}
-			}
-		}
-		get {
-			return self._stateUpdateHandler
-		}
-	}
-
-	/// Retrieve the maximum datagram size that can be sent
-	/// on the connection. Any datagrams sent should be less
-	/// than or equal to this size.
-	@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-	public var maximumDatagramSize: Int {
-		get {
-			return Int(nw_connection_get_maximum_datagram_size(self.nw))
-		}
-	}
-
-	private var _currentPath: NWPath? = nil
-
-	/// Current path for the connection, which can be used to extract interface and effective endpoint information
-	public var currentPath: NWPath? {
-		get {
-			if let path = nw_connection_copy_current_path(self.nw) {
-				return NWPath(path)
-			}
-			return nil
-		}
-	}
-
-	private var _pathUpdateHandler: ((_ newPath: NWPath) -> Void)?
-
-	/// Set a block to be called when the connection's path has changed, which may be called
-	/// multiple times until the connection is cancelled.
-	public var pathUpdateHandler: ((_ newPath: NWPath) -> Void)? {
-		set {
-			self._pathUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_connection_set_path_changed_handler(self.nw) { (nwPath) in
-					let newPath = NWPath(nwPath)
-					self._currentPath = newPath
-					newValue(newPath)
-				}
-			} else {
-				nw_connection_set_path_changed_handler(self.nw, nil)
-			}
-			
-		}
-		get {
-			return self._pathUpdateHandler
-		}
-	}
-
-	private var _viabilityUpdateHandler: ((_ isViable: Bool) -> Void)?
-
-	/// Set a block to be called when the connection's viability changes, which may be called
-	/// multiple times until the connection is cancelled.
-	///
-	/// Connections that are not currently viable do not have a route, and packets will not be
-	/// sent or received. There is a possibility that the connection will become viable
-	/// again when network connectivity changes.
-	public var viabilityUpdateHandler: ((_ isViable: Bool) -> Void)? {
-		set {
-			self._viabilityUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_connection_set_viability_changed_handler(self.nw) { (isViable) in
-					newValue(isViable)
-				}
-			} else {
-				nw_connection_set_viability_changed_handler(self.nw, nil)
-			}
-
-		}
-		get {
-			return self._viabilityUpdateHandler
-		}
-	}
-
-	private var _betterPathUpdateHandler: ((_ betterPathAvailable: Bool) -> Void)?
-
-	/// A better path being available indicates that the system thinks there is a preferred path or
-	/// interface to use, compared to the one this connection is actively using. As an example, the
-	/// connection is established over an expensive cellular interface and an unmetered Wi-Fi interface
-	/// is now available.
-	///
-	/// Set a block to be called when a better path becomes available or unavailable, which may be called
-	/// multiple times until the connection is cancelled.
-	///
-	/// When a better path is available, if it is possible to migrate work from this connection to a new connection,
-	/// create a new connection to the endpoint. Continue doing work on this connection until the new connection is
-	/// ready. Once ready, transition work to the new connection and cancel this one.
-	public var betterPathUpdateHandler: ((_ betterPathAvailable: Bool) -> Void)? {
-		set {
-			self._betterPathUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_connection_set_better_path_available_handler(self.nw) { (betterPathAvailable) in
-					newValue(betterPathAvailable)
-				}
-			} else {
-				nw_connection_set_better_path_available_handler(self.nw, nil)
-			}
-
-		}
-		get {
-			return self._betterPathUpdateHandler
-		}
-	}
-
-	/// The remote endpoint of the connection
-	public let endpoint: NWEndpoint
-
-	/// The set of parameters with which the connection was created
-	public let parameters: NWParameters
-
-	private init(to: NWEndpoint, using: NWParameters, connection: nw_connection_t) {
-		self.endpoint = to
-		self.parameters = using
-		self.nw = connection
-		nw_connection_set_state_changed_handler(self.nw) { (state, error) in
-			self._state = NWConnection.State(state, error)
-		}
-	}
-
-	convenience internal init?(using: NWParameters, inbound: nw_connection_t) {
-		guard let peer = NWEndpoint(nw_connection_copy_endpoint(inbound)) else {
-			return nil
-		}
-		self.init(to: peer, using: using, connection: inbound)
-	}
-
-	/// Create a new outbound connection to an endpoint, with parameters.
-	/// The parameters determine the protocols to be used for the connection, and their options.
-	///
-	/// - Parameter to: The remote endpoint to which to connect.
-	/// - Parameter using: The parameters define which protocols and path to use.
-	public init(to: NWEndpoint, using: NWParameters) {
-		self.endpoint = to
-		self.parameters = using
-		self.nw = nw_connection_create(to.nw!, using.nw)
-		nw_connection_set_state_changed_handler(self.nw) { (state, error) in
-			self._state = NWConnection.State(state, error)
-		}
-	}
-
-	/// Create a new outbound connection to a hostname and port, with parameters.
-	/// The parameters determine the protocols to be used for the connection, and their options.
-	///
-	/// - Parameter host: The remote hostname to which to connect.
-	/// - Parameter port: The remote port to which to connect.
-	/// - Parameter using: The parameters define which protocols and path to use.
-	public convenience init(host: NWEndpoint.Host, port: NWEndpoint.Port, using: NWParameters) {
-		self.init(to: .hostPort(host: host, port: port), using: using)
-	}
-
-	/// Start the connection and provide a dispatch queue for callback blocks.
-	///
-	/// Starts the connection, which will cause the connection to evaluate its path, do resolution and try to become
-	/// ready (connected). NWConnection establishment is asynchronous. A stateUpdateHandler may be used to determine
-	/// when the state changes. If the connection can not be established, the state will transition to waiting with
-	/// an associated error describing the reason. If an unrecoverable error is encountered, the state will
-	/// transition to failed with an associated NWError value. If the connection is established, the state will
-	/// transition to ready.
- 	///
-	/// Start should only be called once on a connection, and multiple calls to start will
-	/// be ignored.
-	public func start(queue: DispatchQueue) {
-		self._queue = queue
-		nw_connection_set_queue(self.nw, queue)
-		nw_connection_start(self.nw)
-	}
-
-	private var _queue: DispatchQueue?
-
-	/// Get queue used for delivering block handlers, such as stateUpdateHandler, pathUpdateHandler,
-	/// viabilityUpdateHandler, betterPathUpdateHandler, and completions for send and receive.
-	/// If the connection has not yet been started, the queue will be nil. Once the connection has been
-	/// started, the queue will be valid.
-	public var queue: DispatchQueue? {
-		get {
-			return self._queue
-		}
-	}
-
-	/// Cancel the connection, and cause all update handlers to be cancelled.
-	///
-	/// Cancel is asynchronous. The last callback will be to the stateUpdateHandler with the cancelled state. After
-	/// the stateUpdateHandlers are called with the cancelled state, all blocks are released to break retain cycles.
-    ///
-    /// Calls to cancel after the first one are ignored.
-	public func cancel() {
-		nw_connection_cancel(self.nw)
-	}
-
-	/// A variant of cancel that performs non-graceful closure of the transport.
-	public func forceCancel() {
-		nw_connection_force_cancel(self.nw)
-	}
-
-	/// Cancel the currently connected endpoint, causing the connection to fall through to the next endpoint if
-	/// available, or to go to the waiting state if no more endpoints are available.
-	public func cancelCurrentEndpoint() {
-		nw_connection_cancel_current_endpoint(self.nw)
-	}
-
-	/// NWConnections will normally re-attempt on network changes. This function causes a connection that is in
-	/// the waiting state to re-attempt even without a network change.
-	public func restart() {
-		nw_connection_restart(self.nw)
-	}
-
-	/// Content Context controls options for how data is sent, and access for metadata to send or receive.
-	/// All properties of Content Context are valid for sending. For received Content Context, only the protocolMetadata
-	/// values will be set.
-	// Set the ObjC name of this class to be nested in the customized ObjC name of NWConnection.
-	@_objcRuntimeName(_TtCC7Network13_NWConnection14ContentContext)
-	public class ContentContext {
-        internal let nw: nw_content_context_t
-
-        /// A string description of the content, used for logging and debugging.
-        public let identifier: String
-
-		/// An expiration in milliseconds after scheduling a send, after which the content may be dropped.
-		/// Defaults to 0, which implies no expiration. Used only when sending.
-		public let expirationMilliseconds: UInt64
-
-		/// A numeric value between 0.0 and 1.0 to specify priority of this data/message. Defaults to 0.5.
-		/// Used only when sending.
-		public let relativePriority: Double
-
-		/// Any content marked as an antecedent must be sent prior to this content being sent. Defaults to nil.
-		/// Used only when sending.
-		public let antecedent: NWConnection.ContentContext?
-
-		/// A boolean indicating if this context is the final context in a given direction on this connection. Defaults to false.
-		public let isFinal: Bool
-
-		/// An array of protocol metadata to send (to inform the protocols of per-data options) or receive (to receive per-data options or statistics).
-        public var protocolMetadata: [NWProtocolMetadata] {
-            get {
-                var metadataArray: [NWProtocolMetadata] = []
-                nw_content_context_foreach_protocol_metadata(self.nw) { (definition, metadata) in
-                    if nw_protocol_metadata_is_tcp(metadata) {
-                       metadataArray.append(NWProtocolTCP.Metadata(metadata))
-                    } else if nw_protocol_metadata_is_udp(metadata) {
-                        metadataArray.append(NWProtocolUDP.Metadata(metadata))
-                    } else if nw_protocol_metadata_is_ip(metadata) {
-                        metadataArray.append(NWProtocolIP.Metadata(metadata))
-					} else if nw_protocol_metadata_is_tls(metadata) {
-						metadataArray.append(NWProtocolTLS.Metadata(metadata))
-					}
-                }
-                return metadataArray
-            }
-        }
-
-		/// Access the metadata for a specific protocol from a context. The metadata may be nil.
-        public func protocolMetadata(definition: NWProtocolDefinition) -> NWProtocolMetadata? {
-			if let metadata = nw_content_context_copy_protocol_metadata(self.nw, definition.nw) {
-				if nw_protocol_metadata_is_tcp(metadata) {
-					return NWProtocolTCP.Metadata(metadata)
-				} else if nw_protocol_metadata_is_udp(metadata) {
-					return NWProtocolUDP.Metadata(metadata)
-				} else if nw_protocol_metadata_is_ip(metadata) {
-					return NWProtocolIP.Metadata(metadata)
-				} else if nw_protocol_metadata_is_tls(metadata) {
-					return NWProtocolTLS.Metadata(metadata)
-				}
-			}
-			return nil
-        }
-
-		/// Create a context for sending, that optionally can set expiration (default 0),
-		/// priority (default 0.5), antecedent (default nil), and protocol metadata (default []]).
-		public init(identifier: String, expiration: UInt64 = 0, priority: Double = 0.5, isFinal: Bool = false, antecedent: NWConnection.ContentContext? = nil, metadata: [NWProtocolMetadata]? = []) {
-            self.nw = nw_content_context_create(identifier)
-
-            self.identifier = identifier
-
-			self.expirationMilliseconds = expiration
-            nw_content_context_set_expiration_milliseconds(self.nw, expiration)
-
-			self.relativePriority = priority
-            nw_content_context_set_relative_priority(self.nw, priority)
-
-			self.isFinal = isFinal
-			nw_content_context_set_is_final(self.nw, isFinal)
-
-			self.antecedent = antecedent
-            if let otherContext = antecedent {
-                nw_content_context_set_antecedent(self.nw, otherContext.nw)
-            }
-
-			if let metadataArray = metadata {
-				for singleMetadata in metadataArray {
-					nw_content_context_set_metadata_for_protocol(self.nw, singleMetadata.nw)
-				}
-			}
-		}
-
-		/// Use the default message context to send content with all default properties:
-		/// default priority, no expiration, and not the final message. Marking this context
-		/// as complete with a send indicates that the message content is now complete and any
-		/// other messages that were blocked may be scheduled, but will not close the underlying
-		/// connection. Use this context for any lightweight sends of datagrams or messages on
-		/// top of a stream that do not require special properties.
-		/// This context does not support overriding any properties.
-		public static let defaultMessage : NWConnection.ContentContext = NWConnection.ContentContext(_swift_nw_content_context_default_message())!
-
-		/// Use the final message context to indicate that no more sends are expected
-		/// once this context is complete. Like .defaultMessage, all properties are default.
-		/// Marking a send as complete when using this context will close the sending side of the
-		/// underlying connection. This is the equivalent of sending a FIN on a TCP stream.
-		/// This context does not support overriding any properties.
-		public static let finalMessage : NWConnection.ContentContext = NWConnection.ContentContext(_swift_nw_content_context_final_message())!
-
-		/// Use the default stream context to indicate that this sending context is
-		/// the one that represents the entire connection. All context properties are default.
-		/// This context behaves in the same way as .finalMessage, such that marking the
-		/// context complete by sending isComplete will close the sending side of the
-		/// underlying connection (a FIN for a TCP stream).
-		/// Note that this context is a convenience for sending a single, final context.
-		/// If the protocol used by the connection is a stream (such as TCP), the caller
-		/// may still use .defaultMessage, .finalMessage, or a custom context with priorities
-		/// and metadata to set properties of a particular chunk of stream data relative
-		/// to other data on the stream.
-		/// This context does not support overriding any properties.
-		public static let defaultStream : NWConnection.ContentContext = NWConnection.ContentContext(_swift_nw_content_context_default_stream())!
-
-		internal init?(_ nw: nw_content_context_t?) {
-			guard let nw = nw else {
-				return nil
-			}
-
-            self.nw = nw
-
-			// Received content context doesn't have expiration, priority, or antecedents
-			self.expirationMilliseconds = 0
-			self.relativePriority = 0
-			self.antecedent = nil
-			self.isFinal = nw_content_context_get_is_final(nw)
-            self.identifier = String(cString: nw_content_context_get_identifier(nw))
-		}
-	}
-
-	/// Receive data from a connection. This may be called before the connection
-	/// is ready, in which case the receive request will be queued until the
-	/// connection is ready. The completion handler will be invoked exactly
-	/// once for each call, so the client must call this function multiple
-	/// times to receive multiple chunks of data. For protocols that
-	/// support flow control, such as TCP, calling receive opens the receive
-	/// window. If the client stops calling receive, the receive window will
-	/// fill up and the remote peer will stop sending.
-	/// - Parameter minimumIncompleteLength: The minimum length to receive from the connection,
-	///   until the content is complete.
-	/// - Parameter maximumLength: The maximum length to receive from the connection in a single completion.
-	/// - Parameter completion: A receive completion is invoked exactly once for a call to receive(...).
-	///   The completion indicates that the requested content has been received (in which case
-	///   the content is delivered), or else an error has occurred. Parameters to the completion are:
-	///
-	///   - content: The received content, as constrained by the minimum and maximum length. This may
-	///     be nil if the message or stream is complete (without any more data to deliver), or if
-	///     an error was encountered.
-	///
-	///   - contentContext: Content context describing the received content. This includes protocol metadata
-	///     that lets the caller introspect information about the received content (such as flags on a packet).
-	///
-	///   - isComplete: An indication that this context (a message or stream, for example) is now complete. For
-	///     protocols such as TCP, this will be marked when the entire stream has be closed in the
-	///     reading direction. For protocols such as UDP, this will be marked when the end of a
-	///     datagram has been reached.
-	///
-	///   - error: An error will be sent if the receive was terminated before completing. There may still
-	///     be content delivered along with the error, but this content may be shorter than the requested
-	///     ranges. An error will be sent for any outstanding receives when the connection is cancelled.
-	public func receive(minimumIncompleteLength: Int, maximumLength: Int,
-						completion: @escaping (_ content: Data?,
-											   _ contentContext: NWConnection.ContentContext?,
-											   _ isComplete: Bool, _ error: NWError?) -> Void) {
-		nw_connection_receive(self.nw, UInt32(minimumIncompleteLength), UInt32(maximumLength)) {
-			(content, context, complete, nwError) in
-			completion(NWCreateNSDataFromDispatchData(content), ContentContext(context), complete, NWError(nwError));
-		}
-	}
-
-	/// Receive complete message content from the connection, waiting for the content to be marked complete
-	/// (or encounter an error) before delivering the callback. This is useful for datagram or message-based
-	/// protocols like UDP. See receive(minimumIncompleteLength:, maximumLength:, completion:) for a description
-	/// of the completion handler.
-	public func receiveMessage(completion: @escaping (_ completeContent: Data?,
-                                                      _ contentContext: NWConnection.ContentContext?,
-                                                      _ isComplete: Bool, _ error: NWError?) -> Void) {
-		nw_connection_receive_message(self.nw) { (content, context, complete, nwError) in
-			completion(NWCreateNSDataFromDispatchData(content), ContentContext(context), complete, NWError(nwError))
-		}
-	}
-
-	/// A type representing a wrapped completion handler invoked when send content has been consumed by the protocol stack, or the lack of a completion handler because the content is idempotent.
-	public enum SendCompletion {
-		/// Completion handler to be invoked when send content has been successfully processed, or failed to send due to an error.
-		/// Note that this does not guarantee that the data was sent out over the network, or acknowledge, but only that
-		/// it has been consumed by the protocol stack.
-		case contentProcessed((_ error: NWError?) -> Void)
-		/// Idempotent content may be sent multiple times when opening up a 0-RTT connection, so there is no completion block
-		case idempotent
-	}
-
-	/// Send data on a connection. This may be called before the connection is ready,
-	/// in which case the send will be enqueued until the connection is ready to send.
-	/// This is an asynchronous send and the completion block can be used to
-	/// determine when the send is complete. There is nothing preventing a client
-	/// from issuing an excessive number of outstanding sends. To minimize memory
-	/// footprint and excessive latency as a consequence of buffer bloat, it is
-	/// advisable to keep a low number of outstanding sends. The completion block
-	/// can be used to pace subsequent sends.
-	/// - Parameter content: The data to send on the connection. May be nil if this send marks its context as complete, such
-	///   as by sending .finalMessage as the context and marking isComplete to send a write-close.
-	/// - Parameter contentContext: The context associated with the content, which represents a logical message
-	///   to be sent on the connection. All content sent within a single context will
-	///   be sent as an in-order unit, up until the point that the context is marked
-	///   complete (see isComplete). Once a context is marked complete, it may be re-used
-	///   as a new logical message. Protocols like TCP that cannot send multiple
-	///   independent messages at once (serial streams) will only start processing a new
-	///   context once the prior context has been marked complete. Defaults to .defaultMessage.
-	/// - Parameter isComplete: A flag indicating if the caller's sending context (logical message) is now complete.
-	///   Until a context is marked complete, content sent for other contexts may not
-	///   be sent immediately (if the protocol requires sending bytes serially, like TCP).
-	///   For datagram protocols, like UDP, isComplete indicates that the content represents
-	///   a complete datagram.
-	///   When sending using streaming protocols like TCP, isComplete can be used to mark the end
-    ///   of a single message on the stream, of which there may be many. However, it can also
-	///   indicate that the connection should send a "write close" (a TCP FIN) if the sending
-	///   context is the final context on the connection. Specifically, to send a "write close",
-	///   pass .finalMessage or .defaultStream for the context (or create a custom context and
-	///   set .isFinal), and pass true for isComplete.
-	/// - Parameter completion: A completion handler (.contentProcessed) to notify the caller when content has been processed by
-	///   the connection, or a marker that this data is idempotent (.idempotent) and may be sent multiple times as fast open data.
-	public func send(content: Data?, contentContext: NWConnection.ContentContext = .defaultMessage, isComplete: Bool = true, completion: SendCompletion) {
-		switch completion {
-		case .idempotent:
-			_swift_nw_connection_send_idempotent(self.nw, NWCreateDispatchDataFromNSData(content), contentContext.nw, isComplete)
-		case .contentProcessed(let handler):
-			_swift_nw_connection_send(self.nw, NWCreateDispatchDataFromNSData(content), contentContext.nw, isComplete) { (error) in
-				handler(NWError(error))
-			}
-		}
-	}
-
-	/// Batching allows multiple send or receive calls provides a hint to the connection that the operations
-	/// should be coalesced to improve efficiency. Calls other than send and receive will not be affected.
-	public func batch(_ block: () -> Void) {
-		nw_connection_batch(self.nw, block)
-	}
-
-	/// Access connection-wide protocol metadata on the connection. This allows access to state for protocols
-	/// like TCP and TLS that have long-term state.
-	public func metadata(definition: NWProtocolDefinition) -> NWProtocolMetadata? {
-		if let metadata = nw_connection_copy_protocol_metadata(self.nw, definition.nw) {
-			if nw_protocol_metadata_is_tcp(metadata) {
-				return NWProtocolTCP.Metadata(metadata)
-			} else if nw_protocol_metadata_is_udp(metadata) {
-				return NWProtocolUDP.Metadata(metadata)
-			} else if nw_protocol_metadata_is_ip(metadata) {
-				return NWProtocolIP.Metadata(metadata)
-			} else if nw_protocol_metadata_is_tls(metadata) {
-				return NWProtocolTLS.Metadata(metadata)
-			}
-			return NWProtocolMetadata(metadata)
-		} else {
-			return nil
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWEndpoint.swift b/stdlib/public/Darwin/Network/NWEndpoint.swift
deleted file mode 100644
index 6249c30a73ab6..0000000000000
--- a/stdlib/public/Darwin/Network/NWEndpoint.swift
+++ /dev/null
@@ -1,737 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Darwin
-import Foundation
-@_implementationOnly import _SwiftNetworkOverlayShims
-
-internal extension sockaddr_in {
-	init(_ address:in_addr, _ port: in_port_t) {
-		self.init(sin_len: UInt8(MemoryLayout<sockaddr_in>.size), sin_family: sa_family_t(AF_INET), sin_port: port,
-				  sin_addr: address, sin_zero: (0, 0, 0, 0, 0, 0, 0, 0))
-	}
-
-	func withSockAddr<ReturnType>(_ body: (_ sa: UnsafePointer<sockaddr>) throws -> ReturnType) rethrows -> ReturnType {
-		// We need to create a mutable copy of `self` so that we can pass it to `withUnsafePointer(to:_:)`.
-		var sin = self
-		return try withUnsafePointer(to: &sin) {
-			try $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
-				try body($0)
-			}
-		}
-	}
-}
-
-internal extension sockaddr_in6 {
-	init(_ address:in6_addr, _ port: in_port_t, flow: UInt32 = 0, scope: UInt32 = 0) {
-		self.init(sin6_len: UInt8(MemoryLayout<sockaddr_in6>.size), sin6_family: sa_family_t(AF_INET6), sin6_port: port,
-				  sin6_flowinfo: flow, sin6_addr: address, sin6_scope_id: scope)
-	}
-
-	func withSockAddr<ReturnType>(_ body: (_ sa: UnsafePointer<sockaddr>) throws -> ReturnType) rethrows -> ReturnType {
-		// We need to create a mutable copy of `self` so that we can pass it to `withUnsafePointer(to:_:)`.
-		var sin6 = self
-		return try withUnsafePointer(to: &sin6) {
-			try $0.withMemoryRebound(to: sockaddr.self, capacity: 1) {
-				try body($0)
-			}
-		}
-	}
-}
-
-internal extension in_addr {
-	init(address: UInt32) {
-		self.init()
-		self.s_addr = address.bigEndian
-	}
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-private func getaddrinfo_numeric(_ string: String, family: Int32 = 0) -> NWEndpoint.Host? {
-	// Determine if this string has an interface scope specified "127.0.0.1%lo0" or "fe80::1%lo0"
-	var string = string
-	var interface : NWInterface? = nil
-	if let range = string.range(of: "%", options: String.CompareOptions.backwards) {
-		interface = NWInterface(String(string[range.upperBound...]))
-		if interface != nil {
-			string.removeSubrange(range.lowerBound...)
-		}
-	}
-
-	// call getaddrinfo
-	var hints = addrinfo(ai_flags: AI_NUMERICHOST, ai_family: family, ai_socktype: SOCK_STREAM, ai_protocol: 0,
-						 ai_addrlen: 0, ai_canonname: nil, ai_addr: nil, ai_next: nil)
-	var resolved : UnsafeMutablePointer<addrinfo>? = nil
-	// After this point we must ensure we free addrinfo before we return
-	guard getaddrinfo(string, nil, &hints, &resolved) == 0, let addrinfo = resolved else {
-		return nil
-	}
-
-	var result: NWEndpoint.Host? = nil
-
-	if let sa = addrinfo.pointee.ai_addr {
-		if sa.pointee.sa_family == AF_INET {
-			sa.withMemoryRebound(to: sockaddr_in.self, capacity: 1, { (sin) -> Void in
-				result = NWEndpoint.Host.ipv4(IPv4Address(sin.pointee.sin_addr, interface))
-			})
-		} else if sa.pointee.sa_family == AF_INET6 {
-			sa.withMemoryRebound(to: sockaddr_in6.self, capacity: 1, { (sin6) -> Void in
-				if sin6.pointee.sin6_scope_id != 0 {
-					interface = NWInterface(Int(sin6.pointee.sin6_scope_id))
-				}
-				let ipv6 = IPv6Address(sin6.pointee.sin6_addr, interface);
-				if ipv6.isIPv4Mapped && family == AF_UNSPEC, let ipv4 = ipv6.asIPv4 {
-					// Treat IPv4 mapped as IPv4
-					result = NWEndpoint.Host.ipv4(ipv4)
-				} else {
-					result = NWEndpoint.Host.ipv6(ipv6)
-				}
-			})
-		}
-	}
-	freeaddrinfo(addrinfo)
-	return result
-}
-
-private func getnameinfo_numeric(address: UnsafeRawPointer) -> String {
-	let sa = address.assumingMemoryBound(to: sockaddr.self)
-	var result : String? = nil
-	let maxLen = socklen_t(100)
-	let storage = UnsafeMutablePointer<Int8>.allocate(capacity: Int(maxLen))
-	if getnameinfo(sa, socklen_t(sa.pointee.sa_len), storage, maxLen, nil, 0, NI_NUMERICHOST) == 0 {
-		result = String(cString: storage)
-	}
-	storage.deallocate()
-	return result ?? "?"
-}
-
-/// An IP address
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public protocol IPAddress {
-
-	/// Fetch the raw address as data
-	var rawValue: Data { get }
-
-	/// Create an IP address from data. The length of the data must
-	/// match the expected length of addresses in the address family
-	/// (four bytes for IPv4, and sixteen bytes for IPv6)
-	init?(_ rawValue: Data, _ interface: NWInterface?)
-
-	/// Create an IP address from an address literal string.
-	/// If the string contains '%' to indicate an interface, the interface will be
-	/// associated with the address, such as "::1%lo0" being associated with the loopback
-	/// interface.
-	/// This function does not perform host name to address resolution. This is the same as calling getaddrinfo
-	/// and using AI_NUMERICHOST.
-	init?(_ string: String)
-
-	/// The interface the address is scoped to, if any.
-	var interface: NWInterface? { get }
-
-	/// Indicates if this address is loopback
-	var isLoopback : Bool { get }
-
-	/// Indicates if this address is link-local
-	var isLinkLocal : Bool { get }
-
-	/// Indicates if this address is multicast
-	var isMulticast : Bool { get }
-}
-
-/// IPv4Address
-/// Base type to hold an IPv4 address and convert between strings and raw bytes.
-/// Note that an IPv4 address may be scoped to an interface.
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public struct IPv4Address: IPAddress, Hashable, CustomDebugStringConvertible {
-
-	/// The IPv4 any address used for listening
-	public static let any = IPv4Address(in_addr(address: INADDR_ANY), nil)
-
-	/// The IPv4 broadcast address used to broadcast to all hosts
-	public static let broadcast = IPv4Address(in_addr(address: INADDR_BROADCAST), nil)
-
-	/// The IPv4 loopback address
-	public static let loopback = IPv4Address(in_addr(address: INADDR_LOOPBACK), nil)
-
-	/// The IPv4 all hosts multicast group
-	public static let allHostsGroup = IPv4Address(in_addr(address: INADDR_ALLHOSTS_GROUP), nil)
-
-	/// The IPv4 all routers multicast group
-	public static let allRoutersGroup = IPv4Address(in_addr(address: INADDR_ALLRTRS_GROUP), nil)
-
-	/// The IPv4 all reports multicast group for ICMPv3 membership reports
-	public static let allReportsGroup = IPv4Address(in_addr(address: INADDR_ALLRPTS_GROUP), nil)
-
-	/// The IPv4 multicast DNS group. (Note: Use the dns_sd APIs instead of creating your own responder/resolver)
-	public static let mdnsGroup = IPv4Address(in_addr(address: INADDR_ALLMDNS_GROUP), nil)
-
-	/// Indicates if this IPv4 address is loopback (127.0.0.1)
-	public var isLoopback : Bool {
-		return self == IPv4Address.loopback
-	}
-
-	/// Indicates if this IPv4 address is link-local
-	public var isLinkLocal : Bool {
-		let linkLocalMask: UInt32 = IN_CLASSB_NET
-		let linkLocalCompare: UInt32 = IN_LINKLOCALNETNUM
-		return (self.address.s_addr & linkLocalMask.bigEndian) == linkLocalCompare.bigEndian
-	}
-
-	/// Indicates if this IPv4 address is multicast
-	public var isMulticast : Bool {
-		let multicastMask: UInt32 = IN_CLASSD_NET
-		let multicastCompare: UInt32 = INADDR_UNSPEC_GROUP
-		return (self.address.s_addr & multicastMask.bigEndian) == multicastCompare.bigEndian
-	}
-
-	/// Fetch the raw address (four bytes)
-	public var rawValue: Data {
-		var temporary = self.address
-		return withUnsafeBytes(of: &temporary) { (bytes) -> Data in
-			Data(bytes)
-		}
-	}
-
-	internal init(_ address: in_addr, _ interface: NWInterface?) {
-		self.address = address
-		self.interface = interface
-	}
-
-	/// Create an IPv4 address from a 4-byte data. Optionally specify an interface.
-	///
-	/// - Parameter rawValue: The raw bytes of the IPv4 address, must be exactly 4 bytes or init will fail.
-	/// - Parameter interface: An optional network interface to scope the address to. Defaults to nil.
-	/// - Returns: An IPv4Address or nil if the Data parameter did not contain an IPv4 address.
-	public init?(_ rawValue: Data, _ interface: NWInterface? = nil) {
-		if rawValue.count != MemoryLayout<in_addr>.size {
-			return nil
-		}
-		let v4 = rawValue.withUnsafeBytes { $0.load(as: in_addr.self) }
-		self.init(v4, interface)
-	}
-
-	/// Create an IPv4 address from an address literal string.
-	///
-	/// This function does not perform host name to address resolution. This is the same as calling getaddrinfo
-	/// and using AI_NUMERICHOST.
-	///
-	/// - Parameter string: An IPv4 address literal string such as "127.0.0.1", "169.254.8.8%en0".
-	/// - Returns: An IPv4Address or nil if the string parameter did not
-	/// contain an IPv4 address literal.
-	public init?(_ string: String) {
-		guard let result = getaddrinfo_numeric(string, family: AF_INET) else {
-			return nil
-		}
-		guard case .ipv4(let address) = result else {
-			return nil
-		}
-		self = address
-	}
-
-	fileprivate let address : in_addr
-
-	/// The interface the address is scoped to, if any.
-	public let interface: NWInterface?
-
-	// Hashable
-	public static func == (lhs: IPv4Address, rhs: IPv4Address) -> Bool {
-		return lhs.address.s_addr == rhs.address.s_addr && lhs.interface == rhs.interface
-	}
-
-	public func hash(into hasher: inout Hasher) {
-		hasher.combine(self.address.s_addr)
-		hasher.combine(self.interface)
-	}
-
-	// CustomDebugStringConvertible
-	public var debugDescription: String {
-		var sin = sockaddr_in(self.address, 0)
-		let addressString = getnameinfo_numeric(address: &sin)
-		if let interface = self.interface {
-			return String("\(addressString)%\(interface)")
-		} else {
-			return addressString
-		}
-	}
-}
-
-/// IPv6Address
-/// Base type to hold an IPv6 address and convert between strings and raw bytes.
-/// Note that an IPv6 address may be scoped to an interface.
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public struct IPv6Address: IPAddress, Hashable, CustomDebugStringConvertible {
-
-	/// IPv6 any address
-	public static let any = IPv6Address(in6addr_any, nil)
-
-	/// IPv6 broadcast address
-	public static let broadcast = IPv6Address(in6addr_any, nil)
-
-	/// IPv6 loopback address
-	public static let loopback = IPv6Address(in6addr_loopback, nil)
-
-	/// IPv6 all node local nodes multicast
-	public static let nodeLocalNodes = IPv6Address(in6addr_nodelocal_allnodes, nil)
-
-	/// IPv6 all link local nodes multicast
-	public static let linkLocalNodes = IPv6Address(in6addr_linklocal_allnodes, nil)
-
-	/// IPv6 all link local routers multicast
-	public static let linkLocalRouters = IPv6Address(in6addr_linklocal_allrouters, nil)
-
-	public enum Scope: UInt8 {
-		case nodeLocal = 1
-		case linkLocal = 2
-		case siteLocal = 5
-		case organizationLocal = 8
-		case global = 0x0e
-	}
-
-	/// Is the Any address "::0"
-	public var isAny : Bool {
-		return self.address.__u6_addr.__u6_addr32.0 == 0 &&
-			self.address.__u6_addr.__u6_addr32.1 == 0 &&
-			self.address.__u6_addr.__u6_addr32.2 == 0 &&
-			self.address.__u6_addr.__u6_addr32.3 == 0
-	}
-
-	/// Is the looback address "::1"
-	public var isLoopback : Bool {
-		return self.address.__u6_addr.__u6_addr32.0 == 0 &&
-			self.address.__u6_addr.__u6_addr32.1 == 0 &&
-			self.address.__u6_addr.__u6_addr32.2 == 0 &&
-			self.address.__u6_addr.__u6_addr32.3 != 0 &&
-			self.address.__u6_addr.__u6_addr32.3 == UInt32(1).bigEndian
-	}
-
-	/// Is an IPv4 compatible address
-	public var isIPv4Compatabile : Bool {
-		return self.address.__u6_addr.__u6_addr32.0 == 0 &&
-			self.address.__u6_addr.__u6_addr32.1 == 0 &&
-			self.address.__u6_addr.__u6_addr32.2 == 0 &&
-			self.address.__u6_addr.__u6_addr32.3 != 0 &&
-			self.address.__u6_addr.__u6_addr32.3 != UInt32(1).bigEndian
-	}
-
-	/// Is an IPv4 mapped address such as "::ffff:1.2.3.4"
-	public var isIPv4Mapped : Bool {
-		return self.address.__u6_addr.__u6_addr32.0 == 0 &&
-			self.address.__u6_addr.__u6_addr32.1 == 0 &&
-			self.address.__u6_addr.__u6_addr32.2 == UInt32(0x0000ffff).bigEndian
-	}
-
-	/// For IPv6 addresses that are IPv4 mapped, returns the IPv4 address
-	///
-	/// - Returns: nil unless the IPv6 address was mapped or compatible, in which case the IPv4 address is
-	/// returned.
-	public var asIPv4 : IPv4Address? {
-		guard self.isIPv4Mapped || self.isIPv4Compatabile else {
-			return nil
-		}
-		return IPv4Address(in_addr(address: self.address.__u6_addr.__u6_addr32.3.bigEndian),
-										   self.interface)
-	}
-
-	/// Is a 6to4 IPv6 address
-	public var is6to4 : Bool {
-		return self.address.__u6_addr.__u6_addr16.0 == UInt16(0x2002).bigEndian
-	}
-
-	/// Is a link-local address
-	public var isLinkLocal : Bool {
-		return self.address.__u6_addr.__u6_addr8.0 == UInt8(0xfe) &&
-			(self.address.__u6_addr.__u6_addr8.1 & 0xc0) == 0x80
-	}
-
-	/// Is multicast
-	public var isMulticast : Bool {
-		return self.address.__u6_addr.__u6_addr8.0 == 0xff
-	}
-
-	/// Returns the multicast scope
-	public var multicastScope : IPv6Address.Scope? {
-		if (self.isMulticast) {
-			return IPv6Address.Scope(rawValue: self.address.__u6_addr.__u6_addr8.1 & 0x0f)
-		}
-		return nil
-	}
-
-	internal init(_ ip6: in6_addr, _ interface: NWInterface?) {
-		self.address = ip6
-		self.interface = interface
-	}
-
-	/// Create an IPv6 from a raw 16 byte value and optional interface
-	///
-	/// - Parameter rawValue: A 16 byte IPv6 address
-	/// - Parameter interface: An optional interface the address is scoped to. Defaults to nil.
-	/// - Returns: nil unless the raw data contained an IPv6 address
-	public init?(_ rawValue: Data, _ interface: NWInterface? = nil) {
-		if rawValue.count != MemoryLayout<in6_addr>.size {
-			return nil
-		}
-		let v6 = rawValue.withUnsafeBytes { $0.load(as: in6_addr.self) }
-		self.init(v6, interface)
-	}
-
-	/// Create an IPv6 address from a string literal such as "fe80::1%lo0" or "2001:DB8::5"
-	///
-	/// This function does not perform hostname resolution. This is similar to calling getaddrinfo with
-	/// AI_NUMERICHOST.
-	///
-	/// - Parameter string: An IPv6 address literal string.
-	/// - Returns: nil unless the string contained an IPv6 literal
-	public init?(_ string: String) {
-		guard let result = getaddrinfo_numeric(string, family: AF_INET6) else {
-			return nil
-		}
-		guard case .ipv6(let address) = result else {
-			return nil
-		}
-		self = address
-	}
-
-	fileprivate let address: in6_addr
-
-	/// The interface the address is scoped to, if any.
-	public let interface: NWInterface?
-
-	/// Fetch the raw address (sixteen bytes)
-	public var rawValue: Data {
-		var temporary = self.address
-		return withUnsafeBytes(of: &temporary) { (bytes) -> Data in
-			Data(bytes)
-		}
-	}
-
-	// Hashable
-	public static func ==(lhs: IPv6Address, rhs: IPv6Address) -> Bool {
-		return lhs.address.__u6_addr.__u6_addr32.0 == rhs.address.__u6_addr.__u6_addr32.0 &&
-			lhs.address.__u6_addr.__u6_addr32.1 == rhs.address.__u6_addr.__u6_addr32.1 &&
-			lhs.address.__u6_addr.__u6_addr32.2 == rhs.address.__u6_addr.__u6_addr32.2 &&
-			lhs.address.__u6_addr.__u6_addr32.3 == rhs.address.__u6_addr.__u6_addr32.3 &&
-			lhs.interface == rhs.interface
-	}
-
-	public func hash(into hasher: inout Hasher) {
-		hasher.combine(self.address.__u6_addr.__u6_addr32.0)
-		hasher.combine(self.address.__u6_addr.__u6_addr32.1)
-		hasher.combine(self.address.__u6_addr.__u6_addr32.2)
-		hasher.combine(self.address.__u6_addr.__u6_addr32.3)
-		hasher.combine(self.interface)
-	}
-
-	// CustomDebugStringConvertible
-	public var debugDescription: String {
-		var sin6 = sockaddr_in6(self.address, 0)
-		let addressString = getnameinfo_numeric(address: &sin6)
-		if let interface = self.interface {
-			return String("\(addressString)%\(interface)")
-		} else {
-			return addressString
-		}
-	}
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-/// NWEndpoint represents something that can be connected to.
-public enum NWEndpoint: Hashable, CustomDebugStringConvertible {
-	// Depends on non-exhaustive enum support for forward compatibility - in the event we need to add
-	// a new case in the future
-	// https://github.com/apple/swift-evolution/blob/master/proposals/0192-non-exhaustive-enums.md
-
-	/// A host port endpoint represents an endpoint defined by the host and port.
-	case hostPort(host: NWEndpoint.Host, port: NWEndpoint.Port)
-
-	/// A service endpoint represents a Bonjour service
-	case service(name: String, type: String, domain: String, interface: NWInterface?)
-
-	/// A unix endpoint represents a path that supports connections using AF_UNIX domain sockets.
-	case unix(path: String)
-
-	/// A Host is a name or address
-	public enum Host: Hashable, CustomDebugStringConvertible, ExpressibleByStringLiteral {
-		public typealias StringLiteralType = String
-
-		public func hash(into hasher: inout Hasher) {
-			switch self {
-			case .name(let hostName, let hostInterface):
-				hasher.combine(hostInterface)
-				hasher.combine(hostName)
-			case .ipv4(let v4Address):
-				hasher.combine(v4Address)
-			case .ipv6(let v6Address):
-				hasher.combine(v6Address)
-			}
-		}
-
-		/// A host specified as a name and optional interface scope
-		case name(String, NWInterface?)
-
-		/// A host specified as an IPv4 address
-		case ipv4(IPv4Address)
-
-		/// A host specified an an IPv6 address
-		case ipv6(IPv6Address)
-
-		public init(stringLiteral: StringLiteralType) {
-			self.init(stringLiteral)
-		}
-
-		/// Create a host from a string.
-		///
-		/// This is the preferred way to create a host. If the string is an IPv4 address literal ("198.51.100.2"), an
-		/// IPv4 host will be created. If the string is an IPv6 address literal ("2001:DB8::2", "fe80::1%lo", etc), an IPv6
-		/// host will be created. If the string is an IPv4 mapped IPv6 address literal ("::ffff:198.51.100.2") an IPv4
-		/// host will be created. Otherwise, a named host will be created.
-		///
-		/// - Parameter string: An IPv4 address literal, an IPv6 address literal, or a hostname.
-		/// - Returns: A Host object
-		public init(_ string: String) {
-			if let result = getaddrinfo_numeric(string) {
-				self = result
-			} else {
-				if let range = string.range(of: "%", options: String.CompareOptions.backwards),
-					let interface = NWInterface(String(string[range.upperBound...])){
-					self = .name(String(string[..<range.lowerBound]), interface)
-				} else {
-					self = .name(string, nil)
-				}
-			}
-		}
-
-		/// Returns the interface the host is scoped to if any
-		public var interface : NWInterface? {
-			switch self {
-			case .ipv4(let ip4):
-				return ip4.interface
-			case .ipv6(let ip6):
-				return ip6.interface
-			case .name(_, let interface):
-				return interface
-			}
-		}
-
-		public var debugDescription: String {
-			switch self {
-			case .ipv4(let ip4):
-				return ip4.debugDescription
-			case .ipv6(let ip6):
-				return ip6.debugDescription
-			case .name(let name, let interface):
-				if let interface = interface {
-					return String("\(name)%\(interface)")
-				} else {
-					return name
-				}
-			}
-		}
-	}
-
-	/// A network port (TCP or UDP)
-	public struct Port : Hashable, CustomDebugStringConvertible, ExpressibleByIntegerLiteral, RawRepresentable {
-		public typealias IntegerLiteralType = UInt16
-
-		fileprivate let port: IntegerLiteralType
-
-		public static let any : NWEndpoint.Port = 0
-		public static let ssh : NWEndpoint.Port = 22
-		public static let smtp : NWEndpoint.Port = 25
-		public static let http : NWEndpoint.Port = 80
-		public static let pop : NWEndpoint.Port = 110
-		public static let imap : NWEndpoint.Port = 143
-		public static let https : NWEndpoint.Port = 443
-		public static let imaps : NWEndpoint.Port = 993
-		public static let socks : NWEndpoint.Port = 1080
-
-		public var rawValue: UInt16 {
-			return self.port
-		}
-
-		/// Create a port from a string.
-		///
-		/// Supports common service names such as "http" as well as number strings such as "80".
-        ///
-        /// - Parameter service: A service string such as "http" or a number string such as "80"
-        /// - Returns: A port if the string can be converted to a port, nil otherwise.
-		public init?(_ service: String) {
-			var hints = addrinfo(ai_flags: AI_DEFAULT, ai_family: AF_INET6, ai_socktype: SOCK_STREAM, ai_protocol: 0,
-								 ai_addrlen: 0, ai_canonname: nil, ai_addr: nil, ai_next: nil)
-			var resolved : UnsafeMutablePointer<addrinfo>? = nil
-			if getaddrinfo(nil, service, &hints, &resolved) != 0 {
-				return nil
-			}
-
-			// Check that it didn't return NULL.
-			guard let addrinfo = resolved else {
-				return nil
-			}
-
-			// After this point we must ensure we free addrinfo before we return
-			guard let sa = addrinfo.pointee.ai_addr, sa.pointee.sa_family == AF_INET6 else {
-				freeaddrinfo(addrinfo)
-				return nil
-			}
-
-			self.port = sa.withMemoryRebound(to: sockaddr_in6.self, capacity: 1) {sin6 in
-				return sin6.pointee.sin6_port.bigEndian
-			}
-
-			freeaddrinfo(addrinfo)
-		}
-
-		public init(integerLiteral value: IntegerLiteralType) {
-			self.port = value
-		}
-
-		public init?(rawValue: UInt16) {
-			self.port = rawValue
-		}
-
-		internal init(_ value: UInt16) {
-			self.init(integerLiteral: value)
-		}
-
-		public var debugDescription: String {
-			return String(port)
-		}
-	}
-
-	/// Returns the interface the endpoint is scoped to if any
-	public var interface : NWInterface? {
-		switch self {
-		case .hostPort(host: let host, port: _):
-			return host.interface
-		case .service(name: _, type: _, domain: _, interface: let interface):
-			return interface
-		case .unix(_):
-			return nil
-		}
-	}
-
-	internal init?(_ nw: nw_endpoint_t?) {
-		guard let nw = nw else {
-			return nil
-		}
-		var interface: NWInterface? = nil
-		if let nwinterface = nw_endpoint_copy_interface(nw) {
-			interface = NWInterface(nwinterface)
-		}
-		if nw_endpoint_get_type(nw) == Network.nw_endpoint_type_host {
-			let host = NWEndpoint.Host.name(String(cString: nw_endpoint_get_hostname(nw)), interface)
-			self = .hostPort(host: host, port: NWEndpoint.Port(nw_endpoint_get_port(nw)))
-		} else if nw_endpoint_get_type(nw) == Network.nw_endpoint_type_address {
-			let port = NWEndpoint.Port(nw_endpoint_get_port(nw))
-			let address = nw_endpoint_get_address(nw)
-			if address.pointee.sa_family == AF_INET && address.pointee.sa_len == MemoryLayout<sockaddr_in>.size {
-                let host = address.withMemoryRebound(to: sockaddr_in.self, capacity: 1) {
-                    (sin: UnsafePointer<sockaddr_in>) -> NWEndpoint.Host in
-					return NWEndpoint.Host.ipv4(IPv4Address(sin.pointee.sin_addr, interface))
-				}
-				self = .hostPort(host: host, port: port)
-			} else if address.pointee.sa_family == AF_INET6 &&
-				address.pointee.sa_len == MemoryLayout<sockaddr_in6>.size {
-				let host = address.withMemoryRebound(to: sockaddr_in6.self, capacity: 1) {
-                    (sin6) -> NWEndpoint.Host in
-					if interface == nil && sin6.pointee.sin6_scope_id != 0 {
-						interface = NWInterface(Int(sin6.pointee.sin6_scope_id))
-					}
-					return NWEndpoint.Host.ipv6(IPv6Address(sin6.pointee.sin6_addr,
-                                                                                      interface))
-				}
-				self = .hostPort(host: host, port: port)
-			} else if address.pointee.sa_family == AF_UNIX {
-				// sockaddr_un is very difficult to deal with in swift. Fortunately, nw_endpoint_copy_address_string
-				// already does exactly what we need.
-				let path = nw_endpoint_copy_address_string(nw)
-				self = .unix(path: String(cString: path))
-				path.deallocate()
-			} else {
-				return nil
-			}
-		} else if nw_endpoint_get_type(nw) == Network.nw_endpoint_type_bonjour_service {
-			self = .service(name: String(cString: nw_endpoint_get_bonjour_service_name(nw)),
-							type: String(cString: nw_endpoint_get_bonjour_service_type(nw)),
-							domain: String(cString: nw_endpoint_get_bonjour_service_domain(nw)),
-							interface: interface)
-		} else {
-			return nil
-		}
-	}
-
-	public func hash(into hasher: inout Hasher) {
-		switch self {
-		case .hostPort(host: let host, port: let port):
-			hasher.combine(host)
-			hasher.combine(port)
-		case .service(name: let name, type: let type, domain: let domain, interface: let interface):
-			hasher.combine(name)
-			hasher.combine(type)
-			hasher.combine(domain)
-			hasher.combine(interface)
-		case .unix(let path):
-			hasher.combine(path)
-		}
-	}
-
-	public var debugDescription: String {
-		switch self {
-		case .hostPort(host: let host, port: let port):
-			var separator = ":"
-			if case .ipv6 = host {
-				separator = "."
-			}
-			return String("\(host)\(separator)\(port)")
-		case .service(name: let name, type: let type, domain: let domain, interface: let interface):
-			if let interface = interface {
-				return String("\(name).\(type)\(domain)%\(interface)")
-			}
-			return String("\(name).\(type)\(domain)")
-		case .unix(let path):
-			return path
-		}
-	}
-
-	internal var nw: nw_endpoint_t? {
-		var endpoint: nw_endpoint_t? = nil
-		var interface: NWInterface? = nil
-		switch self {
-		case .hostPort(host: let host, port: let port):
-			switch host {
-			case .ipv4(let ipv4):
-				let sin = sockaddr_in(ipv4.address, port.port.bigEndian)
-				endpoint = sin.withSockAddr { (sa) -> nw_endpoint_t in
-					nw_endpoint_create_address(sa)
-				}
-				interface = ipv4.interface
-			case .ipv6(let ipv6):
-				let sin6 = sockaddr_in6(ipv6.address, port.port.bigEndian)
-				endpoint = sin6.withSockAddr { (sa) -> nw_endpoint_t? in
-					nw_endpoint_create_address(sa)
-				}
-				interface = ipv6.interface
-			case .name(let host, let hostInterface):
-				endpoint = nw_endpoint_create_host(host, port.debugDescription)
-				interface = hostInterface
-			}
-		case .service(name: let name, type: let type, domain: let domain, interface: let bonjourInterface):
-			endpoint = nw_endpoint_create_bonjour_service(name, type, domain)
-			interface = bonjourInterface
-		case .unix(let path):
-			endpoint = nw_endpoint_create_unix(path)
-		}
-		if interface != nil && endpoint != nil {
-			nw_endpoint_set_interface(endpoint!, interface!.nw)
-		}
-		return endpoint
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWError.swift b/stdlib/public/Darwin/Network/NWError.swift
deleted file mode 100644
index eb26c780fdbd9..0000000000000
--- a/stdlib/public/Darwin/Network/NWError.swift
+++ /dev/null
@@ -1,73 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Darwin
-import Security
-@_implementationOnly import _SwiftNetworkOverlayShims
-
-/// NWError is a type to deliver error codes relevant to NWConnection and NWListener objects.
-/// Generic connectivity errors will be delivered in the posix domain, resolution errors will
-/// be delivered in the dns domain, and security errors will be delivered in the tls domain.
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public enum NWError: Error, CustomDebugStringConvertible, Equatable {
-
-	/// The error code will be a POSIX error as defined in <sys/errno.h>
-	case posix(POSIXErrorCode)
-
-	/// The error code will be a DNSServiceErrorType error as defined in <dns_sd.h>
-	case dns(DNSServiceErrorType)
-
-	/// The error code will be a TLS error as defined in <Security/SecureTransport.h>
-	case tls(OSStatus)
-
-	internal init(_ nw: nw_error_t) {
-		switch nw_error_get_error_domain(nw) {
-		case Network.nw_error_domain_posix:
-			if let errorCode = POSIXErrorCode(rawValue: nw_error_get_error_code(nw)) {
-				self = .posix(errorCode)
-			} else {
-				self = .posix(.EINVAL)
-			}
-		case Network.nw_error_domain_dns:
-			self = .dns(DNSServiceErrorType(nw_error_get_error_code(nw)))
-		case Network.nw_error_domain_tls:
-			self = .tls(OSStatus(nw_error_get_error_code(nw)))
-		default:
-			self = .posix(.EINVAL)
-		}
-	}
-
-	internal init?(_ nw: nw_error_t?) {
-		guard let nw = nw else {
-			return nil
-		}
-		self.init(nw)
-	}
-
-	public var debugDescription: String {
-		switch self {
-		case .posix(let posixError):
-			let maxLen = 128
-			let storage = UnsafeMutablePointer<Int8>.allocate(capacity: maxLen)
-			var asString = "Unknown"
-			if strerror_r(posixError.rawValue, storage, maxLen) == 0 {
-				asString = String(cString: storage)
-			}
-			storage.deallocate()
-			return String("\(posixError): \(asString)")
-		case .dns(let dnsError):
-			return String("\(dnsError): \(String(cString: nwlog_get_string_for_dns_service_error(Int32(dnsError))))")
-		case .tls(let tlsError):
-			return String("\(tlsError): \(String(describing: SecCopyErrorMessageString(Int32(tlsError), nil)))")
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWListener.swift b/stdlib/public/Darwin/Network/NWListener.swift
deleted file mode 100644
index 054fdee0a89db..0000000000000
--- a/stdlib/public/Darwin/Network/NWListener.swift
+++ /dev/null
@@ -1,321 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Darwin
-import Dispatch
-import Foundation
-
-/// An NWListener is an object that is able to receive incoming NWConnection
-/// objects by binding to a local endpoint. A listener will accept connections based
-/// on the protocols defined in its stack. For transport listeners (such as TCP and UDP),
-/// accepted connections will represent new local and remote address and port tuples.
-/// For listeners that include higher-level protocols that support multiplexing,
-/// accepted connections will represent multiplexed streams on a new or existing transport
-/// binding.
-
-// NOTE: older overlays had Network.NWListener as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network11_NWListener is the
-// mangled name for Network._NWListener.
-@_objcRuntimeName(_TtC7Network11_NWListener)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public final class NWListener: CustomDebugStringConvertible {
-	public var debugDescription: String {
-		return String("\(self.nw)")
-	}
-
- 	/// Defines a service to advertise
-	public struct Service : Equatable, CustomDebugStringConvertible {
-		public var debugDescription: String {
-			var description = ""
-			if let name = self.name {
-				description = String("\(name).\(type)")
-			} else {
-				description = String("*.\(type)")
-			}
-			if let domain = self.domain {
-				description = String("\(description).\(domain)")
-			} else {
-				description = String("\(description).*")
-			}
-			if let txtRecord = txtRecord, !txtRecord.isEmpty {
-				description = String("\(description) <\(txtRecord.count) bytes of txt>")
-			}
-			return description
-		}
-
-		/// Bonjour service name - if nil the system name will be used
-		public let name: String?
-
-		/// Bonjour service type
-		public let type: String
-
-		/// Bonjour service domain - if nil the system will register in all appropriate domains
-		public let domain: String?
-
-		/// Bonjour txtRecord - metadata for the service. Update the txtRecord by setting the
-		/// service on the listener with the same name/type/domain and a new txtRecord.
-		public let txtRecord: Data?
-
-		/// Create a Service to advertise for the listener. Name, domain, and txtRecord all default to nil.
-		public init(name: String? = nil, type: String, domain: String? = nil, txtRecord: Data? = nil) {
-			self.name = name
-			self.type = type
-			self.domain = domain
-			self.txtRecord = txtRecord
-		}
-
-		internal var nw: nw_advertise_descriptor_t {
-			get {
-				let descriptor = nw_advertise_descriptor_create_bonjour_service(name, type, domain)
-				if let txtRecord = txtRecord {
-					txtRecord.withUnsafeBytes({ (ptr: UnsafePointer<UInt8>) -> Void in
-						nw_advertise_descriptor_set_txt_record(descriptor!, ptr, txtRecord.count)
-					})
-				}
-				return descriptor!
-			}
-		}
-	}
-
-	public enum State: Equatable {
-		/// Prior to start, the listener will be in the setup state
-		case setup
-
-		/// Waiting listeners do not have a viable network
-		case waiting(NWError)
-
-		/// Ready listeners are able to receive incoming connections
- 		/// Bonjour service may not yet be registered
-		case ready
-
-		/// Failed listeners are no longer able to receive incoming connections
-		case failed(NWError)
-
-		/// Cancelled listeners have been invalidated by the client and will send no more events
-		case cancelled
-
-		internal init(_ nw: nw_listener_state_t, _ err: nw_error_t?) {
-			switch nw {
-			case Network.nw_listener_state_invalid:
-				self = .setup
-			case Network.nw_listener_state_waiting:
-				if let error = NWError(err) {
-					self = .waiting(error)
-				} else {
-					self = .waiting(NWError.posix(.ENETDOWN))
-				}
-			case Network.nw_listener_state_ready:
-				self = .ready
-			case Network.nw_listener_state_failed:
-				if let error = NWError(err) {
-					self = .failed(error)
-				} else {
-					self = .failed(NWError.posix(.EINVAL))
-				}
-			case Network.nw_listener_state_cancelled:
-				self = .cancelled
-			default:
-				self = .cancelled
-			}
-		}
-	}
-
-	private var _newConnectionHandler: ((_ connection: NWConnection) -> Void)?
-
-	/// Block to be called for new inbound connections
-	public var newConnectionHandler: ((_ connection: NWConnection) -> Void)? {
-		set {
-			self._newConnectionHandler = newValue
-			if let newValue = newValue {
-				nw_listener_set_new_connection_handler(self.nw) { (nwConnection) in
-					guard let newConnection = NWConnection(using: self.parameters, inbound: nwConnection) else {
-						return;
-					}
-					newValue(newConnection)
-				}
-			} else {
-				nw_listener_set_state_changed_handler(self.nw, nil)
-			}
-		}
-		get {
-			return self._newConnectionHandler
-		}
-	}
-
-	private var _state : State = .setup
-	private let nw: nw_listener_t
-
-	private var _stateUpdateHandler: ((_ state: NWListener.State) -> Void)?
-
-	/// Set a block to be called when the listener's state changes, which may be called
-	/// multiple times until the listener is cancelled.
-	public var stateUpdateHandler: ((_ state: NWListener.State) -> Void)? {
-		set {
-			self._stateUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_listener_set_state_changed_handler(self.nw) { (state, error) in
-					self._state = NWListener.State(state, error)
-					newValue(self._state)
-				}
-			} else {
-				nw_listener_set_state_changed_handler(self.nw, nil)
-			}
-		}
-		get {
-			return self._stateUpdateHandler
-		}
-	}
-
-	/// NWParameters used to create the listener
-	public let parameters : NWParameters
-
-	private var _service : NWListener.Service?
-
-	/// Optional Bonjour service to advertise with the listener
-	/// May be modified on the fly to update the TXT record or
-	/// change the advertised service.
-	public var service: NWListener.Service? {
-		get {
-			return _service
-		}
-		set {
-			_service = newValue
-			if let service = _service {
-				nw_listener_set_advertise_descriptor(nw, service.nw)
-			} else {
-				nw_listener_set_advertise_descriptor(nw, nil)
-			}
-		}
-	}
-
-	/// The current port the listener is bound to, if any. The port is only valid when the listener is in the ready
-	/// state.
-	public var port: NWEndpoint.Port? {
-		return NWEndpoint.Port(nw_listener_get_port(self.nw))
-	}
-
-	public enum ServiceRegistrationChange {
-		/// An event when a Bonjour service has been registered, with the endpoint being advertised
-		case add(NWEndpoint)
-
-		/// An event when a Bonjour service has been unregistered, with the endpoint being removed
-		case remove(NWEndpoint)
-	}
-
-	private var _serviceRegistrationUpdateHandler: ((_ change: NWListener.ServiceRegistrationChange) -> Void)?
-
-	/// Set a block to be called when the listener has added or removed a
-	/// registered service. This may be called multiple times until the listener
-	/// is cancelled.
-	public var serviceRegistrationUpdateHandler: ((_ change: NWListener.ServiceRegistrationChange) -> Void)? {
-		set {
-			self._serviceRegistrationUpdateHandler = newValue
-			if let newValue = newValue {
-				nw_listener_set_advertised_endpoint_changed_handler(self.nw) { (endpoint, added) in
-					if let changedEndpoint = NWEndpoint(endpoint) {
-					if added {
-						newValue(NWListener.ServiceRegistrationChange.add(changedEndpoint))
-					} else {
-						newValue(NWListener.ServiceRegistrationChange.remove(changedEndpoint))
-					}
-					}
-				}
-			} else {
-				nw_listener_set_advertised_endpoint_changed_handler(self.nw, nil)
-			}
-		}
-		get {
-			return self._serviceRegistrationUpdateHandler
-		}
-	}
-
-	internal init(_ listener: nw_listener_t, _ parameters: NWParameters) {
-		self.parameters = parameters;
-		self.nw = listener
-	}
-
-	/// Creates a networking listener. The listener will be assigned a random
-	/// port to listen on unless otherwise specified.
-	///
-	/// - Parameter using: The parameters to use for the listener, which include the protocols to use for the
-	/// listener. The parameters requiredLocalEndpoint may be used to specify the local address and port to listen on.
-	/// - Parameter on: The port to listen on. Defaults to .any which will cause a random unused port to be assigned.
-	/// Specifying a port that is already in use will cause the listener to fail after starting.
-	/// - Returns: Returns a listener object that may be set up and started or throws an error if the parameters are
-	/// not compatible with the provided port.
-	public init(using: NWParameters, on: NWEndpoint.Port = .any) throws {
-		if on != .any {
-			guard let listener = nw_listener_create_with_port("\(on)", using.nw) else {
-				throw NWError.posix(.EINVAL)
-			}
-			self.parameters = using
-			self.nw = listener
-		} else {
-			guard let listener = nw_listener_create(using.nw) else {
-				throw NWError.posix(.EINVAL)
-			}
-			self.parameters = using
-			self.nw = listener
-		}
-	}
-
-	///	Creates a networking listener based on an existing
-	///	multiplexing connection. If there are multiple protocols
-	///	in the connection that support listening for incoming flows,
-	///	the listener will be hooked up the highest in the stack
-	///	(the closest to the reading and writing of the client data).
-	///
-	/// - Parameter withConnection: An existing connection that has a multiplexing protocol
-	///		that supports receiving new connections.
-	/// - Parameter parameters: The parameters to use for the listener. The protocol stack
-	///		defined in the parameters must be able to join a protocol
-	///		in the connection that supports listening protocols.
-	convenience internal init?(connection: NWConnection, parameters: NWParameters) {
-		guard let listener = nw_listener_create_with_connection(connection.nw, parameters.nw) else {
-			return nil
-		}
-		self.init(listener, parameters)
-	}
-
-	/// Start the listener and provide a queue on which callback handlers will be executed.
-	/// When the listener state moves to ready, the listener is registered with the system
-	/// and can receive incoming connections.
-	/// Start should only be called once on a listener, and multiple calls to start will
-	/// be ignored.
-	public func start(queue: DispatchQueue) {
-		self._queue = queue
-		nw_listener_set_queue(self.nw, queue)
-		nw_listener_start(self.nw)
-	}
-
-	private var _queue : DispatchQueue? = nil
-
-	/// Get queue used for delivering block handlers, such as stateUpdateHandler,
-	/// serviceRegistrationUpdateHandler, and newConnectionHandler.
-	/// If the listener has not yet been started, the queue will be nil. Once the listener has been
-	/// started, the queue will be valid.
-	public var queue: DispatchQueue? {
-		get {
-			return _queue
-		}
-	}
-
-	/// Cancel the listener.
-	///
-	/// The cancel is asynchronous and the state will eventually transition to cancelled. Subsequent calls to
-	/// cancel are ignored.
-	public func cancel() {
-		nw_listener_cancel(self.nw)
-	}
-}
-
diff --git a/stdlib/public/Darwin/Network/NWParameters.swift b/stdlib/public/Darwin/Network/NWParameters.swift
deleted file mode 100644
index face2df7c8989..0000000000000
--- a/stdlib/public/Darwin/Network/NWParameters.swift
+++ /dev/null
@@ -1,505 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-/// An NWParameters object contains the parameters necessary to create
-/// a network connection or listener. NWParameters include any preferences for
-/// network paths (such as required, prohibited, and preferred networks, and local
-/// endpoint requirements); preferences for data transfer and quality of service;
-/// and the protocols to be used for a connection along with any protocol-specific
-/// options.
-// NOTE: older overlays had Network.NWParameters as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network13_NWParameters is the
-// mangled name for Network._NWParameters.
-@_objcRuntimeName(_TtC7Network13_NWParameters)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public final class NWParameters : CustomDebugStringConvertible {
-	public var debugDescription: String {
-		return String("\(self.nw)")
-	}
-
-	internal let nw : nw_parameters_t
-
-	/// Creates a parameters object that is configured for TLS and TCP. The caller can use
-	/// the default configuration for TLS and TCP, or set specific options for each protocol,
-	/// or disable TLS.
-    ///
-    /// - Parameter tls: TLS options or nil for no TLS
-    /// - Parameter tcp: TCP options. Defaults to NWProtocolTCP.Options() with no options overridden.
-    /// - Returns: NWParameters object that can be used for creating a connection or listener
-	public convenience init(tls: NWProtocolTLS.Options?, tcp: NWProtocolTCP.Options = NWProtocolTCP.Options()) {
-		self.init()
-		let protocolStack = self.defaultProtocolStack
-		protocolStack.transportProtocol = tcp
-		if let tls = tls {
-			protocolStack.applicationProtocols = [tls]
-		} else {
-			protocolStack.applicationProtocols = []
-		}
-	}
-
-	/// Creates a parameters object that is configured for DTLS and UDP. The caller can use
-	/// the default configuration for DTLS and UDP, or set specific options for each protocol,
-	/// or disable TLS.
-    ///
-    /// - Parameter dtls: DTLS options or nil for no DTLS
-    /// - Parameter udp: UDP options. Defaults to NWProtocolUDP.Options() with no options overridden.
-    /// - Returns: NWParameters object that can be used for create a connection or listener
-	public convenience init(dtls: NWProtocolTLS.Options?, udp: NWProtocolUDP.Options = NWProtocolUDP.Options()) {
-		self.init()
-		let protocolStack = self.defaultProtocolStack
-		protocolStack.transportProtocol = udp
-		if let dtls = dtls {
-			protocolStack.applicationProtocols = [dtls]
-		} else {
-			protocolStack.applicationProtocols = []
-		}
-	}
-
-	/// Creates a generic NWParameters object. Note that in order to use parameters
-	/// with a NWConnection or a NetworkListener, the parameters must have protocols
-	/// added into the defaultProtocolStack. Clients using standard protocol
-	/// configurations should use init(tls:tcp:) or init(dtls:udp:).
-	public init() {
-		self.nw = nw_parameters_create()
-	}
-
-	private init(nw: nw_parameters_t) {
-		self.nw = nw
-	}
-
-	/// Default set of parameters for TLS over TCP
-	/// This is equivalent to calling init(tls:NWProtocolTLS.Options(), tcp:NWProtocolTCP.Options())
-	public class var tls: NWParameters {
-		return NWParameters(tls:NWProtocolTLS.Options())
-	}
-
-	/// Default set of parameters for DTLS over UDP
-	/// This is equivalent to calling init(dtls:NWProtocolTLS.Options(), udp:NWProtocolUDP.Options())
-	public class var dtls: NWParameters {
-		return NWParameters(dtls:NWProtocolTLS.Options())
-	}
-
-	/// Default set of parameters for TCP
-	/// This is equivalent to calling init(tls:nil, tcp:NWProtocolTCP.Options())
-	public class var tcp: NWParameters {
-		return NWParameters(tls:nil)
-	}
-
-	/// Default set of parameters for UDP
-	/// This is equivalent to calling init(dtls:nil, udp:NWProtocolUDP.Options())
-	public class var udp: NWParameters {
-		return NWParameters(dtls:nil)
-	}
-
-	/// Require a connection to use a specific interface, or fail if not available
-	public var requiredInterface: NWInterface? {
-		set {
-			if let interface = newValue {
-				nw_parameters_require_interface(self.nw, interface.nw)
-			} else {
-				nw_parameters_require_interface(self.nw, nil)
-			}
-		}
-		get {
-			if let interface = nw_parameters_copy_required_interface(self.nw) {
-				return NWInterface(interface)
-			} else {
-				return nil
-			}
-		}
-	}
-
-	/// Require a connection to use a specific interface type, or fail if not available
-	public var requiredInterfaceType: NWInterface.InterfaceType {
-		set {
-			nw_parameters_set_required_interface_type(self.nw, newValue.nw)
-		}
-		get {
-			return NWInterface.InterfaceType(nw_parameters_get_required_interface_type(self.nw))
-		}
-	}
-
-	/// Define one or more interfaces that a connection will not be allowed to use
-	public var prohibitedInterfaces: [NWInterface]? {
-		set {
-			nw_parameters_clear_prohibited_interfaces(self.nw)
-			if let prohibitedInterfaces = newValue {
-				for prohibitedInterface in prohibitedInterfaces {
-					nw_parameters_prohibit_interface(self.nw, prohibitedInterface.nw)
-				}
-			}
-		}
-		get {
-			var interfaces = [NWInterface]()
-			nw_parameters_iterate_prohibited_interfaces(self.nw) { (interface) in
-				interfaces.append(NWInterface(interface))
-				return true
-			}
-			return interfaces
-		}
-	}
-
-	/// Define one or more interface types that a connection will not be allowed to use
-	public var prohibitedInterfaceTypes: [NWInterface.InterfaceType]? {
-		set {
-			nw_parameters_clear_prohibited_interface_types(self.nw)
-			if let prohibitedInterfaceTypes = newValue {
-				for prohibitedInterfaceType in prohibitedInterfaceTypes {
-					nw_parameters_prohibit_interface_type(self.nw, prohibitedInterfaceType.nw)
-				}
-			}
-		}
-		get {
-			var interfaceTypes = [NWInterface.InterfaceType]()
-			nw_parameters_iterate_prohibited_interface_types(self.nw) { (interfaceType) in
-				interfaceTypes.append(NWInterface.InterfaceType(interfaceType))
-				return true
-			}
-			return interfaceTypes
-		}
-	}
-
-	/// Disallow connection from using interfaces considered expensive
-	public var prohibitExpensivePaths: Bool {
-		set {
-			nw_parameters_set_prohibit_expensive(self.nw, newValue)
-		}
-		get {
-			return nw_parameters_get_prohibit_expensive(self.nw)
-		}
-	}
-
-	/// If true, a direct connection will be attempted first even if proxies are configured. If the direct connection
-	/// fails, connecting through the proxies will still be attempted.
-	public var preferNoProxies: Bool {
-		set {
-			nw_parameters_set_prefer_no_proxy(self.nw, newValue)
-		}
-		get {
-			return nw_parameters_get_prefer_no_proxy(self.nw)
-		}
-	}
-
-	/// Force a specific local address to be used. This value is nil by
-	/// default, in which case the system selects the most appropriate
-	/// local address and selects a local port.
-	public var requiredLocalEndpoint: NWEndpoint? {
-		set {
-			if let endpoint = newValue {
-				nw_parameters_set_local_endpoint(self.nw, endpoint.nw)
-			} else {
-				nw_parameters_set_local_endpoint(self.nw, nil)
-			}
-		}
-		get {
-			if let endpoint = nw_parameters_copy_local_endpoint(self.nw) {
-				return NWEndpoint(endpoint)
-			} else {
-				return nil
-			}
-		}
-	}
-
-	/// Allow multiple connections to use the same local address and port
-	/// (SO_REUSEADDR and SO_REUSEPORT).
-	public var allowLocalEndpointReuse: Bool {
-		set {
-			nw_parameters_set_reuse_local_address(self.nw, newValue)
-		}
-		get {
-			return nw_parameters_get_reuse_local_address(self.nw)
-		}
-	}
-
-	/// Cause an NWListener to only advertise services on the local link,
-	/// and only accept connections from the local link.
-	public var acceptLocalOnly: Bool {
-		set {
-			nw_parameters_set_local_only(self.nw, newValue)
-		}
-		get {
-			return nw_parameters_get_local_only(self.nw)
-		}
-	}
-
-    /// Allow the inclusion of peer-to-peer interfaces when
-    /// listening or establishing outbound connections. This parameter
-    /// will not take effect if a specific interface is required.
-    /// This parameter is applicable when advertising a Bonjour service
-    /// on a listener, or connecting to a Bonjour service.
-    public var includePeerToPeer: Bool {
-        set {
-            nw_parameters_set_include_peer_to_peer(self.nw, newValue)
-        }
-        get {
-            return nw_parameters_get_include_peer_to_peer(self.nw)
-        }
-    }
-
-	/// The ServiceClass represents the network queuing priority to use
-	/// for traffic generated by a NWConnection.
-	public enum ServiceClass {
-		/// Default priority traffic
-		case bestEffort
-		/// Bulk traffic, or traffic that can be de-prioritized behind foreground traffic
-		case background
-		/// Interactive video traffic
-		case interactiveVideo
-		/// Interactive voice traffic
-		case interactiveVoice
-        /// Responsive data
-        case responsiveData
-        /// Signaling
-        case signaling
-
-		internal var nw: nw_service_class_t {
-			switch self {
-			case .bestEffort:
-				return Network.nw_service_class_best_effort
-			case .background:
-				return Network.nw_service_class_background
-			case .interactiveVideo:
-				return Network.nw_service_class_interactive_video
-			case .interactiveVoice:
-				return Network.nw_service_class_interactive_voice
-            case .responsiveData:
-                return Network.nw_service_class_responsive_data
-            case .signaling:
-                return Network.nw_service_class_signaling
-			}
-			}
-
-		internal init(_ nw: nw_service_class_t) {
-			switch nw {
-			case Network.nw_service_class_best_effort:
-				self = .bestEffort
-			case Network.nw_service_class_background:
-				self = .background
-			case Network.nw_service_class_interactive_video:
-				self = .interactiveVideo
-			case Network.nw_service_class_interactive_voice:
-				self = .interactiveVoice
-			case Network.nw_service_class_responsive_data:
-				self = .responsiveData
-			case Network.nw_service_class_signaling:
-				self = .signaling
-			default:
-				self = .bestEffort
-			}
-		}
-	}
-	public var serviceClass: NWParameters.ServiceClass {
-		set {
-			nw_parameters_set_service_class(self.nw, newValue.nw)
-		}
-		get {
-			return NWParameters.ServiceClass(nw_parameters_get_service_class(self.nw))
-		}
-	}
-
-	/// Multipath services represent the modes of multipath usage that are
-	/// allowed for connections.
-	public enum MultipathServiceType {
-		/// No multipath transport will be attempted
-		case disabled
-		/// Only use the expensive interface when the when the primary one is not available
-		case handover
-		/// Use the expensive interface more aggressively to reduce latency
-		case interactive
-		/// Use all available interfaces to provide the highest throughput and lowest latency
-		case aggregate
-
-		internal var nw: nw_multipath_service_t {
-			switch self {
-			case .disabled:
-				return Network.nw_multipath_service_disabled
-			case .handover:
-				return Network.nw_multipath_service_handover
-			case .interactive:
-				return Network.nw_multipath_service_interactive
-			case .aggregate:
-				return Network.nw_multipath_service_aggregate
-			}
-		}
-
-		internal init(_ nw: nw_multipath_service_t) {
-			switch nw {
-			case Network.nw_multipath_service_disabled:
-				self = .disabled
-			case Network.nw_multipath_service_handover:
-				self = .handover
-			case Network.nw_multipath_service_interactive:
-				self = .interactive
-			case Network.nw_multipath_service_aggregate:
-				self = .aggregate
-			default:
-				self = .disabled
-			}
-		}
-	}
-	public var multipathServiceType: NWParameters.MultipathServiceType {
-		set {
-			nw_parameters_set_multipath_service(self.nw, newValue.nw)
-		}
-		get {
-			return NWParameters.MultipathServiceType(nw_parameters_get_multipath_service(self.nw))
-		}
-	}
-
-	/// Use fast open for an outbound NWConnection, which may be done at any
-	/// protocol level. Use of fast open requires that the caller send
-	/// idempotent data on the connection before the connection may move
-	/// into ready state. As a side effect, this may implicitly enable
-	/// fast open for protocols in the stack, even if they did not have
-	/// fast open explicitly enabled on them (such as the option to enable
-	/// TCP Fast Open).
-	public var allowFastOpen: Bool {
-		set {
-			nw_parameters_set_fast_open_enabled(self.nw, newValue)
-		}
-		get {
-			return nw_parameters_get_fast_open_enabled(self.nw)
-		}
-	}
-
-	/// Allow or prohibit the use of expired DNS answers during connection establishment.
-	/// If allowed, a DNS answer that was previously returned may be re-used for new
-	/// connections even after the answers are considered expired. A query for fresh answers
-	/// will be sent in parallel, and the fresh answers will be used as alternate addresses
-	/// in case the expired answers do not result in successful connections.
-	/// By default, this value is .systemDefault, which allows the system to determine
-	/// if it is appropriate to use expired answers.
-	public enum ExpiredDNSBehavior {
-		/// Let the system determine whether or not to allow expired DNS answers
-		case systemDefault
-		/// Explicitly allow the use of expired DNS answers
-		case allow
-		/// Explicitly prohibit the use of expired DNS answers
-		case prohibit
-
-		internal var nw: nw_parameters_expired_dns_behavior_t {
-			switch self {
-			case .systemDefault:
-				return Network.nw_parameters_expired_dns_behavior_default
-			case .allow:
-				return Network.nw_parameters_expired_dns_behavior_allow
-			case .prohibit:
-				return Network.nw_parameters_expired_dns_behavior_prohibit
-			}
-		}
-
-		internal init(_ nw: nw_parameters_expired_dns_behavior_t) {
-			switch nw {
-			case Network.nw_parameters_expired_dns_behavior_default:
-				self = .systemDefault
-			case Network.nw_parameters_expired_dns_behavior_allow:
-				self = .allow
-			case Network.nw_parameters_expired_dns_behavior_prohibit:
-				self = .prohibit
-			default:
-				self = .systemDefault
-			}
-		}
-	}
-	public var expiredDNSBehavior: NWParameters.ExpiredDNSBehavior {
-		set {
-			nw_parameters_set_expired_dns_behavior(self.nw, newValue.nw)
-		}
-		get {
-			return NWParameters.ExpiredDNSBehavior(nw_parameters_get_expired_dns_behavior(self.nw))
-		}
-	}
-
-	/// A ProtocolStack contains a list of protocols to use for a connection.
-	/// The members of the protocol stack are NWProtocolOptions objects, each
-	/// defining which protocol to use within the stack along with any protocol-specific
-	/// options. Each stack includes an array of application-level protocols, a single
-	/// transport-level protocol, and an optional internet-level protocol. If the internet-
-	/// level protocol is not specified, any available and applicable IP address family
-	/// may be used.
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWParameters.
-	@_objcRuntimeName(_TtCC7Network13_NWParameters13ProtocolStack)
-	public class ProtocolStack {
-		public var applicationProtocols: [NWProtocolOptions] {
-			set {
-				nw_protocol_stack_clear_application_protocols(self.nw)
-				for applicationProtocol in newValue.reversed() {
-					nw_protocol_stack_prepend_application_protocol(self.nw, applicationProtocol.nw)
-				}
-			}
-			get {
-				var applicationProtocols = [NWProtocolOptions]()
-				nw_protocol_stack_iterate_application_protocols(self.nw) { (protocolOptions) in
-					let applicationDefinition = nw_protocol_options_copy_definition(protocolOptions)
-					if (nw_protocol_definition_is_equal(applicationDefinition, NWProtocolTLS.definition.nw)) {
-						applicationProtocols.append(NWProtocolTLS.Options(protocolOptions))
-					}
-				}
-				return applicationProtocols
-			}
-		}
-
-		public var transportProtocol: NWProtocolOptions? {
-			set {
-				if let transport = newValue {
-					nw_protocol_stack_set_transport_protocol(self.nw, transport.nw)
-				}
-			}
-			get {
-				if let transport = nw_protocol_stack_copy_transport_protocol(nw) {
-					let transportDefinition = nw_protocol_options_copy_definition(transport)
-					if (nw_protocol_definition_is_equal(transportDefinition, NWProtocolTCP.definition.nw)) {
-						return NWProtocolTCP.Options(transport)
-					} else if (nw_protocol_definition_is_equal(transportDefinition, NWProtocolUDP.definition.nw)) {
-						return NWProtocolUDP.Options(transport)
-					}
-				}
-				return nil
-			}
-		}
-
-		public var internetProtocol: NWProtocolOptions? {
-			set {
-				// Not currently allowed
-				return
-			}
-			get {
-				if let ip = nw_protocol_stack_copy_internet_protocol(nw) {
-					if (nw_protocol_definition_is_equal(nw_protocol_options_copy_definition(ip), NWProtocolIP.definition.nw)) {
-						return NWProtocolIP.Options(ip)
-					}
-				}
-				return nil
-			}
-		}
-
-		internal let nw: nw_protocol_stack_t
-
-		internal init(_ nw: nw_protocol_stack_t) {
-			self.nw = nw
-		}
-	}
-
-	/// Every NWParameters has a default protocol stack, although it may start out empty.
-	public var defaultProtocolStack: NWParameters.ProtocolStack {
-		get {
-			return NWParameters.ProtocolStack(nw_parameters_copy_default_protocol_stack(self.nw))
-		}
-	}
-
-	/// Perform a deep copy of parameters
-	public func copy() -> NWParameters {
-		return NWParameters(nw: nw_parameters_copy(self.nw))
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWPath.swift b/stdlib/public/Darwin/Network/NWPath.swift
deleted file mode 100644
index 37df6b6841a6b..0000000000000
--- a/stdlib/public/Darwin/Network/NWPath.swift
+++ /dev/null
@@ -1,302 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_implementationOnly import _SwiftNetworkOverlayShims
-
-/// An NWInterface object represents an instance of a network interface of a specific
-/// type, such as a Wi-Fi or Cellular interface.
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public struct NWInterface : Hashable, CustomDebugStringConvertible {
-
-	public var debugDescription: String {
-		return self.name
-	}
-
-	public static func ==(lhs: NWInterface, rhs: NWInterface) -> Bool {
-		return lhs.index == rhs.index && lhs.name == rhs.name
-	}
-
-	public func hash(into hasher: inout Hasher) {
-		hasher.combine(self.index)
-		hasher.combine(self.name)
-	}
-
-	/// Interface types represent the underlying media for a network link
-	public enum InterfaceType {
-		/// A virtual or otherwise unknown interface type
-		case other
-		/// A Wi-Fi link
-		case wifi
-		/// A Cellular link
-		case cellular
-		/// A Wired Ethernet link
-		case wiredEthernet
-		/// The Loopback Interface
-		case loopback
-
-		internal var nw : nw_interface_type_t {
-			switch self {
-			case .wifi:
-				return Network.nw_interface_type_wifi
-			case .cellular:
-				return Network.nw_interface_type_cellular
-			case .wiredEthernet:
-				return Network.nw_interface_type_wired
-			case .loopback:
-				return Network.nw_interface_type_loopback
-			case .other:
-				return Network.nw_interface_type_other
-			}
-		}
-
-		internal init(_ nw: nw_interface_type_t) {
-			switch nw {
-			case Network.nw_interface_type_wifi:
-				self = .wifi
-			case Network.nw_interface_type_cellular:
-				self = .cellular
-			case Network.nw_interface_type_wired:
-				self = .wiredEthernet
-			case Network.nw_interface_type_loopback:
-				self = .loopback
-			default:
-				self = .other
-			}
-		}
-	}
-
-	/// The interface type.
-	public let type: InterfaceType
-
-	/// The name of the interface, such as "en0"
-	public let name: String
-
-	/// The kernel index of the interface
-	public let index: Int
-
-	internal let nw: nw_interface_t
-
-	internal init(_ nw: nw_interface_t) {
-		self.nw = nw
-		self.type = NWInterface.InterfaceType(nw_interface_get_type(nw))
-		self.name = String(cString: nw_interface_get_name(nw))
-		self.index = Int(nw_interface_get_index(nw))
-	}
-
-	internal init?(_ index: Int) {
-		guard let nw = nw_interface_create_with_index(UInt32(index)) else {
-			return nil
-		}
-		self.init(nw)
-	}
-
-	internal init?(_ name: String) {
-		guard let nw = nw_interface_create_with_name(name) else {
-			return nil
-		}
-		self.init(nw)
-	}
-}
-
-/// An NWPath object represents a snapshot of network path state. This state
-/// represents the known information about the local interface and routes that may
-/// be used to send and receive data. If the network path for a connection changes
-/// due to interface characteristics, addresses, or other attributes, a new NWPath
-/// object will be generated. Note that the differences in the path attributes may not
-/// be visible through public accessors, and these changes should be treated merely
-/// as an indication that something about the network has changed.
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public struct NWPath : Equatable, CustomDebugStringConvertible {
-
-	public var debugDescription: String {
-		return String(describing: self.nw)
-	}
-
-	/// An NWPath status indicates if there is a usable route available upon which to send and receive data.
-	public enum Status {
-		/// The path has a usable route upon which to send and receive data
-		case satisfied
-		/// The path does not have a usable route. This may be due to a network interface being down, or due to system policy.
-		case unsatisfied
-		/// The path does not currently have a usable route, but a connection attempt will trigger network attachment.
-		case requiresConnection
-	}
-
-	public let status: NWPath.Status
-
-	/// A list of all interfaces currently available to this path
-	public let availableInterfaces: [NWInterface]
-
-	/// Checks if the path uses an NWInterface that is considered to be expensive
-	///
-	/// Cellular interfaces are considered expensive. WiFi hotspots from an iOS device are considered expensive. Other
-	/// interfaces may appear as expensive in the future.
-	public let isExpensive : Bool
-	public let supportsIPv4 : Bool
-	public let supportsIPv6 : Bool
-	public let supportsDNS : Bool
-
-	/// Check the local endpoint set on a path. This will be nil for paths
-	/// from an NWPathMonitor. For paths from an NWConnection, this will
-	/// be set to the local address and port in use by the connection.
-	public let localEndpoint: NWEndpoint?
-
-	/// Check the remote endpoint set on a path. This will be nil for paths
-	/// from an NWPathMonitor. For paths from an NWConnection, this will
-	/// be set to the remote address and port in use by the connection.
-	public let remoteEndpoint: NWEndpoint?
-
-	/// Checks if the path uses an NWInterface with the specified type
-	public func usesInterfaceType(_ type: NWInterface.InterfaceType) -> Bool {
-		if let path = self.nw {
-			return nw_path_uses_interface_type(path, type.nw)
-		}
-		return false
-	}
-
-	internal let nw: nw_path_t?
-
-	internal init(_ path: nw_path_t?) {
-		var interfaces = [NWInterface]()
-		var local: NWEndpoint? = nil
-		var remote: NWEndpoint? = nil
-		if let path = path {
-			let nwstatus = nw_path_get_status(path)
-			switch (nwstatus) {
-			case Network.nw_path_status_satisfied:
-				self.status = .satisfied
-			case Network.nw_path_status_satisfiable:
-				self.status = .requiresConnection
-			default:
-				self.status = .unsatisfied
-			}
-			self.isExpensive = nw_path_is_expensive(path)
-			self.supportsDNS = nw_path_has_dns(path)
-			self.supportsIPv4 = nw_path_has_ipv4(path)
-			self.supportsIPv6 = nw_path_has_ipv6(path)
-
-			nw_path_enumerate_interfaces(path, { (interface) in
-				interfaces.append(NWInterface(interface))
-				return true
-			})
-
-			if let nwlocal = nw_path_copy_effective_local_endpoint(path) {
-				local = NWEndpoint(nwlocal)
-			}
-			if let nwremote = nw_path_copy_effective_remote_endpoint(path) {
-				remote = NWEndpoint(nwremote)
-			}
-		} else {
-			self.status = .unsatisfied
-			self.isExpensive = false
-			self.supportsDNS = false
-			self.supportsIPv4 = false
-			self.supportsIPv6 = false
-		}
-		self.availableInterfaces = interfaces
-		self.nw = path
-		self.localEndpoint = local
-		self.remoteEndpoint = remote
-	}
-
-	public static func ==(lhs: NWPath, rhs: NWPath) -> Bool {
-		if let lnw = lhs.nw, let rnw = rhs.nw {
-			return nw_path_is_equal(lnw, rnw)
-		}
-		return lhs.nw == nil && rhs.nw == nil
-	}
-}
-
-/// The NWPathMonitor allows the caller to fetch the current global path (or
-/// a path restricted to a specific network interface type). The path for the monitor
-/// is an observable property that will be updated upon each network change.
-/// Paths generated by a path monitor are not specific to a given endpoint, and
-/// will not have the localEndpoint or remoteEndpoint properties set.
-/// The paths will watch the state of multiple interfaces, and allows the
-/// application to enumerate the available interfaces for use in creating connections
-/// or listeners bound to specific interfaces.
-// NOTE: older overlays had Network.NWPathMonitor as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network14_NWPathMonitor is the
-// mangled name for Network._NWPathMonitor.
-@_objcRuntimeName(_TtC7Network14_NWPathMonitor)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public final class NWPathMonitor {
-
-	/// Access the current network path tracked by the monitor
-	public var currentPath = NWPath(nil)
-	fileprivate let nw : nw_path_monitor_t
-
-	/// Set a block to be called when the network path changes
-	private var _pathUpdateHandler: ((_ newPath: NWPath) -> Void)?
-	public var pathUpdateHandler: ((_ newPath: NWPath) -> Void)? {
-		set {
-			self._pathUpdateHandler = newValue
-		}
-		get {
-			return self._pathUpdateHandler
-		}
-	}
-
-	/// Start the path monitor and set a queue on which path updates
-	/// will be delivered.
-	/// Start should only be called once on a monitor, and multiple calls to start will
-	/// be ignored.
-	public func start(queue: DispatchQueue) {
-		self._queue = queue
-		nw_path_monitor_set_queue(self.nw, queue)
-		nw_path_monitor_start(self.nw)
-	}
-
-	/// Cancel the path monitor, after which point no more path updates will
-	/// be delivered.
-	public func cancel() {
-		nw_path_monitor_cancel(self.nw)
-	}
-
-	private var _queue: DispatchQueue?
-
-	/// Get queue used for delivering the pathUpdateHandler block.
-	/// If the path monitor has not yet been started, the queue will be nil. Once the
-	/// path monitor has been started, the queue will be valid.
-	public var queue: DispatchQueue? {
-		get {
-			return self._queue
-		}
-	}
-
-
-	/// Create a network path monitor to monitor overall network state for the
-	/// system. This allows enumeration of all interfaces that are available for
-	/// general use by the application.
-	public init() {
-		self.nw = nw_path_monitor_create()
-		nw_path_monitor_set_update_handler(self.nw) { (newPath) in
-			self.currentPath = NWPath(newPath)
-			if let handler = self._pathUpdateHandler {
-				handler(self.currentPath)
-			}
-		}
-	}
-
-	/// Create a network path monitor that watches a single interface type.
-	public init(requiredInterfaceType: NWInterface.InterfaceType) {
-		self.nw = nw_path_monitor_create_with_type(requiredInterfaceType.nw)
-		nw_path_monitor_set_update_handler(self.nw) { (newPath) in
-			self.currentPath = NWPath(newPath)
-			if let handler = self._pathUpdateHandler {
-				handler(self.currentPath)
-			}
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWProtocol.swift b/stdlib/public/Darwin/Network/NWProtocol.swift
deleted file mode 100644
index f05e30cf6c91b..0000000000000
--- a/stdlib/public/Darwin/Network/NWProtocol.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-/// NWProtocolDefinition is an abstract superclass that represents the identifier of a
-/// protocol that can be used with connections and listeners, such as TCP.
-// NOTE: older overlays had Network.NWProtocolDefinition as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network21_NWProtocolDefinition is the
-// mangled name for Network._NWProtocolDefinition.
-@_objcRuntimeName(_TtC7Network21_NWProtocolDefinition)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolDefinition : Equatable, CustomDebugStringConvertible {
-	public static func == (lhs: NWProtocolDefinition, rhs: NWProtocolDefinition) -> Bool {
-		return nw_protocol_definition_is_equal(lhs.nw, rhs.nw)
-	}
-
-	/// The name of the protocol, such as "TCP" or "UDP"
-	public let name: String
-	internal let nw: nw_protocol_definition_t
-
-	internal init(_ nw: nw_protocol_definition_t, _ name: String) {
-		self.name = name
-		self.nw = nw
-	}
-
-	public var debugDescription: String {
-		return self.name
-	}
-}
-
-/// NWProtocolOptions is an abstract superclass that represents a configuration options
-/// that can be used to add a protocol into an NWParameters.ProtocolStack. These options
-/// configure the behavior of a protocol and cannot be changed after starting a connection.
-// NOTE: older overlays had Network.NWProtocolOptions as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network18_NWProtocolOptions is the
-// mangled name for Network._NWProtocolOptions.
-@_objcRuntimeName(_TtC7Network18_NWProtocolOptions)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolOptions {
-	internal let nw: nw_protocol_options_t
-
-
-	internal init(_ nw: nw_protocol_options_t) {
-		self.nw = nw
-	}
-}
-
-/// NWProtocolMetadata is an abstract superclass. An instance of metadata holds a set of
-/// protocol-specific metadata. This metadata allows clients to pass down protocol requirements
-/// specific to some content being sent; as well as to retrieve metadata specific to some
-/// content that was received. Each protocol is responsible for defining its own accessor
-/// functions to set and get metadata.
-// NOTE: older overlays had Network.NWProtocolMetadata as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network19_NWProtocolMetadata is the
-// mangled name for Network._NWProtocolMetadata.
-@_objcRuntimeName(_TtC7Network19_NWProtocolMetadata)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolMetadata {
-	internal let nw: nw_protocol_metadata_t
-
-	internal init(_ nw: nw_protocol_metadata_t) {
-		self.nw = nw
-	}
-}
-
-/// NWProtocol is an abstract superclass to which protocol implementations conform.
-// NOTE: older overlays had Network.NWProtocol as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network11_NWProtocol is the
-// mangled name for Network._NWProtocol.
-@_objcRuntimeName(_TtC7Network11_NWProtocol)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocol {
-
-}
diff --git a/stdlib/public/Darwin/Network/NWProtocolIP.swift b/stdlib/public/Darwin/Network/NWProtocolIP.swift
deleted file mode 100644
index 1e585bb95e5b9..0000000000000
--- a/stdlib/public/Darwin/Network/NWProtocolIP.swift
+++ /dev/null
@@ -1,225 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: older overlays had Network.NWProtocolIP as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network13_NWProtocolIP is the
-// mangled name for Network._NWProtocolIP.
-@_objcRuntimeName(_TtC7Network13_NWProtocolIP)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolIP : NWProtocol {
-	public static let definition: NWProtocolDefinition = {
-		NWProtocolDefinition(nw_protocol_copy_ip_definition(), "ip")
-	}()
-
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolIP.
-  @_objcRuntimeName(_TtCC7Network13_NWProtocolIP7Options)
-	public class Options : NWProtocolOptions {
-		public enum Version {
-			/// Allow any IP version
-			case any
-			/// Use only IP version 4 (IPv4)
-			case v4
-			/// Use only IP version 6 (IPv6)
-			case v6
-
-			internal var nw: nw_ip_version_t {
-				switch self {
-				case .v4:
-					return Network.nw_ip_version_4
-				case .v6:
-					return Network.nw_ip_version_6
-				default:
-					return Network.nw_ip_version_any
-				}
-			}
-
-			internal init(_ nw: nw_ip_version_t) {
-				switch nw {
-				case Network.nw_ip_version_4:
-					self = .v4
-				case Network.nw_ip_version_6:
-					self = .v6
-				default:
-					self = .any
-				}
-			}
-		}
-
-		private var _version: Version = .any
-
-		/// Specify a single version of the Internet NWProtocol to allow.
-		/// Setting this value will constrain which address endpoints can
-		/// be used, and will filter DNS results during connection establishment.
-		public var version: Version {
-			set {
-				self._version = newValue
-				nw_ip_options_set_version(self.nw, newValue.nw)
-			}
-			get {
-				return self._version
-			}
-		}
-
-		private var _hopLimit: UInt8 = 0
-
-		/// Configure the IP hop limit, equivalent to IP_TTL for IPv4
-		/// and IPV6_HOPLIMIT for IPv6.
-		public var hopLimit: UInt8 {
-			set {
-				self._hopLimit = newValue
-				nw_ip_options_set_hop_limit(self.nw, newValue)
-			}
-			get {
-				return self._hopLimit
-			}
-		}
-
-		private var _useMinimumMTU: Bool = false
-
-		/// Configure IP to use the minimum MTU value, which
-		/// is 1280 bytes for IPv6 (IPV6_USE_MIN_MTU). This value has
-		/// no effect for IPv4.
-		public var useMinimumMTU: Bool {
-			set {
-				self._useMinimumMTU = newValue
-				nw_ip_options_set_use_minimum_mtu(self.nw, newValue)
-			}
-			get {
-				return self._useMinimumMTU
-			}
-		}
-
-		private var _disableFragmentation: Bool = false
-
-		/// Configure IP to disable fragmentation on outgoing
-		/// packets (IPV6_DONTFRAG). This value has no effect
-		/// for IPv4.
-		public var disableFragmentation: Bool {
-			set {
-				self._disableFragmentation = newValue
-				nw_ip_options_set_disable_fragmentation(self.nw, newValue)
-			}
-			get {
-				return self._disableFragmentation
-			}
-		}
-
-        private var _shouldCalculateReceiveTime: Bool = false
-
-        /// Configure IP to calculate receive time for inbound
-        /// packets.
-        public var shouldCalculateReceiveTime: Bool {
-            set {
-                self._shouldCalculateReceiveTime = newValue
-                nw_ip_options_set_calculate_receive_time(self.nw, newValue)
-            }
-            get {
-                return self._shouldCalculateReceiveTime
-            }
-        }
-
-		override internal init(_ nw: nw_protocol_options_t) {
-			super.init(nw)
-		}
-	}
-
-	/// Values for Explicit Congestion Notification flags
-	public enum ECN {
-		/// Non ECN-Capable Transport
-		case nonECT
-		/// ECN Capable Transport (0)
-		case ect0
-		/// ECN Capable Transport (1)
-		case ect1
-		/// Congestion Experienced
-		case ce
-
-		fileprivate init(_ nw: nw_ip_ecn_flag_t) {
-			switch nw {
-			case Network.nw_ip_ecn_flag_non_ect:
-				self = .nonECT
-			case Network.nw_ip_ecn_flag_ect_0:
-				self = .ect0
-			case Network.nw_ip_ecn_flag_ect_1:
-				self = .ect1
-			case Network.nw_ip_ecn_flag_ce:
-				self = .ce
-			default:
-				self = .nonECT
-			}
-		}
-
-		fileprivate var nw : nw_ip_ecn_flag_t {
-			switch self {
-			case .nonECT:
-				return Network.nw_ip_ecn_flag_non_ect
-			case .ect0:
-				return Network.nw_ip_ecn_flag_ect_0
-			case .ect1:
-				return Network.nw_ip_ecn_flag_ect_1
-			case .ce:
-				return Network.nw_ip_ecn_flag_ce
-			}
-		}
-	}
-
-	/// IP Metadata can be sent or received as part of ContentContext
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolIP.
-  @_objcRuntimeName(_TtCC7Network13_NWProtocolIP8Metadata)
-	public class Metadata: NWProtocolMetadata {
-		/// Set ECN flags to be sent on a packet, or get ECN flags
-		/// received on a packet. These flags will not take effect
-		/// for protocols such as TCP that deliver data without accounting
-		/// for packet boundaries.
-		public var ecn: ECN {
-			set {
-				nw_ip_metadata_set_ecn_flag(nw, newValue.nw)
-			}
-			get {
-				return ECN(nw_ip_metadata_get_ecn_flag(nw))
-			}
-		}
-
-		/// Set the network service class to be sent on a packet. The per-packet
-		/// service class will not take effect for protocols such as TCP that deliver
-		/// data without accounting for packet boundaries. If you need to set
-		/// service class for TCP, use the serviceClass property of NWParameters.
-        public var serviceClass : NWParameters.ServiceClass {
-            set {
-                nw_ip_metadata_set_service_class(nw, newValue.nw)
-            }
-            get {
-                return NWParameters.ServiceClass(nw_ip_metadata_get_service_class(nw))
-            }
-        }
-
-        /// The time at which a packet was received, in nanoseconds.
-        /// Equivalent to timestamps returned by CLOCK_MONOTONIC_RAW.
-        public var receiveTime: UInt64 {
-            get {
-                return nw_ip_metadata_get_receive_time(nw)
-            }
-        }
-
-		override internal init(_ nw: nw_protocol_metadata_t) {
-			super.init(nw)
-		}
-
-		/// Create an empty IP metadata to send with ContentContext
-		public init() {
-			super.init(nw_ip_create_metadata())
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWProtocolTCP.swift b/stdlib/public/Darwin/Network/NWProtocolTCP.swift
deleted file mode 100644
index f7968eb767644..0000000000000
--- a/stdlib/public/Darwin/Network/NWProtocolTCP.swift
+++ /dev/null
@@ -1,277 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: older overlays had Network.NWProtocolTCP as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network14_NWProtocolTCP is the
-// mangled name for Network._NWProtocolTCP.
-@_objcRuntimeName(_TtC7Network14_NWProtocolTCP)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolTCP : NWProtocol {
-	public static let definition: NWProtocolDefinition = {
-		NWProtocolDefinition(nw_protocol_copy_tcp_definition(), "tcp")
-	}()
-
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolTCP.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolTCP7Options)
-	public class Options : NWProtocolOptions {
-
-		private var _noDelay: Bool = false
-
-		/// A boolean indicating that TCP should disable
-		/// Nagle's algorithm (TCP_NODELAY).
-		public var noDelay: Bool {
-			set {
-				self._noDelay = newValue
-				nw_tcp_options_set_no_delay(self.nw, newValue)
-			}
-			get {
-				return self._noDelay
-			}
-		}
-
-		private var _noPush: Bool = false
-
-		/// A boolean indicating that TCP should be set into
-		/// no-push mode (TCP_NOPUSH).
-		public var noPush: Bool {
-			set {
-				self._noPush = newValue
-				nw_tcp_options_set_no_push(self.nw, newValue)
-			}
-			get {
-				return self._noPush
-			}
-		}
-
-		private var _noOptions: Bool = false
-
-		/// A boolean indicating that TCP should be set into
-		/// no-options mode (TCP_NOOPT).
-		public var noOptions: Bool {
-			set {
-				self._noOptions = newValue
-				nw_tcp_options_set_no_options(self.nw, newValue)
-			}
-			get {
-				return self._noOptions
-			}
-		}
-
-		private var _enableKeepalive: Bool = false
-
-		/// A boolean indicating that TCP should send keepalives
-		/// (SO_KEEPALIVE).
-		public var enableKeepalive: Bool {
-			set {
-				self._enableKeepalive = newValue
-				nw_tcp_options_set_enable_keepalive(self.nw, newValue)
-			}
-			get {
-				return self._enableKeepalive
-			}
-		}
-
-		private var _keepaliveCount: Int = 0
-
-		/// The number of keepalive probes to send before terminating
-		/// the connection (TCP_KEEPCNT).
-		public var keepaliveCount : Int {
-			set {
-				self._keepaliveCount = newValue
-				nw_tcp_options_set_keepalive_count(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._keepaliveCount
-			}
-		}
-
-		private var _keepaliveIdle: Int = 0
-
-		/// The number of seconds of idleness to wait before keepalive
-		/// probes are sent by TCP (TCP_KEEPALIVE).
-		public var keepaliveIdle : Int {
-			set {
-				self._keepaliveIdle = newValue
-				nw_tcp_options_set_keepalive_idle_time(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._keepaliveIdle
-			}
-		}
-
-		private var _keepaliveInterval: Int = 0
-
-		/// The number of seconds of to wait before resending TCP
-		/// keepalive probes (TCP_KEEPINTVL).
-		public var keepaliveInterval : Int {
-			set {
-				self._keepaliveInterval = newValue
-				nw_tcp_options_set_keepalive_interval(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._keepaliveInterval
-			}
-		}
-
-		private var _maximumSegmentSize: Int = 0
-
-		/// The maximum segment size in bytes (TCP_MAXSEG).
-		public var maximumSegmentSize : Int {
-			set {
-				self._maximumSegmentSize = newValue
-				nw_tcp_options_set_maximum_segment_size(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._maximumSegmentSize
-			}
-		}
-
-		private var _connectionTimeout: Int = 0
-
-		/// A timeout for TCP connection establishment, in seconds
-		/// (TCP_CONNECTIONTIMEOUT).
-		public var connectionTimeout : Int {
-			set {
-				self._connectionTimeout = newValue
-				nw_tcp_options_set_connection_timeout(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._connectionTimeout
-			}
-		}
-
-		private var _persistTimeout: Int = 0
-
-		/// The TCP persist timeout, in seconds (PERSIST_TIMEOUT).
-		/// See RFC 6429.
-		public var persistTimeout : Int {
-			set {
-				self._persistTimeout = newValue
-				nw_tcp_options_set_persist_timeout(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._persistTimeout
-			}
-		}
-
-		private var _connectionDropTime: Int = 0
-
-		/// A timeout for TCP retransmission attempts, in seconds
-		/// (TCP_RXT_CONNDROPTIME).
-		public var connectionDropTime : Int {
-			set {
-				self._connectionDropTime = newValue
-				nw_tcp_options_set_retransmit_connection_drop_time(self.nw, UInt32(newValue))
-			}
-			get {
-				return self._connectionDropTime
-			}
-		}
-
-		private var _retransmitFinDrop: Bool = false
-
-		/// A boolean to cause TCP to drop its connection after
-		/// not receiving an ACK after a FIN (TCP_RXT_FINDROP).
-		public var retransmitFinDrop: Bool {
-			set {
-				self._retransmitFinDrop = newValue
-				nw_tcp_options_set_retransmit_fin_drop(self.nw, newValue)
-			}
-			get {
-				return self._retransmitFinDrop
-			}
-		}
-
-		private var _disableAckStretching: Bool = false
-
-		/// A boolean to cause TCP to disable ACK stretching (TCP_SENDMOREACKS).
-		public var disableAckStretching: Bool {
-			set {
-				self._disableAckStretching = newValue
-				nw_tcp_options_set_disable_ack_stretching(self.nw, newValue)
-			}
-			get {
-				return self._disableAckStretching
-			}
-		}
-
-		private var _enableFastOpen: Bool = false
-
-		/// Configure TCP to enable TCP Fast Open (TFO). This may take effect
-		/// even when TCP is not the top-level protocol in the protocol stack.
-		/// For example, if TLS is running over TCP, the Client Hello message
-		/// may be sent as fast open data.
-		///
-		/// If TCP is the top-level protocol in the stack (the one the application
-		/// directly interacts with), TFO will be disabled unless the application
-		/// indicated that it will provide its own fast open data by calling
-		/// NWParameters.allowFastOpen.
-		public var enableFastOpen: Bool {
-			set {
-				self._enableFastOpen = newValue
-				nw_tcp_options_set_enable_fast_open(self.nw, newValue)
-			}
-			get {
-				return self._enableFastOpen
-			}
-		}
-
-		private var _disableECN: Bool = false
-
-		/// A boolean to disable ECN negotiation in TCP.
-		public var disableECN: Bool {
-			set {
-				self._disableECN = newValue
-				nw_tcp_options_set_disable_ecn(self.nw, newValue)
-			}
-			get {
-				return self._disableECN
-			}
-		}
-
-		/// Create TCP options to set in an NWParameters.ProtocolStack
-		public init() {
-			super.init(nw_tcp_create_options())
-		}
-
-		override internal init(_ nw: nw_protocol_options_t) {
-			super.init(nw)
-		}
-	}
-
-	/// Access TCP metadata using NWConnection.metadata(protocolDefinition: NWProtocolTCP.definition)
-	/// or in received ContentContext
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolTCP.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolTCP8Metadata)
-	public class Metadata: NWProtocolMetadata {
-		override internal init(_ nw: nw_protocol_metadata_t) {
-			super.init(nw)
-		}
-
-		/// Access the current number of bytes in TCP's receive buffer (SO_NREAD).
-        public var availableReceiveBuffer: UInt32 {
-            get {
-                return nw_tcp_get_available_receive_buffer(self.nw)
-            }
-        }
-
-		/// Access the current number of bytes in TCP's send buffer (SO_NWRITE).
-        public var availableSendBuffer: UInt32 {
-            get {
-                return nw_tcp_get_available_send_buffer(self.nw)
-            }
-        }
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWProtocolTLS.swift b/stdlib/public/Darwin/Network/NWProtocolTLS.swift
deleted file mode 100644
index 0522d8d3f29c4..0000000000000
--- a/stdlib/public/Darwin/Network/NWProtocolTLS.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: older overlays had Network.NWProtocolTLS as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network14_NWProtocolTLS is the
-// mangled name for Network._NWProtocolTLS.
-@_objcRuntimeName(_TtC7Network14_NWProtocolTLS)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolTLS : NWProtocol {
-	public static let definition: NWProtocolDefinition = {
-		NWProtocolDefinition(nw_protocol_copy_tls_definition(), "tls")
-	}()
-
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolTLS.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolTLS7Options)
-	public class Options : NWProtocolOptions {
-		/// Access the sec_protocol_options_t for a given network protocol
-		/// options instance. See <Security/SecProtocolOptions.h> for functions
-		/// to further configure security options.
-		public var securityProtocolOptions: sec_protocol_options_t {
-			return nw_tls_copy_sec_protocol_options(self.nw)
-		}
-
-		/// Create TLS options to set in an NWParameters.ProtocolStack
-		public init() {
-			super.init(nw_tls_create_options())
-		}
-
-		override internal init(_ nw: nw_protocol_options_t) {
-			super.init(nw)
-		}
-	}
-
-	/// Access TLS metadata using NWConnection.metadata(protocolDefinition: NWProtocolTLS.definition)
-	/// or in received ContentContext
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWNWProtocolTLSProtocolIP.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolTLS8Metadata)
-	public class Metadata: NWProtocolMetadata {
-		/// Access the sec_protocol_metadata_t for a given network protocol
-		/// metadata instance. See <Security/SecProtocolMetadata.h> for functions
-		/// to further access security metadata.
-		public var securityProtocolMetadata: sec_protocol_metadata_t {
-			return nw_tls_copy_sec_protocol_metadata(self.nw)
-		}
-
-		override internal init(_ nw: nw_protocol_metadata_t) {
-			super.init(nw)
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/NWProtocolUDP.swift b/stdlib/public/Darwin/Network/NWProtocolUDP.swift
deleted file mode 100644
index 7f345d79d9bd8..0000000000000
--- a/stdlib/public/Darwin/Network/NWProtocolUDP.swift
+++ /dev/null
@@ -1,66 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-// NOTE: older overlays had Network.NWProtocolUDP as the ObjC name.
-// The two must coexist, so it was renamed. The old name must not be
-// used in the new runtime. _TtC7Network14_NWProtocolUDP is the
-// mangled name for Network._NWProtocolUDP.
-@_objcRuntimeName(_TtC7Network14_NWProtocolUDP)
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public class NWProtocolUDP : NWProtocol {
-	public static let definition: NWProtocolDefinition = {
-		NWProtocolDefinition(nw_protocol_copy_udp_definition(), "udp")
-	}()
-
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolUDP.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolUDP7Options)
-	public class Options : NWProtocolOptions {
-
-		private var _preferNoChecksum: Bool = false
-
-		/// Configure UDP to skip computing checksums when sending.
-		/// This will only take effect when running over IPv4 (UDP_NOCKSUM).
-		public var preferNoChecksum: Bool {
-			set {
-				self._preferNoChecksum = newValue
-				nw_udp_options_set_prefer_no_checksum(self.nw, newValue)
-			}
-			get {
-				return self._preferNoChecksum
-			}
-		}
-
-		/// Create UDP options to set in an NWParameters.ProtocolStack
-		public init() {
-			super.init(nw_udp_create_options())
-		}
-
-		override internal init(_ nw: nw_protocol_options_t) {
-			super.init(nw)
-		}
-	}
-
-  // Set the ObjC name of this class to be nested in the customized ObjC
-  // name of NWProtocolUDP.
-  @_objcRuntimeName(_TtCC7Network14_NWProtocolUDP8Metadata)
-  public class Metadata: NWProtocolMetadata {
-		override internal init(_ nw: nw_protocol_metadata_t) {
-			super.init(nw)
-		}
-
-		/// Create an empty UDP metadata to send with ContentContext
-		public init() {
-			super.init(nw_udp_create_metadata())
-		}
-	}
-}
diff --git a/stdlib/public/Darwin/Network/Network.swift b/stdlib/public/Darwin/Network/Network.swift
deleted file mode 100644
index 53172f56eb033..0000000000000
--- a/stdlib/public/Darwin/Network/Network.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Network
diff --git a/stdlib/public/Darwin/ObjectiveC/ObjectiveC.swift b/stdlib/public/Darwin/ObjectiveC/ObjectiveC.swift
index e127f4366329e..0204b2cee461d 100644
--- a/stdlib/public/Darwin/ObjectiveC/ObjectiveC.swift
+++ b/stdlib/public/Darwin/ObjectiveC/ObjectiveC.swift
@@ -25,8 +25,8 @@ import ObjectiveC
 /// ObjCBool.
 @frozen
 public struct ObjCBool : ExpressibleByBooleanLiteral {
-#if os(macOS) || (os(iOS) && (arch(i386) || arch(arm)))
-  // On OS X and 32-bit iOS, Objective-C's BOOL type is a "signed char".
+#if (os(macOS) && arch(x86_64)) || (os(iOS) && (arch(i386) || arch(arm)))
+  // On Intel OS X and 32-bit iOS, Objective-C's BOOL type is a "signed char".
   @usableFromInline var _value: Int8
 
   @_transparent
@@ -52,7 +52,7 @@ public struct ObjCBool : ExpressibleByBooleanLiteral {
   /// The value of `self`, expressed as a `Bool`.
   @_transparent
   public var boolValue: Bool {
-#if os(macOS) || (os(iOS) && (arch(i386) || arch(arm)))
+#if (os(macOS) && arch(x86_64)) || (os(iOS) && (arch(i386) || arch(arm)))
     return _value != 0
 #else
     return _value
diff --git a/stdlib/public/Darwin/OpenCL/CMakeLists.txt b/stdlib/public/Darwin/OpenCL/CMakeLists.txt
deleted file mode 100644
index 6edc70d3398c7..0000000000000
--- a/stdlib/public/Darwin/OpenCL/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftOpenCL ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  OpenCL.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS OpenCL
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_OPENCL_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/OpenCL/OpenCL.swift b/stdlib/public/Darwin/OpenCL/OpenCL.swift
deleted file mode 100644
index f8b9edcb9d055..0000000000000
--- a/stdlib/public/Darwin/OpenCL/OpenCL.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import OpenCL // Clang module
-
-@available(macOS, introduced: 10.7)
-public func clSetKernelArgsListAPPLE(
-  _ kernel: cl_kernel, _ uint: cl_uint, _ args: CVarArg...
-) -> cl_int {
-  // The variable arguments are num_args arguments that are the following:
-  //      cl_uint arg_indx,
-  //      size_t arg_size,
-  //      const void *arg_value,
-  return withVaList(args) { clSetKernelArgsVaListAPPLE(kernel, uint, $0) }
-}
diff --git a/stdlib/public/Darwin/Photos/CMakeLists.txt b/stdlib/public/Darwin/Photos/CMakeLists.txt
deleted file mode 100644
index 7d8a8aae1e786..0000000000000
--- a/stdlib/public/Darwin/Photos/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftPhotos ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  PHChange.swift
-  PHProjectChangeRequest.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-L${sdk}/usr/lib/swift/"
-  TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR OSX
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal Dispatch simd Foundation AVFoundation CoreMedia CoreLocation QuartzCore CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal Dispatch simd Foundation AVFoundation CoreMedia CoreLocation QuartzCore CoreFoundation CoreAudio ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit simd Foundation AVFoundation CoreMedia CoreLocation QuartzCore XPC CoreFoundation CoreAudio ObjectiveC # auto-updated
-  
-  FRAMEWORK_DEPENDS Photos
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_PHOTOS_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_PHOTOS_TVOS}
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_PHOTOS_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Photos/PHChange.swift b/stdlib/public/Darwin/Photos/PHChange.swift
deleted file mode 100644
index 3570dd2ba47f7..0000000000000
--- a/stdlib/public/Darwin/Photos/PHChange.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Photos
-
-// These methods need to be generic, so that the type parameter of the input
-// argument is carried through as the type parameter of the return value.
-#if os(iOS) || os(tvOS)
-@available(iOS 8.0, tvOS 10.0, *)
-extension PHChange {
-  public func changeDetails<
-    T : PHObject
-  >(for object: T) -> PHObjectChangeDetails<T>? {
-    return self.__changeDetails(for: object) as! PHObjectChangeDetails<T>?
-  }
-
-  public func changeDetails<
-    T : PHObject
-  >(for fetchResult: PHFetchResult<T>) -> PHFetchResultChangeDetails<T>? {
-    return self.__changeDetails(
-      for: fetchResult as! PHFetchResult<AnyObject>
-    ) as! PHFetchResultChangeDetails<T>?
-  }
-}
-#endif
diff --git a/stdlib/public/Darwin/Photos/PHProjectChangeRequest.swift b/stdlib/public/Darwin/Photos/PHProjectChangeRequest.swift
deleted file mode 100644
index c7b4a92fc4317..0000000000000
--- a/stdlib/public/Darwin/Photos/PHProjectChangeRequest.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Photos
-
-#if os(macOS)
-@available(macOS 10.13, *)
-extension PHProjectChangeRequest {
-    @available(macOS 10.14, *)
-    public func removeAssets<T>(_ assets: T) where T: Collection, T.Element == PHAsset {
-        let array = Array(assets) as NSArray
-        self.__removeAssets(array)
-    }
-
-    @available(macOS 10.14, *)
-    public func removeAssets(_ assets: PHFetchResult<PHAsset>) {
-        self.__removeAssets(assets)
-    }
-}
-#endif
diff --git a/stdlib/public/Darwin/QuartzCore/CMakeLists.txt b/stdlib/public/Darwin/QuartzCore/CMakeLists.txt
deleted file mode 100644
index 75fadb1f748d3..0000000000000
--- a/stdlib/public/Darwin/QuartzCore/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftQuartzCore ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    NSValue.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreGraphics Metal Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS QuartzCore
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_QUARTZCORE_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_QUARTZCORE_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_QUARTZCORE_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/QuartzCore/NSValue.swift.gyb b/stdlib/public/Darwin/QuartzCore/NSValue.swift.gyb
deleted file mode 100644
index 5e0e4dcda1015..0000000000000
--- a/stdlib/public/Darwin/QuartzCore/NSValue.swift.gyb
+++ /dev/null
@@ -1,21 +0,0 @@
-//===--- NSValue.swift - Bridging things in NSValue -----------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-%{
-from gyb_foundation_support import ObjectiveCBridgeableImplementationForNSValue
-}%
-
-@_exported import QuartzCore // Clang module
-import Foundation
-
-${ ObjectiveCBridgeableImplementationForNSValue("CATransform3D") }
-
diff --git a/stdlib/public/Darwin/SafariServices/CMakeLists.txt b/stdlib/public/Darwin/SafariServices/CMakeLists.txt
deleted file mode 100644
index 6719232fa8d30..0000000000000
--- a/stdlib/public/Darwin/SafariServices/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftSafariServices ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  SafariServices.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit Foundation CoreData QuartzCore AppKit XPC CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK SafariServices
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_SAFARISERVICES_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/SafariServices/SafariServices.swift b/stdlib/public/Darwin/SafariServices/SafariServices.swift
deleted file mode 100644
index 95b064a908c7b..0000000000000
--- a/stdlib/public/Darwin/SafariServices/SafariServices.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import SafariServices // Clang module
-@_implementationOnly import _SwiftSafariServicesOverlayShims
-
-#if os(macOS)
-
-@available(macOS, introduced: 10.11)
-public func SFSafariServicesAvailable(_ version: SFSafariServicesVersion = SFSafariServicesVersion.version10_0) -> Bool {
-  return _swift_SafariServices_isSafariServicesAvailable(version)
-}
-
-#endif
diff --git a/stdlib/public/Darwin/SceneKit/CMakeLists.txt b/stdlib/public/Darwin/SceneKit/CMakeLists.txt
deleted file mode 100644
index 737fc85cc323e..0000000000000
--- a/stdlib/public/Darwin/SceneKit/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftSceneKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    SceneKit.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit GLKit simd Foundation CoreData QuartzCore AppKit ModelIO XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-    UIKit # required in some configurations but not found by tool
-  FRAMEWORK_DEPENDS_WEAK SceneKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_SCENEKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_SCENEKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_SCENEKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_SCENEKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/SceneKit/SceneKit.swift.gyb b/stdlib/public/Darwin/SceneKit/SceneKit.swift.gyb
deleted file mode 100644
index 2c2a3856d8b32..0000000000000
--- a/stdlib/public/Darwin/SceneKit/SceneKit.swift.gyb
+++ /dev/null
@@ -1,274 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import SceneKit // Clang module
-import CoreGraphics
-import Foundation
-import simd
-
-%{
-from gyb_foundation_support import \
-  ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods
-}%
-
-// MARK: Exposing SCNFloat
-
-#if os(macOS)
-public typealias SCNFloat = CGFloat
-#elseif os(iOS) || os(tvOS) || os(watchOS)
-public typealias SCNFloat = Float
-#endif
-
-// MARK: Working with SCNVector3
-
-extension SCNVector3 {
-  public init(_ x: Float, _ y: Float, _ z: Float) {
-    self.init(x: SCNFloat(x), y: SCNFloat(y), z: SCNFloat(z))
-  }
-  public init(_ x: CGFloat, _ y: CGFloat, _ z: CGFloat) {
-    self.init(x: SCNFloat(x), y: SCNFloat(y), z: SCNFloat(z))
-  }
-  public init(_ x: Double, _ y: Double, _ z: Double) {
-    self.init(SCNFloat(x), SCNFloat(y), SCNFloat(z))
-  }
-  public init(_ x: Int, _ y: Int, _ z: Int) {
-    self.init(SCNFloat(x), SCNFloat(y), SCNFloat(z))
-  }
-  public init(_ v: SIMD3<Float>) {
-    self.init(SCNFloat(v.x), SCNFloat(v.y), SCNFloat(v.z))
-  }
-  public init(_ v: SIMD3<Double>) {
-    self.init(SCNFloat(v.x), SCNFloat(v.y), SCNFloat(v.z))
-  }
-}
-
-extension SIMD3 where Scalar == Float {
-  public init(_ v: SCNVector3) {
-    self.init(Float(v.x), Float(v.y), Float(v.z))
-  }
-}
-
-extension SIMD3 where Scalar == Double {
-  public init(_ v: SCNVector3) {
-    self.init(Double(v.x), Double(v.y), Double(v.z))
-  }
-}
-
-// MARK: Working with SCNVector4
-
-extension SCNVector4 {
-  public init(_ x: Float, _ y: Float, _ z: Float, _ w: Float) {
-    self.init(x: SCNFloat(x), y: SCNFloat(y), z: SCNFloat(z), w: SCNFloat(w))
-  }
-  public init(_ x: CGFloat, _ y: CGFloat, _ z: CGFloat, _ w: CGFloat) {
-    self.init(x: SCNFloat(x), y: SCNFloat(y), z: SCNFloat(z), w: SCNFloat(w))
-  }
-  public init(_ x: Double, _ y: Double, _ z: Double, _ w: Double) {
-    self.init(SCNFloat(x), SCNFloat(y), SCNFloat(z), SCNFloat(w))
-  }
-  public init(_ x: Int, _ y: Int, _ z: Int, _ w: Int) {
-    self.init(SCNFloat(x), SCNFloat(y), SCNFloat(z), SCNFloat(w))
-  }
-  public init(_ v: SIMD4<Float>) {
-    self.init(SCNFloat(v.x), SCNFloat(v.y), SCNFloat(v.z), SCNFloat(v.w))
-  }
-  public init(_ v: SIMD4<Double>) {
-    self.init(SCNFloat(v.x), SCNFloat(v.y), SCNFloat(v.z), SCNFloat(v.w))
-  }
-}
-
-extension SIMD4 where Scalar == Float {
-  public init(_ v: SCNVector4) {
-    self.init(Float(v.x), Float(v.y), Float(v.z), Float(v.w))
-  }
-}
-
-extension SIMD4 where Scalar == Double {
-  public init(_ v: SCNVector4) {
-    self.init(Double(v.x), Double(v.y), Double(v.z), Double(v.w))
-  }
-}
-
-// MARK: Working with SCNMatrix4
-
-extension SCNMatrix4 {
-  public init(_ m: float4x4) {
-    self.init(
-      m11: SCNFloat(m[0,0]), m12: SCNFloat(m[0,1]), m13: SCNFloat(m[0,2]), m14: SCNFloat(m[0,3]),
-      m21: SCNFloat(m[1,0]), m22: SCNFloat(m[1,1]), m23: SCNFloat(m[1,2]), m24: SCNFloat(m[1,3]),
-      m31: SCNFloat(m[2,0]), m32: SCNFloat(m[2,1]), m33: SCNFloat(m[2,2]), m34: SCNFloat(m[2,3]),
-      m41: SCNFloat(m[3,0]), m42: SCNFloat(m[3,1]), m43: SCNFloat(m[3,2]), m44: SCNFloat(m[3,3]))
-  }
-  public init(_ m: double4x4) {
-    self.init(
-      m11: SCNFloat(m[0,0]), m12: SCNFloat(m[0,1]), m13: SCNFloat(m[0,2]), m14: SCNFloat(m[0,3]),
-      m21: SCNFloat(m[1,0]), m22: SCNFloat(m[1,1]), m23: SCNFloat(m[1,2]), m24: SCNFloat(m[1,3]),
-      m31: SCNFloat(m[2,0]), m32: SCNFloat(m[2,1]), m33: SCNFloat(m[2,2]), m34: SCNFloat(m[2,3]),
-      m41: SCNFloat(m[3,0]), m42: SCNFloat(m[3,1]), m43: SCNFloat(m[3,2]), m44: SCNFloat(m[3,3]))
-  }
-}
-
-extension float4x4 {
-  public init(_ m: SCNMatrix4) {
-    self.init([
-      SIMD4<Float>(Float(m.m11), Float(m.m12), Float(m.m13), Float(m.m14)),
-      SIMD4<Float>(Float(m.m21), Float(m.m22), Float(m.m23), Float(m.m24)),
-      SIMD4<Float>(Float(m.m31), Float(m.m32), Float(m.m33), Float(m.m34)),
-      SIMD4<Float>(Float(m.m41), Float(m.m42), Float(m.m43), Float(m.m44))
-      ])
-  }
-}
-
-extension double4x4 {
-  public init(_ m: SCNMatrix4) {
-    self.init([
-      SIMD4<Double>(Double(m.m11), Double(m.m12), Double(m.m13), Double(m.m14)),
-      SIMD4<Double>(Double(m.m21), Double(m.m22), Double(m.m23), Double(m.m24)),
-      SIMD4<Double>(Double(m.m31), Double(m.m32), Double(m.m33), Double(m.m34)),
-      SIMD4<Double>(Double(m.m41), Double(m.m42), Double(m.m43), Double(m.m44))
-      ])
-  }
-}
-
-// MARK: Swift Extensions
-
-@available(iOS, introduced: 8.0)
-@available(macOS, introduced: 10.8)
-extension SCNGeometryElement {
-  /// Creates an instance from `indices` for a `primitiveType`
-  /// that has a constant number of indices per primitive
-  /// - Precondition: the `primitiveType` must be `.triangles`, `.triangleStrip`, `.line` or `.point`
-  public convenience init<IndexType : FixedWidthInteger>(
-    indices: [IndexType], primitiveType: SCNGeometryPrimitiveType
-  ) {
-    precondition(primitiveType == .triangles || primitiveType == .triangleStrip || primitiveType == .line || primitiveType == .point, "Expected constant number of indices per primitive")
-    let indexCount = indices.count
-    let primitiveCount: Int
-    switch primitiveType {
-    case .triangles:
-      primitiveCount = indexCount / 3
-    case .triangleStrip:
-      primitiveCount = indexCount - 2
-    case .line:
-      primitiveCount = indexCount / 2
-    case .point:
-      primitiveCount = indexCount
-    case .polygon:
-      fatalError("Expected constant number of indices per primitive")
-    @unknown default:
-      fatalError("Unexpected primitive type")
-    }
-    self.init(
-      data: Data(bytes: indices, count: indexCount * MemoryLayout<IndexType>.stride),
-      primitiveType: primitiveType,
-      primitiveCount: primitiveCount,
-      bytesPerIndex: MemoryLayout<IndexType>.stride)
-    _fixLifetime(indices)
-  }
-}
-
-@available(iOS, introduced: 8.0)
-@available(macOS, introduced: 10.8)
-extension SCNGeometrySource {
-  @nonobjc
-  public convenience init(vertices: [SCNVector3]) {
-    self.init(__vertices: vertices, count: vertices.count)
-  }
-  @nonobjc
-  public convenience init(normals: [SCNVector3]) {
-    self.init(__normals: normals, count: normals.count)
-  }
-  @nonobjc
-  public convenience init(textureCoordinates: [CGPoint]) {
-    self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
-  }
-}
-
-@available(iOS, introduced: 8.0)
-@available(macOS, introduced: 10.10)
-extension SCNBoundingVolume {
-  public var boundingBox: (min: SCNVector3, max: SCNVector3) {
-    get {
-      var min = SCNVector3Zero
-      var max = SCNVector3Zero
-      __getBoundingBoxMin(&min, max: &max)
-      return (min: min, max: max)
-    }
-    set {
-      var min = newValue.min
-      var max = newValue.max
-      __setBoundingBoxMin(&min, max: &max)
-    }
-  }
-  public var boundingSphere: (center: SCNVector3, radius: Float) {
-    var center = SCNVector3Zero
-    var radius = CGFloat(0.0)
-    __getBoundingSphereCenter(&center, radius: &radius)
-    return (center: center, radius: Float(radius))
-  }
-}
-
-// MARK: APIs refined for Swift
-
-@available(iOS, introduced: 8.0)
-@available(macOS, introduced: 10.8)
-extension SCNSceneSource {
-  public func entryWithIdentifier<T: AnyObject>(_ uid: String, withClass entryClass: T.Type) -> T? {
-    return self.__entry(withIdentifier: uid, with: entryClass) as! T?
-  }
-}
-
-// Bridge vector and matrix types to NSValue.
-//
-// SceneKit implements its categories on NSValue by converting SCNVector3
-// and SCNVector4 to CGRect, and SCNMatrix4 to CATransform3D, and boxing the
-// converted struct instead of as the original type.
-
-// Get the ObjC type used by -[NSValue valueWithSCN{Vector3,Vector4,Matrix4}:]
-// to instantiate the resulting NSValue objects, in case these get changed
-// in the future.
-private let SCNVector3InNSValueObjCType =
-  NSValue(scnVector3: SCNVector3()).objCType
-private let SCNVector4InNSValueObjCType =
-  NSValue(scnVector4: SCNVector4()).objCType
-
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="SCNVector3",
-  initializer="{ NSValue(scnVector3: $0) }",
-  getter="{ $0.scnVector3Value }",
-  objCType="{ _ in SCNVector3InNSValueObjCType }",
-) }
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="SCNVector4",
-  initializer="{ NSValue(scnVector4: $0) }",
-  getter="{ $0.scnVector4Value }",
-  objCType="{ _ in SCNVector4InNSValueObjCType }",
-) }
-
-// On macOS, SCNMatrix4 is a typedef for CATransform3D, which is already made
-// NSValue-bridgeable in the QuartzCore overlay. It is a separate struct on
-// iOS, watchOS, and tvOS.
-
-#if os(iOS) || os(tvOS) || os(watchOS)
-
-private let SCNMatrix4InNSValueObjCType =
-  NSValue(scnMatrix4: SCNMatrix4()).objCType
-
-${ ObjectiveCBridgeableImplementationForNSValueWithCategoryMethods(
-  Type="SCNMatrix4",
-  initializer="{ NSValue(scnMatrix4: $0) }",
-  getter="{ $0.scnMatrix4Value }",
-  objCType="{ _ in SCNMatrix4InNSValueObjCType }",
-) }
-
-#endif
-
diff --git a/stdlib/public/Darwin/SpriteKit/CMakeLists.txt b/stdlib/public/Darwin/SpriteKit/CMakeLists.txt
deleted file mode 100644
index bbda4a68ca501..0000000000000
--- a/stdlib/public/Darwin/SpriteKit/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftSpriteKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  SpriteKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    SpriteKitQuickLooks.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit GLKit simd Foundation CoreData QuartzCore AppKit ModelIO XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal UIKit Dispatch GLKit simd Foundation QuartzCore ModelIO CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics UIKit Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS SpriteKit
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_SPRITEKIT_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_SPRITEKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_SPRITEKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_SPRITEKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/SpriteKit/SpriteKit.swift b/stdlib/public/Darwin/SpriteKit/SpriteKit.swift
deleted file mode 100644
index d723f05b61e88..0000000000000
--- a/stdlib/public/Darwin/SpriteKit/SpriteKit.swift
+++ /dev/null
@@ -1,89 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import SpriteKit
-import simd
-
-// SpriteKit defines SKColor using a macro.
-
-#if os(macOS)
-public typealias SKColor = NSColor
-#elseif os(iOS) || os(tvOS) || os(watchOS)
-public typealias SKColor = UIColor
-#endif
-
-// this class only exists to allow AnyObject lookup of _copyImageData
-// since that method only exists in a private header in SpriteKit, the lookup
-// mechanism by default fails to accept it as a valid AnyObject call
-//
-// NOTE: older overlays called this _SpriteKitMethodProvider. The two must
-// coexist, so it was renamed. The old name must not be used in the new
-// runtime.
-@objc class __SpriteKitMethodProvider : NSObject {
-  override init() { preconditionFailure("don't touch me") }
-  @objc func _copyImageData() -> NSData! { return nil }
-}
-
-@available(iOS, introduced: 10.0)
-@available(macOS, introduced: 10.12)
-@available(tvOS, introduced: 10.0)
-@available(watchOS, introduced: 3.0)
-extension SKWarpGeometryGrid {
-  /// Create a grid of the specified dimensions, source and destination positions.
-  ///
-  /// Grid dimensions (columns and rows) refer to the number of faces in each dimension. The
-  /// number of vertices required for a given dimension is equal to (cols + 1) * (rows + 1).
-  ///
-  /// SourcePositions are normalized (0.0 - 1.0) coordinates to determine the source content.
-  ///
-  /// DestinationPositions are normalized (0.0 - 1.0) positional coordinates with respect to
-  /// the node's native size. Values outside the (0.0-1.0) range are perfectly valid and
-  /// correspond to positions outside of the native undistorted bounds.
-  ///
-  /// Source and destination positions are provided in row-major order starting from the top-left.
-  /// For example the indices for a 2x2 grid would be as follows:
-  ///
-  ///     [0]---[1]---[2]
-  ///      |     |     |
-  ///     [3]---[4]---[5]
-  ///      |     |     |
-  ///     [6]---[7]---[8]
-  ///
-  /// - Parameter columns: the number of columns to initialize the SKWarpGeometryGrid with
-  /// - Parameter rows: the number of rows to initialize the SKWarpGeometryGrid with
-  /// - Parameter sourcePositions: the source positions for the SKWarpGeometryGrid to warp from
-  /// - Parameter destinationPositions: the destination positions for SKWarpGeometryGrid to warp to
-  public convenience init(columns: Int, rows: Int, sourcePositions: [SIMD2<Float>] = [SIMD2<Float>](), destinationPositions: [SIMD2<Float>] = [SIMD2<Float>]()) {
-    let requiredElementsCount = (columns + 1) * (rows + 1)
-    switch (destinationPositions.count, sourcePositions.count) {
-    case (0, 0):
-        self.init(__columns: columns, rows: rows, sourcePositions: nil, destPositions: nil)
-    case (let dests, 0):
-        precondition(dests == requiredElementsCount, "Mismatch found between rows/columns and positions.")
-        self.init(__columns: columns, rows: rows, sourcePositions: nil, destPositions: destinationPositions)
-    case (0, let sources):
-        precondition(sources == requiredElementsCount, "Mismatch found between rows/columns and positions.")
-        self.init(__columns: columns, rows: rows, sourcePositions: sourcePositions, destPositions: nil)
-    case (let dests, let sources):
-        precondition(dests == requiredElementsCount && sources == requiredElementsCount, "Mismatch found between rows/columns and positions.")
-        self.init(__columns: columns, rows: rows, sourcePositions: sourcePositions, destPositions: destinationPositions)
-    }
-  }
-
-  public func replacingBySourcePositions(positions source: [SIMD2<Float>]) -> SKWarpGeometryGrid {
-    return self.__replacingSourcePositions(source)
-  }
-
-  public func replacingByDestinationPositions(positions destination: [SIMD2<Float>]) -> SKWarpGeometryGrid {
-    return self.__replacingDestPositions(destination)
-  }
-}
diff --git a/stdlib/public/Darwin/SpriteKit/SpriteKitQuickLooks.swift.gyb b/stdlib/public/Darwin/SpriteKit/SpriteKitQuickLooks.swift.gyb
deleted file mode 100644
index 69a7aebf68f31..0000000000000
--- a/stdlib/public/Darwin/SpriteKit/SpriteKitQuickLooks.swift.gyb
+++ /dev/null
@@ -1,33 +0,0 @@
-//===----------------------------------------------------------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-%import gyb
-
-% for Self in ['SKShapeNode', 'SKSpriteNode', 'SKTextureAtlas', 'SKTexture']:
-
-extension ${Self} : _CustomPlaygroundQuickLookable {
-  @available(*, deprecated, message: "${Self}.customPlaygroundQuickLook will be removed in a future Swift version")
-  public var customPlaygroundQuickLook: PlaygroundQuickLook {
-    let data = (self as AnyObject)._copyImageData?() as Data?
-
-    // we could send a Raw, but I don't want to make a copy of the
-    // bytes for no good reason make an NSImage out of them and
-    // send that
-#if os(macOS)
-    let image = data.flatMap(NSImage.init(data:)) ?? NSImage()
-#elseif os(iOS) || os(watchOS) || os(tvOS)
-    let image = data.flatMap(UIImage.init(data:)) ?? UIImage() 
-#endif
-
-    return .sprite(image)
-  }
-}
diff --git a/stdlib/public/Darwin/UIKit/CMakeLists.txt b/stdlib/public/Darwin/UIKit/CMakeLists.txt
deleted file mode 100644
index 637c3589e6696..0000000000000
--- a/stdlib/public/Darwin/UIKit/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  DesignatedInitializers.mm
-  UIKit.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    UIKit_FoundationExtensions.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal Dispatch Foundation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal Dispatch Foundation QuartzCore CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin CoreGraphics Dispatch Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
-  FRAMEWORK_DEPENDS UIKit
-
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_UIKIT_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_UIKIT_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_UIKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/UIKit/DesignatedInitializers.mm b/stdlib/public/Darwin/UIKit/DesignatedInitializers.mm
deleted file mode 100644
index e7a10640eb662..0000000000000
--- a/stdlib/public/Darwin/UIKit/DesignatedInitializers.mm
+++ /dev/null
@@ -1,76 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains replacements for the designated initializers of some
-// UIKit classes that take variadic parameters and thus cannot be used in
-// Swift as-is.
-//
-//===----------------------------------------------------------------------===//
-
-#import <UIKit/UIKit.h>
-#include <TargetConditionals.h>
-
-#if (!defined(TARGET_OS_WATCH) || !TARGET_OS_WATCH) && \
-    (!defined(TARGET_OS_TV) || !TARGET_OS_TV)
-@interface UIActionSheet (_SwiftInterop)
-
-- (instancetype)initWithTitle:(NSString *)title
-                     delegate:(id<UIActionSheetDelegate>)delegate
-            cancelButtonTitle:(NSString *)cancelButtonTitle
-       destructiveButtonTitle:(NSString *)destructiveButtonTitle;
-
-@end
-
-@implementation UIActionSheet (_SwiftInterop)
-
-- (instancetype)initWithTitle:(NSString *)title
-                     delegate:(id<UIActionSheetDelegate>)delegate
-            cancelButtonTitle:(NSString *)cancelButtonTitle
-       destructiveButtonTitle:(NSString *)destructiveButtonTitle {
-  return [self initWithTitle:title
-                    delegate:delegate
-           cancelButtonTitle:cancelButtonTitle
-      destructiveButtonTitle:destructiveButtonTitle
-           otherButtonTitles:nil];
-}
-
-@end
-#endif
-
-
-#if (!defined(TARGET_OS_WATCH) || !TARGET_OS_WATCH) && \
-    (!defined(TARGET_OS_TV) || !TARGET_OS_TV)
-@interface UIAlertView (_SwiftInterop)
-
-- (instancetype)initWithTitle:(NSString *)title
-                      message:(NSString *)message
-                     delegate:(id <UIAlertViewDelegate>)delegate
-            cancelButtonTitle:(NSString *)cancelButtonTitle;
-
-@end
-
-@implementation UIAlertView (_SwiftInterop)
-
-- (instancetype)initWithTitle:(NSString *)title
-                      message:(NSString *)message
-                     delegate:(id <UIAlertViewDelegate>)delegate
-            cancelButtonTitle:(NSString *)cancelButtonTitle {
-  return [self initWithTitle:title
-                     message:message
-                    delegate:delegate
-           cancelButtonTitle:cancelButtonTitle
-           otherButtonTitles:nil];
-}
-
-@end
-#endif
-
diff --git a/stdlib/public/Darwin/UIKit/UIKit.swift b/stdlib/public/Darwin/UIKit/UIKit.swift
deleted file mode 100644
index 3253959bf60af..0000000000000
--- a/stdlib/public/Darwin/UIKit/UIKit.swift
+++ /dev/null
@@ -1,552 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import UIKit
-
-#if os(iOS) || os(tvOS)
-@_implementationOnly import _SwiftUIKitOverlayShims
-#endif
-
-//===----------------------------------------------------------------------===//
-// UIGeometry
-//===----------------------------------------------------------------------===//
-
-extension UIEdgeInsets : Equatable {
-  @_transparent // @fragile
-  public static func == (lhs: UIEdgeInsets, rhs: UIEdgeInsets) -> Bool {
-    return lhs.top == rhs.top &&
-           lhs.left == rhs.left &&
-           lhs.bottom == rhs.bottom &&
-           lhs.right == rhs.right
-  }
-}
-
-@available(iOS 11.0, tvOS 11.0, watchOS 4.0, *)
-extension NSDirectionalEdgeInsets : Equatable {
-  @_transparent // @fragile
-  public static func == (lhs: NSDirectionalEdgeInsets, rhs: NSDirectionalEdgeInsets) -> Bool {
-    return lhs.top == rhs.top &&
-           lhs.leading == rhs.leading &&
-           lhs.bottom == rhs.bottom &&
-           lhs.trailing == rhs.trailing
-  }
-}
-
-extension UIOffset : Equatable {
-  @_transparent // @fragile
-  public static func == (lhs: UIOffset, rhs: UIOffset) -> Bool {
-    return lhs.horizontal == rhs.horizontal &&
-           lhs.vertical == rhs.vertical
-  }
-}
-
-#if os(iOS) || os(tvOS)
-extension UIFloatRange : Equatable {
-  @_transparent // @fragile
-  public static func == (lhs: UIFloatRange, rhs: UIFloatRange) -> Bool {
-    return lhs.minimum == rhs.minimum &&
-           lhs.maximum == rhs.maximum
-  }
-}
-#endif
-
-@available(swift, deprecated: 4.2, message:"Use == operator instead.")
-public func UIEdgeInsetsEqualToEdgeInsets(_ insets1: UIEdgeInsets, _ insets2: UIEdgeInsets) -> Bool {
-  return insets1 == insets2
-}
-
-@available(swift, deprecated: 4.2, message:"Use == operator instead.")
-public func UIOffsetEqualToOffset(_ offset1: UIOffset, _ offset2: UIOffset) -> Bool {
-  return offset1 == offset2
-}
-
-#if os(iOS) || os(tvOS)
-@available(swift, deprecated: 4.2, message:"Use == operator instead.")
-public func UIFloatRangeIsEqualToRange(_ range: UIFloatRange, _ otherRange: UIFloatRange) -> Bool {
-  return range == otherRange
-}
-#endif
-
-extension UIEdgeInsets : Codable {
-  public init(from decoder: Decoder) throws {
-    var container = try decoder.unkeyedContainer()
-    let top = try container.decode(CGFloat.self)
-    let left = try container.decode(CGFloat.self)
-    let bottom = try container.decode(CGFloat.self)
-    let right = try container.decode(CGFloat.self)
-    self.init(top: top, left: left, bottom: bottom, right: right)
-  }
-
-  public func encode(to encoder: Encoder) throws {
-    var container = encoder.unkeyedContainer()
-    try container.encode(top)
-    try container.encode(left)
-    try container.encode(bottom)
-    try container.encode(right)
-  }
-}
-
-@available(iOS 11.0, tvOS 11.0, watchOS 4.0, *)
-extension NSDirectionalEdgeInsets : Codable {
-  public init(from decoder: Decoder) throws {
-    var container = try decoder.unkeyedContainer()
-    let top = try container.decode(CGFloat.self)
-    let leading = try container.decode(CGFloat.self)
-    let bottom = try container.decode(CGFloat.self)
-    let trailing = try container.decode(CGFloat.self)
-    self.init(top: top, leading: leading, bottom: bottom, trailing: trailing)
-  }
-
-  public func encode(to encoder: Encoder) throws {
-    var container = encoder.unkeyedContainer()
-    try container.encode(top)
-    try container.encode(leading)
-    try container.encode(bottom)
-    try container.encode(trailing)
-  }
-}
-
-extension UIOffset : Codable {
-  public init(from decoder: Decoder) throws {
-    var container = try decoder.unkeyedContainer()
-    let horizontal = try container.decode(CGFloat.self)
-    let vertical = try container.decode(CGFloat.self)
-    self.init(horizontal: horizontal, vertical: vertical)
-  }
-
-  public func encode(to encoder: Encoder) throws {
-    var container = encoder.unkeyedContainer()
-    try container.encode(horizontal)
-    try container.encode(vertical)
-  }
-}
-
-#if os(iOS) || os(tvOS)
-extension UIFloatRange : Codable {
-  public init(from decoder: Decoder) throws {
-    var container = try decoder.unkeyedContainer()
-    let minimum = try container.decode(CGFloat.self)
-    let maximum = try container.decode(CGFloat.self)
-    self.init(minimum: minimum, maximum: maximum)
-  }
-
-  public func encode(to encoder: Encoder) throws {
-    var container = encoder.unkeyedContainer()
-    try container.encode(minimum)
-    try container.encode(maximum)
-  }
-}
-#endif
-
-//===----------------------------------------------------------------------===//
-// Numeric backed types
-//===----------------------------------------------------------------------===//
-
-@available(swift 4)
-public protocol _UIKitNumericRawRepresentable : RawRepresentable, Comparable where RawValue: Comparable & Numeric {}
-
-extension _UIKitNumericRawRepresentable {
-
-  public static func <(lhs: Self, rhs: Self) -> Bool {
-    return lhs.rawValue < rhs.rawValue
-  }
-
-  public static func +(lhs: Self, rhs: RawValue) -> Self {
-    return Self(rawValue: lhs.rawValue + rhs)!
-  }
-
-  public static func +(lhs: RawValue, rhs: Self) -> Self {
-    return Self(rawValue: lhs + rhs.rawValue)!
-  }
-
-  public static func -(lhs: Self, rhs: RawValue) -> Self {
-    return Self(rawValue: lhs.rawValue - rhs)!
-  }
-
-  public static func -(lhs: Self, rhs: Self) -> RawValue {
-    return lhs.rawValue - rhs.rawValue
-  }
-
-  public static func +=(lhs: inout Self, rhs: RawValue) {
-    lhs = Self(rawValue: lhs.rawValue + rhs)!
-  }
-
-  public static func -=(lhs: inout Self, rhs: RawValue) {
-    lhs = Self(rawValue: lhs.rawValue - rhs)!
-  }
-}
-
-extension UIFont.Weight : _UIKitNumericRawRepresentable {}
-
-#if !os(watchOS)
-extension UILayoutPriority : _UIKitNumericRawRepresentable {}
-extension UIWindow.Level : _UIKitNumericRawRepresentable {}
-#endif
-
-// These are un-imported macros in UIKit.
-
-//===----------------------------------------------------------------------===//
-// UIDeviceOrientation
-//===----------------------------------------------------------------------===//
-
-#if !os(watchOS) && !os(tvOS)
-@available(swift, obsoleted: 4.2,
-  renamed: "getter:UIDeviceOrientation.isLandscape(self:)")
-public func UIDeviceOrientationIsLandscape(
-  _ orientation: UIDeviceOrientation
-) -> Bool {
-  return orientation.isLandscape
-}
-
-@available(swift, obsoleted: 4.2,
-  renamed: "getter:UIDeviceOrientation.isPortrait(self:)")
-public func UIDeviceOrientationIsPortrait(
-  _ orientation: UIDeviceOrientation
-) -> Bool {
-  return orientation.isPortrait
-}
-
-@available(swift, obsoleted: 4.2,
-  renamed: "getter:UIDeviceOrientation.isValidInterfaceOrientation(self:)")
-public func UIDeviceOrientationIsValidInterfaceOrientation(
-  _ orientation: UIDeviceOrientation
-) -> Bool {
-  return orientation.isValidInterfaceOrientation
-}
-#endif
-
-//===----------------------------------------------------------------------===//
-// UIInterfaceOrientation
-//===----------------------------------------------------------------------===//
-
-#if !os(watchOS) && !os(tvOS)
-@available(swift, obsoleted: 4.2,
-  renamed: "getter:UIInterfaceOrientation.isPortrait(self:)")
-public func UIInterfaceOrientationIsPortrait(
-  _ orientation: UIInterfaceOrientation
-) -> Bool {
-  return orientation.isPortrait
-}
-
-@available(swift, obsoleted: 4.2,
-  renamed: "getter:UIInterfaceOrientation.isLandscape(self:)")
-public func UIInterfaceOrientationIsLandscape(
-  _ orientation: UIInterfaceOrientation
-) -> Bool {
-  return orientation.isLandscape
-}
-#endif
-
-// Overlays for variadic initializers.
-
-#if !os(watchOS) && !os(tvOS)
-public extension UIActionSheet {
-  convenience init(title: String?,
-       delegate: UIActionSheetDelegate?,
-       cancelButtonTitle: String?,
-       destructiveButtonTitle: String?,
-       // Hack around overload ambiguity with non-variadic constructor.
-       // <rdar://problem/16704770>
-       otherButtonTitles firstButtonTitle: String,
-       _ moreButtonTitles: String...) {
-    self.init(title: title,
-              delegate: delegate,
-              cancelButtonTitle: cancelButtonTitle,
-              destructiveButtonTitle: destructiveButtonTitle)
-    self.addButton(withTitle: firstButtonTitle)
-    for buttonTitle in moreButtonTitles {
-      self.addButton(withTitle: buttonTitle)
-    }
-  }
-}
-#endif
-
-#if !os(watchOS) && !os(tvOS)
-public extension UIAlertView {
-  convenience init(title: String,
-       message: String,
-       delegate: UIAlertViewDelegate?,
-       cancelButtonTitle: String?,
-       // Hack around overload ambiguity with non-variadic constructor.
-       // <rdar://problem/16704770>
-       otherButtonTitles firstButtonTitle: String,
-       _ moreButtonTitles: String...) {
-    self.init(title: title,
-              message: message,
-              delegate: delegate,
-              cancelButtonTitle: cancelButtonTitle)
-    self.addButton(withTitle: firstButtonTitle)
-    for buttonTitle in moreButtonTitles {
-      self.addButton(withTitle: buttonTitle)
-    }
-  }
-}
-#endif
-
-#if !os(watchOS)
-internal struct _UIViewQuickLookState {
-  static var views = Set<UIView>()
-}
-
-extension UIView : __DefaultCustomPlaygroundQuickLookable {
-  @available(*, deprecated, message: "UIView._defaultCustomPlaygroundQuickLook will be removed in a future Swift version")
-  public var _defaultCustomPlaygroundQuickLook: PlaygroundQuickLook {
-    if _UIViewQuickLookState.views.contains(self) {
-      return .view(UIImage())
-    } else {
-      _UIViewQuickLookState.views.insert(self)
-      // in case of an empty rectangle abort the logging
-      if (bounds.size.width == 0) || (bounds.size.height == 0) {
-        return .view(UIImage())
-      }
-
-      UIGraphicsBeginImageContextWithOptions(bounds.size, false, 0.0)
-      // UIKit is about to update this to be optional, so make it work
-      // with both older and newer SDKs. (In this context it should always
-      // be present.)
-      let ctx: CGContext! = UIGraphicsGetCurrentContext()
-      UIColor(white:1.0, alpha:0.0).set()
-      ctx.fill(bounds)
-      layer.render(in: ctx)
-
-      let image: UIImage! = UIGraphicsGetImageFromCurrentImageContext()
-
-      UIGraphicsEndImageContext()
-
-      _UIViewQuickLookState.views.remove(self)
-      return .view(image)
-    }
-  }
-}
-#endif
-
-extension UIColor : _ExpressibleByColorLiteral {
-  @nonobjc public required convenience init(_colorLiteralRed red: Float,
-                                            green: Float,
-                                            blue: Float, alpha: Float) {
-    self.init(red: CGFloat(red), green: CGFloat(green),
-              blue: CGFloat(blue), alpha: CGFloat(alpha))
-  }
-}
-
-public typealias _ColorLiteralType = UIColor
-
-extension UIImage : _ExpressibleByImageLiteral {
-  private convenience init!(failableImageLiteral name: String) {
-    self.init(named: name)
-  }
-
-  public required convenience init(imageLiteralResourceName name: String) {
-    self.init(failableImageLiteral: name)
-  }
-}
-
-public typealias _ImageLiteralType = UIImage
-
-extension UIFont.TextStyle {
-    @available(iOS 11.0, watchOS 4.0, tvOS 11.0, *)
-    public var metrics: UIFontMetrics {
-        return UIFontMetrics(forTextStyle: self)
-    }
-}
-
-#if !os(watchOS) // UIContentSizeCategory not available on watchOS
-extension UIContentSizeCategory {
-
-    @available(iOS 11.0, tvOS 11.0,  *)
-    public var isAccessibilityCategory: Bool {
-        return __UIContentSizeCategoryIsAccessibilityCategory(self)
-    }
-
-    @available(iOS 11.0, tvOS 11.0, *)
-    public static func < (left: UIContentSizeCategory, right: UIContentSizeCategory) -> Bool {
-        return __UIContentSizeCategoryCompareToCategory(left, right) == .orderedAscending
-    }
-
-    @available(iOS 11.0, tvOS 11.0, *)
-    public static func <= (left: UIContentSizeCategory, right: UIContentSizeCategory) -> Bool {
-        return __UIContentSizeCategoryCompareToCategory(left, right) != .orderedDescending
-    }
-
-    @available(iOS 11.0, tvOS 11.0, *)
-    public static func > (left: UIContentSizeCategory, right: UIContentSizeCategory) -> Bool {
-        return __UIContentSizeCategoryCompareToCategory(left, right) == .orderedDescending
-    }
-
-    @available(iOS 11.0, tvOS 11.0, *)
-    public static func >= (left: UIContentSizeCategory, right: UIContentSizeCategory) -> Bool {
-        return __UIContentSizeCategoryCompareToCategory(left, right) != .orderedAscending
-    }
-}
-#endif
-
-//===----------------------------------------------------------------------===//
-// Focus
-//===----------------------------------------------------------------------===//
-
-#if os(iOS) || os(tvOS)
-@available(iOS 11.0, tvOS 11.0, *)
-extension UIFocusEnvironment {
-  @available(iOS 11.0, tvOS 11.0, *)
-  public func contains(_ environment: UIFocusEnvironment) -> Bool {
-    return _swift_UIKit_UIFocusEnvironmentContainsEnvironment(self, environment)
-  }
-}
-
-@available(iOS 11.0, tvOS 11.0, *)
-extension UIFocusItem {
-  @available(iOS 11.0, tvOS 11.0, *)
-  public var isFocused: Bool {
-    return self === UIScreen.main.focusedItem
-  }
-}
-#endif
-
-//===----------------------------------------------------------------------===//
-// NSItemProviderReading/Writing support
-//===----------------------------------------------------------------------===//
-
-#if os(iOS)
-
-@available(iOS 11.0, *)
-extension UIDragDropSession {
-  @available(iOS 11.0, *)
-  public func canLoadObjects<
-    T : _ObjectiveCBridgeable
-  >(ofClass: T.Type) -> Bool where T._ObjectiveCType : NSItemProviderReading {
-    return self.canLoadObjects(ofClass: T._ObjectiveCType.self)
-  }
-}
-
-@available(iOS 11.0, *)
-extension UIDropSession {
-  @available(iOS 11.0, *)
-  public func loadObjects<
-    T : _ObjectiveCBridgeable
-  >(
-    ofClass: T.Type,
-    completion: @escaping ([T]) -> Void
-  ) -> Progress where T._ObjectiveCType : NSItemProviderReading {
-    return self.loadObjects(ofClass: T._ObjectiveCType.self) { nss in
-      let natives = nss.map { $0 as! T }
-      completion(natives)
-    }
-  }
-}
-
-@available(iOS 11.0, *)
-extension UIPasteConfiguration {
-  @available(iOS 11.0, *)
-  public convenience init<
-    T : _ObjectiveCBridgeable
-  >(forAccepting _: T.Type) where T._ObjectiveCType : NSItemProviderReading {
-    self.init(forAccepting: T._ObjectiveCType.self)
-  }
-
-  @available(iOS 11.0, *)
-  public func addTypeIdentifiers<
-    T : _ObjectiveCBridgeable
-  >(forAccepting aClass: T.Type)
-  where T._ObjectiveCType : NSItemProviderReading {
-    self.addTypeIdentifiers(forAccepting: T._ObjectiveCType.self)
-  }
-}
-
-
-extension UIPasteboard {
-  @available(iOS 11.0, *)
-  public func setObjects<
-    T : _ObjectiveCBridgeable
-  >(_ objects: [T]) where T._ObjectiveCType : NSItemProviderWriting {
-    // Using a simpler `$0 as! T._ObjectiveCType` triggers and assertion in
-    // the compiler.
-    self.setObjects(objects.map { $0._bridgeToObjectiveC() })
-  }
-
-  @available(iOS 11.0, *)
-  public func setObjects<
-    T : _ObjectiveCBridgeable
-  >(
-    _ objects: [T],
-    localOnly: Bool,
-    expirationDate: Date?
-  ) where T._ObjectiveCType : NSItemProviderWriting {
-    self.setObjects(
-      // Using a simpler `$0 as! T._ObjectiveCType` triggers and assertion in
-      // the compiler.
-      objects.map { $0._bridgeToObjectiveC() },
-      localOnly: localOnly,
-      expirationDate: expirationDate)
-  }
-}
-
-#endif
-
-//===----------------------------------------------------------------------===//
-// UIPrintError compatibility
-//===----------------------------------------------------------------------===//
-
-#if os(iOS)
-
-@available(swift, obsoleted: 4.2, renamed:"UIPrintError.Code.notAvailable.rawValue")
-public let UIPrintingNotAvailableError = 1
-
-@available(swift, obsoleted: 4.2, renamed:"UIPrintError.Code.noContent.rawValue")
-public let UIPrintNoContentError = 2
-
-@available(swift, obsoleted: 4.2, renamed:"UIPrintError.Code.unknownImageFormat.rawValue")
-public let UIPrintUnknownImageFormatError = 3
-
-@available(swift, obsoleted: 4.2, renamed:"UIPrintError.Code.jobFailed.rawValue")
-public let UIPrintJobFailedError = 4
-
-#endif
-
-//===----------------------------------------------------------------------===//
-// UIApplicationMain compatibility
-//===----------------------------------------------------------------------===//
-
-#if !os(watchOS)
-
-@available(swift, deprecated: 4.2, message: "Use the overload of UIApplicationMain where the type of the second parameter is UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>, which is the same as the type of CommandLine.unsafeArgv.")
-public func UIApplicationMain(_ argc: Int32, _ argv: UnsafeMutablePointer<UnsafeMutablePointer<Int8>>!, _ principalClassName: String?, _ delegateClassName: String?) -> Int32 {
-    let reboundArgv = UnsafeMutableRawPointer(argv).bindMemory(to: UnsafeMutablePointer<Int8>?.self, capacity: Int(argc))
-    return UIApplicationMain(argc, reboundArgv, principalClassName, delegateClassName)
-}
-
-#endif
-
-//===----------------------------------------------------------------------===//
-// UIAccessibilityTraits
-//===----------------------------------------------------------------------===//
-
-extension UIAccessibilityTraits: OptionSet {}
-
-//===----------------------------------------------------------------------===//
-// UITextDirection
-//===----------------------------------------------------------------------===//
-
-#if !os(watchOS)
-
-extension UITextDirection {
-
-  public static func storage(_ direction: UITextStorageDirection) -> UITextDirection {
-    return UITextDirection(rawValue: direction.rawValue)
-  }
-
-  public static func layout(_ direction: UITextLayoutDirection) -> UITextDirection {
-    return UITextDirection(rawValue: direction.rawValue)
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/UIKit/UIKit_FoundationExtensions.swift.gyb b/stdlib/public/Darwin/UIKit/UIKit_FoundationExtensions.swift.gyb
deleted file mode 100644
index bf6b6cd7ef6dc..0000000000000
--- a/stdlib/public/Darwin/UIKit/UIKit_FoundationExtensions.swift.gyb
+++ /dev/null
@@ -1,95 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-import Foundation
-@_exported import UIKit
-
-%{
-from gyb_foundation_support import ObjectiveCBridgeableImplementationForNSValue
-}%
-
-// UITableView extensions
-public extension IndexPath {
-
-    /// Initialize for use with `UITableView` or `UICollectionView`.
-    public init(row: Int, section: Int) {
-        self.init(indexes: [section, row])
-    }
-
-    /// The section of this index path, when used with `UITableView`.
-    ///
-    /// - precondition: The index path must have exactly two elements.
-    public var section: Int {
-        get {
-            precondition(count == 2, "Invalid index path for use with UITableView. This index path must contain exactly two indices specifying the section and row.")
-            return self[0]
-        }
-        set {
-            precondition(count == 2, "Invalid index path for use with UITableView. This index path must contain exactly two indices specifying the section and row.")
-            self[0] = newValue
-        }
-    }
-
-    /// The row of this index path, when used with `UITableView`.
-    ///
-    /// - precondition: The index path must have exactly two elements.
-    public var row: Int {
-        get {
-            precondition(count == 2, "Invalid index path for use with UITableView. This index path must contain exactly two indices specifying the section and row.")
-            return self[1]
-        }
-        set {
-            precondition(count == 2, "Invalid index path for use with UITableView. This index path must contain exactly two indices specifying the section and row.")
-            self[1] = newValue
-        }
-    }
-}
-
-// UICollectionView extensions
-public extension IndexPath {
-
-    /// Initialize for use with `UITableView` or `UICollectionView`.
-    public init(item: Int, section: Int) {
-        self.init(indexes: [section, item])
-    }
-
-    /// The item of this index path, when used with `UICollectionView`.
-    ///
-    /// - precondition: The index path must have exactly two elements.
-    public var item: Int {
-        get {
-            precondition(count == 2, "Invalid index path for use with UICollectionView. This index path must contain exactly two indices specifying the section and item.")
-            return self[1]
-        }
-        set {
-            precondition(count == 2, "Invalid index path for use with UICollectionView. This index path must contain exactly two indices specifying the section and item.")
-            self[1] = newValue
-        }
-    }}
-
-public extension URLResourceValues {
-
-    /// Returns a dictionary of UIImage objects keyed by size.
-    @available(iOS 8.0, *)
-    public var thumbnailDictionary : [URLThumbnailDictionaryItem : UIImage]? {
-        return allValues[URLResourceKey.thumbnailDictionaryKey] as? [URLThumbnailDictionaryItem : UIImage]
-    }
-}
-
-// Bridge UIKit structs to NSValue.
-
-${ ObjectiveCBridgeableImplementationForNSValue("UIEdgeInsets") }
-
-@available(iOS 11.0, tvOS 11.0, watchOS 4.0, *)
-${ ObjectiveCBridgeableImplementationForNSValue("NSDirectionalEdgeInsets") }
-
-${ ObjectiveCBridgeableImplementationForNSValue("UIOffset") }
diff --git a/stdlib/public/Darwin/Vision/CMakeLists.txt b/stdlib/public/Darwin/Vision/CMakeLists.txt
deleted file mode 100644
index 5fd9cb4202f1e..0000000000000
--- a/stdlib/public/Darwin/Vision/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftVision ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  Vision.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-L${sdk}/usr/lib/swift/"
-  TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_OSX Darwin CoreImage CoreGraphics Metal Dispatch IOKit simd Foundation XPC CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin CoreImage CoreGraphics Metal Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin CoreImage CoreGraphics Metal Dispatch simd Foundation CoreFoundation ObjectiveC # auto-updated
-
-  FRAMEWORK_DEPENDS_WEAK Vision
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_VISION_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_VISION_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_VISION_TVOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/Vision/Vision.swift b/stdlib/public/Darwin/Vision/Vision.swift
deleted file mode 100644
index a6e560b241d2a..0000000000000
--- a/stdlib/public/Darwin/Vision/Vision.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import Vision
-import Darwin
-
-//===----------------------------------------------------------------------===//
-// VNFaceLandmarkRegion2D
-//===----------------------------------------------------------------------===//
-
-#if !os(watchOS)
-
-@available(macOS, introduced: 10.13)
-@available(iOS, introduced: 11.0)
-@available(tvOS, introduced: 11.0)
-extension VNFaceLandmarkRegion2D {
-  @nonobjc
-  public var normalizedPoints: [CGPoint] {
-    let pointsBuffer = UnsafeBufferPointer<CGPoint>(
-      start: self.__normalizedPoints, count: Int(self.pointCount))
-    return Array(pointsBuffer)
-	}
-
-  @nonobjc
-  public func pointsInImage(imageSize: CGSize) -> [CGPoint] {
-    let pointsBuffer = UnsafeBufferPointer<CGPoint>(
-      start: self.__pointsInImage(imageSize: imageSize),
-      count: Int(self.pointCount))
-    return Array(pointsBuffer)
-  }
-}
-
-#endif
diff --git a/stdlib/public/Darwin/WatchKit/CMakeLists.txt b/stdlib/public/Darwin/WatchKit/CMakeLists.txt
deleted file mode 100644
index a4d2684126efb..0000000000000
--- a/stdlib/public/Darwin/WatchKit/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftWatchKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  WKInterfaceController.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" "-L${sdk}/usr/lib/swift/"
-  TARGET_SDKS WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin HomeKit CoreGraphics UIKit Dispatch SceneKit simd Foundation MapKit CoreLocation CoreFoundation ObjectiveC # auto-updated
-  FRAMEWORK_DEPENDS_WEAK WatchKit
-  SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
-
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_WATCHKIT_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/WatchKit/WKInterfaceController.swift b/stdlib/public/Darwin/WatchKit/WKInterfaceController.swift
deleted file mode 100644
index a8a2d11f8f0dd..0000000000000
--- a/stdlib/public/Darwin/WatchKit/WKInterfaceController.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import WatchKit
-import Foundation
-
-@available(iOS, introduced: 8.2)
-extension WKInterfaceController {
-  @available(*, unavailable,
-             renamed: "reloadRootControllers(withNamesAndContexts:)")
-  @nonobjc final public class func reloadRootControllers(
-    _ namesAndContexts: [(name: String, context: AnyObject)]
-  ) {
-    reloadRootControllers(withNamesAndContexts: namesAndContexts)
-  }
-
-  // Swift convenience type (class) method for
-  // reloadRootControllersWithNames:contexts: that takes an array of tuples
-  public class func reloadRootControllers(
-    withNamesAndContexts namesAndContexts: [(name: String, context: AnyObject)]
-  ) {
-    WKInterfaceController.reloadRootControllers(
-      withNames: namesAndContexts.map { $0.name },
-      contexts: namesAndContexts.map { $0.context })
-  }
-
-  @available(*, deprecated,
-             renamed: "presentController(withNamesAndContexts:)")
-  @nonobjc final public func presentController(
-    _ namesAndContexts: [(name: String, context: AnyObject)]
-  ) {
-    presentController(withNamesAndContexts: namesAndContexts)
-  }
-
-  // Swift convenience method for presentControllerWithNames:contexts: that
-  // takes an array of tuples
-  public func presentController(
-    withNamesAndContexts namesAndContexts: [(name: String, context: AnyObject)]
-  ) {
-    self.presentController(
-      withNames: namesAndContexts.map { $0.name },
-      contexts: namesAndContexts.map { $0.context })
-  }
-}
-
diff --git a/stdlib/public/Darwin/XCTest/CMakeLists.txt b/stdlib/public/Darwin/XCTest/CMakeLists.txt
index 3728030bd7a77..c2a6cef19ab65 100644
--- a/stdlib/public/Darwin/XCTest/CMakeLists.txt
+++ b/stdlib/public/Darwin/XCTest/CMakeLists.txt
@@ -18,9 +18,6 @@ add_swift_target_library(swiftXCTest ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
   SWIFT_MODULE_DEPENDS ObjectiveC Foundation
   FRAMEWORK_DEPENDS Foundation XCTest
-  SWIFT_MODULE_DEPENDS_OSX AppKit
-  SWIFT_MODULE_DEPENDS_IOS CoreMedia UIKit
-  SWIFT_MODULE_DEPENDS_TVOS UIKit
   DONT_EMBED_BITCODE
 
   DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_XCTEST_OSX}
diff --git a/stdlib/public/Darwin/XPC/CMakeLists.txt b/stdlib/public/Darwin/XPC/CMakeLists.txt
deleted file mode 100644
index 06e64e3a6618d..0000000000000
--- a/stdlib/public/Darwin/XPC/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftXPC ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  XPC.swift
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  TARGET_SDKS OSX
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch ObjectiveC # auto-updated
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_XPC_OSX}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/XPC/XPC.swift b/stdlib/public/Darwin/XPC/XPC.swift
deleted file mode 100644
index fcda4fd130fe8..0000000000000
--- a/stdlib/public/Darwin/XPC/XPC.swift
+++ /dev/null
@@ -1,119 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import XPC
-@_implementationOnly import _SwiftXPCOverlayShims
-
-//===----------------------------------------------------------------------===//
-// XPC Types
-//===----------------------------------------------------------------------===//
-public var XPC_TYPE_CONNECTION: xpc_type_t {
-	return _swift_xpc_type_CONNECTION()
-}
-
-public var XPC_TYPE_ENDPOINT: xpc_type_t {
-	return _swift_xpc_type_ENDPOINT()
-}
-
-public var XPC_TYPE_NULL: xpc_type_t {
-	return _swift_xpc_type_NULL()
-}
-
-public var XPC_TYPE_BOOL: xpc_type_t {
-	return _swift_xpc_type_BOOL()
-}
-
-public var XPC_TYPE_INT64: xpc_type_t {
-	return _swift_xpc_type_INT64()
-}
-
-public var XPC_TYPE_UINT64: xpc_type_t {
-	return _swift_xpc_type_UINT64()
-}
-
-public var XPC_TYPE_DOUBLE: xpc_type_t {
-	return _swift_xpc_type_DOUBLE()
-}
-
-public var XPC_TYPE_DATE: xpc_type_t {
-	return _swift_xpc_type_DATE()
-}
-
-public var XPC_TYPE_DATA: xpc_type_t {
-	return _swift_xpc_type_DATA()
-}
-
-public var XPC_TYPE_STRING: xpc_type_t {
-	return _swift_xpc_type_STRING()
-}
-
-public var XPC_TYPE_UUID: xpc_type_t {
-	return _swift_xpc_type_UUID()
-}
-
-public var XPC_TYPE_FD: xpc_type_t {
-	return _swift_xpc_type_FD()
-}
-
-public var XPC_TYPE_SHMEM: xpc_type_t {
-	return _swift_xpc_type_SHMEM()
-}
-
-public var XPC_TYPE_ARRAY: xpc_type_t {
-	return _swift_xpc_type_ARRAY()
-}
-
-public var XPC_TYPE_DICTIONARY: xpc_type_t {
-	return _swift_xpc_type_DICTIONARY()
-}
-
-public var XPC_TYPE_ERROR: xpc_type_t {
-	return _swift_xpc_type_ERROR()
-}
-
-public var XPC_TYPE_ACTIVITY: xpc_type_t {
-	return _swift_xpc_type_ACTIVITY()
-}
-
-//===----------------------------------------------------------------------===//
-// Macros
-//===----------------------------------------------------------------------===//
-
-// xpc/xpc.h
-public let XPC_ERROR_KEY_DESCRIPTION: UnsafePointer<Int8> = _xpc_error_key_description
-public let XPC_EVENT_KEY_NAME: UnsafePointer<Int8> = _xpc_event_key_name
-
-public var XPC_BOOL_TRUE: xpc_object_t {
-	return _swift_xpc_bool_true()
-}
-
-public var XPC_BOOL_FALSE: xpc_object_t {
-	return _swift_xpc_bool_false()
-}
-
-public var XPC_ARRAY_APPEND: size_t {
-	return -1
-}
-
-// xpc/connection.h
-
-public var XPC_ERROR_CONNECTION_INTERRUPTED: xpc_object_t {
-	return _swift_xpc_connection_interrupted()
-}
-
-public var XPC_ERROR_CONNECTION_INVALID: xpc_object_t {
-	return _swift_xpc_connection_invalid()
-}
-
-public var XPC_ERROR_TERMINATION_IMMINENT: xpc_object_t {
-	return _swift_xpc_connection_termination_imminent()
-}
diff --git a/stdlib/public/Darwin/os/CMakeLists.txt b/stdlib/public/Darwin/os/CMakeLists.txt
deleted file mode 100644
index 080ad497ebc5a..0000000000000
--- a/stdlib/public/Darwin/os/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftos ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-  format.m
-  os.m
-  os_log.swift
-  os_signpost.swift
-  os_trace_blob.c
-  thunks.mm
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin Dispatch ObjectiveC XPC # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin ObjectiveC # auto-updated
-    Dispatch # required in some configurations but not found by tool
-  SWIFT_MODULE_DEPENDS_TVOS Darwin ObjectiveC # auto-updated
-    Dispatch # required in some configurations but not found by tool
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin ObjectiveC # auto-updated
-    Dispatch # required in some configurations but not found by tool
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_OS_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_OS_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_OS_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_OS_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/os/format.h b/stdlib/public/Darwin/os/format.h
deleted file mode 100644
index 696154661d261..0000000000000
--- a/stdlib/public/Darwin/os/format.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __OS_FORMAT_H__
-#define __OS_FORMAT_H__
-
-#include <TargetConditionals.h>
-#include <Availability.h>
-#include <os/base.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "os_trace_blob.h"
-
-#define OS_LOG_FMT_MAX_CMDS    48
-#define OS_LOG_FMT_BUF_SIZE    (2 + (2 + 16) * OS_LOG_FMT_MAX_CMDS)
-
-typedef enum {
-  T_C_NONE = 0,
-  T_C_STATIC = 1,
-  T_C_DYNAMIC = 2,
-} os_log_count_type_t;
-
-enum os_trace_int_types_t {
-  T_CHAR = -2,
-  T_SHORT = -1,
-  T_INT = 0,
-  T_LONG = 1,
-  T_LONGLONG = 2,
-  T_SIZE = 3,
-  T_INTMAX = 4,
-  T_PTRDIFF = 5,
-};
-
-OS_ENUM(os_log_fmt_cmd_flags, uint8_t,
-    OSLF_CMD_FLAG_PRIVATE = 0x1,
-    OSLF_CMD_FLAG_PUBLIC  = 0x2,
-);
-
-OS_ENUM(os_log_fmt_cmd_type, uint8_t,
-    OSLF_CMD_TYPE_SCALAR      = 0,
-    OSLF_CMD_TYPE_COUNT       = 1,
-    OSLF_CMD_TYPE_STRING      = 2,
-    OSLF_CMD_TYPE_DATA        = 3,
-    OSLF_CMD_TYPE_OBJECT      = 4,
-    OSLF_CMD_TYPE_WIDE_STRING = 5,
-    OSLF_CMD_TYPE_ERRNO       = 6,
-);
-
-OS_ENUM(os_log_fmt_hdr_flags, uint8_t,
-    OSLF_HDR_FLAG_HAS_PRIVATE    = 0x01,
-    OSLF_HDR_FLAG_HAS_NON_SCALAR = 0x02,
-);
-
-enum os_log_int_types_t {
-  OST_CHAR = -2,
-  OST_SHORT = -1,
-  OST_INT =  0,
-  OST_LONG =  1,
-  OST_LONGLONG =  2,
-  OST_SIZE =  3,
-  OST_INTMAX =  4,
-  OST_PTRDIFF =  5,
-};
-
-typedef struct {
-    os_log_fmt_cmd_flags_t cmd_flags : 4;
-    os_log_fmt_cmd_type_t cmd_type : 4;
-    uint8_t cmd_size;
-    uint8_t cmd_data[];
-} os_log_fmt_cmd_s, *os_log_fmt_cmd_t;
-
-typedef struct os_log_fmt_hdr_s {
-    os_log_fmt_hdr_flags_t hdr_flags;
-    uint8_t hdr_cmd_cnt;
-    uint8_t hdr_data[];
-} os_log_fmt_hdr_s, *os_log_fmt_hdr_t;
-
-__attribute__((__visibility__("hidden")))
-bool
-_os_log_encode(char buf[OS_LOG_FMT_BUF_SIZE], const char *format, va_list args,
-    int saved_errno, os_trace_blob_t ob);
-
-#endif // __OS_FORMAT_H__
diff --git a/stdlib/public/Darwin/os/format.m b/stdlib/public/Darwin/os/format.m
deleted file mode 100644
index 460e336e3eb63..0000000000000
--- a/stdlib/public/Darwin/os/format.m
+++ /dev/null
@@ -1,306 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#include <sys/param.h>
-#include <Foundation/Foundation.h>
-#include "format.h"
-
-static inline void
-_os_log_encode_arg(os_trace_blob_t ob, os_log_fmt_cmd_t cmd, const void *data)
-{
-  os_trace_blob_add(ob, cmd, sizeof(os_log_fmt_cmd_s));
-  os_trace_blob_add(ob, data, cmd->cmd_size);
-}
-
-bool
-_os_log_encode(char buf[OS_LOG_FMT_BUF_SIZE], const char *format, va_list args,
-    int saved_errno, os_trace_blob_t ob)
-{
-  os_log_fmt_hdr_s hdr = {0};
-  os_trace_blob_add(ob, &hdr, sizeof(hdr));
-
-  const char *percent = strchr(format, '%');
-
-  while (percent != NULL) {
-    ++percent;
-    if (percent[0] != '%') {
-      os_log_fmt_cmd_s cmd = {0};
-      os_log_count_type_t widtht = T_C_NONE;
-      os_log_count_type_t prect = T_C_NONE;
-      os_log_fmt_cmd_flags_t flags = 0;
-      int type = T_INT;
-      bool long_double = false;
-      int precision = 0;
-      char ch;
-
-      if (hdr.hdr_cmd_cnt == OS_LOG_FMT_MAX_CMDS) {
-        break;
-      }
-
-      for (bool done = false; !done; ++percent) {
-        switch (ch = percent[0]) {
-          /* type of types or other */
-          case 'l': ++type; break; // longer
-          case 'h': --type; break; // shorter
-          case 'z': type = T_SIZE; break;
-          case 'j': type = T_INTMAX; break;
-          case 't': type = T_PTRDIFF; break;
-
-          case '*': // dynamic width
-            widtht = T_C_DYNAMIC;
-            // if the next character is a '.' then increment percent
-            // and fallthrough to the precision handling code
-            if (percent[1] != '.') {
-              break;
-            }
-            ++percent;
-            // FALLTHROUGH
-          case '.': // precision
-            if ((percent[1]) == '*') {
-              prect = T_C_DYNAMIC;
-              ++percent;
-            } else {
-              while (isdigit(percent[1])) {
-                precision = 10 * precision + (percent[1] - '0');
-                ++percent;
-              }
-              if (precision > 1024) precision = 1024;
-              prect = T_C_STATIC;
-            }
-            break;
-
-          case '-': // left-align
-          case '+': // force sign
-          case ' ': // prefix non-negative with space
-          case '#': // alternate
-          case '\'': // group by thousands
-            break;
-
-          case '{': // annotated symbols
-            for (const char *curr2 = percent + 1; (ch = (*curr2)) != 0; ++curr2) {
-              if (ch == '}') {
-                if (strncmp(percent + 1, "private", MIN(curr2 - percent - 1, 7)) == 0) {
-                  hdr.hdr_flags |= OSLF_HDR_FLAG_HAS_PRIVATE;
-                  flags |= OSLF_CMD_FLAG_PRIVATE;
-                } else if (strncmp(percent + 1, "public", MIN(curr2 - percent - 1, 6)) == 0) {
-                  flags |= OSLF_CMD_FLAG_PUBLIC;
-                }
-                percent = curr2;
-                break;
-              }
-            }
-            break;
-
-#define encode_width()                                                         \
-  do {                                                                         \
-    if (widtht == T_C_DYNAMIC) {                                               \
-      cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;                                     \
-      encode(int, 0);                                                          \
-    }                                                                          \
-  } while (0)
-
-// clang inconsistency: static precision counts are still marked with the
-// privacy bits of the command they preceed
-#define encode_precision(type)                                                 \
-  do {                                                                         \
-    if (prect != T_C_NONE) {                                                   \
-      cmd.cmd_type = type;                                                     \
-      cmd.cmd_size = sizeof(int);                                              \
-      if (prect == T_C_STATIC && type == OSLF_CMD_TYPE_COUNT) {                \
-        cmd.cmd_flags = flags;                                                 \
-      } else if (prect == T_C_DYNAMIC) {                                       \
-        precision = va_arg(args, int);                                         \
-      }                                                                        \
-      _os_log_encode_arg(ob, &cmd, &precision);                                \
-      ++hdr.hdr_cmd_cnt;                                                       \
-      prect = T_C_NONE;                                                        \
-    }                                                                          \
-  } while (0)
-
-// scalar data types encode their precision as a scalar
-#define encode_scalar_preamble()                                               \
-  do {                                                                         \
-    encode_width();                                                            \
-    if (prect == T_C_DYNAMIC) {                                                \
-      encode_precision(OSLF_CMD_TYPE_SCALAR);                                  \
-    }                                                                          \
-  } while (0)
-
-#define encode_pointer_preamble()                                              \
-  do {                                                                         \
-    encode_width();                                                            \
-    encode_precision(OSLF_CMD_TYPE_COUNT);                                     \
-  } while (0)
-
-#define encode_nsstring(flags)                                                 \
-  do {                                                                         \
-    NSString *__arg = va_arg(args, NSString *);                                \
-    const char *_Nullable __var = __arg.UTF8String;                            \
-    cmd.cmd_flags = flags;                                                     \
-    cmd.cmd_size = sizeof(__var);                                              \
-    _os_log_encode_arg(ob, &cmd, &__var);                                      \
-    ++hdr.hdr_cmd_cnt;                                                         \
-  } while (0)
-
-#define encode_smallint(ty, flags)                                             \
-  do {                                                                         \
-    int __var = va_arg(args, int);                                             \
-    cmd.cmd_flags = flags;                                                     \
-    cmd.cmd_size = sizeof(__var);                                              \
-    _os_log_encode_arg(ob, &cmd, &__var);                                      \
-    ++hdr.hdr_cmd_cnt;                                                         \
-  } while (0)
-
-#define encode(ty, flags)                                                      \
-  do {                                                                         \
-    ty __var = va_arg(args, ty);                                               \
-    cmd.cmd_flags = flags;                                                     \
-    cmd.cmd_size = sizeof(__var);                                              \
-    _os_log_encode_arg(ob, &cmd, &__var);                                      \
-    ++hdr.hdr_cmd_cnt;                                                         \
-  } while (0)
-
-        /* fixed types */
-        case 'c': // char
-        case 'd': // integer
-        case 'i': // integer
-        case 'o': // octal
-        case 'u': // unsigned
-        case 'x': // hex
-        case 'X': // upper-hex
-          encode_scalar_preamble();
-          cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;
-          switch (type) {
-          case T_CHAR:
-            encode_smallint(char, flags);
-            break;
-          case T_SHORT:
-            encode_smallint(short, flags);
-            break;
-          case T_INT:
-            encode(int, flags);
-            break;
-          case T_LONG:
-            encode(long, flags);
-            break;
-          case T_LONGLONG:
-            encode(long long, flags);
-            break;
-          case T_SIZE:
-            encode(size_t, flags);
-            break;
-          case T_INTMAX:
-            encode(intmax_t, flags);
-            break;
-          case T_PTRDIFF:
-            encode(ptrdiff_t, flags);
-            break;
-          default:
-            return false;
-          }
-          done = true;
-          break;
-
-        case 'p': // emit pointers as scalars
-          cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;
-          encode(void *, flags);
-          done = true;
-          break;
-
-        case 'C': // wchar is treated like %lc
-          encode_scalar_preamble();
-          cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;
-          encode_smallint(wint_t, flags);
-          done = true;
-          break;
-
-        case 'P': // pointer data
-          encode_pointer_preamble();
-          hdr.hdr_flags |= OSLF_HDR_FLAG_HAS_NON_SCALAR;
-          cmd.cmd_type = OSLF_CMD_TYPE_DATA;
-          cmd.cmd_size = sizeof(void *);
-          encode(void *, flags);
-          done = true;
-          break;
-
-        case 'L': // long double
-          long_double = true;
-          break;
-
-        case 'a':
-        case 'A':
-        case 'e':
-        case 'E': // floating types
-        case 'f':
-        case 'F':
-        case 'g':
-        case 'G':
-          encode_scalar_preamble();
-          cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;
-          if (long_double) {
-            encode(long double, flags);
-          } else {
-            encode(double, flags);
-          }
-          done = true;
-          break;
-
-        case 's': // Strings sent from Swift as NSString objects
-          encode_pointer_preamble();
-          hdr.hdr_flags |= OSLF_HDR_FLAG_HAS_NON_SCALAR;
-          cmd.cmd_type = OSLF_CMD_TYPE_STRING;
-          encode_nsstring(flags);
-          done = true;
-          break;
-
-        case '@': // CFTypeRef aka NSObject *
-          // %@ does not support precision
-          encode_width();
-          hdr.hdr_flags |= OSLF_HDR_FLAG_HAS_NON_SCALAR;
-          cmd.cmd_type = OSLF_CMD_TYPE_OBJECT;
-          encode(void *, flags);
-          done = true;
-          break;
-
-        case 'm':
-          cmd.cmd_type = OSLF_CMD_TYPE_SCALAR;
-          cmd.cmd_size = sizeof(int);
-          cmd.cmd_flags = flags;
-          _os_log_encode_arg(ob, &cmd, &saved_errno);
-          ++hdr.hdr_cmd_cnt;
-          done = true;
-          break;
-
-        default:
-          if (isdigit(ch)) { // [0-9]
-            continue;
-          }
-          done = true;
-          break;
-        }
-
-        if (done) {
-          percent = strchr(percent, '%'); // Find next format
-          break;
-        }
-      }
-    } else {
-      percent = strchr(percent+1, '%'); // Find next format after %%
-    }
-  }
-  *(os_log_fmt_hdr_t)buf = hdr;
-  return true;
-}
-
-#undef encode_nsstring
-#undef encode_smallint
-#undef encode
diff --git a/stdlib/public/Darwin/os/os.m b/stdlib/public/Darwin/os/os.m
deleted file mode 100644
index ec3b08c5b3c9c..0000000000000
--- a/stdlib/public/Darwin/os/os.m
+++ /dev/null
@@ -1,162 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#include <TargetConditionals.h>
-#include <Availability.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Foundation/Foundation.h>
-#include <dlfcn.h>
-#include <dispatch/dispatch.h>
-#include <os/base.h>
-#include <os/log.h>
-#include <os/signpost.h>
-#include <objc/runtime.h>
-#include <wchar.h>
-
-#include "thunks.h"
-#include "format.h"
-
-#define OST_FORMAT_MAX_STRING_SIZE 1024
-
-typedef struct os_log_pack_s {
-    uint64_t        olp_continuous_time;
-    struct timespec olp_wall_time;
-    const void     *olp_mh;
-    const void     *olp_pc;
-    const char     *olp_format;
-    uint8_t         olp_data[];
-} os_log_pack_s, *os_log_pack_t;
-
-API_AVAILABLE(macosx(10.12.4), ios(10.3), tvos(10.2), watchos(3.2))
-size_t
-_os_log_pack_size(size_t os_log_format_buffer_size);
-
-API_AVAILABLE(macosx(10.12.4), ios(10.3), tvos(10.2), watchos(3.2))
-uint8_t *
-_os_log_pack_fill(os_log_pack_t pack, size_t size, int saved_errno, const void *dso, const char *fmt);
-
-API_AVAILABLE(macosx(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-uint8_t *
-_os_signpost_pack_fill(os_log_pack_t pack, size_t size,
-        int saved_errno, const void *dso, const char *fmt,
-        const char *spnm, os_signpost_id_t spid);
-
-API_AVAILABLE(macosx(10.12.4), ios(10.3), tvos(10.2), watchos(3.2))
-void
-os_log_pack_send(os_log_pack_t pack, os_log_t log, os_log_type_t type);
-
-API_AVAILABLE(macosx(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-void
-_os_signpost_pack_send(os_log_pack_t pack, os_log_t h,
-        os_signpost_type_t spty);
-
-__attribute__((__visibility__("default")))
-void *
-_swift_os_log_return_address(void)
-{
-  return __builtin_return_address(1);
-}
-
-__attribute__((__visibility__("default")))
-void
-_swift_os_log(
-    const void * _Nullable dso,
-    const void * _Nullable ra,
-    os_log_t _Nonnull h,
-    os_log_type_t type,
-    const char * _Nonnull fmt,
-    va_list args)
-{
-  int saved_errno = errno; // %m
-  char buf[OS_LOG_FMT_BUF_SIZE];
-  os_trace_blob_s ob = {
-    .ob_s = buf,
-    .ob_size = OS_LOG_FMT_BUF_SIZE,
-    .ob_binary = true
-  };
-
-  if (_os_log_encode(buf, fmt, args, saved_errno, &ob)) {
-    if (os_log_pack_send) {
-      size_t sz = _os_log_pack_size(ob.ob_len);
-      uint8_t _Alignas(os_log_pack_s) pack[sz];
-      os_log_pack_t p = (os_log_pack_t)pack;
-      /*
-       * _os_log_encode has already packed `saved_errno` into a
-       * OSLF_CMD_TYPE_SCALAR command as the OSLF_CMD_TYPE_ERRNO does not
-       * deploy backwards, so pass zero for errno here.
-       */
-      uint8_t *ptr = _os_log_pack_fill(p, sz, 0, dso, fmt);
-      p->olp_pc = ra;
-      memcpy(ptr, buf, ob.ob_len);
-      os_log_pack_send(p, h, type);
-    } else {
-      _os_log_impl((void *)dso, h, type, fmt, (uint8_t *)buf, ob.ob_len);
-    }
-  }
-}
-
-API_AVAILABLE(macosx(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-__attribute__((__visibility__("default")))
-void
-_swift_os_signpost_with_format(
-    const void * _Nullable dso,
-    const void * _Nullable ra,
-    os_log_t _Nonnull h,
-    os_signpost_type_t spty,
-    const char * _Nonnull spnm,
-    os_signpost_id_t spid,
-    const char * _Nullable fmt,
-    va_list args)
-{
-  int saved_errno = errno; // %m
-  char buf[OS_LOG_FMT_BUF_SIZE];
-  os_trace_blob_s ob = {
-    .ob_s = buf,
-    .ob_size = OS_LOG_FMT_BUF_SIZE,
-    .ob_maxsize = OS_LOG_FMT_BUF_SIZE,
-    .ob_binary = true
-  };
-
-  /*
-   * Signposts with a signpost name but no message/arguments are valid;
-   * the underlying encode/pack/decode infrastructure agrees to treat
-   * these like having an empty format string.
-   */
-  bool encoded = fmt == NULL ?
-      _os_log_encode(buf, "", args, saved_errno, &ob) :
-      _os_log_encode(buf, fmt, args, saved_errno, &ob);
-  if (encoded) {
-    size_t sz = _os_log_pack_size(ob.ob_len);
-    uint8_t _Alignas(os_log_pack_s) pack[sz];
-    os_log_pack_t p = (os_log_pack_t)pack;
-    uint8_t *ptr = _os_signpost_pack_fill(p, sz, saved_errno, dso,
-        fmt, spnm, spid);
-    p->olp_pc = ra;
-    memcpy(ptr, buf, ob.ob_len);
-    _os_signpost_pack_send(p, h, spty);
-  }
-}
-
-API_AVAILABLE(macosx(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-__attribute__((__visibility__("default")))
-void
-_swift_os_signpost(
-    const void * _Nullable dso,
-    const void * _Nullable ra,
-    os_log_t _Nonnull h,
-    os_signpost_type_t spty,
-    const char * _Nonnull spnm,
-    os_signpost_id_t spid)
-{
-  static va_list x;
-  _swift_os_signpost_with_format(dso, ra, h, spty, spnm, spid, NULL, x);
-}
diff --git a/stdlib/public/Darwin/os/os_log.swift b/stdlib/public/Darwin/os/os_log.swift
deleted file mode 100644
index 5eeeb75b6d0be..0000000000000
--- a/stdlib/public/Darwin/os/os_log.swift
+++ /dev/null
@@ -1,118 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import os
-@_exported import os.log
-@_implementationOnly import _SwiftOSOverlayShims
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public func os_log(
-  _ type: OSLogType,
-  dso: UnsafeRawPointer = #dsohandle,
-  log: OSLog = .default,
-  _ message: StaticString,
-  _ args: CVarArg...)
-{
-  guard log.isEnabled(type: type) else { return }
-  let ra = _swift_os_log_return_address()
-
-  message.withUTF8Buffer { (buf: UnsafeBufferPointer<UInt8>) in
-    // Since dladdr is in libc, it is safe to unsafeBitCast
-    // the cstring argument type.
-    buf.baseAddress!.withMemoryRebound(
-      to: CChar.self, capacity: buf.count
-    ) { str in
-      withVaList(args) { valist in
-        _swift_os_log(dso, ra, log, type, str, valist)
-      }
-    }
-  }
-}
-
-@available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-public func os_log(
-  _ message: StaticString,
-  dso: UnsafeRawPointer? = #dsohandle,
-  log: OSLog = .default,
-  type: OSLogType = .default,
-  _ args: CVarArg...)
-{
-  guard log.isEnabled(type: type) else { return }
-  let ra = _swift_os_log_return_address()
-
-  message.withUTF8Buffer { (buf: UnsafeBufferPointer<UInt8>) in
-    // Since dladdr is in libc, it is safe to unsafeBitCast
-    // the cstring argument type.
-    buf.baseAddress!.withMemoryRebound(
-      to: CChar.self, capacity: buf.count
-    ) { str in
-      withVaList(args) { valist in
-        _swift_os_log(dso, ra, log, type, str, valist)
-      }
-    }
-  }
-}
-
-extension OSLogType {
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let `default` = __OS_LOG_TYPE_DEFAULT
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let info = __OS_LOG_TYPE_INFO
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let debug = __OS_LOG_TYPE_DEBUG
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let error = __OS_LOG_TYPE_ERROR
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let fault = __OS_LOG_TYPE_FAULT
-}
-
-extension OSLog {
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let disabled = _swift_os_log_disabled()
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public static let `default` = _swift_os_log_default()
-
-  @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
-  public convenience init(subsystem: String, category: String) {
-    self.init(__subsystem: subsystem, category: category)
-  }
-}
-
-@available(*, unavailable, renamed: "OSLogType.default")
-public var OS_LOG_TYPE_DEFAULT: OSLogType {
-  fatalError()
-}
-
-@available(*, unavailable, renamed: "OSLogType.info")
-public var OS_LOG_TYPE_INFO: OSLogType {
-  fatalError()
-}
-
-@available(*, unavailable, renamed: "OSLogType.debug")
-public var OS_LOG_TYPE_DEBUG: OSLogType {
-  fatalError()
-}
-
-@available(*, unavailable, renamed: "OSLogType.error")
-public var OS_LOG_TYPE_ERROR: OSLogType {
-  fatalError()
-}
-
-@available(*, unavailable, renamed: "OSLogType.fault")
-public var OS_LOG_TYPE_FAULT: OSLogType {
-  fatalError()
-}
diff --git a/stdlib/public/Darwin/os/os_signpost.swift b/stdlib/public/Darwin/os/os_signpost.swift
deleted file mode 100644
index f4b59f3c40276..0000000000000
--- a/stdlib/public/Darwin/os/os_signpost.swift
+++ /dev/null
@@ -1,133 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-@_exported import os
-@_exported import os.signpost
-@_implementationOnly import _SwiftOSOverlayShims
-import os.log
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public func os_signpost(
-  _ type: OSSignpostType,
-  dso: UnsafeRawPointer = #dsohandle,
-  log: OSLog,
-  name: StaticString,
-  signpostID: OSSignpostID = .exclusive
-) {
-  let hasValidID = signpostID != .invalid && signpostID != .null
-  guard log.signpostsEnabled && hasValidID else { return }
-  let ra = _swift_os_log_return_address()
-  name.withUTF8Buffer { (nameBuf: UnsafeBufferPointer<UInt8>) in
-    // Since dladdr is in libc, it is safe to unsafeBitCast
-    // the cstring argument type.
-    nameBuf.baseAddress!.withMemoryRebound(
-      to: CChar.self, capacity: nameBuf.count
-    ) { nameStr in
-      _swift_os_signpost(dso, ra, log, type, nameStr, signpostID.rawValue)
-    }
-  }
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public func os_signpost(
-  _ type: OSSignpostType,
-  dso: UnsafeRawPointer = #dsohandle,
-  log: OSLog,
-  name: StaticString,
-  signpostID: OSSignpostID = .exclusive,
-  _ format: StaticString,
-  _ arguments: CVarArg...
-) {
-  let hasValidID = signpostID != .invalid && signpostID != .null
-  guard log.signpostsEnabled && hasValidID else { return }
-  let ra = _swift_os_log_return_address()
-  name.withUTF8Buffer { (nameBuf: UnsafeBufferPointer<UInt8>) in
-    // Since dladdr is in libc, it is safe to unsafeBitCast
-    // the cstring argument type.
-    nameBuf.baseAddress!.withMemoryRebound(
-      to: CChar.self, capacity: nameBuf.count
-    ) { nameStr in
-      format.withUTF8Buffer { (formatBuf: UnsafeBufferPointer<UInt8>) in
-        // Since dladdr is in libc, it is safe to unsafeBitCast
-        // the cstring argument type.
-        formatBuf.baseAddress!.withMemoryRebound(
-          to: CChar.self, capacity: formatBuf.count
-        ) { formatStr in
-          withVaList(arguments) { valist in
-            _swift_os_signpost_with_format(dso, ra, log, type,
-                nameStr, signpostID.rawValue, formatStr, valist)
-          }
-        }
-      }
-    }
-  }
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension OSSignpostType {
-  public static let event = __OS_SIGNPOST_EVENT
-  public static let begin = __OS_SIGNPOST_INTERVAL_BEGIN
-  public static let end = __OS_SIGNPOST_INTERVAL_END
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-public struct OSSignpostID {
-  public let rawValue: os_signpost_id_t
-
-  public static let exclusive = OSSignpostID(_swift_os_signpost_id_exclusive())
-  public static let invalid = OSSignpostID(_swift_os_signpost_id_invalid())
-  public static let null = OSSignpostID(_swift_os_signpost_id_null())
-
-  public init(log: OSLog) {
-    self.rawValue = __os_signpost_id_generate(log)
-  }
-
-  public init(log: OSLog, object: AnyObject) {
-    self.rawValue = __os_signpost_id_make_with_pointer(log,
-        UnsafeRawPointer(Unmanaged.passUnretained(object).toOpaque()))
-  }
-
-  public init(_ value: UInt64) {
-    self.rawValue = value
-  }
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension OSSignpostID : Comparable {
-  public static func < (a: OSSignpostID, b: OSSignpostID) -> Bool {
-    return a.rawValue < b.rawValue
-  }
-
-  public static func == (a: OSSignpostID, b: OSSignpostID) -> Bool {
-    return a.rawValue == b.rawValue
-  }
-}
-
-@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
-extension OSLog {
-  public struct Category {
-    public let rawValue: String
-    public static let pointsOfInterest =
-        Category(string: String(cString: _swift_os_signpost_points_of_interest()))
-    private init(string: String) {
-      self.rawValue = string
-    }
-  }
-
-  public convenience init(subsystem: String, category: Category) {
-    self.init(__subsystem: subsystem, category: category.rawValue)
-  }
-
-  public var signpostsEnabled: Bool {
-    return __os_signpost_enabled(self)
-  }
-}
diff --git a/stdlib/public/Darwin/os/os_trace_blob.c b/stdlib/public/Darwin/os/os_trace_blob.c
deleted file mode 100644
index 81c86f185ddbe..0000000000000
--- a/stdlib/public/Darwin/os/os_trace_blob.c
+++ /dev/null
@@ -1,123 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#include <ctype.h>
-#include <dispatch/dispatch.h>
-#include <os/base.h>
-#include <os/log.h>
-#include <locale.h>
-#if !defined(__linux__)
-#include <xlocale.h>
-#endif
-#include "os_trace_blob.h"
-
-OS_NOINLINE
-static void
-_os_trace_temporary_resource_shortage(void)
-{
-    sleep(1);
-}
-
-static void *
-_os_trace_malloc(size_t size)
-{
-    void *buf;
-    while (os_unlikely(!(buf = malloc(size)))) {
-        _os_trace_temporary_resource_shortage();
-    }
-    return buf;
-}
-
-static void *
-_os_trace_memdup(void *ptr, size_t size)
-{
-    return memcpy(_os_trace_malloc(size), ptr, size);
-}
-
-static void *
-_os_trace_realloc(void *ptr, size_t size)
-{
-    void *buf;
-    while (os_unlikely(!(buf = realloc(ptr, size)))) {
-        _os_trace_temporary_resource_shortage();
-    }
-    return buf;
-}
-
-void
-os_trace_blob_destroy_slow(os_trace_blob_t ob)
-{
-    char *s = ob->ob_s;
-    ob->ob_s = (void *)0xEBADF000;
-    ob->ob_flags = 0;
-    free(s);
-}
-
-char *
-os_trace_blob_detach(os_trace_blob_t ob, size_t *len)
-{
-    bool needs_free = ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE;
-    char *s = ob->ob_s;
-    ob->ob_s = (void *)0xEBADF000;
-    ob->ob_flags = 0;
-    if (len) *len = ob->ob_len;
-    if (needs_free) return s;
-    return _os_trace_memdup(s, ob->ob_len + !ob->ob_binary);
-}
-
-OS_NOINLINE
-static uint32_t
-os_trace_blob_grow(os_trace_blob_t ob, size_t hint)
-{
-    uint32_t size, minsize, used = ob->ob_len + !ob->ob_binary;
-    if (os_add_overflow(used, hint, &minsize)) {
-        size = ob->ob_maxsize;
-    } else if (os_mul_overflow(ob->ob_size, 2, &size)) {
-        size = ob->ob_maxsize;
-    } else {
-        size = MIN((uint32_t)ob->ob_maxsize, MAX(minsize, size));
-    }
-    if (size > ob->ob_size) {
-        if (ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE) {
-            ob->ob_s = _os_trace_realloc(ob->ob_s, size);
-        } else {
-            char *s = ob->ob_s;
-            ob->ob_s = _os_trace_malloc(size);
-            memcpy(ob->ob_s, s, used);
-            ob->ob_flags |= OS_TRACE_BLOB_NEEDS_FREE;
-        }
-        ob->ob_size = size;
-    }
-    return size - used;
-}
-
-uint32_t
-os_trace_blob_add_slow(os_trace_blob_t ob, const void *ptr, size_t size)
-{
-    if (os_unlikely(ob->ob_flags & OS_TRACE_BLOB_TRUNCATED)) {
-        return 0;
-    }
-
-    uint32_t avail = _os_trace_blob_available(ob);
-    if (avail < size) {
-        if (ob->ob_size < ob->ob_maxsize) {
-            avail = os_trace_blob_grow(ob, size);
-        }
-        if (avail < size) {
-            ob->ob_flags |= OS_TRACE_BLOB_TRUNCATED;
-            size = avail;
-        }
-    }
-
-    memcpy(ob->ob_s + ob->ob_len, ptr, size);
-    return _os_trace_blob_growlen(ob, size);
-}
diff --git a/stdlib/public/Darwin/os/os_trace_blob.h b/stdlib/public/Darwin/os/os_trace_blob.h
deleted file mode 100644
index 386f983df7d14..0000000000000
--- a/stdlib/public/Darwin/os/os_trace_blob.h
+++ /dev/null
@@ -1,178 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __BLOB_H__
-#define __BLOB_H__
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include "thunks.h"
-
-OS_ENUM(os_trace_blob_flags, uint16_t,
-    OS_TRACE_BLOB_NEEDS_FREE = 0x0001,
-    OS_TRACE_BLOB_TRUNCATED  = 0x0002,
-);
-
-typedef struct os_trace_blob_s {
-    union {
-        uint8_t *ob_b;
-        void *ob_v;
-        char *ob_s;
-        const char *ob_c;
-    };
-    uint32_t ob_len;
-    uint32_t ob_size;
-    uint32_t ob_maxsize;
-    uint16_t ob_flags;
-    bool     ob_binary;
-} os_trace_blob_s, *os_trace_blob_t;
-
-#pragma mark - helpers (not to be used directly)
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-_os_trace_blob_available(os_trace_blob_t ob)
-{
-    return ob->ob_size - !ob->ob_binary - ob->ob_len;
-}
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-_os_trace_blob_growlen(os_trace_blob_t ob, size_t extra)
-{
-    ob->ob_len += extra;
-    if (!ob->ob_binary) ob->ob_s[ob->ob_len] = '\0';
-    return (uint32_t)extra;
-}
-
-OS_ALWAYS_INLINE
-static inline void
-_os_trace_blob_setlen(os_trace_blob_t ob, uint32_t len)
-{
-    ob->ob_len = len;
-    if (!ob->ob_binary) ob->ob_s[len] = '\0';
-}
-
-__attribute__((__visibility__("hidden")))
-void
-os_trace_blob_destroy_slow(os_trace_blob_t ob);
-
-#pragma mark - initialization and simple helpers
-
-#define os_trace_blob_init_buf(buf, binary) (os_trace_blob_s){ \
-        .ob_v = buf, \
-        .ob_binary = binary, \
-        .ob_size = ({ _Static_assert(sizeof(*buf) == 1, ""); countof(buf); }) \
-    }
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-os_trace_blob_max_available(os_trace_blob_t ob)
-{
-    uint32_t used = ob->ob_len + !ob->ob_binary;
-    if (ob->ob_maxsize) return ob->ob_maxsize - used;
-    if (ob->ob_size) return ob->ob_size - used;
-    return 0;
-}
-
-OS_ALWAYS_INLINE
-static inline size_t
-os_trace_blob_is_empty(os_trace_blob_t ob)
-{
-    return ob->ob_len == 0;
-}
-
-OS_MALLOC __attribute__((__visibility__("hidden")))
-char *
-os_trace_blob_detach(os_trace_blob_t ob, size_t *len);
-
-OS_ALWAYS_INLINE
-static inline void
-os_trace_blob_assert_not_allocated(os_trace_blob_t ob)
-{
-    if (os_unlikely(ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE)) {
-        OS_TRACE_INTERNAL_CRASH(0, "Buffer needs free");
-    }
-}
-
-OS_ALWAYS_INLINE
-static inline void
-os_trace_blob_destroy(os_trace_blob_t ob)
-{
-    if (ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE) {
-        return os_trace_blob_destroy_slow(ob);
-    }
-}
-
-OS_ALWAYS_INLINE
-static inline void
-os_trace_blob_set_string(os_trace_blob_t ob, const char *s)
-{
-    if (ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE) {
-        free(ob->ob_s);
-    }
-    *ob = (os_trace_blob_s){
-        .ob_c = s,
-        .ob_len = (uint32_t)strlen(s),
-        // not setting the size means "const"
-    };
-}
-
-OS_ALWAYS_INLINE
-static inline void
-os_trace_blob_rtrim(os_trace_blob_t ob)
-{
-    uint32_t len = ob->ob_len;
-    while (len > 0 && isspace(ob->ob_s[len - 1])) --len;
-    _os_trace_blob_setlen(ob, len);
-}
-
-#pragma mark - appending to the blob
-
-__attribute__((__visibility__("hidden")))
-uint32_t
-os_trace_blob_add_slow(os_trace_blob_t ob, const void *ptr, size_t size);
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-os_trace_blob_add(os_trace_blob_t ob, const void *ptr, size_t size)
-{
-    if (os_unlikely(ob->ob_flags & OS_TRACE_BLOB_TRUNCATED)) {
-        return 0;
-    }
-    if (os_unlikely(size > _os_trace_blob_available(ob))) {
-        return os_trace_blob_add_slow(ob, ptr, size);
-    }
-    memcpy(ob->ob_s + ob->ob_len, ptr, size);
-    return _os_trace_blob_growlen(ob, size);
-}
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-os_trace_blob_addc(os_trace_blob_t ob, int c)
-{
-    uint8_t byte = (uint8_t)c;
-    return os_trace_blob_add(ob, &byte, 1);
-}
-
-OS_ALWAYS_INLINE
-static inline uint32_t
-os_trace_blob_add_safe_string(os_trace_blob_t ob, const char *s)
-{
-    // safe means pure ascii no control chars
-    return os_trace_blob_add(ob, s, strlen(s));
-}
-
-#endif // !__LIBTRACE_BLOB_INTERNAL_H__
diff --git a/stdlib/public/Darwin/os/thunks.h b/stdlib/public/Darwin/os/thunks.h
deleted file mode 100644
index 2546d95e11f97..0000000000000
--- a/stdlib/public/Darwin/os/thunks.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __OS_THUNKS_H__
-#define __OS_THUNKS_H__
-
-#include <stdlib.h>
-
-#ifndef os_fastpath
-#define os_fastpath(x) ((__typeof__(x))OS_EXPECT((long)(x), ~0l))
-#endif
-#ifndef os_slowpath
-#define os_slowpath(x) ((__typeof__(x))OS_EXPECT((long)(x), 0l))
-#endif
-#ifndef os_likely
-#define os_likely(x) OS_EXPECT(!!(x), 1)
-#endif
-#ifndef os_unlikely
-#define os_unlikely(x) OS_EXPECT(!!(x), 0)
-#endif
-
-#ifndef MIN
-#define MIN(a, b)  (((a)<(b))?(a):(b))
-#endif
-
-#ifndef MAX
-#define MAX(a, b)  (((a)>(b))?(a):(b))
-#endif
-
-#ifndef OS_TRACE_INTERNAL_CRASH
-#define OS_TRACE_INTERNAL_CRASH(_ptr, _message) _swift_os_log_reportError(0, _message)
-#endif
-
-#ifndef os_likely
-#define os_likely(x) OS_EXPECT(!!(x), 1)
-#endif
-#ifndef os_unlikely
-#define os_unlikely(x) OS_EXPECT(!!(x), 0)
-#endif
-
-#define os_add_overflow(a, b, res) __builtin_add_overflow((a), (b), (res))
-#define os_sub_overflow(a, b, res) __builtin_sub_overflow((a), (b), (res))
-#define os_mul_overflow(a, b, res) __builtin_mul_overflow((a), (b), (res))
-
-__BEGIN_DECLS
-
-__attribute__((__visibility__("hidden")))
-void
-_swift_os_log_reportError(uint32_t flags, const char *message);
-
-__END_DECLS
-
-#endif // __OS_THUNKS_H__
diff --git a/stdlib/public/Darwin/os/thunks.mm b/stdlib/public/Darwin/os/thunks.mm
deleted file mode 100644
index 332d22990198f..0000000000000
--- a/stdlib/public/Darwin/os/thunks.mm
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-
-#include <swift/Runtime/Debug.h>
-#include "thunks.h"
-
-extern "C" void
-_swift_os_log_reportError(uint32_t flags, const char *message)
-{
-	swift::swift_reportError(flags, message);
-}
diff --git a/stdlib/public/Darwin/simd/CMakeLists.txt b/stdlib/public/Darwin/simd/CMakeLists.txt
deleted file mode 100644
index de156d5c73252..0000000000000
--- a/stdlib/public/Darwin/simd/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 3.4.3)
-include("../../../../cmake/modules/StandaloneOverlay.cmake")
-
-add_swift_target_library(swiftsimd ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
-
-  "${SWIFT_SOURCE_DIR}/stdlib/linker-support/magic-symbols-for-install-name.c"
-
-  GYB_SOURCES
-    simd.swift.gyb
-    Quaternion.swift.gyb
-
-  SWIFT_COMPILE_FLAGS ${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS} -parse-stdlib ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
-  LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-  SWIFT_MODULE_DEPENDS_OSX Darwin # auto-updated
-  SWIFT_MODULE_DEPENDS_IOS Darwin # auto-updated
-  SWIFT_MODULE_DEPENDS_TVOS Darwin # auto-updated
-  SWIFT_MODULE_DEPENDS_WATCHOS Darwin # auto-updated
-
-  DEPLOYMENT_VERSION_OSX ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_OSX}
-  DEPLOYMENT_VERSION_IOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_IOS}
-  DEPLOYMENT_VERSION_TVOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_TVOS}
-  DEPLOYMENT_VERSION_WATCHOS ${SWIFTLIB_DEPLOYMENT_VERSION_SIMD_WATCHOS}
-  INSTALL_IN_COMPONENT sdk-overlay
-)
diff --git a/stdlib/public/Darwin/simd/Quaternion.swift.gyb b/stdlib/public/Darwin/simd/Quaternion.swift.gyb
deleted file mode 100644
index 45a2e97474559..0000000000000
--- a/stdlib/public/Darwin/simd/Quaternion.swift.gyb
+++ /dev/null
@@ -1,268 +0,0 @@
-//===----------------------------------------------------------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-// simd module overlays for Swift
-//===----------------------------------------------------------------------===//
-
-import Swift
-import Darwin
-@_exported import simd
-
-%for scalar in ['Float','Double']:
-% quat = 'simd_quat' + ('f' if scalar == 'Float' else 'd')
-% mat3 = 'simd_' + str.lower(scalar) + '3x3'
-% mat4 = 'simd_' + str.lower(scalar) + '4x4'
-
-extension ${quat} {
-
-  /// Construct a quaternion from components.
-  ///
-  /// - Parameters:
-  ///   - ix: The x-component of the imaginary (vector) part.
-  ///   - iy: The y-component of the imaginary (vector) part.
-  ///   - iz: The z-component of the imaginary (vector) part.
-  ///   - r: The real (scalar) part.
-  @_transparent
-  public init(ix: ${scalar}, iy: ${scalar}, iz: ${scalar}, r: ${scalar}) {
-    self.init(vector: SIMD4<${scalar}>(ix, iy, iz, r))
-  }
-
-  /// Construct a quaternion from real and imaginary parts.
-  @_transparent
-  public init(real: ${scalar}, imag: SIMD3<${scalar}>) {
-    self.init(vector: simd_make_${str.lower(scalar)}4(imag, real))
-  }
-
-  /// A quaternion whose action is a rotation by `angle` radians about `axis`.
-  ///
-  /// - Parameters:
-  ///   - angle: The angle to rotate by measured in radians.
-  ///   - axis: The axis to rotate around.
-  @_transparent
-  public init(angle: ${scalar}, axis: SIMD3<${scalar}>) {
-    self = simd_quaternion(angle, axis)
-  }
-
-  /// A quaternion whose action rotates the vector `from` onto the vector `to`.
-  @_transparent
-  public init(from: SIMD3<${scalar}>, to: SIMD3<${scalar}>) {
-    self = simd_quaternion(from, to)
-  }
-
-  /// Construct a quaternion from `rotationMatrix`.
-  @_transparent
-  public init(_ rotationMatrix: ${mat3}) {
-    self = simd_quaternion(rotationMatrix)
-  }
-
-  /// Construct a quaternion from `rotationMatrix`.
-  @_transparent
-  public init(_ rotationMatrix: ${mat4}) {
-    self = simd_quaternion(rotationMatrix)
-  }
-
-  /// The real (scalar) part of `self`.
-  public var real: ${scalar} {
-    @_transparent
-    get { return vector.w }
-    @_transparent
-    set { vector.w = newValue }
-  }
-
-  /// The imaginary (vector) part of `self`.
-  public var imag: SIMD3<${scalar}> {
-    @_transparent
-    get { return simd_make_${str.lower(scalar)}3(vector) }
-    @_transparent
-    set { vector = simd_make_${str.lower(scalar)}4(newValue, vector.w) }
-  }
-
-  /// The angle (in radians) by which `self`'s action rotates.
-  @_transparent
-  public var angle: ${scalar} {
-    return simd_angle(self)
-  }
-
-  /// The normalized axis about which `self`'s action rotates.
-  @_transparent
-  public var axis: SIMD3<${scalar}> {
-    return simd_axis(self)
-  }
-
-  /// The conjugate of `self`.
-  @_transparent
-  public var conjugate: ${quat} {
-    return simd_conjugate(self)
-  }
-
-  /// The inverse of `self`.
-  @_transparent
-  public var inverse: ${quat} {
-    return simd_inverse(self)
-  }
-
-  /// The unit quaternion obtained by normalizing `self`.
-  @_transparent
-  public var normalized: ${quat} {
-    return simd_normalize(self)
-  }
-
-  /// The length of the quaternion interpreted as a 4d vector.
-  @_transparent
-  public var length: ${scalar} {
-    return simd_length(self)
-  }
-
-  /// Applies the rotation represented by a unit quaternion to the vector and
-  /// returns the result.
-  @_transparent
-  public func act(_ vector: SIMD3<${scalar}>) -> SIMD3<${scalar}> {
-    return simd_act(self, vector)
-  }
-}
-
-extension ${mat3} {
-  /// Construct a 3x3 matrix from `quaternion`.
-  public init(_ quaternion: ${quat}) {
-    self = simd_matrix3x3(quaternion)
-  }
-}
-
-extension ${mat4} {
-  /// Construct a 4x4 matrix from `quaternion`.
-  public init(_ quaternion: ${quat}) {
-    self = simd_matrix4x4(quaternion)
-  }
-}
-
-extension ${quat} : CustomDebugStringConvertible {
-  public var debugDescription: String {
-    return "${quat}(real: \(real), imag: \(imag))"
-  }
-}
-
-extension ${quat} : Equatable {
-  @_transparent
-  public static func ==(lhs: ${quat}, rhs: ${quat}) -> Bool {
-    return lhs.vector == rhs.vector
-  }
-}
-
-extension ${quat} {
-  /// The sum of `lhs` and `rhs`.
-  @_transparent
-  public static func +(lhs: ${quat}, rhs: ${quat}) -> ${quat} {
-    return simd_add(lhs, rhs)
-  }
-
-  /// Add `rhs` to `lhs`.
-  @_transparent
-  public static func +=(lhs: inout ${quat}, rhs: ${quat}) {
-    lhs = lhs + rhs
-  }
-
-  /// The difference of `lhs` and `rhs`.
-  @_transparent
-  public static func -(lhs: ${quat}, rhs: ${quat}) -> ${quat} {
-    return simd_sub(lhs, rhs)
-  }
-
-  /// Subtract `rhs` from `lhs`.
-  @_transparent
-  public static func -=(lhs: inout ${quat}, rhs: ${quat}) {
-    lhs = lhs - rhs
-  }
-
-  /// The negation of `rhs`.
-  @_transparent
-  public static prefix func -(rhs: ${quat}) -> ${quat} {
-    return simd_sub(${quat}(), rhs)
-  }
-
-  /// The product of `lhs` and `rhs`.
-  @_transparent
-  public static func *(lhs: ${quat}, rhs: ${quat}) -> ${quat} {
-    return simd_mul(lhs, rhs)
-  }
-
-  /// The product of `lhs` and `rhs`.
-  @_transparent
-  public static func *(lhs: ${scalar}, rhs: ${quat}) -> ${quat} {
-    return simd_mul(lhs, rhs)
-  }
-
-  /// The product of `lhs` and `rhs`.
-  @_transparent
-  public static func *(lhs: ${quat}, rhs: ${scalar}) -> ${quat} {
-    return simd_mul(lhs, rhs)
-  }
-
-  /// Multiply `lhs` by `rhs`.
-  @_transparent
-  public static func *=(lhs: inout ${quat}, rhs: ${quat}) {
-    lhs = lhs * rhs
-  }
-
-  /// Multiply `lhs` by `rhs`.
-  @_transparent
-  public static func *=(lhs: inout ${quat}, rhs: ${scalar}) {
-    lhs = lhs * rhs
-  }
-
-  /// The quotient of `lhs` and `rhs`.
-  @_transparent
-  public static func /(lhs: ${quat}, rhs: ${quat}) -> ${quat} {
-    return simd_mul(lhs, rhs.inverse)
-  }
-
-  /// The quotient of `lhs` and `rhs`.
-  @_transparent
-  public static func /(lhs: ${quat}, rhs: ${scalar}) -> ${quat} {
-    return ${quat}(vector: lhs.vector/rhs)
-  }
-
-  /// Divide `lhs` by `rhs`.
-  @_transparent
-  public static func /=(lhs: inout ${quat}, rhs: ${quat}) {
-    lhs = lhs / rhs
-  }
-
-  /// Divide `lhs` by `rhs`.
-  @_transparent
-  public static func /=(lhs: inout ${quat}, rhs: ${scalar}) {
-    lhs = lhs / rhs
-  }
-}
-
-/// The dot product of the quaternions `p` and `q` interpreted as
-/// four-dimensional vectors.
-@_transparent
-public func dot(_ lhs: ${quat}, _ rhs: ${quat}) -> ${scalar} {
-  return simd_dot(lhs, rhs)
-}
-
-/// Logarithm of the quaternion `q`.
-///
-/// We can write a quaternion `q` in the form: `r(cos(t) + sin(t)v)` where
-/// `r` is the length of `q`, `t` is an angle, and `v` is a unit 3-vector.
-/// The logarithm of `q` is `log(r) + tv`, just like the logarithm of the
-/// complex number `r*(cos(t) + i sin(t))` is `log(r) + it`.
-public func log(_ q: ${quat}) -> ${quat} {
-  return __tg_log(q)
-}
-
-/// Inverse function of `log`; the exponential map on quaternions.
-@_transparent
-public func exp(_ q: ${quat}) -> ${quat} {
-  return __tg_exp(q)
-}
-
-%end # for scalar
diff --git a/stdlib/public/Darwin/simd/simd.swift.gyb b/stdlib/public/Darwin/simd/simd.swift.gyb
deleted file mode 100644
index 926701413ab4b..0000000000000
--- a/stdlib/public/Darwin/simd/simd.swift.gyb
+++ /dev/null
@@ -1,611 +0,0 @@
-//===----------------------------------------------------------*- swift -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-// simd.h overlays for Swift
-//===----------------------------------------------------------------------===//
-
-import Swift
-import Darwin
-@_exported import simd
-
-public extension SIMD {
-  @available(swift, deprecated:5, renamed: "init(repeating:)")
-  @_transparent
-  init(_ scalar: Scalar) { self.init(repeating: scalar) }
-}
-
-internal extension SIMD2 {
-  var _descriptionAsArray: String { return "[\(x), \(y)]" }
-}
-
-internal extension SIMD3 {
-  var _descriptionAsArray: String { return "[\(x), \(y), \(z)]" }
-}
-
-internal extension SIMD4 {
-  var _descriptionAsArray: String { return "[\(x), \(y), \(z), \(w)]" }
-}
-
-public extension SIMD where Scalar : FixedWidthInteger {
-  @available(swift, deprecated:5, message: "use 0 &- rhs")
-  @_transparent
-  static prefix func -(rhs: Self) -> Self { return 0 &- rhs }
-}
-
-%{
-component = ['x','y','z','w']
-scalar_types = ['Float','Double','Int32','UInt32']
-ctype = { 'Float':'float', 'Double':'double', 'Int32':'int', 'UInt32':'uint'}
-floating_types = ['Float','Double']
-}%
-
-%for scalar in scalar_types:
-% for count in [2, 3, 4]:
-%  vectype = "SIMD" + str(count) + "<" + scalar + ">"
-%  vecsize = (8 if scalar == 'Double' else 4) * (4 if count == 3 else count)
-%  vecalign = (16 if vecsize > 16 else vecsize)
-%  is_floating = scalar in floating_types
-%  is_signed = scalar[0] != 'U'
-%  wrap = "" if is_floating else "&"
-
-@available(swift, deprecated: 5.1, message: "Use SIMD${count}<${scalar}>")
-public typealias ${ctype[scalar]}${count} = ${vectype}
-
-%  if is_signed:
-/// Elementwise absolute value of a vector.  The result is a vector of the same
-/// length with all elements positive.
-@_transparent
-public func abs(_ x: ${vectype}) -> ${vectype} {
-  return simd_abs(x)
-}
-%  end
-
-/// Elementwise minimum of two vectors.  Each component of the result is the
-/// smaller of the corresponding component of the inputs.
-@_transparent
-public func min(_ x: ${vectype}, _ y: ${vectype}) -> ${vectype} {
-  return simd_min(x, y)
-}
-
-/// Elementwise maximum of two vectors.  Each component of the result is the
-/// larger of the corresponding component of the inputs.
-@_transparent
-public func max(_ x: ${vectype}, _ y: ${vectype}) -> ${vectype} {
-  return simd_max(x, y)
-}
-
-/// Vector-scalar minimum.  Each component of the result is the minimum of the
-/// corresponding element of the input vector and the scalar.
-@_transparent
-public func min(_ vector: ${vectype}, _ scalar: ${scalar}) -> ${vectype} {
-  return min(vector, ${vectype}(repeating: scalar))
-}
-
-/// Vector-scalar maximum.  Each component of the result is the maximum of the
-/// corresponding element of the input vector and the scalar.
-@_transparent
-public func max(_ vector: ${vectype}, _ scalar: ${scalar}) -> ${vectype} {
-  return max(vector, ${vectype}(repeating: scalar))
-}
-
-/// Each component of the result is the corresponding element of `x` clamped to
-/// the range formed by the corresponding elements of `min` and `max`.  Any
-/// lanes of `x` that contain NaN will end up with the `min` value.
-@_transparent
-public func clamp(_ x: ${vectype}, min: ${vectype}, max: ${vectype})
-  -> ${vectype} {
-  return simd.min(simd.max(x, min), max)
-}
-
-/// Clamp each element of `x` to the range [`min`, max].  If any lane of `x` is
-/// NaN, the corresponding lane of the result is `min`.
-@_transparent
-public func clamp(_ x: ${vectype}, min: ${scalar}, max: ${scalar})
-  -> ${vectype} {
-  return simd.min(simd.max(x, min), max)
-}
-
-/// Sum of the elements of the vector.
-@_transparent
-public func reduce_add(_ x: ${vectype}) -> ${scalar} {
-  return simd_reduce_add(x)
-}
-
-/// Minimum element of the vector.
-@_transparent
-public func reduce_min(_ x: ${vectype}) -> ${scalar} {
-  return simd_reduce_min(x)
-}
-
-/// Maximum element of the vector.
-@_transparent
-public func reduce_max(_ x: ${vectype}) -> ${scalar} {
-  return simd_reduce_max(x)
-}
-
-%  if is_floating:
-
-/// Sign of a vector.  Each lane contains -1 if the corresponding lane of `x`
-/// is less than zero, +1 if the corresponding lane of `x` is greater than
-/// zero, and 0 otherwise.
-@_transparent
-public func sign(_ x: ${vectype}) -> ${vectype} {
-  return simd_sign(x)
-}
-
-/// Linear interpolation between `x` (at `t=0`) and `y` (at `t=1`).  May be
-/// used with `t` outside of [0, 1] as well.
-@_transparent
-public func mix(_ x: ${vectype}, _ y: ${vectype}, t: ${vectype}) -> ${vectype} {
-  return x + t*(y-x)
-}
-
-/// Linear interpolation between `x` (at `t=0`) and `y` (at `t=1`).  May be
-/// used with `t` outside of [0, 1] as well.
-@_transparent
-public func mix(_ x: ${vectype}, _ y: ${vectype}, t: ${scalar}) -> ${vectype} {
-  return x + t*(y-x)
-}
-
-/// Elementwise reciprocal.
-@_transparent
-public func recip(_ x: ${vectype}) -> ${vectype} {
-  return simd_recip(x)
-}
-
-/// Elementwise reciprocal square root.
-@_transparent
-public func rsqrt(_ x: ${vectype}) -> ${vectype} {
-  return simd_rsqrt(x)
-}
-
-/// Alternate name for minimum of two floating-point vectors.
-@_transparent
-public func fmin(_ x: ${vectype}, _ y: ${vectype}) -> ${vectype} {
-  return min(x, y)
-}
-
-/// Alternate name for maximum of two floating-point vectors.
-@_transparent
-public func fmax(_ x: ${vectype}, _ y: ${vectype}) -> ${vectype} {
-  return max(x, y)
-}
-
-/// Each element of the result is the smallest integral value greater than or
-/// equal to the corresponding element of the input.
-@_transparent
-public func ceil(_ x: ${vectype}) -> ${vectype} {
-  return __tg_ceil(x)
-}
-
-/// Each element of the result is the largest integral value less than or equal
-/// to the corresponding element of the input.
-@_transparent
-public func floor(_ x: ${vectype}) -> ${vectype} {
-  return __tg_floor(x)
-}
-
-/// Each element of the result is the closest integral value with magnitude
-/// less than or equal to that of the corresponding element of the input.
-@_transparent
-public func trunc(_ x: ${vectype}) -> ${vectype} {
-  return __tg_trunc(x)
-}
-
-/// `x - floor(x)`, clamped to lie in the range [0,1).  Without this clamp step,
-/// the result would be 1.0 when `x` is a very small negative number, which may
-/// result in out-of-bounds table accesses in common usage.
-@_transparent
-public func fract(_ x: ${vectype}) -> ${vectype} {
-  return simd_fract(x)
-}
-
-/// 0.0 if `x < edge`, and 1.0 otherwise.
-@_transparent
-public func step(_ x: ${vectype}, edge: ${vectype}) -> ${vectype} {
-  return simd_step(edge, x)
-}
-
-/// 0.0 if `x < edge0`, 1.0 if `x > edge1`, and cubic interpolation between
-/// 0 and 1 in the interval [edge0, edge1].
-@_transparent
-public func smoothstep(_ x: ${vectype}, edge0: ${vectype}, edge1: ${vectype})
-  -> ${vectype} {
-  return simd_smoothstep(edge0, edge1, x)
-}
-
-/// Dot product of `x` and `y`.
-@_transparent
-public func dot(_ x: ${vectype}, _ y: ${vectype}) -> ${scalar} {
-  return reduce_add(x * y)
-}
-
-/// Projection of `x` onto `y`.
-@_transparent
-public func project(_ x: ${vectype}, _ y: ${vectype}) -> ${vectype} {
-  return simd_project(x, y)
-}
-
-/// Length of `x`, squared.  This is more efficient to compute than the length,
-/// so you should use it if you only need to compare lengths to each other.
-/// I.e. instead of writing:
-///
-///   if (length(x) < length(y)) { ... }
-///
-/// use:
-///
-///   if (length_squared(x) < length_squared(y)) { ... }
-///
-/// Doing it this way avoids one or two square roots, which is a fairly costly
-/// operation.
-@_transparent
-public func length_squared(_ x: ${vectype}) -> ${scalar} {
-  return dot(x, x)
-}
-
-/// Length (two-norm or "Euclidean norm") of `x`.
-@_transparent
-public func length(_ x: ${vectype}) -> ${scalar} {
-  return sqrt(length_squared(x))
-}
-
-/// The one-norm (or "taxicab norm") of `x`.
-@_transparent
-public func norm_one(_ x: ${vectype}) -> ${scalar} {
-  return reduce_add(abs(x))
-}
-
-/// The infinity-norm (or "sup norm") of `x`.
-@_transparent
-public func norm_inf(_ x: ${vectype}) -> ${scalar} {
-  return reduce_max(abs(x))
-}
-
-/// Distance between `x` and `y`, squared.
-@_transparent
-public func distance_squared(_ x: ${vectype}, _ y: ${vectype}) -> ${scalar} {
-  return length_squared(x - y)
-}
-
-/// Distance between `x` and `y`.
-@_transparent
-public func distance(_ x: ${vectype}, _ y: ${vectype}) -> ${scalar} {
-  return length(x - y)
-}
-
-/// Unit vector pointing in the same direction as `x`.
-@_transparent
-public func normalize(_ x: ${vectype}) -> ${vectype} {
-  return simd_normalize(x)
-}
-
-/// `x` reflected through the hyperplane with unit normal vector `n`, passing
-/// through the origin.  E.g. if `x` is [1,2,3] and `n` is [0,0,1], the result
-/// is [1,2,-3].
-@_transparent
-public func reflect(_ x: ${vectype}, n: ${vectype}) -> ${vectype} {
-  return simd_reflect(x, n)
-}
-
-/// The refraction direction given unit incident vector `x`, unit surface
-/// normal `n`, and index of refraction `eta`.  If the angle between the
-/// incident vector and the surface is so small that total internal reflection
-/// occurs, zero is returned.
-@_transparent
-public func refract(_ x: ${vectype}, n: ${vectype}, eta: ${scalar})
-  -> ${vectype} {
-  return simd_refract(x, n, eta)
-}
-
-%  end # if is_floating
-% end # for count in [2, 3, 4]
-% if is_floating:
-//  Scalar versions of common operations:
-
-/// Returns -1 if `x < 0`, +1 if `x > 0`, and 0 otherwise (`sign(NaN)` is 0).
-@_transparent
-public func sign(_ x: ${scalar}) -> ${scalar} {
-  return simd_sign(x)
-}
-
-/// Reciprocal.
-@_transparent
-public func recip(_ x: ${scalar}) -> ${scalar} {
-  return simd_recip(x)
-}
-
-/// Reciprocal square root.
-@_transparent
-public func rsqrt(_ x: ${scalar}) -> ${scalar} {
-  return simd_rsqrt(x)
-}
-
-/// Returns 0.0 if `x < edge`, and 1.0 otherwise.
-@_transparent
-public func step(_ x: ${scalar}, edge: ${scalar}) -> ${scalar} {
-  return simd_step(edge, x)
-}
-
-/// Interprets two two-dimensional vectors as three-dimensional vectors in the
-/// xy-plane and computes their cross product, which lies along the z-axis.
-@_transparent
-public func cross(_ x: SIMD2<${scalar}>, _ y: SIMD2<${scalar}>) -> SIMD3<${scalar}> {
-  return simd_cross(x,y)
-}
-
-/// Cross-product of two three-dimensional vectors.  The resulting vector is
-/// perpendicular to the plane determined by `x` and `y`, with length equal to
-/// the oriented area of the parallelogram they determine.
-@_transparent
-public func cross(_ x: SIMD3<${scalar}>, _ y: SIMD3<${scalar}>) -> SIMD3<${scalar}> {
-  return simd_cross(x,y)
-}
-
-% end # is_floating
-%end # for scalar in scalar_types
-
-%for type in floating_types:
-% for rows in [2,3,4]:
-%  for cols in [2,3,4]:
-%   mattype = 'simd_' + ctype[type] + str(cols) + 'x' + str(rows)
-%   diagsize = rows if rows < cols else cols
-%   coltype = "SIMD" + str(rows) + "<" + type + ">"
-%   rowtype = "SIMD" + str(cols) + "<" + type + ">"
-%   diagtype = "SIMD" + str(diagsize) + "<" + type + ">"
-%   transtype = ctype[type] + str(rows) + 'x' + str(cols)
-
-public typealias ${ctype[type]}${cols}x${rows} = ${mattype}
-
-extension ${mattype} {
-
-  /// Initialize matrix to have `scalar` on main diagonal, zeros elsewhere.
-  public init(_ scalar: ${type}) {
-    self.init(diagonal: ${diagtype}(repeating: scalar))
-  }
-
-  /// Initialize matrix to have specified `diagonal`, and zeros elsewhere.
-  public init(diagonal: ${diagtype}) {
-    self.init()
-%   for i in range(diagsize):
-    self.columns.${i}.${component[i]} = diagonal.${component[i]}
-%   end
-  }
-
-  /// Initialize matrix to have specified `columns`.
-  public init(_ columns: [${coltype}]) {
-    precondition(columns.count == ${cols}, "Requires array of ${cols} vectors")
-    self.init()
-%   for i in range(cols):
-    self.columns.${i} = columns[${i}]
-%   end
-  }
-
-  /// Initialize matrix to have specified `rows`.
-  public init(rows: [${rowtype}]) {
-    precondition(rows.count == ${rows}, "Requires array of ${rows} vectors")
-    self = ${transtype}(rows).transpose
-  }
-
-  /// Initialize matrix to have specified `columns`.
-  public init(${', '.join(['_ col' + str(i) + ': ' + coltype
-                          for i in range(cols)])}) {
-    self.init()
-%   for i in range(cols):
-      self.columns.${i} = col${i}
-%   end
-  }
-
-  /// Initialize matrix from corresponding C matrix type.
-  @available(swift, deprecated: 4, message: "This conversion is no longer necessary; use `cmatrix` directly.")
-  @_transparent
-  public init(_ cmatrix: ${mattype}) {
-    self = cmatrix
-  }
-
-  /// Get the matrix as the corresponding C matrix type.
-  @available(swift, deprecated: 4, message: "This property is no longer needed; use the matrix itself.")
-  @_transparent
-  public var cmatrix: ${mattype} {
-    return self
-  }
-
-  /// Access to individual columns.
-  public subscript(column: Int) -> ${coltype} {
-    get {
-      switch(column) {
-%   for i in range(cols):
-      case ${i}: return columns.${i}
-%   end
-      default: preconditionFailure("Column index out of range")
-      }
-    }
-    set (value) {
-      switch(column) {
-%   for i in range(cols):
-      case ${i}: columns.${i} = value
-%   end
-      default: preconditionFailure("Column index out of range")
-      }
-    }
-  }
-
-  /// Access to individual elements.
-  public subscript(column: Int, row: Int) -> ${type} {
-    get { return self[column][row] }
-    set (value) { self[column][row] = value }
-  }
-}
-
-extension ${mattype} : CustomDebugStringConvertible {
-  public var debugDescription: String {
-    return "${mattype}([${', '.join(map(lambda i: \
-                        '\(columns.' + str(i) + '._descriptionAsArray)',
-                        range(cols)))}])"
-  }
-}
-
-extension ${mattype} : Equatable {
-  @_transparent
-  public static func ==(lhs: ${mattype}, rhs: ${mattype}) -> Bool {
-    return simd_equal(lhs, rhs)
-  }
-}
-
-extension ${mattype} {
-
-  /// Transpose of the matrix.
-  @_transparent
-  public var transpose: ${transtype} {
-    return simd_transpose(self)
-  }
-
-%   if rows == cols:
-  /// Inverse of the matrix if it exists, otherwise the contents of the
-  /// resulting matrix are undefined.
-  @available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
-  @_transparent
-  public var inverse: ${mattype} {
-    return simd_inverse(self)
-  }
-
-  /// Determinant of the matrix.
-  @_transparent
-  public var determinant: ${type} {
-    return simd_determinant(self)
-  }
-%   end
-
-  /// Sum of two matrices.
-  @_transparent
-  public static func +(lhs: ${mattype}, rhs: ${mattype}) -> ${mattype} {
-    return simd_add(lhs, rhs)
-  }
-
-  /// Negation of a matrix.
-  @_transparent
-  public static prefix func -(rhs: ${mattype}) -> ${mattype} {
-    return ${mattype}() - rhs
-  }
-
-  /// Difference of two matrices.
-  @_transparent
-  public static func -(lhs: ${mattype}, rhs: ${mattype}) -> ${mattype} {
-    return simd_sub(lhs, rhs)
-  }
-
-  @_transparent
-  public static func +=(lhs: inout ${mattype}, rhs: ${mattype}) -> Void {
-    lhs = lhs + rhs
-  }
-
-  @_transparent
-  public static func -=(lhs: inout ${mattype}, rhs: ${mattype}) -> Void {
-    lhs = lhs - rhs
-  }
-
-  /// Scalar-Matrix multiplication.
-  @_transparent
-  public static func *(lhs: ${type}, rhs: ${mattype}) -> ${mattype} {
-    return simd_mul(lhs, rhs)
-  }
-
-  /// Matrix-Scalar multiplication.
-  @_transparent
-  public static func *(lhs: ${mattype}, rhs: ${type}) -> ${mattype} {
-    return rhs*lhs
-  }
-
-  @_transparent
-  public static func *=(lhs: inout ${mattype}, rhs: ${type}) -> Void {
-    lhs = lhs*rhs
-  }
-
-  /// Matrix-Vector multiplication.  Keep in mind that matrix types are named
-  /// `${type}NxM` where `N` is the number of *columns* and `M` is the number of
-  /// *rows*, so we multiply a `${type}3x2 * ${type}3` to get a `${type}2`, for
-  /// example.
-  @_transparent
-  public static func *(lhs: ${mattype}, rhs: ${rowtype}) -> ${coltype} {
-    return simd_mul(lhs, rhs)
-  }
-
-  /// Vector-Matrix multiplication.
-  @_transparent
-  public static func *(lhs: ${coltype}, rhs: ${mattype}) -> ${rowtype} {
-    return simd_mul(lhs, rhs)
-  }
-
-%   for k in [2,3,4]:
-  /// Matrix multiplication (the "usual" matrix product, not the elementwise
-  /// product).
-%    restype = ctype[type] + str(k) + 'x' + str(rows)
-%    rhstype = ctype[type] + str(k) + 'x' + str(cols)
-  @_transparent
-  public static func *(lhs: ${mattype}, rhs: ${rhstype}) -> ${restype} {
-    return simd_mul(lhs, rhs)
-  }
-
-%   end # for k in [2,3,4]
-
-%   rhstype = ctype[type] + str(cols) + 'x' + str(cols)
-  /// Matrix multiplication (the "usual" matrix product, not the elementwise
-  /// product).
-  @_transparent
-  public static func *=(lhs: inout ${mattype}, rhs: ${rhstype}) -> Void {
-    lhs = lhs*rhs
-  }
-}
-
-// Make old-style C free functions with the `matrix_` prefix available but
-// deprecated in Swift 4.
-
-%   if rows == cols:
-@available(swift, deprecated: 4, renamed: "${mattype}(diagonal:)")
-public func matrix_from_diagonal(_ d: ${diagtype}) -> ${mattype} {
-  return ${mattype}(diagonal: d)
-}
-
-@available(swift, deprecated: 4, message: "Use the .inverse property instead.")
-@available(macOS 10.10, iOS 8.0, tvOS 10.0, watchOS 3.0, *)
-public func matrix_invert(_ x: ${mattype}) -> ${mattype} {
-  return x.inverse
-}
-
-@available(swift, deprecated: 4, message: "Use the .determinant property instead.")
-public func matrix_determinant(_ x: ${mattype}) -> ${type} {
-  return x.determinant
-}
-
-%   end # rows == cols
-@available(swift, deprecated: 4, renamed: "${mattype}")
-public func matrix_from_columns(${', '.join(['_ col' + str(i) + ': ' + coltype
-                                for i in range(cols)])}) -> ${mattype} {
-  return ${mattype}(${', '.join(['col' + str(i) for i in range(cols)])})
-}
-
-public func matrix_from_rows(${', '.join(['_ row' + str(i) + ': ' + rowtype
-                             for i in range(rows)])}) -> ${mattype} {
-  return ${transtype}(${', '.join(['row' + str(i) for i in range(rows)])}).transpose
-}
-
-@available(swift, deprecated: 4, message: "Use the .transpose property instead.")
-public func matrix_transpose(_ x: ${mattype}) -> ${transtype} {
-  return x.transpose
-}
-
-@available(swift, deprecated: 4, renamed: "==")
-public func matrix_equal(_ lhs: ${mattype}, _ rhs: ${mattype}) -> Bool {
-  return lhs == rhs
-}
-
-%  end # for cols in [2,3,4]
-% end # for rows in [2,3,4]
-%end # for type in floating_types
diff --git a/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb b/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb
index c4ea3fb01f06c..d1fdf2bb52cf5 100644
--- a/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb
+++ b/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb
@@ -21,7 +21,7 @@ bits = self_type.bits
 
 def Availability(bits):
     if bits == 16:
-        return '@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)'
+        return '@available(macOS 10.16, iOS 14.0, tvOS 14.0, watchOS 7.0, *)'
     return ''
 }%
 
diff --git a/stdlib/public/SwiftOnoneSupport/SwiftOnoneSupport.swift b/stdlib/public/SwiftOnoneSupport/SwiftOnoneSupport.swift
index 0fd2fd159ad83..982da8031a465 100644
--- a/stdlib/public/SwiftOnoneSupport/SwiftOnoneSupport.swift
+++ b/stdlib/public/SwiftOnoneSupport/SwiftOnoneSupport.swift
@@ -276,16 +276,16 @@ extension Range where Bound: Strideable, Bound.Stride : SignedInteger {
 extension ClosedRange {
   // init(uncheckedBounds: (lower: A, upper: A)) -> Swift.ClosedRange<A>
   @_semantics("prespecialize.$sSN15uncheckedBoundsSNyxGx5lower_x5uppert_tcfC")
-  // endIndex.getter
-  @_semantics("prespecialize.$sSNsSxRzSZ6StrideRpzrlE8endIndexSNsSxRzSZABRQrlE0C0Oyx_Gvg")
-  // subscript.read
-  @_semantics("prespecialize.$sSNsSxRzSZ6StrideRpzrlEyxSNsSxRzSZABRQrlE5IndexOyx_Gcir")
   func _prespecializeClosedRange() {}
 }
 
 extension ClosedRange where Bound: Strideable, Bound.Stride : SignedInteger {
   // startIndex.getter
   @_semantics("prespecialize.$sSNsSxRzSZ6StrideRpzrlE10startIndexSNsSxRzSZABRQrlE0C0Oyx_Gvg")
+  // endIndex.getter
+  @_semantics("prespecialize.$sSNsSxRzSZ6StrideRpzrlE8endIndexSNsSxRzSZABRQrlE0C0Oyx_Gvg")
+  // subscript.read
+  @_semantics("prespecialize.$sSNsSxRzSZ6StrideRpzrlEyxSNsSxRzSZABRQrlE5IndexOyx_Gcir")
   func _prespecializeIntegerClosedRange() {}
 
   // index(after: ClosedRange<A>< where A: Swift.Strideable, A.Stride: Swift.SignedInteger>.Index)
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
index c009212d2cccd..7c7cbfa24622d 100644
--- a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
+++ b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -40,8 +40,8 @@ struct SwiftReflectionContext {
   NativeReflectionContext *nativeContext;
   std::vector<std::function<void()>> freeFuncs;
   std::vector<std::tuple<swift_addr_t, swift_addr_t>> dataSegments;
-  std::string lastError;
-  
+  std::string lastString;
+
   SwiftReflectionContext(MemoryReaderImpl impl) {
     auto Reader = std::make_shared<CMemoryReader>(impl);
     nativeContext = new NativeReflectionContext(Reader);
@@ -71,7 +71,7 @@ static int minimalDataLayoutQueryFunction(void *ReaderContext,
 #else
     auto applePlatform = false;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
     auto iosDerivedPlatform = true;
 #else
     auto iosDerivedPlatform = false;
@@ -406,6 +406,9 @@ static swift_typeinfo_t convertTypeInfo(const TypeInfo *TI) {
 }
 
 static swift_childinfo_t convertChild(const TypeInfo *TI, unsigned Index) {
+  if (!TI)
+    return {};
+
   const FieldInfo *FieldInfo;
   if (auto *EnumTI = dyn_cast<EnumTypeInfo>(TI)) {
     FieldInfo = &(EnumTI->getCases()[Index]);
@@ -423,11 +426,11 @@ static swift_childinfo_t convertChild(const TypeInfo *TI, unsigned Index) {
   };
 }
 
-static const char *convertError(SwiftReflectionContextRef ContextRef,
-                                llvm::Optional<std::string> Error) {
-  if (Error) {
-    ContextRef->lastError = *Error;
-    return ContextRef->lastError.c_str();
+static const char *returnableCString(SwiftReflectionContextRef ContextRef,
+                                      llvm::Optional<std::string> String) {
+  if (String) {
+    ContextRef->lastString = *String;
+    return ContextRef->lastString.c_str();
   }
   return nullptr;
 }
@@ -605,7 +608,7 @@ const char *swift_reflection_iterateConformanceCache(
   auto Error = Context->iterateConformances([&](auto Type, auto Proto) {
     Call(Type, Proto, ContextPtr);
   });
-  return convertError(ContextRef, Error);
+  return returnableCString(ContextRef, Error);
 }
 
 const char *swift_reflection_iterateMetadataAllocations(
@@ -621,10 +624,9 @@ const char *swift_reflection_iterateMetadataAllocations(
     CAllocation.Size = Allocation.Size;
     Call(CAllocation, ContextPtr);
   });
-  return convertError(ContextRef, Error);
+  return returnableCString(ContextRef, Error);
 }
 
-SWIFT_REMOTE_MIRROR_LINKAGE
 swift_reflection_ptr_t swift_reflection_allocationMetadataPointer(
   SwiftReflectionContextRef ContextRef,
   swift_metadata_allocation_t Allocation) {
@@ -636,9 +638,16 @@ swift_reflection_ptr_t swift_reflection_allocationMetadataPointer(
   return Context->allocationMetadataPointer(NativeAllocation);
 }
 
+const char *swift_reflection_metadataAllocationTagName(
+    SwiftReflectionContextRef ContextRef, swift_metadata_allocation_tag_t Tag) {
+  auto Context = ContextRef->nativeContext;
+  auto Result = Context->metadataAllocationTagName(Tag);
+  return returnableCString(ContextRef, Result);
+}
+
 const char *swift_reflection_iterateMetadataAllocationBacktraces(
-    SwiftReflectionContextRef ContextRef, swift_metadataAllocationIterator Call,
-    void *ContextPtr) {
+    SwiftReflectionContextRef ContextRef,
+    swift_metadataAllocationBacktraceIterator Call, void *ContextPtr) {
   auto Context = ContextRef->nativeContext;
   auto Error = Context->iterateMetadataAllocationBacktraces(
       [&](auto AllocationPtr, auto Count, auto Ptrs) {
@@ -651,5 +660,5 @@ const char *swift_reflection_iterateMetadataAllocationBacktraces(
                                                           &Ptrs[Count]};
         Call(AllocationPtr, Count, ConvertedPtrs.data(), ContextPtr);
       });
-  return convertError(ContextRef, Error);
+  return returnableCString(ContextRef, Error);
 }
diff --git a/stdlib/public/SwiftShims/CMakeLists.txt b/stdlib/public/SwiftShims/CMakeLists.txt
index b6d3edc47818c..c9a4aac64f3f5 100644
--- a/stdlib/public/SwiftShims/CMakeLists.txt
+++ b/stdlib/public/SwiftShims/CMakeLists.txt
@@ -7,6 +7,7 @@ set(sources
   KeyPath.h
   LibcOverlayShims.h
   LibcShims.h
+  MetadataSections.h
   Random.h
   RefCount.h
   RuntimeShims.h
diff --git a/stdlib/public/SwiftShims/MetadataSections.h b/stdlib/public/SwiftShims/MetadataSections.h
new file mode 100644
index 0000000000000..939b49d969d05
--- /dev/null
+++ b/stdlib/public/SwiftShims/MetadataSections.h
@@ -0,0 +1,74 @@
+//===--- MetadataSections.h -----------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file contains the declaration of the MetadataSectionsRange and 
+/// MetadataSections struct, which represent, respectively,  information about  
+/// an image's section, and an image's metadata information (which is composed
+/// of multiple section information).
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_STDLIB_SHIMS_METADATASECTIONS_H
+#define SWIFT_STDLIB_SHIMS_METADATASECTIONS_H
+
+#include "SwiftStddef.h"
+#include "SwiftStdint.h"
+
+#ifdef __cplusplus
+namespace swift { 
+extern "C" {
+#endif
+
+/// Specifies the address range corresponding to a section.
+typedef struct MetadataSectionRange {
+  __swift_uintptr_t start;
+  __swift_size_t length;
+} MetadataSectionRange;
+
+
+/// Identifies the address space ranges for the Swift metadata required by the Swift runtime.
+struct MetadataSections {
+  __swift_uintptr_t version;
+  __swift_uintptr_t reserved;
+
+  /// `next` and `prev` are used by the runtime to construct a
+  /// circularly doubly linked list to quickly iterate over the metadata
+  /// from each image loaded into the address space.  These are invasive
+  /// to enable the runtime registration, which occurs at image load time, to
+  /// be allocation-free as it is invoked from an image constructor function
+  /// context where the system may not yet be ready to perform allocations.
+  /// Additionally, avoiding the allocation enables a fast load operation, which
+  /// directly impacts application load time.
+  struct MetadataSections *next;
+  struct MetadataSections *prev;
+
+
+  MetadataSectionRange swift5_protocols;
+  MetadataSectionRange swift5_protocol_conformances;
+  MetadataSectionRange swift5_type_metadata;
+  MetadataSectionRange swift5_typeref;
+  MetadataSectionRange swift5_reflstr;
+  MetadataSectionRange swift5_fieldmd;
+  MetadataSectionRange swift5_assocty;
+  MetadataSectionRange swift5_replace;
+  MetadataSectionRange swift5_replac2;
+  MetadataSectionRange swift5_builtin;
+  MetadataSectionRange swift5_capture;
+};
+
+#ifdef __cplusplus
+} //extern "C"
+} // namespace swift
+#endif
+
+#endif // SWIFT_STDLIB_SHIMS_METADATASECTIONS_H
diff --git a/stdlib/public/SwiftShims/module.modulemap b/stdlib/public/SwiftShims/module.modulemap
index 493e0db7df559..f855d10e973ca 100644
--- a/stdlib/public/SwiftShims/module.modulemap
+++ b/stdlib/public/SwiftShims/module.modulemap
@@ -6,6 +6,7 @@ module SwiftShims {
   header "HeapObject.h"
   header "KeyPath.h"
   header "LibcShims.h"
+  header "MetadataSections.h"
   header "Random.h"
   header "RefCount.h"
   header "RuntimeShims.h"
diff --git a/stdlib/public/core/Availability.swift b/stdlib/public/core/Availability.swift
index ecfc7bb4d1287..55da2e8314a77 100644
--- a/stdlib/public/core/Availability.swift
+++ b/stdlib/public/core/Availability.swift
@@ -42,3 +42,20 @@ public func _stdlib_isOSVersionAtLeast(
   return false._value
 #endif
 }
+
+#if os(macOS)
+// This is a magic entry point known to the compiler. It is called in
+// generated code for API availability checking.
+@_semantics("availability.osversion")
+@_effects(readnone)
+public func _stdlib_isOSVersionAtLeastOrVariantVersionAtLeast(
+  _ major: Builtin.Word,
+  _ minor: Builtin.Word,
+  _ patch: Builtin.Word,
+  _ variantMajor: Builtin.Word,
+  _ variantMinor: Builtin.Word,
+  _ variantPatch: Builtin.Word
+  ) -> Builtin.Int1 {
+  return _stdlib_isOSVersionAtLeast(major, minor, patch)
+}
+#endif
diff --git a/stdlib/public/core/BidirectionalCollection.swift b/stdlib/public/core/BidirectionalCollection.swift
index 98b6cc89029b5..c702e3c5d5530 100644
--- a/stdlib/public/core/BidirectionalCollection.swift
+++ b/stdlib/public/core/BidirectionalCollection.swift
@@ -342,9 +342,12 @@ extension BidirectionalCollection where SubSequence == Self {
   public mutating func removeLast(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it contains")
-    self = self[startIndex..<index(endIndex, offsetBy: -k)]
+    guard let end = index(endIndex, offsetBy: -k, limitedBy: startIndex)
+    else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+    self = self[startIndex..<end]
   }
 }
 
diff --git a/stdlib/public/core/CTypes.swift b/stdlib/public/core/CTypes.swift
index c23fa6d42e37c..b1f2432f29adb 100644
--- a/stdlib/public/core/CTypes.swift
+++ b/stdlib/public/core/CTypes.swift
@@ -57,7 +57,7 @@ public typealias CLong = Int
 public typealias CLongLong = Int64
 
 /// The C '_Float16' type.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 public typealias CFloat16 = Float16
 
 /// The C 'float' type.
diff --git a/stdlib/public/core/Codable.swift b/stdlib/public/core/Codable.swift
index 6e6f28ae47185..f9e66c553bc96 100644
--- a/stdlib/public/core/Codable.swift
+++ b/stdlib/public/core/Codable.swift
@@ -4730,7 +4730,7 @@ extension RawRepresentable where RawValue == Float, Self: Decodable {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension Float16: Codable {
   /// Creates a new instance by decoding from the given decoder.
   ///
diff --git a/stdlib/public/core/Collection.swift b/stdlib/public/core/Collection.swift
index 1db572b65d06c..7b91d1b0d2b3e 100644
--- a/stdlib/public/core/Collection.swift
+++ b/stdlib/public/core/Collection.swift
@@ -491,7 +491,7 @@ public protocol Collection: Sequence {
   ///
   ///     let horseName = "Silver"
   ///     if horseName.isEmpty {
-  ///         print("I've been through the desert on a horse with no name.")
+  ///         print("My horse has no name.")
   ///     } else {
   ///         print("Hi ho, \(horseName)!")
   ///     }
@@ -1070,7 +1070,7 @@ extension Collection {
   ///
   ///     let horseName = "Silver"
   ///     if horseName.isEmpty {
-  ///         print("I've been through the desert on a horse with no name.")
+  ///         print("My horse has no name.")
   ///     } else {
   ///         print("Hi ho, \(horseName)!")
   ///     }
@@ -1664,8 +1664,10 @@ extension Collection where SubSequence == Self {
   public mutating func removeFirst(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it contains")
-    self = self[index(startIndex, offsetBy: k)..<endIndex]
+    guard let idx = index(startIndex, offsetBy: k, limitedBy: endIndex) else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+    self = self[idx..<endIndex]
   }
 }
diff --git a/stdlib/public/core/CollectionAlgorithms.swift b/stdlib/public/core/CollectionAlgorithms.swift
index 8bb9bd46a102b..534ba91cc08ec 100644
--- a/stdlib/public/core/CollectionAlgorithms.swift
+++ b/stdlib/public/core/CollectionAlgorithms.swift
@@ -231,7 +231,7 @@ extension Collection {
   ///   returns `true`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public func subranges(where predicate: (Element) throws -> Bool) rethrows
     -> RangeSet<Index>
   {
@@ -267,7 +267,7 @@ extension Collection where Element: Equatable {
   ///   `element`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public func subranges(of element: Element) -> RangeSet<Index> {
     subranges(where: { $0 == element })
   }
diff --git a/stdlib/public/core/ContiguousArrayBuffer.swift b/stdlib/public/core/ContiguousArrayBuffer.swift
index 0519e44821b95..4b6ac4a5ee6fc 100644
--- a/stdlib/public/core/ContiguousArrayBuffer.swift
+++ b/stdlib/public/core/ContiguousArrayBuffer.swift
@@ -454,18 +454,12 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
   @_alwaysEmitIntoClient
   internal var isImmutable: Bool {
     get {
-// TODO: Enable COW runtime checks by default (when INTERNAL_CHECKS_ENABLED
-//       is set). Currently there is a problem with remote AST which needs to be
-//       fixed.
-#if ENABLE_COW_RUNTIME_CHECKS
       if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
         return capacity == 0 || _swift_isImmutableCOWBuffer(_storage)
       }
-#endif
       return true
     }
     nonmutating set {
-#if ENABLE_COW_RUNTIME_CHECKS
       if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
         if newValue {
           if capacity > 0 {
@@ -481,17 +475,14 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
             "re-setting mutable array buffer to mutable")
         }
       }
-#endif
     }
   }
   
   @_alwaysEmitIntoClient
   internal var isMutable: Bool {
-#if ENABLE_COW_RUNTIME_CHECKS
     if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
       return !_swift_isImmutableCOWBuffer(_storage)
     }
-#endif
     return true
   }
 #endif
diff --git a/stdlib/public/core/DiscontiguousSlice.swift b/stdlib/public/core/DiscontiguousSlice.swift
index eccd2c86e63dd..a5e9e50df4f0c 100644
--- a/stdlib/public/core/DiscontiguousSlice.swift
+++ b/stdlib/public/core/DiscontiguousSlice.swift
@@ -12,7 +12,7 @@
 
 /// A collection wrapper that provides access to the elements of a collection,
 /// indexed by a set of indices.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 @frozen
 public struct DiscontiguousSlice<Base: Collection> {
   /// The collection that the indexed collection wraps.
@@ -22,7 +22,7 @@ public struct DiscontiguousSlice<Base: Collection> {
   public var subranges: RangeSet<Base.Index>
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice {
   /// A position in an `DiscontiguousSlice`.
   @frozen
@@ -39,10 +39,10 @@ extension DiscontiguousSlice {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice.Index: Hashable where Base.Index: Hashable {}
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice: Collection {
   public typealias SubSequence = Self
   
@@ -83,7 +83,7 @@ extension DiscontiguousSlice: Collection {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice {
   public var count: Int {
     var c = 0
@@ -102,7 +102,7 @@ extension DiscontiguousSlice {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice: BidirectionalCollection
   where Base: BidirectionalCollection
 {
@@ -122,7 +122,7 @@ extension DiscontiguousSlice: BidirectionalCollection
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension DiscontiguousSlice: MutableCollection where Base: MutableCollection {
   public subscript(i: Index) -> Base.Element {
     get {
@@ -145,7 +145,7 @@ extension Collection {
   /// - Returns: A collection of the elements at the positions in `subranges`.
   ///
   /// - Complexity: O(1)
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public subscript(subranges: RangeSet<Index>) -> DiscontiguousSlice<Self> {
     DiscontiguousSlice(base: self, subranges: subranges)
   }
@@ -162,7 +162,7 @@ extension MutableCollection {
   /// - Complexity: O(1) to access the elements, O(*m*) to mutate the
   ///   elements at the positions in `subranges`, where *m* is the number of
   ///   elements indicated by `subranges`.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public subscript(subranges: RangeSet<Index>) -> DiscontiguousSlice<Self> {
     get {
       DiscontiguousSlice(base: self, subranges: subranges)
@@ -196,7 +196,7 @@ extension Collection {
   /// - Returns: A collection of the elements that are not in `subranges`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public func removingSubranges(
     _ subranges: RangeSet<Index>
   ) -> DiscontiguousSlice<Self> {
diff --git a/stdlib/public/core/FloatingPoint.swift b/stdlib/public/core/FloatingPoint.swift
index 1ce3db69c57d9..a6339654ff6d9 100644
--- a/stdlib/public/core/FloatingPoint.swift
+++ b/stdlib/public/core/FloatingPoint.swift
@@ -1746,7 +1746,6 @@ extension BinaryFloatingPoint {
     )
   }
 
-  @inlinable
   public // @testable
   static func _convert<Source: BinaryFloatingPoint>(
     from source: Source
@@ -1935,7 +1934,6 @@ extension BinaryFloatingPoint {
 
 extension BinaryFloatingPoint where Self.RawSignificand: FixedWidthInteger {
   
-  @inlinable
   public // @testable
   static func _convert<Source: BinaryInteger>(
     from source: Source
diff --git a/stdlib/public/core/FloatingPointParsing.swift.gyb b/stdlib/public/core/FloatingPointParsing.swift.gyb
index b3fc57b6367eb..5b8aa99c20760 100644
--- a/stdlib/public/core/FloatingPointParsing.swift.gyb
+++ b/stdlib/public/core/FloatingPointParsing.swift.gyb
@@ -46,7 +46,7 @@ internal func _isspace_clocale(_ u: UTF16.CodeUnit) -> Bool {
 
 //===--- Parsing ----------------------------------------------------------===//
 %if bits == 16:
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %end
 extension ${Self}: LosslessStringConvertible {
   /// Creates a new instance from the given string.
@@ -134,7 +134,7 @@ extension ${Self}: LosslessStringConvertible {
   %if bits == 16:
     self.init(Substring(text))
   %else:
-    if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+    if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
       self.init(Substring(text))
     } else {
       self = 0.0
@@ -164,7 +164,7 @@ extension ${Self}: LosslessStringConvertible {
   // In particular, we still have to export
   // _swift_stdlib_strtoXYZ_clocale()
   // as ABI to support old compiled code that still requires it.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public init?(_ text: Substring) {
     self = 0.0
     let success = withUnsafeMutablePointer(to: &self) { p -> Bool in
diff --git a/stdlib/public/core/FloatingPointTypes.swift.gyb b/stdlib/public/core/FloatingPointTypes.swift.gyb
index 393f7924aca79..f0af6af778043 100644
--- a/stdlib/public/core/FloatingPointTypes.swift.gyb
+++ b/stdlib/public/core/FloatingPointTypes.swift.gyb
@@ -40,7 +40,7 @@ RawSignificand = 'UInt' + str(SignificandSize)
 
 def Availability(bits):
     if bits == 16:
-        return '@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)'
+        return '@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)'
     return ''
 
 if Self == 'Float16':
@@ -1034,7 +1034,7 @@ extension ${Self} {
     _value = Builtin.sitofp_Int${word_bits}_FPIEEE${bits}(v._value)
   }
 
-  // Fast-path for conversion when the source is representable as a 64-bit int,
+  // Fast-path for conversion when the source is representable as int,
   // falling back on the generic _convert operation otherwise.
   @inlinable // FIXME(inline-always)
   @inline(__always)
@@ -1044,14 +1044,64 @@ extension ${Self} {
         let asInt = Int(truncatingIfNeeded: value)
         _value = Builtin.sitofp_Int${word_bits}_FPIEEE${bits}(asInt._value)
       } else {
-        let asUInt = Int(truncatingIfNeeded: value)
+        let asUInt = UInt(truncatingIfNeeded: value)
         _value = Builtin.uitofp_Int${word_bits}_FPIEEE${bits}(asUInt._value)
       }
     } else {
+      // TODO: we can do much better than the generic _convert here for Float
+      // and Double by pulling out the high-order 32/64b of the integer, ORing
+      // in a sticky bit, and then using the builtin.
       self = ${Self}._convert(from: value).value
     }
   }
 
+  // Fast-path for conversion when the source is representable as int,
+  // falling back on the generic _convert operation otherwise.
+  @_alwaysEmitIntoClient @inline(never)
+  public init?<Source: BinaryInteger>(exactly value: Source) {
+    if value.bitWidth <= ${word_bits} {
+      // If the source is small enough to fit in a word, we can use the LLVM
+      // conversion intrinsic, then check if we can round-trip back to the
+      // the original value; if so, the conversion was exact. We need to be
+      // careful, however, to make sure that the first conversion does not
+      // round to a value that is out of the defined range of the second
+      // converion. E.g. Float(Int.max) rounds to Int.max + 1, and converting
+      // that back to Int will trap. For Float, Double, and Float80, this is
+      // only an issue for the upper bound (because the lower bound of [U]Int
+      // is either zero or a power of two, both of which are exactly
+      // representable). For Float16, we also need to check for overflow to
+      // -.infinity.
+      if Source.isSigned {
+        let extended = Int(truncatingIfNeeded: value)
+        _value = Builtin.sitofp_Int${word_bits}_FPIEEE${bits}(extended._value)
+% if bits == 16:
+        guard self.isFinite && Int(self) == extended else {
+% else:
+        guard self < 0x1.0p${word_bits-1} && Int(self) == extended else {
+% end
+          return nil
+        }
+      } else {
+        let extended = UInt(truncatingIfNeeded: value)
+        _value = Builtin.uitofp_Int${word_bits}_FPIEEE${bits}(extended._value)
+% if bits == 16:
+        guard self.isFinite && UInt(self) == extended else {
+% else:
+        guard self < 0x1.0p${word_bits} && UInt(self) == extended else {
+% end
+          return nil
+        }
+      }
+    } else {
+      // TODO: we can do much better than the generic _convert here for Float
+      // and Double by pulling out the high-order 32/64b of the integer, ORing
+      // in a sticky bit, and then using the builtin.
+      let (value_, exact) = Self._convert(from: value)
+      guard exact else { return nil }
+      self = value_
+    }
+  }
+  
 % for src_type in all_floating_point_types():
 %   srcBits = src_type.bits
 %   That = src_type.stdlib_name
diff --git a/stdlib/public/core/IntegerTypes.swift.gyb b/stdlib/public/core/IntegerTypes.swift.gyb
index 34c1ae509c660..83c61552efae7 100644
--- a/stdlib/public/core/IntegerTypes.swift.gyb
+++ b/stdlib/public/core/IntegerTypes.swift.gyb
@@ -1152,7 +1152,7 @@ public struct ${Self}
   ///   `source` must be representable in this type after rounding toward
   ///   zero.
 %     if FloatType == 'Float16':
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %     end
   @_transparent
   public init(_ source: ${FloatType}) {
@@ -1182,7 +1182,7 @@ public struct ${Self}
   ///
   /// - Parameter source: A floating-point value to convert to an integer.
 %     if FloatType == 'Float16':
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %     end
   @_transparent
   public init?(exactly source: ${FloatType}) {
diff --git a/stdlib/public/core/Misc.swift b/stdlib/public/core/Misc.swift
index 83ec946ea64eb..4d3526d7fb320 100644
--- a/stdlib/public/core/Misc.swift
+++ b/stdlib/public/core/Misc.swift
@@ -78,13 +78,13 @@ func _typeName(_ type: Any.Type, qualified: Bool = true) -> String {
     UnsafeBufferPointer(start: stringPtr, count: count)).0
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 @_silgen_name("swift_getMangledTypeName")
 public func _getMangledTypeName(_ type: Any.Type)
   -> (UnsafePointer<UInt8>, Int)
 
 /// Returns the mangled name for a given type.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 public // SPI
 func _mangledTypeName(_ type: Any.Type) -> String? {
   let (stringPtr, count) = _getMangledTypeName(type)
diff --git a/stdlib/public/core/MutableCollection.swift b/stdlib/public/core/MutableCollection.swift
index d9f09477e0bb1..968215420e18f 100644
--- a/stdlib/public/core/MutableCollection.swift
+++ b/stdlib/public/core/MutableCollection.swift
@@ -290,7 +290,7 @@ extension MutableCollection {
   /// - Returns: The new bounds of the moved elements.
   ///
   /// - Complexity: O(*n* log *n*) where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   @discardableResult
   public mutating func moveSubranges(
     _ subranges: RangeSet<Index>, to insertionPoint: Index
diff --git a/stdlib/public/core/RangeReplaceableCollection.swift b/stdlib/public/core/RangeReplaceableCollection.swift
index 729849b7b1d40..6ec6afaea0416 100644
--- a/stdlib/public/core/RangeReplaceableCollection.swift
+++ b/stdlib/public/core/RangeReplaceableCollection.swift
@@ -285,12 +285,17 @@ public protocol RangeReplaceableCollection: Collection
   /// Customization point for `removeLast()`.  Implement this function if you
   /// want to replace the default implementation.
   ///
+  /// The collection must not be empty.
+  ///
   /// - Returns: A non-nil value if the operation was performed.
   mutating func _customRemoveLast() -> Element?
 
   /// Customization point for `removeLast(_:)`.  Implement this function if you
   /// want to replace the default implementation.
   ///
+  /// - Parameter n: The number of elements to remove from the collection.
+  ///   `n` must be greater than or equal to zero and must not exceed the
+  ///   number of elements in the collection.
   /// - Returns: `true` if the operation was performed.
   mutating func _customRemoveLast(_ n: Int) -> Bool
 
@@ -590,9 +595,10 @@ extension RangeReplaceableCollection {
   public mutating func removeFirst(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it has")
-    let end = index(startIndex, offsetBy: k)
+    guard let end = index(startIndex, offsetBy: k, limitedBy: endIndex) else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it has")
+    }
     removeSubrange(startIndex..<end)
   }
 
@@ -698,9 +704,11 @@ extension RangeReplaceableCollection where SubSequence == Self {
   public mutating func removeFirst(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it contains")
-    self = self[index(startIndex, offsetBy: k)..<endIndex]
+    guard let idx = index(startIndex, offsetBy: k, limitedBy: endIndex) else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+    self = self[idx..<endIndex]
   }
 }
 
@@ -799,7 +807,12 @@ extension RangeReplaceableCollection
 
   @inlinable
   public mutating func _customRemoveLast(_ n: Int) -> Bool {
-    self = self[startIndex..<index(endIndex, offsetBy: -n)]
+    guard let end = index(endIndex, offsetBy: -n, limitedBy: startIndex)
+    else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+    self = self[startIndex..<end]
     return true
   }
 }
@@ -863,13 +876,17 @@ extension RangeReplaceableCollection where Self: BidirectionalCollection {
   public mutating func removeLast(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it contains")
     if _customRemoveLast(k) {
       return
     }
     let end = endIndex
-    removeSubrange(index(end, offsetBy: -k)..<end)
+    guard let start = index(end, offsetBy: -k, limitedBy: startIndex)
+    else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+
+    removeSubrange(start..<end)
   }
 }
 
@@ -933,13 +950,16 @@ where Self: BidirectionalCollection, SubSequence == Self {
   public mutating func removeLast(_ k: Int) {
     if k == 0 { return }
     _precondition(k >= 0, "Number of elements to remove should be non-negative")
-    _precondition(count >= k,
-      "Can't remove more items from a collection than it contains")
     if _customRemoveLast(k) {
       return
     }
     let end = endIndex
-    removeSubrange(index(end, offsetBy: -k)..<end)
+    guard let start = index(end, offsetBy: -k, limitedBy: startIndex)
+    else {
+      _preconditionFailure(
+        "Can't remove more items from a collection than it contains")
+    }
+    removeSubrange(start..<end)
   }
 }
 
@@ -1158,7 +1178,7 @@ extension RangeReplaceableCollection {
   /// - Parameter subranges: The indices of the elements to remove.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public mutating func removeSubranges(_ subranges: RangeSet<Index>) {
     guard !subranges.isEmpty else {
       return
@@ -1188,7 +1208,7 @@ extension MutableCollection where Self: RangeReplaceableCollection {
   /// - Parameter subranges: The indices of the elements to remove.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public mutating func removeSubranges(_ subranges: RangeSet<Index>) {
     guard let firstRange = subranges.ranges.first else {
       return
diff --git a/stdlib/public/core/RangeSet.swift b/stdlib/public/core/RangeSet.swift
index ce287dd470690..8b5e9d5a33b75 100644
--- a/stdlib/public/core/RangeSet.swift
+++ b/stdlib/public/core/RangeSet.swift
@@ -26,7 +26,7 @@
 ///
 ///     numbers.moveSubranges(negativeSubranges, to: 0)
 ///     // numbers == [-5, -3, -9, 10, 12, 14, 15]
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 public struct RangeSet<Bound: Comparable> {
   internal var _ranges = _RangeSetStorage<Bound>()
 
@@ -238,15 +238,15 @@ public struct RangeSet<Bound: Comparable> {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet: Equatable {}
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet: Hashable where Bound: Hashable {}
 
 // MARK: - Range Collection
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet {
   /// A collection of the ranges that make up a range set.
   public struct Ranges: RandomAccessCollection {
@@ -271,7 +271,7 @@ extension RangeSet {
 
 // MARK: - Collection APIs
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet {
   /// Creates a new range set containing ranges that contain only the
   /// specified indices in the given collection.
@@ -365,7 +365,7 @@ extension RangeSet {
 
 // These methods only depend on the ranges that comprise the range set, so
 // we can provide them even when we can't provide `SetAlgebra` conformance.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet {
   /// Adds the contents of the given range set to this range set.
   ///
@@ -549,7 +549,7 @@ extension RangeSet {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet: CustomStringConvertible {
   public var description: String {
     let rangesDescription = _ranges
diff --git a/stdlib/public/core/Runtime.swift b/stdlib/public/core/Runtime.swift
index 35f03967e62fc..236953378fe33 100644
--- a/stdlib/public/core/Runtime.swift
+++ b/stdlib/public/core/Runtime.swift
@@ -303,7 +303,7 @@ internal func _float16ToStringImpl(
   _ debug: Bool
 ) -> Int
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 internal func _float16ToString(
   _ value: Float16,
   debug: Bool
diff --git a/stdlib/public/core/SIMDVectorTypes.swift.gyb b/stdlib/public/core/SIMDVectorTypes.swift.gyb
index ba887ed6f81be..59fab35027b99 100644
--- a/stdlib/public/core/SIMDVectorTypes.swift.gyb
+++ b/stdlib/public/core/SIMDVectorTypes.swift.gyb
@@ -254,7 +254,7 @@ extension ${Self}: SIMDScalar {
 
 %for (Self, bits) in [('Float16',16), ('Float',32), ('Double',64)]:
 %if bits == 16:
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %end
 extension ${Self} : SIMDScalar {
 
diff --git a/stdlib/public/core/Sequence.swift b/stdlib/public/core/Sequence.swift
index e05cc19eb0892..f926324314e2e 100644
--- a/stdlib/public/core/Sequence.swift
+++ b/stdlib/public/core/Sequence.swift
@@ -98,7 +98,7 @@
 ///         }
 ///     }
 ///     print(longestAnimal)
-///     // Prints "Butterfly"
+///     // Prints Optional("Butterfly")
 ///
 /// Using Multiple Iterators
 /// ========================
diff --git a/stdlib/public/core/String.swift b/stdlib/public/core/String.swift
index 602bd96edee79..cc0c3175e9044 100644
--- a/stdlib/public/core/String.swift
+++ b/stdlib/public/core/String.swift
@@ -501,7 +501,7 @@ extension String {
   ///     memory with room for `capacity` UTF-8 code units, initializes
   ///     that memory, and returns the number of initialized elements.
   @inline(__always)
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public init(
     unsafeUninitializedCapacity capacity: Int,
     initializingUTF8With initializer: (
diff --git a/stdlib/public/core/StringBridge.swift b/stdlib/public/core/StringBridge.swift
index fa12c928bf383..a24d721d0e630 100644
--- a/stdlib/public/core/StringBridge.swift
+++ b/stdlib/public/core/StringBridge.swift
@@ -472,7 +472,7 @@ private func getConstantTaggedCocoaContents(_ cocoaString: _CocoaString) ->
   )!
 
   guard _swift_stdlib_dyld_is_objc_constant_string(
-    unsafeBitCast(ivarPointer, to: UnsafeRawPointer.self)
+    UnsafeRawPointer(ivarPointer)
   ) == 1 else {
     return nil
   }
diff --git a/stdlib/public/core/StringInterpolation.swift b/stdlib/public/core/StringInterpolation.swift
index 39d4fe3ae7de5..3ba187f16defc 100644
--- a/stdlib/public/core/StringInterpolation.swift
+++ b/stdlib/public/core/StringInterpolation.swift
@@ -178,7 +178,12 @@ public struct DefaultStringInterpolation: StringInterpolationProtocol {
   public mutating func appendInterpolation<T>(_ value: T) {
     _print_unlocked(value, &self)
   }
-  
+
+  @_alwaysEmitIntoClient
+  public mutating func appendInterpolation(_ value: Any.Type) {
+	  _typeName(value, qualified: false).write(to: &self)
+  }
+
   /// Creates a string from this instance, consuming the instance in the
   /// process.
   @inlinable
diff --git a/stdlib/public/runtime/CMakeLists.txt b/stdlib/public/runtime/CMakeLists.txt
index db829a67538b7..a43be7ce52b1d 100644
--- a/stdlib/public/runtime/CMakeLists.txt
+++ b/stdlib/public/runtime/CMakeLists.txt
@@ -45,6 +45,7 @@ set(swift_runtime_sources
     Float16Support.cpp
     Heap.cpp
     HeapObject.cpp
+    ImageInspectionCommon.cpp
     ImageInspectionMachO.cpp
     ImageInspectionELF.cpp
     ImageInspectionCOFF.cpp
diff --git a/stdlib/public/runtime/Casting.cpp b/stdlib/public/runtime/Casting.cpp
index c5d33eb10e580..374d0dfe745bf 100644
--- a/stdlib/public/runtime/Casting.cpp
+++ b/stdlib/public/runtime/Casting.cpp
@@ -1183,13 +1183,6 @@ swift_dynamicCastMetatypeImpl(const Metadata *sourceType,
     }
     break;
 
-  case MetadataKind::Existential: {
-    auto targetTypeAsExistential = static_cast<const ExistentialTypeMetadata *>(targetType);
-    if (_conformsToProtocols(nullptr, sourceType, targetTypeAsExistential, nullptr))
-      return origSourceType;
-    return nullptr;
-  }
-
   default:
     return nullptr;
   }
diff --git a/stdlib/public/runtime/EnvironmentVariables.def b/stdlib/public/runtime/EnvironmentVariables.def
index eca25ddea2518..2cd3c2f7a949e 100644
--- a/stdlib/public/runtime/EnvironmentVariables.def
+++ b/stdlib/public/runtime/EnvironmentVariables.def
@@ -41,4 +41,7 @@ VARIABLE(SWIFT_ENABLE_MANGLED_NAME_VERIFICATION, bool, false,
          "Enable verification that metadata can roundtrip through a mangled "
          "name each time metadata is instantiated.")
 
+VARIABLE(SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE, bool, false,
+         "Scribble on runtime allocations such as metadata allocations.")
+
 #undef VARIABLE
diff --git a/stdlib/public/runtime/ImageInspection.h b/stdlib/public/runtime/ImageInspection.h
index 32e3b2122ce40..8a20756947153 100644
--- a/stdlib/public/runtime/ImageInspection.h
+++ b/stdlib/public/runtime/ImageInspection.h
@@ -21,7 +21,6 @@
 #ifndef SWIFT_RUNTIME_IMAGEINSPECTION_H
 #define SWIFT_RUNTIME_IMAGEINSPECTION_H
 
-#include "ImageInspectionELF.h"
 #include <cstdint>
 #include <cstddef>
 #if defined(__cplusplus)
diff --git a/stdlib/public/runtime/ImageInspectionCOFF.cpp b/stdlib/public/runtime/ImageInspectionCOFF.cpp
index a6f6d906f98e6..1caf515e56d5d 100644
--- a/stdlib/public/runtime/ImageInspectionCOFF.cpp
+++ b/stdlib/public/runtime/ImageInspectionCOFF.cpp
@@ -13,7 +13,6 @@
 #if !defined(__ELF__) && !defined(__MACH__)
 
 #include "ImageInspection.h"
-#include "ImageInspectionCOFF.h"
 
 #if defined(__CYGWIN__)
 #include <dlfcn.h>
@@ -26,108 +25,6 @@
 
 using namespace swift;
 
-namespace {
-static const swift::MetadataSections *registered = nullptr;
-
-void record(const swift::MetadataSections *sections) {
-  if (registered == nullptr) {
-    registered = sections;
-    sections->next = sections->prev = sections;
-  } else {
-    registered->prev->next = sections;
-    sections->next = registered;
-    sections->prev = registered->prev;
-    registered->prev = sections;
-  }
-}
-}
-
-void swift::initializeProtocolLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &protocols =
-      sections->swift5_protocols;
-    if (protocols.length)
-      addImageProtocolsBlockCallbackUnsafe(
-          reinterpret_cast<void *>(protocols.start), protocols.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-
-void swift::initializeProtocolConformanceLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &conformances =
-        sections->swift5_protocol_conformances;
-    if (conformances.length)
-      addImageProtocolConformanceBlockCallbackUnsafe(
-          reinterpret_cast<void *>(conformances.start), conformances.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-
-void swift::initializeTypeMetadataRecordLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &type_metadata =
-        sections->swift5_type_metadata;
-    if (type_metadata.length)
-      addImageTypeMetadataRecordBlockCallbackUnsafe(
-          reinterpret_cast<void *>(type_metadata.start), type_metadata.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-
-void swift::initializeDynamicReplacementLookup() {
-}
-
-SWIFT_RUNTIME_EXPORT
-void swift_addNewDSOImage(const void *addr) {
-  const swift::MetadataSections *sections =
-      static_cast<const swift::MetadataSections *>(addr);
-
-  record(sections);
-
-  const auto &protocols_section = sections->swift5_protocols;
-  const void *protocols =
-      reinterpret_cast<void *>(protocols_section.start);
-  if (protocols_section.length)
-    addImageProtocolsBlockCallback(protocols, protocols_section.length);
-
-  const auto &protocol_conformances = sections->swift5_protocol_conformances;
-  const void *conformances =
-      reinterpret_cast<void *>(protocol_conformances.start);
-  if (protocol_conformances.length)
-    addImageProtocolConformanceBlockCallback(conformances,
-                                             protocol_conformances.length);
-
-  const auto &type_metadata = sections->swift5_type_metadata;
-  const void *metadata = reinterpret_cast<void *>(type_metadata.start);
-  if (type_metadata.length)
-    addImageTypeMetadataRecordBlockCallback(metadata, type_metadata.length);
-
-  const auto &dynamic_replacements = sections->swift5_repl;
-  const auto *replacements =
-      reinterpret_cast<void *>(dynamic_replacements.start);
-  if (dynamic_replacements.length) {
-    const auto &dynamic_replacements_some = sections->swift5_reps;
-    const auto *replacements_some =
-      reinterpret_cast<void *>(dynamic_replacements_some.start);
-    addImageDynamicReplacementBlockCallback(
-        replacements, dynamic_replacements.length, replacements_some,
-        dynamic_replacements_some.length);
-  }
-}
-
 int swift::lookupSymbol(const void *address, SymbolInfo *info) {
 #if defined(__CYGWIN__)
   Dl_info dlinfo;
@@ -173,10 +70,4 @@ int swift::lookupSymbol(const void *address, SymbolInfo *info) {
 #endif // defined(__CYGWIN__) || defined(_WIN32)
 }
 
-// This is only used for backward deployment hooks, which we currently only support for
-// MachO. Add a stub here to make sure it still compiles.
-void *swift::lookupSection(const char *segment, const char *section, size_t *outSize) {
-  return nullptr;
-}
-
 #endif // !defined(__ELF__) && !defined(__MACH__)
diff --git a/stdlib/public/runtime/ImageInspectionCOFF.h b/stdlib/public/runtime/ImageInspectionCOFF.h
deleted file mode 100644
index c76a33e25d0c4..0000000000000
--- a/stdlib/public/runtime/ImageInspectionCOFF.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//===--- ImageInspectionELF.h -----------------------------------*- C++ -*-===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-///
-/// COFF specific image inspection routines.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef SWIFT_RUNTIME_IMAGEINSPECTIONCOFF_H
-#define SWIFT_RUNTIME_IMAGEINSPECTIONCOFF_H
-
-#if !defined(__ELF__) && !defined(__MACH__)
-
-#include "../SwiftShims/Visibility.h"
-#include <cstdint>
-#include <cstddef>
-
-namespace swift {
-struct SectionInfo {
-  uint64_t size;
-  const char *data;
-};
-
-static constexpr const uintptr_t CurrentSectionMetadataVersion = 1;
-
-struct MetadataSections {
-  uintptr_t version;
-  uintptr_t reserved;
-
-  mutable const MetadataSections *next;
-  mutable const MetadataSections *prev;
-
-  struct Range {
-    uintptr_t start;
-    size_t length;
-  };
-
-  Range swift5_protocols;
-  Range swift5_protocol_conformances;
-  Range swift5_type_metadata;
-  Range swift5_typeref;
-  Range swift5_reflstr;
-  Range swift5_fieldmd;
-  Range swift5_assocty;
-  Range swift5_repl;
-  Range swift5_reps;
-};
-} // namespace swift
-
-// Called by injected constructors when a dynamic library is loaded.
-SWIFT_RUNTIME_EXPORT
-void swift_addNewDSOImage(const void *addr);
-
-#endif // !defined(__ELF__) && !defined(__MACH__)
-
-#endif // SWIFT_RUNTIME_IMAGEINSPECTIONCOFF_H
diff --git a/stdlib/public/runtime/ImageInspectionCommon.cpp b/stdlib/public/runtime/ImageInspectionCommon.cpp
new file mode 100644
index 0000000000000..6a5cce64681f7
--- /dev/null
+++ b/stdlib/public/runtime/ImageInspectionCommon.cpp
@@ -0,0 +1,143 @@
+//===--- ImageInspectionCommon.cpp - Image inspection routines --*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+///
+/// This file unifies common ELF and COFF image inspection routines
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
+#define SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
+
+#if !defined(__MACH__)
+
+#include "../SwiftShims/Visibility.h"
+#include "../SwiftShims/MetadataSections.h"
+#include "ImageInspection.h"
+
+
+namespace swift {
+
+static swift::MetadataSections *registered = nullptr;
+
+void record(swift::MetadataSections *sections) {
+  if (registered == nullptr) {
+    registered = sections;
+    sections->next = sections->prev = sections;
+  } else {
+    registered->prev->next = sections;
+    sections->next = registered;
+    sections->prev = registered->prev;
+    registered->prev = sections;
+  }
+}
+}
+
+SWIFT_RUNTIME_EXPORT
+void swift_addNewDSOImage(const void *addr) {
+  const swift::MetadataSections *sections =
+      static_cast<const swift::MetadataSections *>(addr);
+
+  // We cast off the const in order to update the linked list
+  // data structure. This is safe to do since we don't touch 
+  // any other fields.
+  auto casted_sections = const_cast<swift::MetadataSections *>(sections);
+  record(casted_sections);
+
+  const auto &protocols_section = sections->swift5_protocols;
+  const void *protocols = reinterpret_cast<void *>(protocols_section.start);
+  if (protocols_section.length)
+    swift::addImageProtocolsBlockCallback(protocols, protocols_section.length);
+
+  const auto &protocol_conformances = sections->swift5_protocol_conformances;
+  const void *conformances =
+      reinterpret_cast<void *>(protocol_conformances.start);
+  if (protocol_conformances.length)
+    swift::addImageProtocolConformanceBlockCallback(conformances,
+                                             protocol_conformances.length);
+
+  const auto &type_metadata = sections->swift5_type_metadata;
+  const void *metadata = reinterpret_cast<void *>(type_metadata.start);
+  if (type_metadata.length)
+    swift::addImageTypeMetadataRecordBlockCallback(metadata, type_metadata.length);
+
+  const auto &dynamic_replacements = sections->swift5_replace;
+  const auto *replacements =
+      reinterpret_cast<void *>(dynamic_replacements.start);
+  if (dynamic_replacements.length) {
+    const auto &dynamic_replacements_some = sections->swift5_replac2;
+    const auto *replacements_some =
+      reinterpret_cast<void *>(dynamic_replacements_some.start);
+    swift::addImageDynamicReplacementBlockCallback(
+        replacements, dynamic_replacements.length, replacements_some,
+        dynamic_replacements_some.length);
+  }
+}
+
+void swift::initializeProtocolLookup() {
+  const swift::MetadataSections *sections = registered;
+  while (true) {
+    const swift::MetadataSectionRange &protocols =
+      sections->swift5_protocols;
+    if (protocols.length)
+      addImageProtocolsBlockCallbackUnsafe(
+          reinterpret_cast<void *>(protocols.start), protocols.length);
+
+    if (sections->next == registered)
+      break;
+    sections = sections->next;
+  }
+}
+
+void swift::initializeProtocolConformanceLookup() {
+  const swift::MetadataSections *sections = registered;
+  while (true) {
+    const swift::MetadataSectionRange &conformances =
+        sections->swift5_protocol_conformances;
+    if (conformances.length)
+      addImageProtocolConformanceBlockCallbackUnsafe(
+          reinterpret_cast<void *>(conformances.start), conformances.length);
+
+    if (sections->next == registered)
+      break;
+    sections = sections->next;
+  }
+}
+
+void swift::initializeTypeMetadataRecordLookup() {
+  const swift::MetadataSections *sections = registered;
+  while (true) {
+    const swift::MetadataSectionRange &type_metadata =
+        sections->swift5_type_metadata;
+    if (type_metadata.length)
+      addImageTypeMetadataRecordBlockCallbackUnsafe(
+          reinterpret_cast<void *>(type_metadata.start), type_metadata.length);
+
+    if (sections->next == registered)
+      break;
+    sections = sections->next;
+  }
+}
+
+void swift::initializeDynamicReplacementLookup() {
+}
+
+// This is only used for backward deployment hooks, which we currently only support for
+// MachO. Add a stub here to make sure it still compiles.
+void *swift::lookupSection(const char *segment, const char *section, size_t *outSize) {
+  return nullptr;
+}
+
+#endif // !defined(__MACH__)
+
+#endif // SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
diff --git a/stdlib/public/runtime/ImageInspectionELF.h b/stdlib/public/runtime/ImageInspectionCommon.h
similarity index 56%
rename from stdlib/public/runtime/ImageInspectionELF.h
rename to stdlib/public/runtime/ImageInspectionCommon.h
index afa2ee7150603..e0cf26a270fa3 100644
--- a/stdlib/public/runtime/ImageInspectionELF.h
+++ b/stdlib/public/runtime/ImageInspectionCommon.h
@@ -1,4 +1,4 @@
-//===--- ImageInspectionELF.h -----------------------------------*- C++ -*-===//
+//===--- ImageInspectionCommon.h - Image inspection routines -----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -12,59 +12,36 @@
 ///
 /// \file
 ///
-/// ELF specific image inspection routines.
+/// This file unifies common ELF and COFF image inspection routines
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_RUNTIME_IMAGEINSPECTIONELF_H
-#define SWIFT_RUNTIME_IMAGEINSPECTIONELF_H
+#ifndef SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
+#define SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
 
-#define SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING "swift_reflection_metadata_magic_string"
+#if !defined(__MACH__)
 
 #if defined(__ELF__)
+#define SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING "swift_reflection_metadata_magic_string"
+#endif // defined(__ELF__)
 
 #include "../SwiftShims/Visibility.h"
 #include <cstdint>
-#include <cstddef>
 
 namespace swift {
+struct MetadataSections;
+static constexpr const uintptr_t CurrentSectionMetadataVersion = 1;
+}
+
 struct SectionInfo {
   uint64_t size;
   const char *data;
 };
 
-static constexpr const uintptr_t CurrentSectionMetadataVersion = 1;
-
-struct MetadataSections {
-  uintptr_t version;
-  uintptr_t reserved;
-
-  mutable const MetadataSections *next;
-  mutable const MetadataSections *prev;
-
-  struct Range {
-    uintptr_t start;
-    size_t length;
-  };
-
-  Range swift5_protocols;
-  Range swift5_protocol_conformances;
-  Range swift5_type_metadata;
-  Range swift5_typeref;
-  Range swift5_reflstr;
-  Range swift5_fieldmd;
-  Range swift5_assocty;
-  Range swift5_replace;
-  Range swift5_replac2;
-  Range swift5_builtin;
-  Range swift5_capture;
-};
-} // namespace swift
-
 // Called by injected constructors when a dynamic library is loaded.
 SWIFT_RUNTIME_EXPORT
 void swift_addNewDSOImage(const void *addr);
 
-#endif // defined(__ELF__)
+#endif // !defined(__MACH__)
 
-#endif // SWIFT_RUNTIME_IMAGE_INSPECTION_ELF_H
+#endif // SWIFT_RUNTIME_IMAGEINSPECTIONCOMMON_H
\ No newline at end of file
diff --git a/stdlib/public/runtime/ImageInspectionELF.cpp b/stdlib/public/runtime/ImageInspectionELF.cpp
index 331ee3614f54f..9771051180770 100644
--- a/stdlib/public/runtime/ImageInspectionELF.cpp
+++ b/stdlib/public/runtime/ImageInspectionELF.cpp
@@ -20,117 +20,12 @@
 
 #if defined(__ELF__)
 
+#include "../SwiftShims/MetadataSections.h"
 #include "ImageInspection.h"
-#include "ImageInspectionELF.h"
 #include <dlfcn.h>
 
 using namespace swift;
 
-namespace {
-static const swift::MetadataSections *registered = nullptr;
-
-void record(const swift::MetadataSections *sections) {
-  if (registered == nullptr) {
-    registered = sections;
-    sections->next = sections->prev = sections;
-  } else {
-    registered->prev->next = sections;
-    sections->next = registered;
-    sections->prev = registered->prev;
-    registered->prev = sections;
-  }
-}
-}
-
-void swift::initializeProtocolLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &protocols =
-        sections->swift5_protocols;
-    if (protocols.length)
-      addImageProtocolsBlockCallbackUnsafe(
-          reinterpret_cast<void *>(protocols.start), protocols.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-void swift::initializeProtocolConformanceLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &conformances =
-        sections->swift5_protocol_conformances;
-    if (conformances.length)
-      addImageProtocolConformanceBlockCallbackUnsafe(
-          reinterpret_cast<void *>(conformances.start), conformances.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-
-void swift::initializeTypeMetadataRecordLookup() {
-  const swift::MetadataSections *sections = registered;
-  while (true) {
-    const swift::MetadataSections::Range &type_metadata =
-        sections->swift5_type_metadata;
-    if (type_metadata.length)
-      addImageTypeMetadataRecordBlockCallbackUnsafe(
-          reinterpret_cast<void *>(type_metadata.start), type_metadata.length);
-
-    if (sections->next == registered)
-      break;
-    sections = sections->next;
-  }
-}
-
-void swift::initializeDynamicReplacementLookup() {
-}
-
-// As ELF images are loaded, ImageInspectionInit:sectionDataInit() will call
-// addNewDSOImage() with an address in the image that can later be used via
-// dladdr() to dlopen() the image after the appropriate initialize*Lookup()
-// function has been called.
-SWIFT_RUNTIME_EXPORT
-void swift_addNewDSOImage(const void *addr) {
-  const swift::MetadataSections *sections =
-      static_cast<const swift::MetadataSections *>(addr);
-
-  record(sections);
-
-  const auto &protocols_section = sections->swift5_protocols;
-  const void *protocols =
-      reinterpret_cast<void *>(protocols_section.start);
-  if (protocols_section.length)
-    addImageProtocolsBlockCallback(protocols, protocols_section.length);
-
-  const auto &protocol_conformances = sections->swift5_protocol_conformances;
-  const void *conformances =
-      reinterpret_cast<void *>(protocol_conformances.start);
-  if (protocol_conformances.length)
-    addImageProtocolConformanceBlockCallback(conformances,
-                                             protocol_conformances.length);
-
-  const auto &type_metadata = sections->swift5_type_metadata;
-  const void *metadata = reinterpret_cast<void *>(type_metadata.start);
-  if (type_metadata.length)
-    addImageTypeMetadataRecordBlockCallback(metadata, type_metadata.length);
-
-  const auto &dynamic_replacements = sections->swift5_replace;
-  const auto *replacements =
-      reinterpret_cast<void *>(dynamic_replacements.start);
-  if (dynamic_replacements.length) {
-    const auto &dynamic_replacements_some = sections->swift5_replac2;
-    const auto *replacements_some =
-      reinterpret_cast<void *>(dynamic_replacements_some.start);
-    addImageDynamicReplacementBlockCallback(
-        replacements, dynamic_replacements.length, replacements_some,
-        dynamic_replacements_some.length);
-  }
-}
-
 int swift::lookupSymbol(const void *address, SymbolInfo *info) {
   Dl_info dlinfo;
   if (dladdr(address, &dlinfo) == 0) {
@@ -144,10 +39,4 @@ int swift::lookupSymbol(const void *address, SymbolInfo *info) {
   return 1;
 }
 
-// This is only used for backward deployment hooks, which we currently only support for
-// MachO. Add a stub here to make sure it still compiles.
-void *swift::lookupSection(const char *segment, const char *section, size_t *outSize) {
-  return nullptr;
-}
-
 #endif // defined(__ELF__)
diff --git a/stdlib/public/runtime/Metadata.cpp b/stdlib/public/runtime/Metadata.cpp
index b632dfc6f811f..5703748dfc182 100644
--- a/stdlib/public/runtime/Metadata.cpp
+++ b/stdlib/public/runtime/Metadata.cpp
@@ -662,11 +662,6 @@ swift::swift_allocateGenericValueMetadata(const ValueTypeDescriptor *description
   auto bytes = (char*) cache.getAllocator().withTag(GenericValueMetadataTag)
     .Allocate(totalSize, alignof(void*));
 
-#ifndef NDEBUG
-  // Fill the metadata record with garbage.
-  memset(bytes, 0xAA, totalSize);
-#endif
-
   auto addressPoint = bytes + sizeof(ValueMetadata::HeaderType);
   auto metadata = reinterpret_cast<ValueMetadata *>(addressPoint);
 
@@ -1918,6 +1913,33 @@ bool swift::equalContexts(const ContextDescriptor *a,
   }
 }
 
+SWIFT_CC(swift)
+bool swift::swift_compareTypeContextDescriptors(
+    const TypeContextDescriptor *a, const TypeContextDescriptor *b) {
+  // The implementation is the same as the implementation of
+  // swift::equalContexts except that the handling of non-type
+  // context descriptors and casts to TypeContextDescriptor are removed.
+
+  // Fast path: pointer equality.
+  if (a == b) return true;
+
+  // If either context is null, we're done.
+  if (a == nullptr || b == nullptr)
+    return false;
+
+  // If either descriptor is known to be unique, we're done.
+  if (a->isUnique() || b->isUnique()) return false;
+  
+  // Do the kinds match?
+  if (a->getKind() != b->getKind()) return false;
+  
+  // Do the parents match?
+  if (!equalContexts(a->Parent.get(), b->Parent.get()))
+    return false;
+
+  return TypeContextIdentity(a) == TypeContextIdentity(b);
+}
+
 /***************************************************************************/
 /*** Common value witnesses ************************************************/
 /***************************************************************************/
@@ -4971,6 +4993,12 @@ const WitnessTable *swift::swift_getAssociatedConformanceWitness(
                                                    assocConformance);
 }
 
+bool swift::swift_compareProtocolConformanceDescriptors(
+    const ProtocolConformanceDescriptor *lhs,
+    const ProtocolConformanceDescriptor *rhs) {
+  return MetadataCacheKey::compareProtocolConformanceDescriptors(lhs, rhs) == 0;
+}
+
 /***************************************************************************/
 /*** Recursive metadata dependencies ***************************************/
 /***************************************************************************/
@@ -5547,6 +5575,21 @@ static void recordBacktrace(void *allocation) {
   });
 }
 
+template <typename Pointee>
+static inline void memsetScribble(Pointee *bytes, size_t totalSize) {
+#ifndef NDEBUG
+  // When DEBUG is defined, always scribble.
+  memset(bytes, 0xAA, totalSize);
+#else
+  // When DEBUG is not defined, only scribble when the
+  // SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE environment variable is set.
+  if (SWIFT_UNLIKELY(
+          runtime::environment::SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE())) {
+    memset(bytes, 0xAA, totalSize);
+  }
+#endif
+}
+
 void *MetadataAllocator::Allocate(size_t size, size_t alignment) {
   assert(Tag != 0);
   assert(alignment <= alignof(void*));
@@ -5556,8 +5599,11 @@ void *MetadataAllocator::Allocate(size_t size, size_t alignment) {
   SWIFT_ONCE_F(getenvToken, checkAllocatorDebugEnvironmentVariable, nullptr);
 
   // If the size is larger than the maximum, just use malloc.
-  if (size > PoolRange::MaxPoolAllocationSize)
-    return malloc(size);
+  if (size > PoolRange::MaxPoolAllocationSize) {
+    void *allocation = malloc(size);
+    memsetScribble(allocation, size);
+    return allocation;
+  }
 
   // Allocate out of the pool.
   auto sizeWithHeader = size;
@@ -5601,7 +5647,8 @@ void *MetadataAllocator::Allocate(size_t size, size_t alignment) {
       // If that succeeded, we've successfully allocated.
       __msan_allocated_memory(allocation, sizeWithHeader);
       __asan_unpoison_memory_region(allocation, sizeWithHeader);
-      
+      memsetScribble(allocation, sizeWithHeader);
+
       if (SWIFT_UNLIKELY(_swift_debug_metadataAllocationIterationEnabled)) {
         AllocationHeader *header = (AllocationHeader *)allocation;
         header->Size = size;
diff --git a/stdlib/public/runtime/MetadataAllocatorTags.def b/stdlib/public/runtime/MetadataAllocatorTags.def
new file mode 100644
index 0000000000000..5f4c4e700b9fb
--- /dev/null
+++ b/stdlib/public/runtime/MetadataAllocatorTags.def
@@ -0,0 +1,45 @@
+//===--- MetadataAllocatorTags.def - Metadata allocator tags. ---*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines x-macros used for metaprogramming with the set of tags used
+// to mark metadata allocations when
+// SWIFT_DEBUG_ENABLE_METADATA_ALLOCATION_ITERATION is enabled.
+//
+//===----------------------------------------------------------------------===//
+
+// #define TAG(name, value)
+
+#ifndef TAG
+#error "Must define TAG to include MetadataAllocatorTags.def"
+#endif
+
+TAG(NotSet, 0)
+TAG(Boxes, 1)
+TAG(ObjCClassWrappers, 2)
+TAG(FunctionTypes, 3)
+TAG(MetatypeTypes, 4)
+TAG(ExistentialMetatypeValueWitnessTables, 5)
+TAG(ExistentialMetatypes, 6)
+TAG(ExistentialTypes, 7)
+TAG(OpaqueExistentialValueWitnessTables, 8)
+TAG(ClassExistentialValueWitnessTables, 9)
+TAG(ForeignWitnessTables, 10)
+TAG(ResilientMetadataAllocator, 11)
+TAG(Metadata, 12)
+TAG(TupleCache, 13)
+TAG(GenericMetadataCache, 14)
+TAG(ForeignMetadataCache, 15)
+TAG(GenericWitnessTableCache, 16)
+TAG(GenericClassMetadata, 17)
+TAG(GenericValueMetadata, 18)
+
+#undef TAG
diff --git a/stdlib/public/runtime/MetadataCache.h b/stdlib/public/runtime/MetadataCache.h
index 047f97816197d..6e471273e4702 100644
--- a/stdlib/public/runtime/MetadataCache.h
+++ b/stdlib/public/runtime/MetadataCache.h
@@ -386,6 +386,14 @@ class MetadataCacheKey {
 
     auto *aDescription = awt->getDescription();
     auto *bDescription = bwt->getDescription();
+    return compareProtocolConformanceDescriptors(aDescription, bDescription);
+  }
+
+public:
+  /// Compare two conformance descriptors, checking their contents if necessary.
+  static int compareProtocolConformanceDescriptors(
+      const ProtocolConformanceDescriptor *aDescription,
+      const ProtocolConformanceDescriptor *bDescription) {
     if (aDescription == bDescription)
       return 0;
 
@@ -405,6 +413,7 @@ class MetadataCacheKey {
                            bDescription->getProtocol());
   }
 
+private:
   /// Compare the content from two keys.
   static int compareContent(const void * const *adata,
                             const void * const *bdata,
diff --git a/stdlib/public/runtime/Private.h b/stdlib/public/runtime/Private.h
index 8a1bfaece97a2..d337409524f37 100644
--- a/stdlib/public/runtime/Private.h
+++ b/stdlib/public/runtime/Private.h
@@ -96,14 +96,22 @@ class TypeInfo {
 // out the proper includes from libobjc. The values MUST match the ones from
 // libobjc. Debug builds check these values against objc_debug_isa_class_mask
 // from libobjc.
-#  if TARGET_OS_SIMULATOR
-// Simulators don't currently use isa masking, but we still want to emit
+#  if TARGET_OS_SIMULATOR && __x86_64__
+// Simulators don't currently use isa masking on x86, but we still want to emit
 // swift_isaMask and the corresponding code in case that changes. libobjc's
 // mask has the bottom bits clear to include pointer alignment, match that
 // value here.
 #    define SWIFT_ISA_MASK 0xfffffffffffffff8ULL
 #  elif __arm64__
-#    define SWIFT_ISA_MASK 0x0000000ffffffff8ULL
+#    if __has_feature(ptrauth_calls)
+#      define SWIFT_ISA_MASK 0x007ffffffffffff8ULL
+#    else
+#      if TARGET_OS_OSX
+#      define SWIFT_ISA_MASK 0x00007ffffffffff8ULL
+#      else
+#      define SWIFT_ISA_MASK 0x0000000ffffffff8ULL
+#      endif
+#    endif
 #  elif __x86_64__
 #    define SWIFT_ISA_MASK 0x00007ffffffffff8ULL
 #  else
diff --git a/stdlib/public/runtime/SwiftRT-COFF.cpp b/stdlib/public/runtime/SwiftRT-COFF.cpp
index 935fe75a11386..9bdb0b25c1d34 100644
--- a/stdlib/public/runtime/SwiftRT-COFF.cpp
+++ b/stdlib/public/runtime/SwiftRT-COFF.cpp
@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ImageInspectionCOFF.h"
+#include "ImageInspectionCommon.h"
+#include "../SwiftShims/MetadataSections.h"
 
 #include <cstdint>
 
@@ -46,7 +47,9 @@ DECLARE_SWIFT_SECTION(sw5flmd)
 DECLARE_SWIFT_SECTION(sw5asty)
 DECLARE_SWIFT_SECTION(sw5repl)
 DECLARE_SWIFT_SECTION(sw5reps)
-}
+DECLARE_SWIFT_SECTION(sw5bltn)
+DECLARE_SWIFT_SECTION(sw5cptr)
+ }
 
 namespace {
 static swift::MetadataSections sections{};
@@ -74,6 +77,8 @@ static void swift_image_constructor() {
       SWIFT_SECTION_RANGE(sw5asty),
       SWIFT_SECTION_RANGE(sw5repl),
       SWIFT_SECTION_RANGE(sw5reps),
+      SWIFT_SECTION_RANGE(sw5bltn),
+      SWIFT_SECTION_RANGE(sw5cptr),
   };
 
 #undef SWIFT_SECTION_RANGE
diff --git a/stdlib/public/runtime/SwiftRT-ELF.cpp b/stdlib/public/runtime/SwiftRT-ELF.cpp
index fa585a8a68241..c08f48c0a8e87 100644
--- a/stdlib/public/runtime/SwiftRT-ELF.cpp
+++ b/stdlib/public/runtime/SwiftRT-ELF.cpp
@@ -10,7 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ImageInspectionELF.h"
+#include "ImageInspectionCommon.h"
+#include "../SwiftShims/MetadataSections.h"
 
 #include <cstddef>
 
diff --git a/stdlib/public/stubs/CommandLine.cpp b/stdlib/public/stubs/CommandLine.cpp
index 4c236c03f69cf..b487b168939c0 100644
--- a/stdlib/public/stubs/CommandLine.cpp
+++ b/stdlib/public/stubs/CommandLine.cpp
@@ -14,8 +14,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <vector>
-#include <string>
 #include <cassert>
 #include <climits>
 #include <cstdarg>
@@ -23,11 +21,13 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <string>
+#include <vector>
 
 #include "swift/Runtime/Debug.h"
 
-#include "../SwiftShims/RuntimeStubs.h"
 #include "../SwiftShims/GlobalObjects.h"
+#include "../SwiftShims/RuntimeStubs.h"
 
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
@@ -52,7 +52,7 @@ extern "C" char ***_NSGetArgv(void);
 extern "C" int *_NSGetArgc(void);
 
 SWIFT_RUNTIME_STDLIB_API
-char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   assert(outArgLen != nullptr);
 
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -65,7 +65,7 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 }
 #elif defined(__linux__) || defined(__CYGWIN__)
 SWIFT_RUNTIME_STDLIB_API
-char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   assert(outArgLen != nullptr);
 
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -75,8 +75,8 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 
   FILE *cmdline = fopen("/proc/self/cmdline", "rb");
   if (!cmdline) {
-    swift::fatalError(0,
-            "Fatal error: Unable to open interface to '/proc/self/cmdline'.\n");
+    swift::fatalError(
+        0, "Fatal error: Unable to open interface to '/proc/self/cmdline'.\n");
   }
   char *arg = nullptr;
   size_t size = 0;
@@ -89,17 +89,17 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   }
   fclose(cmdline);
   *outArgLen = argvec.size();
-  char **outBuf = (char **)calloc(argvec.size() + 1, sizeof(char *));
+  auto outBuf = static_cast<char **>(calloc(argvec.size() + 1, sizeof(char *)));
   std::copy(argvec.begin(), argvec.end(), outBuf);
   outBuf[argvec.size()] = nullptr;
 
   return outBuf;
 }
-#elif defined (_WIN32)
+#elif defined(_WIN32)
 #include <stdlib.h>
 
 SWIFT_RUNTIME_STDLIB_API
-char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   assert(outArgLen != nullptr);
 
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -109,7 +109,6 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 
   *outArgLen = 0;
 
-
   LPWSTR *szArgList;
   int nArgs;
   szArgList = CommandLineToArgvW(GetCommandLineW(), &nArgs);
@@ -118,27 +117,31 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 
   std::vector<char *> argv;
   for (int i = 0; i < nArgs; ++i) {
-    int szBufferSize = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS,
-                                           szArgList[i], -1, nullptr, 0,
-                                           nullptr, nullptr);
+    int szBufferSize =
+        WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, szArgList[i], -1,
+                            nullptr, 0, nullptr, nullptr);
     if (szBufferSize == 0) {
-      for (char *arg : argv)
-        free(arg);
+      swift::fatalError(0,
+                        "Fatal error: Could not retrieve commandline "
+                        "arguments: %u\n",
+                        GetLastError());
       return nullptr;
     }
 
-    char *buffer = static_cast<char *>(calloc(static_cast<size_t>(szBufferSize),
-                                              sizeof(char)));
+    char *buffer = static_cast<char *>(
+        calloc(static_cast<size_t>(szBufferSize), sizeof(char)));
     if (buffer == nullptr) {
-      for (char *arg : argv)
-        free(arg);
+      swift::fatalError(0,
+                        "Fatal error: Could not allocate space for commandline"
+                        "arguments");
       return nullptr;
     }
 
     if (!WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, szArgList[i], -1,
                              buffer, szBufferSize, nullptr, nullptr)) {
-      for (char *arg : argv)
-        free(arg);
+      swift::fatalError(0,
+                        "Fatal error: Conversion to UTF-8 failed for "
+                        "commandline arguments");
       return nullptr;
     }
 
@@ -157,13 +160,13 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 }
 #elif defined(__FreeBSD__)
 #include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 SWIFT_RUNTIME_STDLIB_API
-char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   assert(outArgLen != nullptr);
 
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -172,11 +175,11 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   }
 
   char *argPtr = nullptr; // or use ARG_MAX? 8192 is used in LLDB though..
-  int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid() };
+  int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid()};
   size_t argPtrSize = 0;
   for (int i = 0; i < 3 && !argPtr; ++i) { // give up after 3 tries
     if (sysctl(mib, 4, nullptr, &argPtrSize, nullptr, 0) != -1) {
-      argPtr = (char *)malloc(argPtrSize);
+      argPtr = static_cast<char *>(malloc(argPtrSize));
       if (sysctl(mib, 4, argPtr, &argPtrSize, nullptr, 0) == -1) {
         free(argPtr);
         argPtr = nullptr;
@@ -188,8 +191,10 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
     }
   }
   if (!argPtr)
-    swift::fatalError(0, "Fatal error: Could not retrieve commandline "
-                         "arguments: sysctl: %s.\n", strerror(errno));
+    swift::fatalError(0,
+                      "Fatal error: Could not retrieve commandline "
+                      "arguments: sysctl: %s.\n",
+                      strerror(errno));
 
   char *curPtr = argPtr;
   char *endPtr = argPtr + argPtrSize;
@@ -198,21 +203,21 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   for (; curPtr < endPtr; curPtr += strlen(curPtr) + 1)
     argvec.push_back(strdup(curPtr));
   *outArgLen = argvec.size();
-  char **outBuf = (char **)calloc(argvec.size() + 1, sizeof(char *));
+  auto outBuf = static_cast<char **>(calloc(argvec.size() + 1, sizeof(char *)));
   std::copy(argvec.begin(), argvec.end(), outBuf);
   outBuf[argvec.size()] = nullptr;
 
   free(argPtr);
-    
+
   return outBuf;
 }
 #elif defined(__wasi__)
+#include <stdlib.h>
 #include <wasi/api.h>
 #include <wasi/libc.h>
-#include <stdlib.h>
 
 SWIFT_RUNTIME_STDLIB_API
-char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
   assert(outArgLen != nullptr);
 
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -222,19 +227,24 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 
   __wasi_errno_t err;
 
-  size_t argv_buf_size;
-  size_t argc;
+  size_t argv_buf_size = 0;
+  size_t argc = 0;
   err = __wasi_args_sizes_get(&argc, &argv_buf_size);
-  if (err != __WASI_ERRNO_SUCCESS) return nullptr;
+  if (err != __WASI_ERRNO_SUCCESS) {
+    swift::fatalError(0,
+                      "Fatal error: Could not retrieve commandline "
+                      "arguments: %d.\n", static_cast<int>(err));
+    return nullptr;
+  }
 
-  size_t num_ptrs = argc + 1;
-  char *argv_buf = (char *)malloc(argv_buf_size);
-  char **argv = (char **)calloc(num_ptrs, sizeof(char *));
+  char *argv_buf = static_cast<char *>(malloc(argv_buf_size));
+  char **argv = static_cast<char **>(calloc(argc + 1, sizeof(char *)));
 
   err = __wasi_args_get((uint8_t **)argv, (uint8_t *)argv_buf);
   if (err != __WASI_ERRNO_SUCCESS) {
-    free(argv_buf);
-    free(argv);
+    swift::fatalError(0,
+                      "Fatal error: Could not retrieve commandline "
+                      "arguments: %d.\n", static_cast<int>(err));
     return nullptr;
   }
 
@@ -242,16 +252,52 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
 
   return argv;
 }
-#else // Add your favorite OS's command line arg grabber here.
+#elif defined(__OpenBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/exec.h>
+
 SWIFT_RUNTIME_STDLIB_API
 char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+  assert(outArgLen != nullptr);
   if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
     *outArgLen = _swift_stdlib_ProcessOverrideUnsafeArgc;
     return _swift_stdlib_ProcessOverrideUnsafeArgv;
   }
-  
-  swift::fatalError(0,
+
+  int mib[2] = {CTL_VM, VM_PSSTRINGS};
+  struct _ps_strings _ps;
+  size_t len = sizeof(_ps);
+
+  if (sysctl(mib, 2, &_ps, &len, NULL, 0) == -1) {
+    char **empty_argv = static_cast<char **>(calloc(1, sizeof(char *)));
+    empty_argv[0] = nullptr;
+    *outArgLen = 0;
+    return empty_argv;
+  }
+
+  struct ps_strings *ps = static_cast<struct ps_strings *>(_ps.val);
+  *outArgLen = ps->ps_nargvstr;
+
+  char **argv_copy =
+      static_cast<char **>(calloc(ps->ps_nargvstr + 1, sizeof(char *)));
+  for(int i = 0; i < ps->ps_nargvstr; i++) {
+    argv_copy[i] = strdup(ps->ps_argvstr[i]);
+  }
+  argv_copy[ps->ps_nargvstr] = nullptr;
+
+  return argv_copy;
+}
+#else // Add your favorite OS's command line arg grabber here.
+SWIFT_RUNTIME_STDLIB_API
+char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
+  if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
+    *outArgLen = _swift_stdlib_ProcessOverrideUnsafeArgc;
+    return _swift_stdlib_ProcessOverrideUnsafeArgv;
+  }
+
+  swift::fatalError(
+      0,
       "Fatal error: Command line arguments not supported on this platform.\n");
 }
 #endif
-
diff --git a/stdlib/public/stubs/Stubs.cpp b/stdlib/public/stubs/Stubs.cpp
index 0cdb3d39804ff..cde6ddd796ff1 100644
--- a/stdlib/public/stubs/Stubs.cpp
+++ b/stdlib/public/stubs/Stubs.cpp
@@ -36,44 +36,28 @@
 #endif
 #include <climits>
 #include <clocale>
+#include <cmath>
 #include <cstdarg>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#if defined(__CYGWIN__) || defined(_WIN32) || defined(__HAIKU__) || defined(__OpenBSD__)
 #include <sstream>
-#include <cmath>
-#elif defined(__ANDROID__)
+#if defined(__OpenBSD__) || defined(__ANDROID__) || defined(__linux__) || defined(__wasi__) || defined(_WIN32)
 #include <locale.h>
-
-#include <android/api-level.h>
-
-#if __ANDROID_API__ < 21 // Introduced in Android API 21 - L
-static inline long double swift_strtold_l(const char *nptr, char **endptr,
-                                          locale_t) {
-  return strtod(nptr, endptr);
-}
-#define strtold_l swift_strtold_l
-#endif
-
-#if __ANDROID_API__ < 26 // Introduced in Android API 26 - O
-static double swift_strtod_l(const char *nptr, char **endptr, locale_t loc) {
-  return strtod(nptr, endptr);
-}
-static float swift_strtof_l(const char *nptr, char **endptr, locale_t loc) {
-  return strtof(nptr, endptr);
-}
-#define strtod_l swift_strtod_l
-#define strtof_l swift_strtof_l
+#if defined(_WIN32)
+#define locale_t _locale_t
 #endif
-#elif defined(__linux__) || defined(__wasi__)
-#include <locale.h>
 #else
 #include <xlocale.h>
 #endif
 #include <limits>
 #include <thread>
+
+#if defined(__ANDROID__)
+#include <android/api-level.h>
+#endif
+
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/SwiftDtoa.h"
 #include "swift/Basic/Lazy.h"
@@ -369,104 +353,82 @@ static bool swift_stringIsSignalingNaN(const char *nptr) {
   return strcasecmp(nptr, "snan") == 0;
 }
 
-#if defined(__CYGWIN__) || defined(_WIN32) || defined(__HAIKU__) || defined(__OpenBSD__)
-// Cygwin does not support uselocale(), but we can use the locale feature 
-// in stringstream object.
+// This implementation should only be used on platforms without the
+// relevant strto* functions, such as Cygwin or Haiku.
+// Note that using this currently causes test failures.
 template <typename T>
-static const char *_swift_stdlib_strtoX_clocale_impl(
-    const char *nptr, T *outResult) {
-  if (swift_stringIsSignalingNaN(nptr)) {
-    *outResult = std::numeric_limits<T>::signaling_NaN();
-    return nptr + std::strlen(nptr);
-  }
-  
+T _swift_strto(const char *nptr, char **endptr) {
   std::istringstream ValueStream(nptr);
   ValueStream.imbue(std::locale::classic());
   T ParsedValue;
   ValueStream >> ParsedValue;
-  *outResult = ParsedValue;
 
   std::streamoff pos = ValueStream.tellg();
   if (ValueStream.eof())
     pos = static_cast<std::streamoff>(strlen(nptr));
-  if (pos <= 0)
-    return nullptr;
+  if (pos <= 0) {
+    errno = ERANGE;
+    return 0.0;
+  }
 
-  return nptr + pos;
+  return ParsedValue;
 }
 
+static double swift_strtod_l(const char *nptr, char **endptr, locale_t loc) {
 #if defined(_WIN32)
-template <>
-const char *
-_swift_stdlib_strtoX_clocale_impl<float>(const char *str, float *result) {
-  if (swift_stringIsSignalingNaN(str)) {
-    *result = std::numeric_limits<float>::signaling_NaN();
-    return str + std::strlen(str);
-  }
-
-  char *end;
-  _set_errno(0);
-  *result = _strtof_l(str, &end, getCLocale());
-  if (*result == HUGE_VALF || *result == -HUGE_VALF || *result == 0.0 || *result == -0.0) {
-    if (errno == ERANGE)
-        end = nullptr;
-  }
-  return end;
+  return _strtod_l(nptr, endptr, getCLocale());
+#elif defined(__CYGWIN__) || defined(__HAIKU__)
+  return _swift_strto<double>(nptr, endptr);
+#else
+  return strtod(nptr, endptr);
+#endif
 }
 
-template <>
-const char *
-_swift_stdlib_strtoX_clocale_impl<double>(const char *str, double *result) {
-  if (swift_stringIsSignalingNaN(str)) {
-    *result = std::numeric_limits<double>::signaling_NaN();
-    return str + std::strlen(str);
-  }
-
-  char *end;
-  _set_errno(0);
-  *result = _strtod_l(str, &end, getCLocale());
-  if (*result == HUGE_VAL || *result == -HUGE_VAL || *result == 0.0 || *result == -0.0) {
-    if (errno == ERANGE)
-        end = nullptr;
-  }
-  return end;
+static float swift_strtof_l(const char *nptr, char **endptr, locale_t loc) {
+#if defined(_WIN32)
+  return _strtof_l(nptr, endptr, getCLocale());
+#elif defined(__CYGWIN__) || defined(__HAIKU__)
+  return _swift_strto<float>(nptr, endptr);
+#else
+  return strtof(nptr, endptr);
+#endif
 }
 
-template <>
-const char *
-_swift_stdlib_strtoX_clocale_impl<long double>(const char *str, long double *result) {
-  if (swift_stringIsSignalingNaN(str)) {
-    *result = std::numeric_limits<long double>::signaling_NaN();
-    return str + std::strlen(str);
-  }
-
-  char *end;
-  _set_errno(0);
-  *result = _strtod_l(str, &end, getCLocale());
-  if (*result == HUGE_VALL || *result == -HUGE_VALL || *result == 0.0 || *result == -0.0) {
-    if (errno == ERANGE)
-        end = nullptr;
-  }
-  return end;
-}
+static long double swift_strtold_l(const char *nptr, char **endptr,
+                                   locale_t loc) {
+#if defined(_WIN32)
+  return _strtod_l(nptr, endptr, getCLocale());
+#elif defined(__ANDROID__)
+  return strtod(nptr, endptr);
+#elif defined(__CYGWIN__) || defined(__HAIKU__)
+  return _swift_strto<long double>(nptr, endptr);
+#else
+  return strtold(nptr, endptr);
 #endif
-
-const char *swift::_swift_stdlib_strtold_clocale(
-    const char *nptr, void *outResult) {
-  return _swift_stdlib_strtoX_clocale_impl(
-    nptr, static_cast<long double*>(outResult));
 }
 
-const char *swift::_swift_stdlib_strtod_clocale(
-    const char * nptr, double *outResult) {
-  return _swift_stdlib_strtoX_clocale_impl(nptr, outResult);
-}
+#if defined(__OpenBSD__) || defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__)
+#define strtod_l swift_strtod_l
+#define strtof_l swift_strtof_l
+#define strtold_l swift_strtold_l
+#elif defined(__ANDROID__)
+#if __ANDROID_API__ < 21 // Introduced in Android API 21 - L
+#define strtold_l swift_strtold_l
+#endif
 
-const char *swift::_swift_stdlib_strtof_clocale(
-    const char * nptr, float *outResult) {
-  return _swift_stdlib_strtoX_clocale_impl(nptr, outResult);
-}
+#if __ANDROID_API__ < 26 // Introduced in Android API 26 - O
+#define strtod_l swift_strtod_l
+#define strtof_l swift_strtof_l
+#endif
+#endif
+
+static inline void _swift_set_errno(int to) {
+#if defined(_WIN32)
+  _set_errno(0);
 #else
+  errno = 0;
+#endif
+}
 
 // We can't return Float80, but we can receive a pointer to one, so
 // switch the return type and the out parameter on strtold.
@@ -483,7 +445,7 @@ static const char *_swift_stdlib_strtoX_clocale_impl(
   }
   
   char *EndPtr;
-  errno = 0;
+  _swift_set_errno(0);
   const auto result = posixImpl(nptr, &EndPtr, getCLocale());
   *outResult = result;
   if (result == huge || result == -huge || result == 0.0 || result == -0.0) {
@@ -510,7 +472,6 @@ const char *swift::_swift_stdlib_strtof_clocale(
   return _swift_stdlib_strtoX_clocale_impl(
     nptr, outResult, HUGE_VALF, strtof_l);
 }
-#endif
 
 const char *swift::_swift_stdlib_strtof16_clocale(
     const char * nptr, __fp16 *outResult) {
diff --git a/stdlib/tools/swift-reflection-test/swift-reflection-test.c b/stdlib/tools/swift-reflection-test/swift-reflection-test.c
index 4c2d94c5aec47..4e3d143174ced 100644
--- a/stdlib/tools/swift-reflection-test/swift-reflection-test.c
+++ b/stdlib/tools/swift-reflection-test/swift-reflection-test.c
@@ -147,7 +147,7 @@ static int PipeMemoryReader_queryDataLayout(void *Context,
 #else
   int applePlatform = 0;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
   int iosDerivedPlatform = 1;
 #else
   int iosDerivedPlatform = 0;
diff --git a/test/AutoDiff/Parse/derivative_attr_parse.swift b/test/AutoDiff/Parse/derivative_attr_parse.swift
index 755180ba9c4b4..ed17c86836eff 100644
--- a/test/AutoDiff/Parse/derivative_attr_parse.swift
+++ b/test/AutoDiff/Parse/derivative_attr_parse.swift
@@ -26,6 +26,27 @@ func dfoo(x: Float) -> (value: Float, differential: (Float) -> (Float)) {
   return (x, { $0 })
 }
 
+@derivative(of: property.get) // ok
+func dPropertyGetter() -> ()
+
+@derivative(of: subscript.get) // ok
+func dSubscriptGetter() -> ()
+
+@derivative(of: subscript(_:label:).get) // ok
+func dLabeledSubscriptGetter() -> ()
+
+@derivative(of: property.set) // ok
+func dPropertySetter() -> ()
+
+@derivative(of: subscript.set) // ok
+func dSubscriptSetter() -> ()
+
+@derivative(of: subscript(_:label:).set) // ok
+func dLabeledSubscriptSetter() -> ()
+
+@derivative(of: nestedType.name) // ok
+func dNestedTypeFunc() -> ()
+
 /// Bad
 
 // expected-error @+2 {{expected an original function name}}
@@ -98,3 +119,16 @@ func testLocalDerivativeRegistration() {
   @derivative(of: sin)
   func dsin()
 }
+
+
+func testLocalDerivativeRegistration() {
+  // expected-error @+1 {{attribute '@derivative' can only be used in a non-local scope}}
+  @derivative(of: sin)
+  func dsin()
+}
+
+// expected-error @+2 {{expected ',' separator}}
+// expected-error @+1 {{expected declaration}}
+@derivative(of: nestedType.name.set)
+func dNestedTypePropertySetter() -> ()
+
diff --git a/test/AutoDiff/SILOptimizer/differentiation_diagnostics.swift b/test/AutoDiff/SILOptimizer/differentiation_diagnostics.swift
index cb0e1030bc87e..13c23dcc656da 100644
--- a/test/AutoDiff/SILOptimizer/differentiation_diagnostics.swift
+++ b/test/AutoDiff/SILOptimizer/differentiation_diagnostics.swift
@@ -66,14 +66,156 @@ func noReturn(_ x: Float) -> Float {
 }
 
 //===----------------------------------------------------------------------===//
-// Conversion to `@differentiable(linear)` (not yet supported)
+// Global variables
 //===----------------------------------------------------------------------===//
 
-// expected-error @+1 {{conversion to '@differentiable(linear)' function type is not yet supported}}
-let _: @differentiable(linear) (Float) -> Float = { x in x }
+var global: Float = 3.0
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+2 {{when differentiating this function definition}}
+@differentiable(wrt: x)
+func testWriteToGlobalVariable(x: Float) -> Float {
+  // expected-note @+1 {{cannot differentiate writes to global variables}}
+  global = global + x
+  return global
+}
 
 //===----------------------------------------------------------------------===//
-// Non-differentiable arguments and results
+// Class differentiation
+//===----------------------------------------------------------------------===//
+
+class Class : Differentiable {
+  @differentiable
+  var stored: Float = 1
+
+  @differentiable
+  func testRefElementAddr(_ x: Float) -> Float {
+    return stored * x
+  }
+
+  var nonDifferentiableStored: Float = 1
+
+  @differentiable
+  func testNonDifferentiableRefElementAddr(_ x: Float) -> Float {
+    // expected-error @+2 {{expression is not differentiable}}
+    // expected-note @+1 {{member is not differentiable because the corresponding class member is not '@differentiable'}}
+    return nonDifferentiableStored * x
+  }
+
+  @differentiable
+  func method(_ x: Float) -> Float { x }
+
+  @differentiable
+  static func testClassMethod(x: Float) -> Float {
+    return Class().method(x)
+  }
+
+  func nonDifferentiableMethod(_ x: Float) -> Float { x }
+
+  @differentiable
+  static func testDifferentiableClassMethod(x: Float) -> Float {
+    // expected-error @+2 {{expression is not differentiable}}
+    // expected-note @+1 {{member is not differentiable because the corresponding class member is not '@differentiable'}}
+    return Class().nonDifferentiableMethod(x)
+  }
+}
+
+// TF-676: Test differentiation of class method with multiple `@differentiable`
+// attributes.
+class ClassMethodMultipleDifferentiableAttribute : Differentiable {
+  @differentiable(wrt: (self, x))
+  @differentiable(wrt: x)
+  func f(_ x: Float) -> Float { x }
+}
+func testMultipleDiffAttrsClass<C: ClassMethodMultipleDifferentiableAttribute>(
+  _ c: C, _ x: Float
+) {
+  _ = gradient(at: c, x) { c, x in c.f(x) }
+  _ = gradient(at: x) { x in c.f(x) }
+}
+
+// TF-1149: Test class with loadable type but address-only `TangentVector` type.
+class C<T: Differentiable>: Differentiable {
+  @differentiable
+  var stored: T
+
+  init(_ stored: T) {
+    self.stored = stored
+  }
+
+  @differentiable
+  func method(_ x: T) -> T {
+    stored
+  }
+}
+
+//===----------------------------------------------------------------------===//
+// Enum differentiation
+//===----------------------------------------------------------------------===//
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+1 {{when differentiating this function definition}}
+func usesOptionals(_ x: Float) -> Float {
+  // expected-note @+1 {{differentiating enum values is not yet supported}}
+  var maybe: Float? = 10
+  maybe = x
+  return maybe!
+}
+
+enum DirectEnum: Differentiable & AdditiveArithmetic {
+  case leaf(Float)
+
+  typealias TangentVector = Self
+
+  static var zero: Self { fatalError() }
+  static func +(_ lhs: Self, _ rhs: Self) -> Self { fatalError() }
+  static func -(_ lhs: Self, _ rhs: Self) -> Self { fatalError() }
+}
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable(wrt: e)
+// expected-note @+2 {{when differentiating this function definition}}
+// expected-note @+1 {{differentiating enum values is not yet supported}}
+func enum_active(_ e: DirectEnum, _ x: Float) -> Float {
+  switch e {
+  case let .leaf(y): return y
+  }
+}
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable(wrt: e)
+// expected-note @+2 {{when differentiating this function definition}}
+// expected-note @+1 {{differentiating enum values is not yet supported}}
+func activeEnumValue(_ e: DirectEnum, _ x: Float) -> Float {
+  switch e {
+  case let .leaf(y): return y
+  }
+}
+
+enum IndirectEnum<T: Differentiable>: Differentiable & AdditiveArithmetic {
+  case leaf(T)
+
+  typealias TangentVector = Self
+
+  static func ==(_ lhs: Self, _ rhs: Self) -> Bool { fatalError() }
+  static var zero: Self { fatalError() }
+  static func +(_ lhs: Self, _ rhs: Self) -> Self { fatalError() }
+  static func -(_ lhs: Self, _ rhs: Self) -> Self { fatalError() }
+}
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable(wrt: e)
+// expected-note @+2 {{when differentiating this function definition}}
+// expected-note @+1 {{differentiating enum values is not yet supported}}
+func activeEnumAddr(_ e: IndirectEnum<Float>, _ x: Float) -> Float {
+  switch e {
+  case let .leaf(y): return y
+  }
+}
+
+//===----------------------------------------------------------------------===//
+// Unmet derivative generic requirements
 //===----------------------------------------------------------------------===//
 
 @differentiable
@@ -82,7 +224,6 @@ func generic<T: Differentiable & FloatingPoint>(_ x: T) -> T {
   // expected-note @+1 {{member is not differentiable because the corresponding protocol requirement is not '@differentiable'}}
   return x + 1
 }
-_ = gradient(at: 1.0, in: generic)
 
 // Test unmet generic requirements.
 
@@ -95,12 +236,12 @@ func vjpWeirdExtraRequirements<T : Differentiable & CaseIterable>(_ x: T) -> (
 ) where T.AllCases : ExpressibleByStringLiteral {
   return (x, { $0 })
 }
+@differentiable
 func weirdWrapper<T : Differentiable>(_ x: T) -> T {
   // expected-error @+2 {{expression is not differentiable}}
   // expected-note @+1 {{function call is not differentiable because generic requirements are not met: 'T : CaseIterable, T.AllCases : ExpressibleByStringLiteral'}}
   return weird(x)
 }
-_ = gradient(at: Float(1), in: { x in weirdWrapper(x) })
 
 @differentiable
 func direct<T : Differentiable>(_ x: T) -> T {
@@ -118,13 +259,13 @@ extension Tensor where Scalar : BinaryFloatingPoint {
   }
 }
 
-protocol TF8Proto : Differentiable {
+protocol TF8_Proto : Differentiable {
   associatedtype Scalar
   @differentiable(wrt: (self, input))
   func applied(to input: Float) -> Float
 }
 
-struct TF8Struct<Scalar> : TF8Proto where Scalar : FloatingPoint & Differentiable {
+struct TF8_Struct<Scalar> : TF8_Proto where Scalar : FloatingPoint & Differentiable {
   @noDerivative let bar: Scalar
 
   @differentiable(wrt: (self, input))
@@ -133,7 +274,24 @@ struct TF8Struct<Scalar> : TF8Proto where Scalar : FloatingPoint & Differentiabl
   }
 }
 
-_ = gradient(at: 1.0, in: { x in x.squareRoot() })
+//===----------------------------------------------------------------------===//
+// `Differentiable` conformance requirement inference
+//===----------------------------------------------------------------------===//
+
+func id<T>(_ x: T) -> T { x }
+let _: @differentiable (Float) -> Float = { x in id(x) }
+
+struct TF_691<Scalar> {
+  var x: Scalar
+  init(_ x: Scalar) {
+    self.x = x
+  }
+}
+extension TF_691: Differentiable where Scalar: Differentiable {}
+
+func identity<T>(_ x: TF_691<T>) -> TF_691<T> { x }
+let _: @differentiable (Float) -> TF_691<Float> = { x in identity(TF_691(x)) }
+let _: @differentiable (Float) -> TF_691<Float> = { x in id(TF_691(x)) }
 
 //===----------------------------------------------------------------------===//
 // Non-differentiable arguments and results
@@ -152,27 +310,338 @@ struct TF_687<T> : Differentiable {
 // expected-note @+1 {{cannot differentiate through a non-differentiable argument; do you want to use 'withoutDerivative(at:)'?}}
 let _: @differentiable (Float) -> TF_687<Any> = { x in TF_687<Any>(x, dummy: x) }
 
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+1 {{when differentiating this function definition}}
+func roundingGivesError(x: Float) -> Float {
+  // expected-note @+1 {{cannot differentiate through a non-differentiable result; do you want to use 'withoutDerivative(at:)'?}}
+  return Float(Int(x))
+}
+
 //===----------------------------------------------------------------------===//
-// Add `Differentiable` conformance for generic wrt parameters
+// Non-varied results
 //===----------------------------------------------------------------------===//
 
-func id<T>(_ x: T) -> T { x }
-let _: @differentiable (Float) -> Float = { x in id(x) }
+@differentiable
+func nonVariedResult(_ x: Float) -> Float {
+  // TODO(TF-788): Re-enable non-varied result warning.
+  // xpected-warning @+1 {{result does not depend on differentiation arguments and will always have a zero derivative; do you want to use 'withoutDerivative(at:)'?}} {{10-10=withoutDerivative(at:}} {{15-15=)}}
+  return 0
+}
 
-struct TF_691<Scalar> {
-  var x: Scalar
-  init(_ x: Scalar) {
-    self.x = x
+// Check that `withoutDerivative(at:)` silences the non-varied result warning.
+
+struct TF_775: Differentiable {
+  @differentiable(wrt: (self))
+  func nonVariedResult(_ input: Float) -> Float {
+    return withoutDerivative(at: input)
   }
 }
-extension TF_691: Differentiable where Scalar: Differentiable {}
 
-func identity<T>(_ x: TF_691<T>) -> TF_691<T> { x }
-let _: @differentiable (Float) -> TF_691<Float> = { x in identity(TF_691(x)) }
-let _: @differentiable (Float) -> TF_691<Float> = { x in id(TF_691(x)) }
+//===----------------------------------------------------------------------===//
+// Multiple results
+//===----------------------------------------------------------------------===//
+
+func multipleResults(_ x: Float) -> (Float, Float) {
+  return (x, x)
+}
+
+@differentiable
+func usesMultipleResults(_ x: Float) -> Float {
+  let tuple = multipleResults(x)
+  return tuple.0 + tuple.1
+}
+
+//===----------------------------------------------------------------------===//
+// `inout` parameter differentiation
+//===----------------------------------------------------------------------===//
+
+@differentiable
+func activeInoutParam(_ x: Float) -> Float {
+  var result = x
+  result += x
+  return result
+}
+
+@differentiable
+func activeInoutParamNonactiveInitialResult(_ x: Float) -> Float {
+  var result: Float = 1
+  result += x
+  return result
+}
+
+@differentiable
+func activeInoutParamTuple(_ x: Float) -> Float {
+  var tuple = (x, x)
+  tuple.0 *= x
+  return x * tuple.0
+}
+
+@differentiable
+func activeInoutParamControlFlow(_ array: [Float]) -> Float {
+  var result: Float = 1
+  for i in withoutDerivative(at: array).indices {
+    result += array[i]
+  }
+  return result
+}
+
+@differentiable
+func activeInoutParamControlFlowComplex(_ array: [Float], _ bool: Bool) -> Float {
+  var result: Float = 1
+  if bool {
+    if bool {}
+    for i in withoutDerivative(at: array).indices {
+      switch i % 2 {
+      case 0: continue
+      case 1: break
+      default: break
+      }
+      result = result + 1
+      result += array[i]
+    }
+  }
+  return result
+}
+
+struct Mut: Differentiable {}
+extension Mut {
+  @differentiable(wrt: x)
+  mutating func mutatingMethod(_ x: Mut) {}
+}
+
+@differentiable(wrt: x)
+func nonActiveInoutParam(_ nonactive: inout Mut, _ x: Mut) {
+  nonactive.mutatingMethod(x)
+}
+
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethod(_ x: Mut) -> Mut {
+  var result = x
+  result.mutatingMethod(result)
+  return result
+}
+
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethodVar(_ nonactive: inout Mut, _ x: Mut) {
+  var result = nonactive
+  result.mutatingMethod(x)
+  nonactive = result
+}
+
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethodTuple(_ nonactive: inout Mut, _ x: Mut) {
+  var result = (nonactive, x)
+  result.0.mutatingMethod(result.0)
+  nonactive = result.0
+}
+
+func twoInoutParameters(_ x: inout Float, _ y: inout Float) {}
+@differentiable
+func testTwoInoutParameters(_ x: Float, _ y: Float) -> Float {
+  var x = x
+  var y = y
+  twoInoutParameters(&x, &y)
+  return x
+}
+
+func inoutParameterAndFormalResult(_ x: inout Float) -> Float { x }
+@differentiable
+func testInoutParameterAndFormalResult(_ x: Float) -> Float {
+  var x = x
+  return inoutParameterAndFormalResult(&x)
+}
 
 //===----------------------------------------------------------------------===//
-// Property wrappers
+// Stored property access differentiation
+//===----------------------------------------------------------------------===//
+
+// Test differentiation of invalid stored property access instructions:
+// `struct_extract`, `struct_element_addr`, `ref_element_addr`.
+
+struct StructTangentVectorNotStruct: Differentiable {
+  var x: Float
+
+  enum TangentVector: Differentiable, AdditiveArithmetic {
+    case x(Float)
+    typealias TangentVector = Self
+    static func ==(_: Self, _: Self) -> Bool { fatalError() }
+    static var zero: Self { fatalError() }
+    static func +(_: Self, _: Self) -> Self { fatalError() }
+    static func -(_: Self, _: Self) -> Self { fatalError() }
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_vector_not_struct")
+func testStructTangentVectorNotStruct(_ s: StructTangentVectorNotStruct) -> Float {
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentVectorNotStruct.x' because 'StructTangentVectorNotStruct.TangentVector' is not a struct}}
+  return s.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_vector_not_struct
+// CHECK: struct_extract {{%.*}} : $StructTangentVectorNotStruct, #StructTangentVectorNotStruct.x
+
+struct StructOriginalPropertyNotDifferentiable: Differentiable {
+  struct Nondiff {
+    var x: Float
+  }
+  var nondiff: Nondiff
+
+  struct TangentVector: Differentiable & AdditiveArithmetic {
+    var nondiff: Float
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_original_property_not_differentiable")
+func testStructOriginalPropertyNotDifferentiable(_ s: StructOriginalPropertyNotDifferentiable) -> Float {
+  // expected-note @+1 {{cannot differentiate access to property 'StructOriginalPropertyNotDifferentiable.nondiff' because property type 'StructOriginalPropertyNotDifferentiable.Nondiff' does not conform to 'Differentiable'}}
+  return s.nondiff.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_original_property_not_differentiable
+// CHECK: struct_extract {{%.*}} : $StructOriginalPropertyNotDifferentiable, #StructOriginalPropertyNotDifferentiable.nondiff
+
+struct StructTangentVectorPropertyNotFound: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var y: Float
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_not_found")
+func testStructTangentPropertyNotFound(_ s: StructTangentVectorPropertyNotFound) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentVectorPropertyNotFound.x' because 'StructTangentVectorPropertyNotFound.TangentVector' does not have a stored property named 'x'}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_not_found
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentVectorPropertyNotFound, #StructTangentVectorPropertyNotFound.x
+
+struct StructTangentPropertyWrongType: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Double
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_wrong_type")
+func testStructTangentPropertyWrongType(_ s: StructTangentPropertyWrongType) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentPropertyWrongType.x' because 'StructTangentPropertyWrongType.TangentVector.x' does not have expected type 'Float.TangentVector' (aka 'Float')}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_wrong_type
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentPropertyWrongType, #StructTangentPropertyWrongType.x
+
+final class ClassTangentPropertyWrongType: Differentiable {
+  var x: Float = 0
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Double
+  }
+  func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_class_tangent_property_wrong_type")
+func testClassTangentPropertyWrongType(_ c: ClassTangentPropertyWrongType) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = c
+  // expected-note @+1 {{cannot differentiate access to property 'ClassTangentPropertyWrongType.x' because 'ClassTangentPropertyWrongType.TangentVector.x' does not have expected type 'Float.TangentVector' (aka 'Float')}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_class_tangent_property_wrong_type
+// CHECK: ref_element_addr {{%.*}} : $ClassTangentPropertyWrongType, #ClassTangentPropertyWrongType.x
+
+struct StructTangentPropertyNotStored: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Float { 0 }
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_not_stored")
+func testStructTangentPropertyNotStored(_ s: StructTangentPropertyNotStored) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentPropertyNotStored.x' because 'StructTangentPropertyNotStored.TangentVector.x' is not a stored property}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_not_stored
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentPropertyNotStored, #StructTangentPropertyNotStored.x
+
+final class ClassTangentPropertyNotStored: Differentiable {
+  var x: Float = 0
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Float { 0 }
+  }
+  func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_class_tangent_property_not_stored")
+func testClassTangentPropertyNotStored(_ c: ClassTangentPropertyNotStored) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = c
+  // expected-note @+1 {{cannot differentiate access to property 'ClassTangentPropertyNotStored.x' because 'ClassTangentPropertyNotStored.TangentVector.x' is not a stored property}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_class_tangent_property_not_stored
+// CHECK: ref_element_addr {{%.*}} : $ClassTangentPropertyNotStored, #ClassTangentPropertyNotStored.x
+
+// SR-13134: Test stored property access with conditionally `Differentiable` base type.
+
+struct Complex<T: FloatingPoint> {
+  var real: T
+  var imaginary: T
+}
+extension Complex: Differentiable where T: Differentiable {
+  typealias TangentVector = Complex
+}
+extension Complex: AdditiveArithmetic {}
+
+@differentiable
+func SR_13134(lhs: Complex<Float>, rhs: Complex<Float>) -> Float {
+  return lhs.real + rhs.real
+}
+
+//===----------------------------------------------------------------------===//
+// Wrapped property differentiation
 //===----------------------------------------------------------------------===//
 
 @propertyWrapper
@@ -209,7 +678,7 @@ extension DifferentiableWrapper: Differentiable where Value: Differentiable {}
 
 struct Struct: Differentiable {
   // expected-error @+2 {{expression is not differentiable}}
-  // expected-note @+1 {{property cannot be differentiated because 'Struct.TangentVector' does not have a member named '_x'}}
+  // expected-note @+1 {{cannot differentiate access to property 'Struct._x' because 'Struct.TangentVector' does not have a stored property named '_x'}}
   @DifferentiableWrapper @DifferentiableWrapper var x: Float = 10
 
   @Wrapper var y: Float = 20
@@ -240,3 +709,172 @@ func modify(_ s: Struct, _ x: Float) -> Float {
   s.x *= x * s.z
   return s.x
 }
+
+//===----------------------------------------------------------------------===//
+// Array literal initialization
+//===----------------------------------------------------------------------===//
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+1 {{when differentiating this function definition}}
+func tupleArrayLiteralInitialization(_ x: Float, _ y: Float) -> Float {
+  // `Array<(Float, Float)>` does not conform to `Differentiable`.
+  let array = [(x * y, x * y)]
+  // expected-note @+1 {{cannot differentiate through a non-differentiable argument; do you want to use 'withoutDerivative(at:)'?}}
+  return array[0].0
+}
+
+//===----------------------------------------------------------------------===//
+// Subset parameter differentiation thunks
+//===----------------------------------------------------------------------===//
+
+// FIXME(SR-13046): Non-differentiability diagnostic crash due to invalid source location.
+/*
+func testNoDerivativeParameter(_ f: @differentiable (Float, @noDerivative Float) -> Float) -> Float {
+  return gradient(at: 2) { x in f(x * x, x) }
+}
+*/
+
+// Test parameter subset thunk + partially-applied original function.
+struct TF_675 : Differentiable {
+  @differentiable
+  func method(_ x: Float) -> Float {
+    return x
+  }
+}
+let _: @differentiable (Float) -> Float = TF_675().method
+
+// TF-918: Test parameter subset thunk + partially-applied original function.
+let _: @differentiable (Float, Float) -> Float = (+) as @differentiable (Float, @noDerivative Float) -> Float
+
+//===----------------------------------------------------------------------===//
+// Differentiation in fragile functions
+//===----------------------------------------------------------------------===//
+
+public func implicitlyDifferentiableFromFragile(_ x: Float) -> Float { x }
+
+public func hasImplicitlyDifferentiatedTopLevelDefaultArgument(
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+1 {{differentiated functions in default arguments must be marked '@differentiable' or have a public '@derivative'}}
+  _ f: @differentiable (Float) -> Float = implicitlyDifferentiableFromFragile
+) {}
+
+// TODO(TF-1030): This will eventually not be an error.
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+1 {{differentiated functions in default arguments must be marked '@differentiable' or have a public '@derivative'; this is not possible with a closure, make a top-level function instead}}
+public func hasImplicitlyDifferentiatedClosureDefaultArgument(_ f: @differentiable (Float) -> Float = { $0 }) {}
+
+@inlinable
+public func fragileFuncWithGradient() {
+  // expected-error @+2 {{function is not differentiable}}
+  // expected-note @+1 {{differentiated functions in '@inlinable' functions must be marked '@differentiable' or have a public '@derivative'}}
+  _ = gradient(at: 0, in: implicitlyDifferentiableFromFragile)
+}
+
+@inlinable
+@differentiable
+public func fragileDifferentiable(_ x: Float) -> Float {
+  // expected-error @+2 {{expression is not differentiable}}
+  // expected-note @+1 {{differentiated functions in '@inlinable' functions must be marked '@differentiable' or have a public '@derivative'}}
+  implicitlyDifferentiableFromFragile(x)
+}
+
+// TF-1208: Test curry thunk differentiation regression.
+public struct TF_1208_Struct<Scalar> {
+  var x: Scalar
+}
+extension TF_1208_Struct: Differentiable where Scalar: Differentiable {
+  @differentiable
+  public static func id(x: Self) -> Self {
+    return x
+  }
+}
+@differentiable(wrt: x)
+public func TF_1208<Scalar: Differentiable>(
+  _ x: TF_1208_Struct<Scalar>,
+  // NOTE(TF-1208): This diagnostic is unexpected because `TF_1208_Struct.id` is marked `@differentiable`.
+  // expected-error @+3 2 {{function is not differentiable}}
+  // expected-note @+2 {{differentiated functions in '@inlinable' functions must be marked '@differentiable' or have a public '@derivative'; this is not possible with a closure, make a top-level function instead}}
+  // expected-note @+1 {{opaque non-'@differentiable' function is not differentiable}}
+  reduction: @differentiable (TF_1208_Struct<Scalar>) -> TF_1208_Struct<Scalar> = TF_1208_Struct.id
+) -> TF_1208_Struct<Scalar> {
+  reduction(x)
+}
+
+//===----------------------------------------------------------------------===//
+// Coroutines (SIL function yields, `begin_apply`) (not yet supported)
+//===----------------------------------------------------------------------===//
+
+struct HasCoroutineAccessors: Differentiable {
+  var stored: Float
+  var computed: Float {
+    // `_read` is a coroutine: `(Self) -> () -> ()`.
+    _read { yield stored }
+    // `_modify` is a coroutine: `(inout Self) -> () -> ()`.
+    _modify { yield &stored }
+  }
+}
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+2 {{when differentiating this function definition}}
+@differentiable
+func testAccessorCoroutines(_ x: HasCoroutineAccessors) -> HasCoroutineAccessors {
+  var x = x
+  // expected-note @+1 {{differentiation of coroutine calls is not yet supported}}
+  x.computed = x.computed
+  return x
+}
+
+// TF-1078: Diagnose `_modify` accessor application with active `inout` argument.
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+2 {{when differentiating this function definition}}
+@differentiable
+func TF_1078(array: [Float], x: Float) -> Float {
+  var array = array
+  // Array subscript assignment below calls `Array.subscript.modify`.
+  // expected-note @+1 {{differentiation of coroutine calls is not yet supported}}
+  array[0] = x
+  return array[0]
+}
+
+// TF-1115: Diagnose `_modify` accessor application with initially non-active `inout` argument.
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+2 {{when differentiating this function definition}}
+@differentiable
+func TF_1115(_ x: Float) -> Float {
+  var array: [Float] = [0]
+  // Array subscript assignment below calls `Array.subscript.modify`.
+  // expected-note @+1 {{differentiation of coroutine calls is not yet supported}}
+  array[0] = x
+  return array[0]
+}
+
+// TF-1115: Test `_modify` accessor application with initially non-active `inout` argument,
+// where the yielded value is not a projection from `self`.
+extension Float {
+  static var staticProperty: Float = 1
+
+  var projection: Float {
+    get { self }
+    // This `modify` accessor yields a static variable, not a projection from `self`.
+    // Diagnosing active applications is nonetheless a safe over-approximation.
+    _modify { yield &Float.staticProperty }
+  }
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+2 {{when differentiating this function definition}}
+@differentiable
+func TF_1115_modifyNonSelfProjection(x: Float) -> Float {
+  var result: Float = 0
+  // Assignment below calls `Float.projection.modify`.
+  // expected-note @+1 {{differentiation of coroutine calls is not yet supported}}
+  result.projection = x
+  return result
+}
+
+//===----------------------------------------------------------------------===//
+// Conversion to `@differentiable(linear)` (not yet supported)
+//===----------------------------------------------------------------------===//
+
+// expected-error @+1 {{conversion to '@differentiable(linear)' function type is not yet supported}}
+let _: @differentiable(linear) (Float) -> Float = { x in x }
diff --git a/test/AutoDiff/SILOptimizer/forward_mode_diagnostics.swift b/test/AutoDiff/SILOptimizer/forward_mode_diagnostics.swift
new file mode 100644
index 0000000000000..f028db4baca4f
--- /dev/null
+++ b/test/AutoDiff/SILOptimizer/forward_mode_diagnostics.swift
@@ -0,0 +1,320 @@
+// RUN: %target-swift-frontend -enable-experimental-forward-mode-differentiation -emit-sil -verify %s
+
+// Test forward-mode differentiation transform diagnostics.
+
+// TODO: Move these tests back into `autodiff_diagnostics.swift` once
+// forward mode reaches feature parity with reverse mode.
+
+import _Differentiation
+
+//===----------------------------------------------------------------------===//
+// Basic function
+//===----------------------------------------------------------------------===//
+
+@differentiable
+func basic(_ x: Float) -> Float {
+  return x
+}
+
+//===----------------------------------------------------------------------===//
+// Control flow
+//===----------------------------------------------------------------------===//
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+2 {{when differentiating this function definition}}
+// expected-note @+1 {{forward-mode differentiation does not yet support control flow}}
+func cond(_ x: Float) -> Float {
+  if x > 0 {
+    return x * x
+  }
+  return x + x
+}
+
+//===----------------------------------------------------------------------===//
+// Non-varied results
+//===----------------------------------------------------------------------===//
+
+@differentiable
+func nonVariedResult(_ x: Float) -> Float {
+  // TODO(TF-788): Re-enable non-varied result warning.
+  // xpected-warning @+1 {{result does not depend on differentiation arguments and will always have a zero derivative; do you want to use 'withoutDerivative(at:)'?}} {{10-10=withoutDerivative(at:}} {{15-15=)}}
+  return 0
+}
+
+//===----------------------------------------------------------------------===//
+// Multiple results
+//===----------------------------------------------------------------------===//
+
+// TODO(TF-983): Support differentiation of multiple results.
+/*
+func multipleResults(_ x: Float) -> (Float, Float) {
+  return (x, x)
+}
+@differentiable
+func usesMultipleResults(_ x: Float) -> Float {
+  let tuple = multipleResults(x)
+  return tuple.0 + tuple.1
+}
+*/
+
+//===----------------------------------------------------------------------===//
+// `inout` parameter differentiation
+//===----------------------------------------------------------------------===//
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+1 {{when differentiating this function definition}}
+func activeInoutParamNonactiveInitialResult(_ x: Float) -> Float {
+  var result: Float = 1
+  // expected-note @+1 {{cannot differentiate through 'inout' arguments}}
+  result += x
+  return result
+}
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+1 {{when differentiating this function definition}}
+func activeInoutParamTuple(_ x: Float) -> Float {
+  var tuple = (x, x)
+  // expected-note @+1 {{cannot differentiate through 'inout' arguments}}
+  tuple.0 *= x
+  return x * tuple.0
+}
+
+// expected-error @+1 {{function is not differentiable}}
+@differentiable
+// expected-note @+2 {{when differentiating this function definition}}
+// expected-note @+1 {{forward-mode differentiation does not yet support control flow}}
+func activeInoutParamControlFlow(_ array: [Float]) -> Float {
+  var result: Float = 1
+  for i in withoutDerivative(at: array).indices {
+    result += array[i]
+  }
+  return result
+}
+
+struct Mut: Differentiable {}
+extension Mut {
+  @differentiable(wrt: x)
+  mutating func mutatingMethod(_ x: Mut) {}
+}
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable(wrt: x)
+func nonActiveInoutParam(_ nonactive: inout Mut, _ x: Mut) -> Mut {
+  return nonactive.mutatingMethod(x)
+}
+*/
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethod(_ x: Mut) -> Mut {
+  var result = x
+  result = result.mutatingMethod(result)
+  return result
+}
+*/
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethodVar(_ nonactive: inout Mut, _ x: Mut) -> Mut {
+  var result = nonactive
+  result = result.mutatingMethod(x)
+  return result
+}
+*/
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable(wrt: x)
+func activeInoutParamMutatingMethodTuple(_ nonactive: inout Mut, _ x: Mut) -> Mut {
+  var result = (nonactive, x)
+  let result2 = result.0.mutatingMethod(result.0)
+  return result2
+}
+*/
+
+//===----------------------------------------------------------------------===//
+// Subset parameter differentiation thunks
+//===----------------------------------------------------------------------===//
+
+// FIXME(SR-13046): Non-differentiability diagnostic crash due to invalid source location.
+/*
+func testNoDerivativeParameter(_ f: @differentiable (Float, @noDerivative Float) -> Float) -> Float {
+  return derivative(at: 2, 3) { (x, y) in f(x * x, y) }
+}
+*/
+
+//===----------------------------------------------------------------------===//
+// Stored property access differentiation
+//===----------------------------------------------------------------------===//
+
+// Test differentiation of invalid stored property access instructions:
+// `struct_extract`, `struct_element_addr`, `ref_element_addr`.
+
+struct StructTangentVectorNotStruct: Differentiable {
+  var x: Float
+
+  enum TangentVector: Differentiable, AdditiveArithmetic {
+    case x(Float)
+    typealias TangentVector = Self
+    static func ==(_: Self, _: Self) -> Bool { fatalError() }
+    static var zero: Self { fatalError() }
+    static func +(_: Self, _: Self) -> Self { fatalError() }
+    static func -(_: Self, _: Self) -> Self { fatalError() }
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_vector_not_struct")
+func testStructTangentVectorNotStruct(_ s: StructTangentVectorNotStruct) -> Float {
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentVectorNotStruct.x' because 'StructTangentVectorNotStruct.TangentVector' is not a struct}}
+  return s.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_vector_not_struct
+// CHECK: struct_extract {{%.*}} : $StructTangentVectorNotStruct, #StructTangentVectorNotStruct.x
+
+struct StructOriginalPropertyNotDifferentiable: Differentiable {
+  struct Nondiff {
+    var x: Float
+  }
+  var nondiff: Nondiff
+
+  struct TangentVector: Differentiable & AdditiveArithmetic {
+    var nondiff: Float
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_original_property_not_differentiable")
+func testStructOriginalPropertyNotDifferentiable(_ s: StructOriginalPropertyNotDifferentiable) -> Float {
+  // expected-note @+1 {{cannot differentiate access to property 'StructOriginalPropertyNotDifferentiable.nondiff' because property type 'StructOriginalPropertyNotDifferentiable.Nondiff' does not conform to 'Differentiable'}}
+  return s.nondiff.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_original_property_not_differentiable
+// CHECK: struct_extract {{%.*}} : $StructOriginalPropertyNotDifferentiable, #StructOriginalPropertyNotDifferentiable.nondiff
+
+struct StructTangentVectorPropertyNotFound: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var y: Float
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_not_found")
+func testStructTangentPropertyNotFound(_ s: StructTangentVectorPropertyNotFound) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentVectorPropertyNotFound.x' because 'StructTangentVectorPropertyNotFound.TangentVector' does not have a stored property named 'x'}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_not_found
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentVectorPropertyNotFound, #StructTangentVectorPropertyNotFound.x
+
+struct StructTangentPropertyWrongType: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Double
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_wrong_type")
+func testStructTangentPropertyWrongType(_ s: StructTangentPropertyWrongType) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentPropertyWrongType.x' because 'StructTangentPropertyWrongType.TangentVector.x' does not have expected type 'Float.TangentVector' (aka 'Float')}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_wrong_type
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentPropertyWrongType, #StructTangentPropertyWrongType.x
+
+final class ClassTangentPropertyWrongType: Differentiable {
+  var x: Float = 0
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Double
+  }
+  func move(along direction: TangentVector) {}
+}
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable
+@_silgen_name("test_class_tangent_property_wrong_type")
+func testClassTangentPropertyWrongType(_ c: ClassTangentPropertyWrongType) -> Float {
+  var tmp = c
+  return tmp.x
+}
+*/
+
+// CHECK-LABEL: sil {{.*}} @test_class_tangent_property_wrong_type
+// CHECK: ref_element_addr {{%.*}} : $ClassTangentPropertyWrongType, #ClassTangentPropertyWrongType.x
+
+struct StructTangentPropertyNotStored: Differentiable {
+  var x: Float
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Float { 0 }
+  }
+  mutating func move(along direction: TangentVector) {}
+}
+
+// expected-error @+2 {{function is not differentiable}}
+// expected-note @+3 {{when differentiating this function definition}}
+@differentiable
+@_silgen_name("test_struct_tangent_property_not_stored")
+func testStructTangentPropertyNotStored(_ s: StructTangentPropertyNotStored) -> Float {
+  // expected-warning @+1 {{variable 'tmp' was never mutated}}
+  var tmp = s
+  // expected-note @+1 {{cannot differentiate access to property 'StructTangentPropertyNotStored.x' because 'StructTangentPropertyNotStored.TangentVector.x' is not a stored property}}
+  return tmp.x
+}
+
+// CHECK-LABEL: sil {{.*}} @test_struct_tangent_property_not_stored
+// CHECK: struct_element_addr {{%.*}} : $*StructTangentPropertyNotStored, #StructTangentPropertyNotStored.x
+
+final class ClassTangentPropertyNotStored: Differentiable {
+  var x: Float = 0
+
+  struct TangentVector: Differentiable, AdditiveArithmetic {
+    var x: Float { 0 }
+  }
+  func move(along direction: TangentVector) {}
+}
+
+// FIXME(TF-984): Forward-mode crash due to unset tangent buffer.
+/*
+@differentiable
+@_silgen_name("test_class_tangent_property_not_stored")
+func testClassTangentPropertyNotStored(_ c: ClassTangentPropertyNotStored) -> Float {
+  var tmp = c
+  return tmp.x
+}
+*/
+
+// CHECK-LABEL: sil {{.*}} @test_class_tangent_property_not_stored
+// CHECK: ref_element_addr {{%.*}} : $ClassTangentPropertyNotStored, #ClassTangentPropertyNotStored.x
diff --git a/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift
index 05e95b05738d6..220aba234b60f 100644
--- a/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift
+++ b/test/AutoDiff/Sema/DerivedConformances/class_differentiable.swift
@@ -525,7 +525,6 @@ class SR_12793: Differentiable {
 }
 
 // Test property wrappers.
-// TF-1190: Test `@noDerivative` warning for property wrapper backing storage properties.
 
 @propertyWrapper
 struct ImmutableWrapper<Value> {
@@ -559,10 +558,13 @@ class WrappedProperties: Differentiable {
 
   @Wrapper var float: Generic<Float> = Generic()
   @ClassWrapper var float2: Generic<Float> = Generic()
+  // SR-13071: Test `@differentiable` wrapped property.
+  @differentiable @Wrapper var float3: Generic<Float> = Generic()
+
   @noDerivative @ImmutableWrapper var nondiff: Generic<Int> = Generic()
 
   static func testTangentMemberwiseInitializer() {
-    _ = TangentVector(float: .init(), float2: .init())
+    _ = TangentVector(float: .init(), float2: .init(), float3: .init())
   }
 }
 
diff --git a/test/AutoDiff/Sema/DerivedConformances/derived_zero_tangent_vector_initializer.swift b/test/AutoDiff/Sema/DerivedConformances/derived_zero_tangent_vector_initializer.swift
index 98ac63b275aaf..ef536b591c9e4 100644
--- a/test/AutoDiff/Sema/DerivedConformances/derived_zero_tangent_vector_initializer.swift
+++ b/test/AutoDiff/Sema/DerivedConformances/derived_zero_tangent_vector_initializer.swift
@@ -137,8 +137,8 @@ enum CustomTangentVectorEnum<T: Differentiable>: Differentiable {
 // CHECK:   [[Y_PROP:%.*]] = struct_extract [[SELF]] : $SelfTangentVectorStruct, #SelfTangentVectorStruct.y
 // CHECK:   [[Y_ZERO_INIT_FN:%.*]] = function_ref @$sSd{{.*}}E28zeroTangentVectorInitializerSdycvg : $@convention(method) (Double) -> @owned @callee_guaranteed () -> Double
 // CHECK:   [[Y_ZERO_INIT:%.*]] = apply [[Y_ZERO_INIT_FN]]([[Y_PROP]])
-// CHECK:   // function_ref closure #2 in SelfTangentVectorStruct.zeroTangentVectorInitializer.getter
-// CHECK:   [[CLOSURE_FN:%.*]] = function_ref @${{.*}}SelfTangentVectorStructV0bgH11InitializerACycvgACycfU0_
+// CHECK:   // function_ref closure #1 in SelfTangentVectorStruct.zeroTangentVectorInitializer.getter
+// CHECK:   [[CLOSURE_FN:%.*]] = function_ref @${{.*}}SelfTangentVectorStructV0bgH11InitializerACycvgACycfU_
 // CHECK:   [[X_ZERO_INIT_COPY:%.*]] = copy_value [[X_ZERO_INIT]]
 // CHECK:   [[Y_ZERO_INIT_COPY:%.*]] = copy_value [[Y_ZERO_INIT]]
 // CHECK:   [[ZERO_INIT:%.*]] = partial_apply [callee_guaranteed] [[CLOSURE_FN]]([[X_ZERO_INIT_COPY]], [[Y_ZERO_INIT_COPY]])
@@ -148,8 +148,8 @@ enum CustomTangentVectorEnum<T: Differentiable>: Differentiable {
 // CHECK-LABEL: // CustomTangentVectorStruct.zeroTangentVectorInitializer.getter
 // CHECK-NEXT: sil hidden [_semantics "autodiff.nonvarying"] [ossa] @${{.*}}CustomTangentVectorStructV0bgH11Initializer0gH0Qzycvg : $@convention(method) <T, U where T : Differentiable, U : Differentiable> (@in_guaranteed CustomTangentVectorStruct<T, U>) -> @owned @callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <T.TangentVector> {
 // CHECK: bb0([[SELF:%.*]] : $*CustomTangentVectorStruct<T, U>):
-// CHECK:   // function_ref closure #3 in CustomTangentVectorStruct.zeroTangentVectorInitializer.getter
-// CHECK:   function_ref @${{.*}}CustomTangentVectorStructV0bgH11Initializer0gH0QzycvgAFycfU1_
+// CHECK:   // function_ref closure #1 in CustomTangentVectorStruct.zeroTangentVectorInitializer.getter
+// CHECK:   function_ref @${{.*}}CustomTangentVectorStructV0bgH11Initializer0gH0QzycvgAFycfU_
 // CHECK: }
 
 // CHECK-LABEL: // MemberwiseTangentVectorClass.zeroTangentVectorInitializer.getter
@@ -163,8 +163,8 @@ enum CustomTangentVectorEnum<T: Differentiable>: Differentiable {
 // CHECK:   [[Y_PROP:%.*]] = apply [[Y_PROP_METHOD]]([[SELF]])
 // CHECK:   [[Y_ZERO_INIT_FN:%.*]] = function_ref @$sSd{{.*}}E28zeroTangentVectorInitializerSdycvg : $@convention(method) (Double) -> @owned @callee_guaranteed () -> Double
 // CHECK:   [[Y_ZERO_INIT:%.*]] = apply [[Y_ZERO_INIT_FN]]([[Y_PROP]])
-// CHECK:   // function_ref closure #4 in MemberwiseTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK:   [[CLOSURE_FN:%.*]] = function_ref @${{.*}}MemberwiseTangentVectorClassC0bgH11InitializerAC0gH0VycvgAFycfU2_
+// CHECK:   // function_ref closure #1 in MemberwiseTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK:   [[CLOSURE_FN:%.*]] = function_ref @${{.*}}MemberwiseTangentVectorClassC0bgH11InitializerAC0gH0VycvgAFycfU_
 // CHECK:   [[X_ZERO_INIT_COPY:%.*]] = copy_value [[X_ZERO_INIT]]
 // CHECK:   [[Y_ZERO_INIT_COPY:%.*]] = copy_value [[Y_ZERO_INIT]]
 // CHECK:   [[ZERO_INIT:%.*]] = partial_apply [callee_guaranteed] [[CLOSURE_FN]]([[X_ZERO_INIT_COPY]], [[Y_ZERO_INIT_COPY]])
@@ -174,29 +174,29 @@ enum CustomTangentVectorEnum<T: Differentiable>: Differentiable {
 // CHECK-LABEL: // SelfTangentVectorClass.zeroTangentVectorInitializer.getter
 // CHECK-NEXT: sil hidden [_semantics "autodiff.nonvarying"] [ossa] @${{.*}}SelfTangentVectorClassC0bgH11InitializerACycvg : $@convention(method) (@guaranteed SelfTangentVectorClass) -> @owned @callee_guaranteed () -> @owned SelfTangentVectorClass {
 // CHECK: bb0([[SELF:%.*]] : @guaranteed $SelfTangentVectorClass):
-// CHECK:   // function_ref closure #5 in SelfTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK:   function_ref @${{.*}}SelfTangentVectorClassC0bgH11InitializerACycvgACycfU3_
+// CHECK:   // function_ref closure #1 in SelfTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK:   function_ref @${{.*}}SelfTangentVectorClassC0bgH11InitializerACycvgACycfU_
 // CHECK: }
 
 // CHECK-LABEL: // CustomTangentVectorClass.zeroTangentVectorInitializer.getter
 // CHECK-NEXT: sil hidden [_semantics "autodiff.nonvarying"] [ossa] @${{.*}}CustomTangentVectorClassC0bgH11Initializer0gH0Qzycvg : $@convention(method) <T, U where T : Differentiable, U : Differentiable> (@guaranteed CustomTangentVectorClass<T, U>) -> @owned @callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <T.TangentVector> {
 // CHECK: bb0(%0 : @guaranteed $CustomTangentVectorClass<T, U>):
-// CHECK:   // function_ref closure #6 in CustomTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK:   function_ref @${{.*}}CustomTangentVectorClassC0bgH11Initializer0gH0QzycvgAFycfU4_
+// CHECK:   // function_ref closure #1 in CustomTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK:   function_ref @${{.*}}CustomTangentVectorClassC0bgH11Initializer0gH0QzycvgAFycfU_
 // CHECK: }
 
 // CHECK-LABEL: // SelfTangentVectorEnum.zeroTangentVectorInitializer.getter
 // CHECK-NEXT: sil hidden [_semantics "autodiff.nonvarying"] [ossa] @${{.*}}SelfTangentVectorEnumO0bgH11InitializerACycvg : $@convention(method) (@guaranteed SelfTangentVectorEnum) -> @owned @callee_guaranteed () -> @owned SelfTangentVectorEnum {
 // CHECK: bb0([[SELF:%.*]] : @guaranteed $SelfTangentVectorEnum):
-// CHECK:   // function_ref closure #7 in SelfTangentVectorEnum.zeroTangentVectorInitializer.getter
-// CHECK:   function_ref @${{.*}}SelfTangentVectorEnumO0bgH11InitializerACycvgACycfU5_
+// CHECK:   // function_ref closure #1 in SelfTangentVectorEnum.zeroTangentVectorInitializer.getter
+// CHECK:   function_ref @${{.*}}SelfTangentVectorEnumO0bgH11InitializerACycvgACycfU_
 // CHECK: }
 
 // CHECK-LABEL: // CustomTangentVectorEnum.zeroTangentVectorInitializer.getter
 // CHECK-NEXT: sil hidden [_semantics "autodiff.nonvarying"] [ossa] @${{.*}}CustomTangentVectorEnumO0bgH11Initializer0gH0Qzycvg : $@convention(method) <T where T : Differentiable> (@in_guaranteed CustomTangentVectorEnum<T>) -> @owned @callee_guaranteed @substituted <τ_0_0> () -> @out τ_0_0 for <T.TangentVector> {
 // CHECK: bb0([[SELF:%.*]] : $*CustomTangentVectorEnum<T>):
-// CHECK:   // function_ref closure #8 in CustomTangentVectorEnum.zeroTangentVectorInitializer.getter
-// CHECK:   function_ref @${{.*}}CustomTangentVectorEnumO0bgH11Initializer0gH0QzycvgAFycfU6_
+// CHECK:   // function_ref closure #1 in CustomTangentVectorEnum.zeroTangentVectorInitializer.getter
+// CHECK:   function_ref @${{.*}}CustomTangentVectorEnumO0bgH11Initializer0gH0QzycvgAFycfU_
 // CHECK: }
 
 // CHECK-LABEL: // closure #1 in MemberwiseTangentVectorStruct.zeroTangentVectorInitializer.getter
@@ -206,44 +206,44 @@ enum CustomTangentVectorEnum<T: Differentiable>: Differentiable {
 // CHECK-NOT:   witness_method {{.*}}, #AdditiveArithmetic.zero!getter
 // CHECK: }
 
-// CHECK-LABEL: // closure #2 in SelfTangentVectorStruct.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorStructV0bgH11InitializerACycvgACycfU0_ : $@convention(thin) (@guaranteed @callee_guaranteed () -> Float, @guaranteed @callee_guaranteed () -> Double) -> SelfTangentVectorStruct {
+// CHECK-LABEL: // closure #1 in SelfTangentVectorStruct.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorStructV0bgH11InitializerACycvgACycfU_ : $@convention(thin) (@guaranteed @callee_guaranteed () -> Float, @guaranteed @callee_guaranteed () -> Double) -> SelfTangentVectorStruct {
 // CHECK:   // function_ref SelfTangentVectorStruct.init(x:y:)
 // CHECK-NOT:   // function_ref static {{.*}}.zero.getter
 // CHECK-NOT:   witness_method {{.*}}, #AdditiveArithmetic.zero!getter
 // CHECK: }
 
-// CHECK-LABEL: // closure #3 in CustomTangentVectorStruct.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}CustomTangentVectorStructV0bgH11Initializer0gH0QzycvgAFycfU1_ : $@convention(thin) <T, U where T : Differentiable, U : Differentiable> () -> @out T.TangentVector {
+// CHECK-LABEL: // closure #1 in CustomTangentVectorStruct.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}CustomTangentVectorStructV0bgH11Initializer0gH0QzycvgAFycfU_ : $@convention(thin) <T, U where T : Differentiable, U : Differentiable> () -> @out T.TangentVector {
 // CHECK:   witness_method $T.TangentVector, #AdditiveArithmetic.zero!getter
 // CHECK: }
 
-// CHECK-LABEL: // closure #4 in MemberwiseTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}MemberwiseTangentVectorClassC0bgH11InitializerAC0gH0VycvgAFycfU2_ : $@convention(thin) (@guaranteed @callee_guaranteed () -> Float, @guaranteed @callee_guaranteed () -> Double) -> MemberwiseTangentVectorClass.TangentVector {
+// CHECK-LABEL: // closure #1 in MemberwiseTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}MemberwiseTangentVectorClassC0bgH11InitializerAC0gH0VycvgAFycfU_ : $@convention(thin) (@guaranteed @callee_guaranteed () -> Float, @guaranteed @callee_guaranteed () -> Double) -> MemberwiseTangentVectorClass.TangentVector {
 // CHECK:   // function_ref MemberwiseTangentVectorClass.TangentVector.init(x:y:)
 // CHECK-NOT:   // function_ref static {{.*}}.zero.getter
 // CHECK-NOT:   witness_method {{.*}}, #AdditiveArithmetic.zero!getter
 // CHECK: }
 
-// CHECK-LABEL: // closure #5 in SelfTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorClassC0bgH11InitializerACycvgACycfU3_ : $@convention(thin) () -> @owned SelfTangentVectorClass {
+// CHECK-LABEL: // closure #1 in SelfTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorClassC0bgH11InitializerACycvgACycfU_ : $@convention(thin) () -> @owned SelfTangentVectorClass {
 // CHECK:   // function_ref static SelfTangentVectorClass.zero.getter
 // CHECK:   function_ref @${{.*}}SelfTangentVectorClassC0B0ACXDvgZ : $@convention(method) (@thick SelfTangentVectorClass.Type) -> @owned SelfTangentVectorClass
 // CHECK: }
 
-// CHECK-LABEL: // closure #6 in CustomTangentVectorClass.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}CustomTangentVectorClassC0bgH11Initializer0gH0QzycvgAFycfU4_ : $@convention(thin) <T, U where T : Differentiable, U : Differentiable> () -> @out T.TangentVector {
+// CHECK-LABEL: // closure #1 in CustomTangentVectorClass.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}CustomTangentVectorClassC0bgH11Initializer0gH0QzycvgAFycfU_ : $@convention(thin) <T, U where T : Differentiable, U : Differentiable> () -> @out T.TangentVector {
 // CHECK:   witness_method $T.TangentVector, #AdditiveArithmetic.zero!getter
 // CHECK: }
 
 // TODO(TF-1012): Implement memberwise `zeroTangentVectorInitializer` synthesis for enums.
-// CHECK-LABEL: // closure #7 in SelfTangentVectorEnum.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorEnumO0bgH11InitializerACycvgACycfU5_ : $@convention(thin) () -> @owned SelfTangentVectorEnum {
+// CHECK-LABEL: // closure #1 in SelfTangentVectorEnum.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @${{.*}}SelfTangentVectorEnumO0bgH11InitializerACycvgACycfU_ : $@convention(thin) () -> @owned SelfTangentVectorEnum {
 // CHECK:   // function_ref static SelfTangentVectorEnum.zero.getter
 // CHECK:   function_ref @${{.*}}SelfTangentVectorEnumO0B0ACvgZ : $@convention(method) (@thin SelfTangentVectorEnum.Type) -> @owned SelfTangentVectorEnum
 // CHECK: }
 
-// CHECK-LABEL: // closure #8 in CustomTangentVectorEnum.zeroTangentVectorInitializer.getter
-// CHECK-NEXT: sil private [ossa] @$s39derived_zero_tangent_vector_initializer23CustomTangentVectorEnumO0bgH11Initializer0gH0QzycvgAFycfU6_ : $@convention(thin) <T where T : Differentiable> () -> @out T.TangentVector {
+// CHECK-LABEL: // closure #1 in CustomTangentVectorEnum.zeroTangentVectorInitializer.getter
+// CHECK-NEXT: sil private [ossa] @$s39derived_zero_tangent_vector_initializer23CustomTangentVectorEnumO0bgH11Initializer0gH0QzycvgAFycfU_ : $@convention(thin) <T where T : Differentiable> () -> @out T.TangentVector {
 // CHECK:   witness_method $T.TangentVector, #AdditiveArithmetic.zero!getter
 // CHECK: }
diff --git a/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift b/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift
index c9ca868598ce3..9da7d49f7c9de 100644
--- a/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift
+++ b/test/AutoDiff/Sema/DerivedConformances/struct_differentiable.swift
@@ -341,7 +341,6 @@ struct SR_12793: Differentiable {
 }
 
 // Test property wrappers.
-// TF-1190: Test `@noDerivative` warning for property wrapper backing storage properties.
 
 @propertyWrapper
 struct ImmutableWrapper<Value> {
@@ -372,10 +371,13 @@ struct WrappedProperties: Differentiable {
 
   @Wrapper var float: Generic<Float>
   @ClassWrapper var float2: Generic<Float>
+  // SR-13071: Test `@differentiable` wrapped property.
+  @differentiable @Wrapper var float3: Generic<Float>
+
   @noDerivative @ImmutableWrapper var nondiff: Generic<Int>
 
   static func testTangentMemberwiseInitializer() {
-    _ = TangentVector(float: .init(), float2: .init())
+    _ = TangentVector(float: .init(), float2: .init(), float3: .init())
   }
 }
 
diff --git a/test/AutoDiff/Sema/derivative_attr_type_checking.swift b/test/AutoDiff/Sema/derivative_attr_type_checking.swift
index 01d997d14560b..598dc3600879a 100644
--- a/test/AutoDiff/Sema/derivative_attr_type_checking.swift
+++ b/test/AutoDiff/Sema/derivative_attr_type_checking.swift
@@ -1,4 +1,6 @@
-// RUN: %target-swift-frontend-typecheck -verify %s
+// RUN: %target-swift-frontend-typecheck -verify -disable-availability-checking %s
+
+// Swift.AdditiveArithmetic:3:17: note: cannot yet register derivative default implementation for protocol requirements
 
 import _Differentiation
 
@@ -86,7 +88,8 @@ func vjpOriginalFunctionNotFound2(_ x: Float) -> (value: Int, pullback: (Float)
 
 // Test incorrect `@derivative` declaration type.
 
-// expected-note @+1 {{'incorrectDerivativeType' defined here}}
+// expected-note @+2 {{'incorrectDerivativeType' defined here}}
+// expected-note @+1 {{candidate global function does not have expected type '(Int) -> Int'}}
 func incorrectDerivativeType(_ x: Float) -> Float {
   return x
 }
@@ -106,7 +109,7 @@ func vjpResultIncorrectFirstLabel(x: Float) -> (Float, (Float) -> Float) {
 func vjpResultIncorrectSecondLabel(x: Float) -> (value: Float, (Float) -> Float) {
   return (x, { $0 })
 }
-// expected-error @+1 {{could not find function 'incorrectDerivativeType' with expected type '(Int) -> Int'}}
+// expected-error @+1 {{referenced declaration 'incorrectDerivativeType' could not be resolved}}
 @derivative(of: incorrectDerivativeType)
 func vjpResultNotDifferentiable(x: Int) -> (
   value: Int, pullback: (Int) -> Int
@@ -357,6 +360,7 @@ extension Wrapper where T: Differentiable, T == T.TangentVector {
 
 class Super {
   @differentiable
+  // expected-note @+1 {{candidate instance method is not defined in the current type context}}
   func foo(_ x: Float) -> Float {
     return x
   }
@@ -370,7 +374,7 @@ class Super {
 class Sub: Super {
   // TODO(TF-649): Enable `@derivative` to override derivatives for original
   // declaration defined in superclass.
-  // expected-error @+1 {{'foo' is not defined in the current type context}}
+  // expected-error @+1 {{referenced declaration 'foo' could not be resolved}}
   @derivative(of: foo)
   override func vjpFoo(_ x: Float) -> (value: Float, pullback: (Float) -> Float)
   {
@@ -401,16 +405,48 @@ where T: Differentiable & AdditiveArithmetic {
   }
 }
 
+class Class<T> {
+  var x: T
+  init(_ x: T) {
+    self.x = x
+  }
+}
+extension Class: Differentiable where T: Differentiable {}
+
 // Test computed properties.
 
 extension Struct {
-  var computedProperty: T { x }
+  var computedProperty: T {
+    get { x }
+    set { x = newValue }
+    _modify { yield &x }
+  }
 }
 extension Struct where T: Differentiable & AdditiveArithmetic {
   @derivative(of: computedProperty)
   func vjpProperty() -> (value: T, pullback: (T.TangentVector) -> TangentVector) {
     return (x, { v in .init(x: v) })
   }
+  
+  @derivative(of: computedProperty.get)
+  func jvpProperty() -> (value: T, differential: (TangentVector) -> T.TangentVector) {
+    fatalError()
+  }
+  
+  @derivative(of: computedProperty.set)
+  mutating func vjpPropertySetter(_ newValue: T) -> (
+    value: (), pullback: (inout TangentVector) -> T.TangentVector
+  ) {
+    fatalError()
+  }
+
+  // expected-error @+1 {{cannot register derivative for _modify accessor}}
+  @derivative(of: computedProperty._modify)
+  mutating func vjpPropertyModify(_ newValue: T) -> (
+    value: (), pullback: (inout TangentVector) -> T.TangentVector
+  ) {
+    fatalError()
+  }
 }
 
 // Test initializers.
@@ -442,26 +478,133 @@ extension Struct {
     get { 1 }
     set {}
   }
-  subscript(float float: Float) -> Float { 1 }
+
+  subscript(float float: Float) -> Float {
+    get { 1 }
+    set {}
+  }
+
+  // expected-note @+1 {{candidate subscript does not have a setter}}
   subscript<T: Differentiable>(x: T) -> T { x }
 }
 extension Struct where T: Differentiable & AdditiveArithmetic {
+  @derivative(of: subscript.get)
+  func vjpSubscriptGetter() -> (value: Float, pullback: (Float) -> TangentVector) {
+    return (1, { _ in .zero })
+  }
+
+  // expected-error @+2 {{a derivative already exists for '_'}}
+  // expected-note @-6 {{other attribute declared here}}
   @derivative(of: subscript)
   func vjpSubscript() -> (value: Float, pullback: (Float) -> TangentVector) {
     return (1, { _ in .zero })
   }
 
+  @derivative(of: subscript().get)
+  func jvpSubscriptGetter() -> (value: Float, differential: (TangentVector) -> Float) {
+    return (1, { _ in .zero })
+  }
+
+  @derivative(of: subscript(float:).get, wrt: self)
+  func vjpSubscriptLabeledGetter(float: Float) -> (value: Float, pullback: (Float) -> TangentVector)  {
+    return (1, { _ in .zero })
+  }
+
+  // expected-error @+2 {{a derivative already exists for '_'}}
+  // expected-note @-6 {{other attribute declared here}}
   @derivative(of: subscript(float:), wrt: self)
-  func vjpSubscriptLabelled(float: Float) -> (value: Float, pullback: (Float) -> TangentVector) {
+  func vjpSubscriptLabeled(float: Float) -> (value: Float, pullback: (Float) -> TangentVector) {
     return (1, { _ in .zero })
   }
 
+  @derivative(of: subscript(float:).get)
+  func jvpSubscriptLabeledGetter(float: Float) -> (value: Float, differential: (TangentVector, Float) -> Float)   {
+    return (1, { (_,_) in 1})
+  }
+
+  @derivative(of: subscript(_:).get, wrt: self)
+  func vjpSubscriptGenericGetter<T: Differentiable>(x: T) -> (value: T, pullback: (T.TangentVector) -> TangentVector)   {
+    return (x, { _ in .zero })
+  }
+
+  // expected-error @+2 {{a derivative already exists for '_'}}
+  // expected-note @-6 {{other attribute declared here}}
   @derivative(of: subscript(_:), wrt: self)
-  func vjpSubscriptGeneric<T: Differentiable>(x: T) -> (value: T, pullback: (T.TangentVector) -> TangentVector) {
+  func vjpSubscriptGeneric<T: Differentiable>(x: T) -> (value: T, pullback: (T.TangentVector) -> TangentVector)   {
+    return (x, { _ in .zero })
+  }
+
+  @derivative(of: subscript.set)
+  mutating func vjpSubscriptSetter(_ newValue: Float) -> (
+    value: (), pullback: (inout TangentVector) -> Float
+  ) {
+    fatalError()
+  }
+
+  @derivative(of: subscript().set)
+  mutating func jvpSubscriptSetter(_ newValue: Float) -> (
+    value: (), differential: (inout TangentVector, Float) -> ()
+  ) {
+    fatalError()
+  }
+
+  @derivative(of: subscript(float:).set)
+  mutating func vjpSubscriptLabeledSetter(float: Float, newValue: Float) -> (
+    value: (), pullback: (inout TangentVector) -> (Float, Float)
+  ) {
+    fatalError()
+  }
+
+  @derivative(of: subscript(float:).set)
+  mutating func jvpSubscriptLabeledSetter(float: Float, _ newValue: Float) -> (
+    value: (), differential: (inout TangentVector, Float, Float) -> Void
+  ) {
+    fatalError()
+  }
+
+  // Error: original subscript has no setter.
+  // expected-error @+1 {{referenced declaration 'subscript(_:)' could not be resolved}}
+  @derivative(of: subscript(_:).set, wrt: self)
+  mutating func vjpSubscriptGeneric_NoSetter<T: Differentiable>(x: T) -> (
+    value: T, pullback: (T.TangentVector) -> TangentVector
+  ) {
     return (x, { _ in .zero })
   }
 }
 
+extension Class {
+  subscript() -> Float {
+    get { 1 }
+    // expected-note @+1 {{'subscript()' declared here}}
+    set {}
+  }
+}
+extension Class where T: Differentiable {
+  @derivative(of: subscript.get)
+  func vjpSubscriptGetter() -> (value: Float, pullback: (Float) -> TangentVector) {
+    return (1, { _ in .zero })
+  }
+
+  // expected-error @+2 {{a derivative already exists for '_'}}
+  // expected-note @-6 {{other attribute declared here}}
+  @derivative(of: subscript)
+  func vjpSubscript() -> (value: Float, pullback: (Float) -> TangentVector) {
+    return (1, { _ in .zero })
+  }
+
+  // FIXME(SR-13096): Enable derivative registration for class property/subscript setters.
+  // This requires changing derivative type calculation rules for functions with
+  // class-typed parameters. We need to assume that all functions taking
+  // class-typed operands may mutate those operands.
+  // expected-error @+1 {{cannot yet register derivative for class property or subscript setters}}
+  @derivative(of: subscript.set)
+  func vjpSubscriptSetter(_ newValue: Float) -> (
+    value: (), pullback: (inout TangentVector) -> Float
+  ) {
+    fatalError()
+  }
+}
+
 // Test duplicate `@derivative` attribute.
 
 func duplicate(_ x: Float) -> Float { x }
@@ -478,8 +621,10 @@ func jvpDuplicate2(_ x: Float) -> (value: Float, differential: (Float) -> Float)
 
 // Test invalid original declaration kind.
 
+// expected-note @+1 {{candidate var does not have a getter}}
 var globalVariable: Float
-// expected-error @+1 {{'globalVariable' is not a 'func', 'init', 'subscript', or 'var' computed property declaration}}
+
+// expected-error @+1 {{referenced declaration 'globalVariable' could not be resolved}}
 @derivative(of: globalVariable)
 func invalidOriginalDeclaration(x: Float) -> (
   value: Float, differential: (Float) -> (Float)
@@ -491,10 +636,12 @@ func invalidOriginalDeclaration(x: Float) -> (
 
 protocol P1 {}
 protocol P2 {}
+// expected-note @+1 {{candidate global function found here}}
 func ambiguous<T: P1>(_ x: T) -> T { x }
+// expected-note @+1 {{candidate global function found here}}
 func ambiguous<T: P2>(_ x: T) -> T { x }
 
-// expected-error @+1 {{ambiguous reference to 'ambiguous' in '@derivative' attribute}}
+// expected-error @+1 {{referenced declaration 'ambiguous' is ambiguous}}
 @derivative(of: ambiguous)
 func jvpAmbiguous<T: P1 & P2 & Differentiable>(x: T)
   -> (value: T, differential: (T.TangentVector) -> (T.TangentVector))
@@ -506,11 +653,14 @@ func jvpAmbiguous<T: P1 & P2 & Differentiable>(x: T)
 // Original declarations are invalid because they have extra generic
 // requirements unsatisfied by the `@derivative` function.
 
+// expected-note @+1 {{candidate global function does not have type equal to or less constrained than '<T where T : Differentiable> (x: T) -> T'}}
 func invalid<T: BinaryFloatingPoint>(x: T) -> T { x }
+// expected-note @+1 {{candidate global function does not have type equal to or less constrained than '<T where T : Differentiable> (x: T) -> T'}}
 func invalid<T: CustomStringConvertible>(x: T) -> T { x }
+// expected-note @+1 {{candidate global function does not have type equal to or less constrained than '<T where T : Differentiable> (x: T) -> T'}}
 func invalid<T: FloatingPoint>(x: T) -> T { x }
 
-// expected-error @+1 {{could not find function 'invalid' with expected type '<T where T : Differentiable> (x: T) -> T'}}
+// expected-error @+1 {{referenced declaration 'invalid' could not be resolved}}
 @derivative(of: invalid)
 func jvpInvalid<T: Differentiable>(x: T) -> (
   value: T, differential: (T.TangentVector) -> T.TangentVector
@@ -521,9 +671,10 @@ func jvpInvalid<T: Differentiable>(x: T) -> (
 // Test invalid derivative type context: instance vs static method mismatch.
 
 struct InvalidTypeContext<T: Differentiable> {
+  // expected-note @+1 {{candidate static method does not have type equal to or less constrained than '<T where T : Differentiable> (InvalidTypeContext<T>) -> (T) -> T'}}
   static func staticMethod(_ x: T) -> T { x }
 
-  // expected-error @+1 {{could not find function 'staticMethod' with expected type '<T where T : Differentiable> (InvalidTypeContext<T>) -> (T) -> T'}}
+  // expected-error @+1 {{referenced declaration 'staticMethod' could not be resolved}}
   @derivative(of: staticMethod)
   func jvpStatic(_ x: T) -> (
     value: T, differential: (T.TangentVector) -> (T.TangentVector)
@@ -562,13 +713,11 @@ extension HasStoredProperty {
 // TODO(TF-982): Lift this restriction and add proper support.
 
 protocol ProtocolRequirementDerivative {
+  // expected-note @+1 {{cannot yet register derivative default implementation for protocol requirements}}
   func requirement(_ x: Float) -> Float
 }
 extension ProtocolRequirementDerivative {
-  // NOTE: the error is misleading because `findAbstractFunctionDecl` in
-  // TypeCheckAttr.cpp is not setup to show customized error messages for
-  // invalid original function candidates.
-  // expected-error @+1 {{could not find function 'requirement' with expected type '<Self where Self : ProtocolRequirementDerivative> (Self) -> (Float) -> Float'}}
+  // expected-error @+1 {{referenced declaration 'requirement' could not be resolved}}
   @derivative(of: requirement)
   func vjpRequirement(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
     fatalError()
@@ -736,15 +885,19 @@ extension InoutParameters {
 // Test original/derivative function `inout` parameter mismatches.
 
 extension InoutParameters {
+  // expected-note @+1 {{candidate instance method does not have expected type '(InoutParameters) -> (inout Float) -> Void'}}
   func inoutParameterMismatch(_ x: Float) {}
-  // expected-error @+1 {{could not find function 'inoutParameterMismatch' with expected type '(InoutParameters) -> (inout Float) -> Void'}}
+
+  // expected-error @+1 {{referenced declaration 'inoutParameterMismatch' could not be resolved}}
   @derivative(of: inoutParameterMismatch)
   func vjpInoutParameterMismatch(_ x: inout Float) -> (value: Void, pullback: (inout Float) -> Void) {
     fatalError()
   }
 
+  // expected-note @+1 {{candidate instance method does not have expected type '(inout InoutParameters) -> (Float) -> Void'}}
   func mutatingMismatch(_ x: Float) {}
-  // expected-error @+1 {{could not find function 'mutatingMismatch' with expected type '(inout InoutParameters) -> (Float) -> Void'}}
+
+  // expected-error @+1 {{referenced declaration 'mutatingMismatch' could not be resolved}}
   @derivative(of: mutatingMismatch)
   mutating func vjpMutatingMismatch(_ x: Float) -> (value: Void, pullback: (inout Float) -> Void) {
     fatalError()
@@ -765,7 +918,7 @@ extension FloatingPoint where Self: Differentiable {
 }
 
 extension Differentiable where Self: AdditiveArithmetic {
-  // expected-error @+1 {{'+' is not defined in the current type context}}
+  // expected-error @+1 {{referenced declaration '+' could not be resolved}}
   @derivative(of: +)
   static func vjpPlus(x: Self, y: Self) -> (
     value: Self,
@@ -777,7 +930,7 @@ extension Differentiable where Self: AdditiveArithmetic {
 
 extension AdditiveArithmetic
 where Self: Differentiable, Self == Self.TangentVector {
-  // expected-error @+1 {{could not find function '+' with expected type '<Self where Self : Differentiable, Self == Self.TangentVector> (Self) -> (Self, Self) -> Self'}}
+  // expected-error @+1 {{referenced declaration '+' could not be resolved}}
   @derivative(of: +)
   func vjpPlusInstanceMethod(x: Self, y: Self) -> (
     value: Self, pullback: (Self) -> (Self, Self)
@@ -801,13 +954,14 @@ extension HasADefaultImplementation {
 
 // Test default derivatives of requirements.
 protocol HasADefaultDerivative {
+  // expected-note @+1 {{cannot yet register derivative default implementation for protocol requirements}}
   func req(_ x: Float) -> Float
 }
 extension HasADefaultDerivative {
-  // TODO(TF-982): Make this ok.
-  // expected-error @+1 {{could not find function 'req'}}
+  // TODO(TF-982): Support default derivatives for protocol requirements.
+  // expected-error @+1 {{referenced declaration 'req' could not be resolved}}
   @derivative(of: req)
-  func req(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
+  func vjpReq(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
     (x, { 10 * $0 })
   }
 }
@@ -951,3 +1105,62 @@ func internal_original_fileprivate_derivative(_ x: Float) -> Float { x }
 fileprivate func _internal_original_fileprivate_derivative(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
   fatalError()
 }
+
+// Test invalid reference to an accessor of a non-storage declaration.
+
+// expected-note @+1 {{candidate global function does not have a getter}}
+func function(_ x: Float) -> Float {
+  x
+}
+
+// expected-error @+1 {{referenced declaration 'function' could not be resolved}}
+@derivative(of: function(_:).get)
+func vjpFunction(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
+  fatalError()
+}
+
+// Test ambiguity that exists when Type function name is the same
+// as an accessor label.
+
+extension Float {
+  // Original function name conflicts with an accessor name ("set").
+  func set() -> Float {
+    self
+  }
+
+  // Original function name does not conflict with an accessor name.
+  func method() -> Float {
+    self
+  }
+
+  // Test ambiguous parse.
+  // Expected:
+  // - Base type: `Float`
+  // - Declaration name: `set`
+  // - Accessor kind: <none>
+  // Actual:
+  // - Base type: <none>
+  // - Declaration name: `Float`
+  // - Accessor kind: `set`
+  // expected-error @+1 {{cannot find 'Float' in scope}}
+  @derivative(of: Float.set)
+  func jvpSet() -> (value: Float, differential: (Float) -> Float) {
+    fatalError()
+  }
+
+  @derivative(of: Float.method)
+  func jvpMethod() -> (value: Float, differential: (Float) -> Float) {
+    fatalError()
+  }
+}
+
+// Test original function with opaque result type.
+
+// expected-note @+1 {{candidate global function does not have expected type '(Float) -> Float'}}
+func opaqueResult(_ x: Float) -> some Differentiable { x }
+
+// expected-error @+1 {{referenced declaration 'opaqueResult' could not be resolved}}
+@derivative(of: opaqueResult)
+func vjpOpaqueResult(_ x: Float) -> (value: Float, pullback: (Float) -> Float) {
+  fatalError()
+}
diff --git a/test/AutoDiff/Sema/differentiable_attr_type_checking.swift b/test/AutoDiff/Sema/differentiable_attr_type_checking.swift
index 55cdfee43d9c6..a090b5de6a121 100644
--- a/test/AutoDiff/Sema/differentiable_attr_type_checking.swift
+++ b/test/AutoDiff/Sema/differentiable_attr_type_checking.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend-typecheck -verify %s
+// RUN: %target-swift-frontend-typecheck -verify -disable-availability-checking %s
 
 import _Differentiation
 
@@ -697,3 +697,7 @@ struct Accessors: Differentiable {
     _modify { yield &stored }
   }
 }
+
+// expected-error @+1 {{cannot differentiate functions returning opaque result types}}
+@differentiable
+func opaqueResult(_ x: Float) -> some Differentiable { x }
diff --git a/test/AutoDiff/Sema/differentiable_func_type.swift b/test/AutoDiff/Sema/differentiable_func_type.swift
index 77a2b8f71bc75..3cca54f7020f3 100644
--- a/test/AutoDiff/Sema/differentiable_func_type.swift
+++ b/test/AutoDiff/Sema/differentiable_func_type.swift
@@ -175,8 +175,10 @@ extension Vector: Differentiable where T: Differentiable {
   mutating func move(along direction: TangentVector) { fatalError() }
 }
 
+// expected-note@+1 2 {{found this candidate}}
 func inferredConformancesGeneric<T, U>(_: @differentiable (Vector<T>) -> Vector<U>) {}
 
+// expected-note  @+5 2 {{found this candidate}}
 // expected-error @+4 {{generic signature requires types 'Vector<T>' and 'Vector<T>.TangentVector' to be the same}}
 // expected-error @+3 {{generic signature requires types 'Vector<U>' and 'Vector<U>.TangentVector' to be the same}}
 // expected-error @+2 {{parameter type 'Vector<T>' does not conform to 'Differentiable' and satisfy 'Vector<T> == Vector<T>.TangentVector', but the enclosing function type is '@differentiable(linear)'}}
@@ -184,9 +186,13 @@ func inferredConformancesGeneric<T, U>(_: @differentiable (Vector<T>) -> Vector<
 func inferredConformancesGenericLinear<T, U>(_: @differentiable(linear) (Vector<T>) -> Vector<U>) {}
 
 func nondiff(x: Vector<Int>) -> Vector<Int> {}
-// expected-error @+1 {{global function 'inferredConformancesGeneric' requires that 'Int' conform to 'Differentiable}}
+
+// TODO(diagnostics): Ambiguity notes for two following calls should talk about `T` and `U` both not conforming to `Differentiable`
+// but we currently have to way to coalesce notes multiple fixes in to a single note.
+
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGeneric'}}
 inferredConformancesGeneric(nondiff)
-// expected-error @+1 {{global function 'inferredConformancesGenericLinear' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGenericLinear'}}
 inferredConformancesGenericLinear(nondiff)
 
 func diff(x: Vector<Float>) -> Vector<Float> {}
@@ -208,16 +214,16 @@ extension Linear: Differentiable where T: Differentiable, T == T.TangentVector {
   typealias TangentVector = Self
 }
 
-// expected-note @+1 2 {{where 'T' = 'Int'}}
+// expected-note @+1 2 {{found this candidate}}
 func inferredConformancesGeneric<T, U>(_: @differentiable (Linear<T>) -> Linear<U>) {}
 
-// expected-note @+1 2 {{where 'T' = 'Int'}}
+// expected-note @+1 2 {{found this candidate}}
 func inferredConformancesGenericLinear<T, U>(_: @differentiable(linear) (Linear<T>) -> Linear<U>) {}
 
 func nondiff(x: Linear<Int>) -> Linear<Int> {}
-// expected-error @+1 {{global function 'inferredConformancesGeneric' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGeneric'}}
 inferredConformancesGeneric(nondiff)
-// expected-error @+1 {{global function 'inferredConformancesGenericLinear' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGenericLinear'}}
 inferredConformancesGenericLinear(nondiff)
 
 func diff(x: Linear<Float>) -> Linear<Float> {}
diff --git a/test/AutoDiff/Sema/transpose_attr_type_checking.swift b/test/AutoDiff/Sema/transpose_attr_type_checking.swift
index ebacb07a9d054..a49ff941a49d3 100644
--- a/test/AutoDiff/Sema/transpose_attr_type_checking.swift
+++ b/test/AutoDiff/Sema/transpose_attr_type_checking.swift
@@ -174,12 +174,13 @@ func missingSelfRequirementT<T: Differentiable>(x: T) -> T {
   return x
 }
 
+// expected-note @+1 {{candidate global function does not have type equal to or less constrained than '<T where T : Differentiable, T == T.TangentVector> (T) -> T'}}
 func differentGenericConstraint<T: Differentiable & BinaryFloatingPoint>(x: T)
 -> T where T == T.TangentVector {
   return x
 }
 
-// expected-error @+1 {{could not find function 'differentGenericConstraint' with expected type '<T where T : Differentiable, T == T.TangentVector> (T) -> T'}}
+// expected-error @+1 {{referenced declaration 'differentGenericConstraint' could not be resolved}}
 @transpose(of: differentGenericConstraint, wrt: 0)
 func differentGenericConstraintT<T: Differentiable>(x: T)
 -> T where T == T.TangentVector {
@@ -472,6 +473,7 @@ extension Float {
 
 // Test non-`func` original declarations.
 
+// expected-note @+1 {{candidate initializer does not have type equal to or less constrained than '<T where T : Differentiable, T == T.TangentVector> (Struct<T>) -> (Float) -> Struct<T>'}}
 struct Struct<T> {}
 extension Struct: Equatable where T: Equatable {}
 extension Struct: Differentiable & AdditiveArithmetic
@@ -496,7 +498,9 @@ extension Struct where T: Differentiable & AdditiveArithmetic {
 
 // Test initializers.
 extension Struct {
+  // expected-note @+1 {{candidate initializer does not have type equal to or less constrained than '<T where T : Differentiable, T == T.TangentVector> (Struct<T>) -> (Float) -> Struct<T>'}}
   init(_ x: Float) {}
+  // expected-note @+1 {{candidate initializer does not have type equal to or less constrained than '<T where T : Differentiable, T == T.TangentVector> (Struct<T>) -> (Float) -> Struct<T>'}}
   init(_ x: T, y: Float) {}
 }
 
@@ -513,7 +517,7 @@ extension Struct where T: Differentiable, T == T.TangentVector {
 
   // Test instance transpose for static original intializer.
   // TODO(TF-1015): Add improved instance/static member mismatch error.
-  // expected-error @+1 {{could not find function 'init' with expected type '<T where T : Differentiable, T == T.TangentVector> (Struct<T>) -> (Float) -> Struct<T>'}}
+  // expected-error @+1 {{referenced declaration 'init' could not be resolved}}
   @transpose(of: init, wrt: 0)
   func vjpInitStaticMismatch(_ x: Self) -> Float {
     fatalError()
@@ -550,6 +554,7 @@ extension Struct where T: Differentiable & AdditiveArithmetic {
 // Check that `@transpose` attribute rejects stored property original declarations.
 
 struct StoredProperty: Differentiable & AdditiveArithmetic {
+  // expected-note @+1 {{candidate getter does not have expected type '(StoredProperty) -> () -> StoredProperty'}}
   var stored: Float
   typealias TangentVector = StoredProperty
   static var zero: StoredProperty { StoredProperty(stored: 0) }
@@ -563,7 +568,7 @@ struct StoredProperty: Differentiable & AdditiveArithmetic {
   // Note: `@transpose` support for instance members is currently too limited
   // to properly register a transpose for a non-`Self`-typed member.
 
-  // expected-error @+1 {{could not find function 'stored' with expected type '(StoredProperty) -> () -> StoredProperty'}}
+  // expected-error @+1 {{referenced declaration 'stored' could not be resolved}}
   @transpose(of: stored, wrt: self)
   static func vjpStored(v: Self) -> Self {
     fatalError()
diff --git a/test/AutoDiff/Syntax/Outputs/round_trip_parse_gen.swift.withkinds b/test/AutoDiff/Syntax/Outputs/round_trip_parse_gen.swift.withkinds
index b6e782e5afd58..812f2a8e42aa7 100644
--- a/test/AutoDiff/Syntax/Outputs/round_trip_parse_gen.swift.withkinds
+++ b/test/AutoDiff/Syntax/Outputs/round_trip_parse_gen.swift.withkinds
@@ -38,6 +38,18 @@ func bazDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <
   return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
 }</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
 
+@derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>baz<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.set, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>x</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func bazSetDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>y: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
+    -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>baz<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.get, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>x</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func bazGetDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>y: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
+    -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
 @transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>-</QualifiedDeclName></DerivativeRegistrationAttributeArguments>)</Attribute>
 func negateDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
     -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
@@ -56,6 +68,18 @@ func qualifiedDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>
   return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
 }</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
 
+@derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><MemberTypeIdentifier><MemberTypeIdentifier><SimpleTypeIdentifier>A<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>T</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></SimpleTypeIdentifier>.B<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>U</SimpleTypeIdentifier>, </GenericArgument><GenericArgument><SimpleTypeIdentifier>V</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></MemberTypeIdentifier>.C</MemberTypeIdentifier>.foo<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.get, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParam>x</DifferentiabilityParam></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func qualifiedGetDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>y: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
+    -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><MemberTypeIdentifier><MemberTypeIdentifier><SimpleTypeIdentifier>A<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>T</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></SimpleTypeIdentifier>.B<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>U</SimpleTypeIdentifier>, </GenericArgument><GenericArgument><SimpleTypeIdentifier>V</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></MemberTypeIdentifier>.C</MemberTypeIdentifier>.foo<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.set, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParam>x</DifferentiabilityParam></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func qualifiedSetDerivative<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>y: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>)</ParameterClause><ReturnClause>
+    -> <TupleType>(<TupleTypeElement>value: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement>pullback: <FunctionType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionType></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>x</IdentifierExpr>, </TupleExprElement><TupleExprElement><ClosureExpr>{ <ClosureSignature><ClosureParam>v </ClosureParam>in </ClosureSignature><IdentifierExpr>v </IdentifierExpr>}</ClosureExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
 @transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>+</QualifiedDeclName></DerivativeRegistrationAttributeArguments>)</Attribute>
 func addTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_ v: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
   return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><IdentifierExpr>v</IdentifierExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
@@ -71,7 +95,28 @@ func subtractTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_
   return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>v</IdentifierExpr></PrefixOperatorExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
 }</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
 
+@transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>.-</QualifiedDeclName>.get, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>0, </DifferentiabilityParam><DifferentiabilityParam>1</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func subtractGetTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_ v: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>v</IdentifierExpr></PrefixOperatorExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>.-</QualifiedDeclName>.set, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>0, </DifferentiabilityParam><DifferentiabilityParam>1</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func subtractSetTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_ v: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>v</IdentifierExpr></PrefixOperatorExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
 @derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><MemberTypeIdentifier><MemberTypeIdentifier><SimpleTypeIdentifier>A<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>T</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></SimpleTypeIdentifier>.B<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>U</SimpleTypeIdentifier>, </GenericArgument><GenericArgument><SimpleTypeIdentifier>V</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></MemberTypeIdentifier>.C</MemberTypeIdentifier>.foo<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParam>0</DifferentiabilityParam></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
 func qualifiedTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_ v: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
   return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>v</IdentifierExpr></PrefixOperatorExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
-}</CodeBlock></FunctionDecl>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName><MemberTypeIdentifier><MemberTypeIdentifier><SimpleTypeIdentifier>A<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>T</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></SimpleTypeIdentifier>.B<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>U</SimpleTypeIdentifier>, </GenericArgument><GenericArgument><SimpleTypeIdentifier>V</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></MemberTypeIdentifier>.C</MemberTypeIdentifier>.foo<DeclNameArguments>(<DeclNameArgument>label:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.get, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParam>0</DifferentiabilityParam></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func qualifiedGetTranspose<FunctionSignature><ParameterClause>(<FunctionParameter>_ v: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <TupleType>(<TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><SimpleTypeIdentifier>Float</SimpleTypeIdentifier></TupleTypeElement>) </TupleType></ReturnClause></FunctionSignature><CodeBlock>{<ReturnStmt>
+  return <TupleExpr>(<TupleExprElement><IdentifierExpr>v</IdentifierExpr>, </TupleExprElement><TupleExprElement><PrefixOperatorExpr>-<IdentifierExpr>v</IdentifierExpr></PrefixOperatorExpr></TupleExprElement>)</TupleExpr></ReturnStmt>
+}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@derivative(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>subscript<DeclNameArguments>(<DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.set, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>self, </DifferentiabilityParam><DifferentiabilityParam>newValue</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments>)</Attribute>
+func subscriptSetterDerivative<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>
+
+@transpose(<DerivativeRegistrationAttributeArguments>of: <QualifiedDeclName>subscript<DeclNameArguments>(<DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments></QualifiedDeclName>.set, <DifferentiabilityParamsClause>wrt: <DifferentiabilityParams>(<DifferentiabilityParam>self, </DifferentiabilityParam><DifferentiabilityParam>0</DifferentiabilityParam>)</DifferentiabilityParams></DifferentiabilityParamsClause></DerivativeRegistrationAttributeArguments></Attribute>
+func subscriptSetterTranspose<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{}</CodeBlock></FunctionDecl>
\ No newline at end of file
diff --git a/test/AutoDiff/Syntax/round_trip_parse_gen.swift b/test/AutoDiff/Syntax/round_trip_parse_gen.swift
index c71cd77b378dd..3df86a561ebe7 100644
--- a/test/AutoDiff/Syntax/round_trip_parse_gen.swift
+++ b/test/AutoDiff/Syntax/round_trip_parse_gen.swift
@@ -38,6 +38,18 @@ func bazDerivative(_ x: Float, y: Float)
   return (x, { v in v })
 }
 
+@derivative(of: baz(label:_:).set, wrt: (x))
+func bazSetDerivative(_ x: Float, y: Float)
+    -> (value: Float, pullback: (Float) -> Float) {
+  return (x, { v in v })
+}
+
+@derivative(of: baz(label:_:).get, wrt: (x))
+func bazGetDerivative(_ x: Float, y: Float)
+    -> (value: Float, pullback: (Float) -> Float) {
+  return (x, { v in v })
+}
+
 @transpose(of: -)
 func negateDerivative(_ x: Float)
     -> (value: Float, pullback: (Float) -> Float) {
@@ -56,6 +68,18 @@ func qualifiedDerivative(_ x: Float, y: Float)
   return (x, { v in v })
 }
 
+@derivative(of: A<T>.B<U, V>.C.foo(label:_:).get, wrt: x)
+func qualifiedGetDerivative(_ x: Float, y: Float)
+    -> (value: Float, pullback: (Float) -> Float) {
+  return (x, { v in v })
+}
+
+@derivative(of: A<T>.B<U, V>.C.foo(label:_:).set, wrt: x)
+func qualifiedSetDerivative(_ x: Float, y: Float)
+    -> (value: Float, pullback: (Float) -> Float) {
+  return (x, { v in v })
+}
+
 @transpose(of: +)
 func addTranspose(_ v: Float) -> (Float, Float) {
   return (v, v)
@@ -71,7 +95,28 @@ func subtractTranspose(_ v: Float) -> (Float, Float) {
   return (v, -v)
 }
 
+@transpose(of: Float.-.get, wrt: (0, 1))
+func subtractGetTranspose(_ v: Float) -> (Float, Float) {
+  return (v, -v)
+}
+
+@transpose(of: Float.-.set, wrt: (0, 1))
+func subtractSetTranspose(_ v: Float) -> (Float, Float) {
+  return (v, -v)
+}
+
 @derivative(of: A<T>.B<U, V>.C.foo(label:_:), wrt: 0)
 func qualifiedTranspose(_ v: Float) -> (Float, Float) {
   return (v, -v)
 }
+
+@transpose(of: A<T>.B<U, V>.C.foo(label:_:).get, wrt: 0)
+func qualifiedGetTranspose(_ v: Float) -> (Float, Float) {
+  return (v, -v)
+}
+
+@derivative(of: subscript(_:).set, wrt: (self, newValue))
+func subscriptSetterDerivative() {}
+
+@transpose(of: subscript(_:).set, wrt: (self, 0)
+func subscriptSetterTranspose() {}
\ No newline at end of file
diff --git a/test/AutoDiff/compiler_crashers/sr12656-differentiation-opaque-result-type.swift b/test/AutoDiff/compiler_crashers_fixed/sr12656-differentiation-opaque-result-type.swift
similarity index 94%
rename from test/AutoDiff/compiler_crashers/sr12656-differentiation-opaque-result-type.swift
rename to test/AutoDiff/compiler_crashers_fixed/sr12656-differentiation-opaque-result-type.swift
index 703786fcd8031..ed48abb31be0f 100644
--- a/test/AutoDiff/compiler_crashers/sr12656-differentiation-opaque-result-type.swift
+++ b/test/AutoDiff/compiler_crashers_fixed/sr12656-differentiation-opaque-result-type.swift
@@ -1,4 +1,4 @@
-// RUN: not --crash %target-swift-frontend -disable-availability-checking -emit-sil -verify %s
+// RUN: not %target-swift-frontend -disable-availability-checking -emit-sil -verify %s
 // REQUIRES: asserts
 
 // SR-12656: Differentiation transform crashes for original function with opaque
diff --git a/test/AutoDiff/compiler_crashers_fixed/tf1180-silgen-vtable-method-does-not-appear.swift b/test/AutoDiff/compiler_crashers_fixed/tf1180-silgen-vtable-method-does-not-appear.swift
new file mode 100644
index 0000000000000..173cbe66bc55c
--- /dev/null
+++ b/test/AutoDiff/compiler_crashers_fixed/tf1180-silgen-vtable-method-does-not-appear.swift
@@ -0,0 +1,37 @@
+// RUN: %target-swift-frontend -emit-silgen %s
+
+// TF-1180: SIL verification error regarding `@differentiable` class method
+// witnesses for `@differentiable` protocol requirements.
+
+import _Differentiation
+
+protocol Protocol {
+  @differentiable
+  func method(_ x: Float) -> Float
+}
+
+class Class: Protocol {
+  @differentiable
+  public func method(_ x: Float) -> Float { x }
+}
+
+// Original error:
+// SIL verification failed: method does not appear in the class's vtable: VerifyClassMethodVisitor(member).Seen
+// Verifying instruction:
+//      %2 = load_borrow %1 : $*Class                // users: %8, %4, %3
+// ->   %3 = class_method %2 : $Class, #Class.method!jvp.SU.<Self where Self : Protocol> : (Class) -> (Float) -> Float, $@convention(method) (Float, @guaranteed Class) -> (Float, @owned @callee_guaranteed (Float) -> Float) // user: %4
+//      %4 = apply %3(%0, %2) : $@convention(method) (Float, @guaranteed Class) -> (Float, @owned @callee_guaranteed (Float) -> Float) // user: %5
+// In function:
+// // AD__$s4main5ClassCAA8ProtocolA2aDP6methodyS2fFTW_jvp_SU
+// sil private [transparent] [thunk] [ossa] @AD__$s4main5ClassCAA8ProtocolA2aDP6methodyS2fFTW_jvp_SU : $@convention(witness_method: Protocol) (Float, @in_guaranteed Class) -> (Float, @owned @callee_guaranteed (Float) -> Float) {
+// // %0                                             // user: %4
+// // %1                                             // user: %2
+// bb0(%0 : $Float, %1 : $*Class):
+//   %2 = load_borrow %1 : $*Class                   // users: %8, %4, %3
+//   %3 = class_method %2 : $Class, #Class.method!jvp.SU.<Self where Self : Protocol> : (Class) -> (Float) -> Float, $@convention(method) (Float, @guaranteed Class) -> (Float, @owned @callee_guaranteed (Float) -> Float) // user: %4
+//   %4 = apply %3(%0, %2) : $@convention(method) (Float, @guaranteed Class) -> (Float, @owned @callee_guaranteed (Float) -> Float) // user: %5
+//   (%5, %6) = destructure_tuple %4 : $(Float, @callee_guaranteed (Float) -> Float) // users: %7, %7
+//   %7 = tuple (%5 : $Float, %6 : $@callee_guaranteed (Float) -> Float) // user: %9
+//   end_borrow %2 : $Class                          // id: %8
+//   return %7 : $(Float, @callee_guaranteed (Float) -> Float) // id: %9
+// } // end sil function 'AD__$s4main5ClassCAA8ProtocolA2aDP6methodyS2fFTW_jvp_SU'
diff --git a/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb b/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb
index 331955bf4fe39..6a7573f51e4a4 100644
--- a/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb
+++ b/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb
@@ -1,9 +1,9 @@
 // RUN: %target-run-simple-swiftgyb(-Xfrontend -enable-experimental-forward-mode-differentiation)
 // REQUIRES: executable_test
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin.C.tgmath
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/AutoDiff/validation-test/address_only_tangentvector.swift b/test/AutoDiff/validation-test/address_only_tangentvector.swift
new file mode 100644
index 0000000000000..a29556e29cda6
--- /dev/null
+++ b/test/AutoDiff/validation-test/address_only_tangentvector.swift
@@ -0,0 +1,67 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+import StdlibUnittest
+import DifferentiationUnittest
+
+var AddressOnlyTangentVectorTests = TestSuite("AddressOnlyTangentVector")
+
+// TF-1149: Test loadable class type with an address-only `TangentVector` type.
+
+AddressOnlyTangentVectorTests.test("LoadableClassAddressOnlyTangentVector") {
+  final class LoadableClass<T: Differentiable>: Differentiable {
+    @differentiable
+    var stored: T
+
+    @differentiable
+    init(_ stored: T) {
+      self.stored = stored
+    }
+
+    @differentiable
+    func method(_ x: T) -> T {
+      stored
+    }
+  }
+
+  @differentiable
+  func projection<T: Differentiable>(_ s: LoadableClass<T>) -> T {
+    var x = s.stored
+    return x
+  }
+  expectEqual(.init(stored: 1), gradient(at: LoadableClass<Float>(10), in: projection))
+
+  @differentiable
+  func tuple<T: Differentiable>(_ s: LoadableClass<T>) -> T {
+    var tuple = (s, (s, s))
+    return tuple.1.0.stored
+  }
+  expectEqual(.init(stored: 1), gradient(at: LoadableClass<Float>(10), in: tuple))
+
+  @differentiable
+  func conditional<T: Differentiable>(_ s: LoadableClass<T>) -> T {
+    var tuple = (s, (s, s))
+    if false {}
+    return tuple.1.0.stored
+  }
+  expectEqual(.init(stored: 1), gradient(at: LoadableClass<Float>(10), in: conditional))
+
+  @differentiable
+  func loop<T: Differentiable>(_ array: [LoadableClass<T>]) -> T {
+    var result: [LoadableClass<T>] = []
+    for i in withoutDerivative(at: array.indices) {
+      result.append(array[i])
+    }
+    return result[0].stored
+  }
+  expectEqual([.init(stored: 1)], gradient(at: [LoadableClass<Float>(10)], in: loop))
+
+  @differentiable
+  func arrayLiteral<T: Differentiable>(_ s: LoadableClass<T>) -> T {
+    var result: [[LoadableClass<T>]] = [[s, s]]
+    return result[0][1].stored
+  }
+  expectEqual(.init(stored: 1), gradient(at: LoadableClass<Float>(10), in: arrayLiteral))
+}
+
+runAllTests()
diff --git a/test/AutoDiff/validation-test/custom_derivatives.swift b/test/AutoDiff/validation-test/custom_derivatives.swift
index 4ec19f7bd9382..bd3fda6f560a7 100644
--- a/test/AutoDiff/validation-test/custom_derivatives.swift
+++ b/test/AutoDiff/validation-test/custom_derivatives.swift
@@ -2,12 +2,14 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-import Darwin.C
+#if canImport(Darwin)
+  import Darwin.C
+#elseif canImport(Glibc)
+  import Glibc
 #elseif os(Windows)
-import ucrt
+  import ucrt
 #else
-import Glibc
+#error("Unsupported platform")
 #endif
 import DifferentiationUnittest
 
diff --git a/test/AutoDiff/validation-test/derivative_registration.swift b/test/AutoDiff/validation-test/derivative_registration.swift
index 81b761f754047..ec008e55518e1 100644
--- a/test/AutoDiff/validation-test/derivative_registration.swift
+++ b/test/AutoDiff/validation-test/derivative_registration.swift
@@ -100,14 +100,14 @@ extension Wrapper {
   }
 
   @derivative(of: subscript(_:))
-  func _vjpSubscript(_ x: Tracked<Float>)
+  func _vjpSubscriptGetter(_ x: Tracked<Float>)
     -> (value: Tracked<Float>, pullback: (Tracked<Float>) -> (Wrapper.TangentVector, Tracked<Float>)) {
     return (self[x], { v in
       (TangentVector(float: v * x), v * self.float)
     })
   }
 }
-DerivativeRegistrationTests.testWithLeakChecking("Subscript") {
+DerivativeRegistrationTests.testWithLeakChecking("SubscriptGetter") {
   let x: Tracked<Float> = 2
   let wrapper = Wrapper(float: 3)
   let (𝛁wrapper, 𝛁x) = gradient(at: wrapper, x) { wrapper, x in wrapper[x] }
@@ -115,27 +115,82 @@ DerivativeRegistrationTests.testWithLeakChecking("Subscript") {
   expectEqual(3, 𝛁x)
 }
 
+extension Wrapper {
+  subscript() -> Tracked<Float> {
+    get { float }
+    set { float = newValue }
+  }
+
+  @derivative(of: subscript.set)
+  mutating func _vjpSubscriptSetter(_ newValue: Tracked<Float>)
+    -> (value: (), pullback: (inout TangentVector) -> Tracked<Float>) {
+    return ((), { dself in
+      // Note: pullback is hardcoded to set `dself.float = 100` and to return `dnewValue = 200`.
+      dself.float = 100
+      return 200
+    })
+  }
+}
+DerivativeRegistrationTests.testWithLeakChecking("SubscriptSetter") {
+  // A function wrapper around `Wrapper.subscript().set`.
+  func testSubscriptSet(_ wrapper: Wrapper, _ newValue: Tracked<Float>) -> Wrapper {
+    var result = wrapper
+    result[] = newValue
+    return result
+  }
+
+  let x: Tracked<Float> = 2
+  let wrapper = Wrapper(float: 3)
+  let (𝛁wrapper, 𝛁x) = pullback(at: wrapper, x, in: testSubscriptSet)(.init(float: 10))
+  expectEqual(Wrapper.TangentVector(float: 100), 𝛁wrapper)
+  expectEqual(200, 𝛁x)
+}
+
 extension Wrapper {
   var computedProperty: Tracked<Float> {
     @_semantics("autodiff.opaque")
     get { float * float }
-    set {}
+    set { float = newValue }
   }
 
   @derivative(of: computedProperty)
-  func _vjpComputedProperty()
+  func _vjpComputedPropertyGetter()
     -> (value: Tracked<Float>, pullback: (Tracked<Float>) -> Wrapper.TangentVector) {
     return (computedProperty, { [f = self.float] v in
       TangentVector(float: v * (f + f))
     })
   }
+
+  @derivative(of: computedProperty.set)
+  mutating func _vjpComputedPropertySetter(_ newValue: Tracked<Float>)
+    -> (value: (), pullback: (inout TangentVector) -> Tracked<Float>) {
+    return ((), { dself in
+      // Note: pullback is hardcoded to set `dself.float = 100` and to return `dnewValue = 200`.
+      dself.float = 100
+      return 200
+    })
+  }
 }
-DerivativeRegistrationTests.testWithLeakChecking("ComputedProperty") {
+DerivativeRegistrationTests.testWithLeakChecking("ComputedPropertyGetter") {
   let wrapper = Wrapper(float: 3)
   let 𝛁wrapper = gradient(at: wrapper) { wrapper in wrapper.computedProperty }
   expectEqual(Wrapper.TangentVector(float: 6), 𝛁wrapper)
 }
 
+DerivativeRegistrationTests.testWithLeakChecking("ComputedPropertySetter") {
+  // A function wrapper around `Wrapper.computedProperty.set`.
+  func testComputedPropertySet(_ wrapper: Wrapper, _ newValue: Tracked<Float>) -> Wrapper {
+    var result = wrapper
+    result.computedProperty = newValue
+    return result
+  }
+  let x: Tracked<Float> = 2
+  let wrapper = Wrapper(float: 3)
+  let (𝛁wrapper, 𝛁x) = pullback(at: wrapper, x, in: testComputedPropertySet)(.init(float: 10))
+  expectEqual(Wrapper.TangentVector(float: 100), 𝛁wrapper)
+  expectEqual(200, 𝛁x)
+}
+
 struct Generic<T> {
   @differentiable // derivative generic signature: none
   func instanceMethod(_ x: Tracked<Float>) -> Tracked<Float> {
diff --git a/test/AutoDiff/validation-test/forward_mode.swift b/test/AutoDiff/validation-test/forward_mode.swift
index 14bd1e38d00e7..22b049158c432 100644
--- a/test/AutoDiff/validation-test/forward_mode.swift
+++ b/test/AutoDiff/validation-test/forward_mode.swift
@@ -746,7 +746,7 @@ ForwardModeTests.test("SimpleWrtSelf") {
     // FIXME(TF-648): Dummy to make `Super.AllDifferentiableVariables` be nontrivial.
     var _nontrivial: [Float] = []
 
-    // FIXME(SR-12175): Fix forward-mode differentiation crash.
+    // FIXME(SR-12175): Fix forward-mode differentiation tangent buffer crash.
     // @differentiable
     required init(base: Float) {
       self.base = base
@@ -792,7 +792,7 @@ ForwardModeTests.test("SimpleWrtSelf") {
     }
   }
 
-  // FIXME(SR-12175): Fix forward-mode differentiation crash.
+    // FIXME(SR-12175): Fix forward-mode differentiation tangent buffer crash.
   // let v = Super.TangentVector(base: 100, _nontrivial: [])
   // expectEqual(100, pullback(at: 1337) { x in Super(base: x) }(v))
   // expectEqual(100, pullback(at: 1337) { x in SubOverride(base: x) }(v))
@@ -1064,12 +1064,80 @@ ForwardModeTests.test("FunctionCall") {
 }
 
 ForwardModeTests.test("ResultSelection") {
-  func foo(_ x: Float, _ y: Float) -> (Float, Float) {
+  func tuple(_ x: Float, _ y: Float) -> (Float, Float) {
     return (x + 1, y + 2)
   }
-  expectEqual(1, derivative(at: 3, 3, in: { x, y in foo(x, y).0 }))
-  expectEqual(1, derivative(at: 3, 3, in: { x, y in foo(x, y).1 }))
+  expectEqual(1, derivative(at: 3, 3, in: { x, y in tuple(x, y).0 }))
+  expectEqual(1, derivative(at: 3, 3, in: { x, y in tuple(x, y).1 }))
+
+  // FIXME(SR-12175): Fix forward-mode differentiation tangent buffer crash.
+  /*
+  func tupleGeneric<T>(_ x: T, _ y: T) -> (T, T) {
+    return (x, y)
+  }
+  func tupleGenericFirst<T>(_ x: T, _ y: T) -> T { tupleGeneric(x, y).0 }
+  func tupleGenericSecond<T>(_ x: T, _ y: T) -> T { tupleGeneric(x, y).1 }
+  expectEqual(1, derivative(at: 3, 3, in: tupleGenericFirst))
+  expectEqual(1, derivative(at: 3, 3, in: tupleGenericSecond))
+  */
+}
+
+// TODO(TF-983): Support forward-mode differentiation of multiple results.
+/*
+ForwardModeTests.test("MultipleResults") {
+  // Test function returning a tuple of active results.
+  func tuple(_ x: Float, _ y: Float) -> (Float, Float) {
+    return (x, y)
+  }
+  func multiply(_ x: Float, _ y: Float) -> Float {
+    let z = tuple(x, y)
+    // Note: both results (tuple elements) are active.
+    return z.0 * z.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply))
+
+  // Test function with multiple `inout` parameters.
+  func swap(_ x: inout Float, _ y: inout Float) {
+    let tmp = x; x = y; y = tmp
+  }
+  func multiply_swap(_ x: Float, _ y: Float) -> Float {
+    var tuple = (x, y)
+    swap(&tuple.0, &tuple.1)
+    return tuple.0 * tuple.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swap))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply_swap))
+
+  // Test function with multiple `inout` parameters.
+  func swapGeneric<T>(_ x: inout T, _ y: inout T) {
+    let tmp = x; x = y; y = tmp
+  }
+  func multiply_swapGeneric(_ x: Float, _ y: Float) -> Float {
+    var tuple = (x, y)
+    swapGeneric(&tuple.0, &tuple.1)
+    return tuple.0 * tuple.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapGeneric))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply_swapGeneric))
+
+  // Test function with multiple `inout` parameters and a formal result.
+  func swapAndReturnProduct(_ x: inout Float, _ y: inout Float) -> Float {
+    let tmp = x
+    x = y
+    y = tmp
+    return x * y
+  }
+  func multiply_swapAndReturnProduct(_ x: Float, _ y: Float) -> Float {
+    var x2 = x
+    var y2 = y
+    let result = swapAndReturnProduct(&x2, &y2)
+    return result
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapAndReturnProduct))
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapAndReturnProduct))
 }
+*/
 
 ForwardModeTests.test("CaptureLocal") {
   let z: Float = 10
diff --git a/test/AutoDiff/validation-test/property_wrappers.swift b/test/AutoDiff/validation-test/property_wrappers.swift
index 3ac24a8427b3d..5afd32f2e791b 100644
--- a/test/AutoDiff/validation-test/property_wrappers.swift
+++ b/test/AutoDiff/validation-test/property_wrappers.swift
@@ -98,10 +98,7 @@ PropertyWrapperTests.test("GenericStruct") {
   */
 }
 
-// FIXME(TF-1149): Cannot differentiate active value with loadable type but
-// address-only tangent type. Triggered by marking properties with
-// `@differentiable`, which triggers derivative vtable thunk entries.
-/*
+// TF-1149: Test class with loadable type but address-only `TangentVector` type.
 class Class: Differentiable {
   @differentiable
   @Wrapper @Wrapper var x: Tracked<Float> = 10
@@ -124,8 +121,15 @@ PropertyWrapperTests.test("SimpleClass") {
     c.x = c.x * x * c.z
     return c.x
   }
+  // FIXME(TF-1175): Class operands should always be marked active.
+  // This is relevant for `Class.x.setter`, which has type
+  // `$@convention(method) (@in Tracked<Float>, @guaranteed Class) -> ()`.
+  expectEqual((.init(x: 1, y: 0, z: 0), 0),
+              gradient(at: Class(), 2, in: setter))
+  /*
   expectEqual((.init(x: 60, y: 0, z: 20), 300),
               gradient(at: Class(), 2, in: setter))
+  */
 
   // TODO(SR-12640): Support `modify` accessors.
   /*
@@ -138,7 +142,6 @@ PropertyWrapperTests.test("SimpleClass") {
               gradient(at: Class(), 2, in: modify))
   */
 }
-*/
 
 // From: https://github.com/apple/swift-evolution/blob/master/proposals/0258-property-wrappers.md#proposed-solution
 // Tests the following functionality:
diff --git a/test/AutoDiff/validation-test/separate_tangent_type.swift b/test/AutoDiff/validation-test/separate_tangent_type.swift
index 61b323cd3a3d3..a39a3d39c14a6 100644
--- a/test/AutoDiff/validation-test/separate_tangent_type.swift
+++ b/test/AutoDiff/validation-test/separate_tangent_type.swift
@@ -2,13 +2,16 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-import Darwin.C
+#if canImport(Darwin)
+  import Darwin.C
+#elseif canImport(Glibc)
+  import Glibc
 #elseif os(Windows)
-import ucrt
+  import ucrt
 #else
-import Glibc
+#error("Unsupported platform")
 #endif
+
 import DifferentiationUnittest
 
 var SeparateTangentTypeTests = TestSuite("SeparateTangentType")
diff --git a/test/AutoDiff/validation-test/simple_math.swift b/test/AutoDiff/validation-test/simple_math.swift
index 68c4ce442d550..d96332c5f4941 100644
--- a/test/AutoDiff/validation-test/simple_math.swift
+++ b/test/AutoDiff/validation-test/simple_math.swift
@@ -1,7 +1,11 @@
 // RUN: %target-run-simple-swift
+
 // NOTE(TF-813): verify that enabling forward-mode does not affect reverse-mode.
-// RUN: %target-run-simple-swift(-Xfrontend -enable-experimental-forward-mode-differentiation)
+// Temporarily disabled because forward-mode is not at feature parity with reverse-mode.
+// UN: %target-run-simple-swift(-Xfrontend -enable-experimental-forward-mode-differentiation)
+
 // RUN: %target-swift-frontend -Xllvm -sil-print-after=differentiation %s -emit-sil -o /dev/null -module-name null 2>&1 | %FileCheck %s
+
 // REQUIRES: executable_test
 
 import StdlibUnittest
@@ -48,11 +52,73 @@ SimpleMathTests.test("FunctionCall") {
 }
 
 SimpleMathTests.test("ResultSelection") {
-  func foo(_ x: Float, _ y: Float) -> (Float, Float) {
+  func tuple(_ x: Float, _ y: Float) -> (Float, Float) {
     return (x + 1, y + 2)
   }
-  expectEqual((1, 0), gradient(at: 3, 3, in: { x, y in foo(x, y).0 }))
-  expectEqual((0, 1), gradient(at: 3, 3, in: { x, y in foo(x, y).1 }))
+  expectEqual((1, 0), gradient(at: 3, 3, in: { x, y in tuple(x, y).0 }))
+  expectEqual((0, 1), gradient(at: 3, 3, in: { x, y in tuple(x, y).1 }))
+
+  func tupleGeneric<T>(_ x: T, _ y: T) -> (T, T) {
+    return (x, y)
+  }
+  func tupleGenericFirst<T>(_ x: T, _ y: T) -> T { tupleGeneric(x, y).0 }
+  func tupleGenericSecond<T>(_ x: T, _ y: T) -> T { tupleGeneric(x, y).1 }
+  expectEqual((1, 0), gradient(at: 3, 3, in: tupleGenericFirst))
+  expectEqual((0, 1), gradient(at: 3, 3, in: tupleGenericSecond))
+}
+
+SimpleMathTests.test("MultipleResults") {
+  // Test function returning a tuple of active results.
+  func tuple(_ x: Float, _ y: Float) -> (Float, Float) {
+    return (x, y)
+  }
+  func multiply(_ x: Float, _ y: Float) -> Float {
+    let z = tuple(x, y)
+    // Note: both results (tuple elements) are active.
+    return z.0 * z.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply))
+
+  // Test function with multiple `inout` parameters.
+  func swap(_ x: inout Float, _ y: inout Float) {
+    let tmp = x; x = y; y = tmp
+  }
+  func multiply_swap(_ x: Float, _ y: Float) -> Float {
+    var tuple = (x, y)
+    swap(&tuple.0, &tuple.1)
+    return tuple.0 * tuple.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swap))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply_swap))
+
+  // Test function with multiple `inout` parameters.
+  func swapGeneric<T>(_ x: inout T, _ y: inout T) {
+    let tmp = x; x = y; y = tmp
+  }
+  func multiply_swapGeneric(_ x: Float, _ y: Float) -> Float {
+    var tuple = (x, y)
+    swapGeneric(&tuple.0, &tuple.1)
+    return tuple.0 * tuple.1
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapGeneric))
+  expectEqual((10, 5), gradient(at: 5, 10, in: multiply_swapGeneric))
+
+  // Test function with multiple `inout` parameters and a formal result.
+  func swapAndReturnProduct(_ x: inout Float, _ y: inout Float) -> Float {
+    let tmp = x
+    x = y
+    y = tmp
+    return x * y
+  }
+  func multiply_swapAndReturnProduct(_ x: Float, _ y: Float) -> Float {
+    var x2 = x
+    var y2 = y
+    let result = swapAndReturnProduct(&x2, &y2)
+    return result
+  }
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapAndReturnProduct))
+  expectEqual((4, 3), gradient(at: 3, 4, in: multiply_swapAndReturnProduct))
 }
 
 SimpleMathTests.test("CaptureLocal") {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b29d88e60f575..d647ae51cd046 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -43,10 +43,23 @@ function(get_test_dependencies SDK result_var_name)
 
   if (SWIFT_INCLUDE_TOOLS)
     list(APPEND deps_binaries
-      swift swift-ide-test swift-syntax-test sil-opt swift-llvm-opt swift-demangle
-      sil-func-extractor sil-llvm-gen sil-nm sil-passpipeline-dumper
-      lldb-moduleimport-test swift-reflection-dump swift-remoteast-test
-      swift-api-digester swift-refactor swift-demangle-yamldump)
+      lldb-moduleimport-test
+      sil-func-extractor
+      sil-llvm-gen
+      sil-nm
+      sil-opt
+      sil-passpipeline-dumper
+      swift-frontend
+      swift-api-digester
+      swift-demangle
+      swift-demangle-yamldump
+      swift-dependency-tool
+      swift-ide-test
+      swift-llvm-opt
+      swift-refactor
+      swift-reflection-dump
+      swift-remoteast-test
+      swift-syntax-test)
 
     if(SWIFT_BUILD_SYNTAXPARSERLIB)
       list(APPEND deps_binaries swift-syntax-parser-test)
diff --git a/test/ClangImporter/CoreGraphics_test.swift b/test/ClangImporter/CoreGraphics_test.swift
index 017265f52a220..ef16031857079 100644
--- a/test/ClangImporter/CoreGraphics_test.swift
+++ b/test/ClangImporter/CoreGraphics_test.swift
@@ -4,6 +4,7 @@
 import CoreGraphics
 
 // REQUIRES: OS=macosx
+// REQUIRES: CPU=x86_64
 
 // CHECK: [[SWITCHTABLE:@.*]] = private unnamed_addr constant [8 x i64] [i64 0, i64 12, i64 23, i64 34, i64 45, i64 55, i64 67, i64 71]
 
diff --git a/test/ClangImporter/Inputs/custom-modules/MacOSVersionCanonicalization.h b/test/ClangImporter/Inputs/custom-modules/MacOSVersionCanonicalization.h
new file mode 100644
index 0000000000000..b0b02c20e999b
--- /dev/null
+++ b/test/ClangImporter/Inputs/custom-modules/MacOSVersionCanonicalization.h
@@ -0,0 +1,11 @@
+__attribute__((availability(macosx,introduced=10.16)))
+void FunctionIntroducedIn10_16();
+
+__attribute__((availability(macosx,introduced=11.0)))
+void FunctionIntroducedIn11_0();
+
+__attribute__((availability(macosx_app_extension,introduced=10.16)))
+void FunctionIntroducedIn10_16AppExt();
+
+__attribute__((availability(macosx_app_extension,introduced=11.0)))
+void FunctionIntroducedIn11_0AppExt();
diff --git a/test/ClangImporter/Inputs/custom-modules/module.map b/test/ClangImporter/Inputs/custom-modules/module.map
index 6c4612efb44c0..b66f030963f97 100644
--- a/test/ClangImporter/Inputs/custom-modules/module.map
+++ b/test/ClangImporter/Inputs/custom-modules/module.map
@@ -221,6 +221,10 @@ module BlocksReturningBool {
   header "BlocksReturningBool.h"
 }
 
+module MacOSVersionCanonicalization {
+  header "MacOSVersionCanonicalization.h"
+}
+
 module Warnings1 { header "Warnings1.h" }
 module Warnings2 { header "Warnings2.h" }
 module Warnings3 { header "Warnings3.h" }
diff --git a/test/ClangImporter/availability_implicit_macosx.swift b/test/ClangImporter/availability_implicit_macosx.swift
index 71713bf1fff27..158a321fd06d5 100644
--- a/test/ClangImporter/availability_implicit_macosx.swift
+++ b/test/ClangImporter/availability_implicit_macosx.swift
@@ -1,5 +1,5 @@
-// RUN: %swift -typecheck -verify -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift
-// RUN: not %swift -typecheck -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
+// RUN: %swift -typecheck -verify -target %target-cpu-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift
+// RUN: not %swift -typecheck -target %target-cpu-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s %S/Inputs/availability_implicit_macosx_other.swift 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
 
 // REQUIRES: OS=macosx
 
diff --git a/test/ClangImporter/availability_macosx_canonical_versions.swift b/test/ClangImporter/availability_macosx_canonical_versions.swift
new file mode 100644
index 0000000000000..29e6dd40dbd4b
--- /dev/null
+++ b/test/ClangImporter/availability_macosx_canonical_versions.swift
@@ -0,0 +1,13 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target x86_64-apple-macosx10.15 %s
+
+// REQUIRES: OS=macosx
+
+import MacOSVersionCanonicalization
+
+FunctionIntroducedIn10_16()
+// expected-error@-1 {{'FunctionIntroducedIn10_16()' is only available in macOS 11.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn11_0()
+// expected-error@-1 {{'FunctionIntroducedIn11_0()' is only available in macOS 11.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
diff --git a/test/ClangImporter/availability_macosx_canonical_versions_appext.swift b/test/ClangImporter/availability_macosx_canonical_versions_appext.swift
new file mode 100644
index 0000000000000..b6357e8a553a5
--- /dev/null
+++ b/test/ClangImporter/availability_macosx_canonical_versions_appext.swift
@@ -0,0 +1,13 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -target x86_64-apple-macosx10.15 -application-extension %s
+
+// REQUIRES: OS=macosx
+
+import MacOSVersionCanonicalization
+
+FunctionIntroducedIn10_16AppExt()
+// expected-error@-1 {{'FunctionIntroducedIn10_16AppExt()' is only available in application extensions for macOS 11.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
+
+FunctionIntroducedIn11_0AppExt()
+// expected-error@-1 {{'FunctionIntroducedIn11_0AppExt()' is only available in application extensions for macOS 11.0 or newer}}
+// expected-note@-2 {{add 'if #available' version check}}
diff --git a/test/ClangImporter/availability_returns_twice.swift b/test/ClangImporter/availability_returns_twice.swift
index 35b3ccba5a590..b54a15de2008f 100644
--- a/test/ClangImporter/availability_returns_twice.swift
+++ b/test/ClangImporter/availability_returns_twice.swift
@@ -5,10 +5,10 @@
 // XFAIL: OS=linux-android
 // XFAIL: OS=openbsd
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
   typealias JumpBuffer = Int32
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
   typealias JumpBuffer = jmp_buf
 #else
diff --git a/test/ClangImporter/bad-deployment-target.swift b/test/ClangImporter/bad-deployment-target.swift
index 47d0bfa934d34..3e60703a55a5c 100644
--- a/test/ClangImporter/bad-deployment-target.swift
+++ b/test/ClangImporter/bad-deployment-target.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -target x86_64-apple-macosx10.8 %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -target %target-cpu-apple-macosx10.8 %s
 //
 // This test ensures that a -target that is too old for the standard library
 // will not crash in the ClangImporter.
diff --git a/test/ClangImporter/cfuncs_parse.swift b/test/ClangImporter/cfuncs_parse.swift
index 5863fdb13bbce..d522b9d656c1f 100644
--- a/test/ClangImporter/cfuncs_parse.swift
+++ b/test/ClangImporter/cfuncs_parse.swift
@@ -72,7 +72,7 @@ func test_powl() {
 }
 #endif
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 func test_f16() {
   var x = Float16.zero
   f16ptrfunc(&x)
diff --git a/test/ClangImporter/clang_builtins.swift b/test/ClangImporter/clang_builtins.swift
index c534db2ee15c2..07557df68b723 100644
--- a/test/ClangImporter/clang_builtins.swift
+++ b/test/ClangImporter/clang_builtins.swift
@@ -1,8 +1,8 @@
 // RUN: not %target-swift-frontend -typecheck %s 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-%target-runtime %s
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -24,7 +24,7 @@ func test() {
   // CHECK: [[@LINE-1]]:16: error: cannot convert value of type '({{.+}}) -> Int'{{( [(]aka .+[)])?}} to specified type 'Int'
 }
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 // These functions aren't consistently available across platforms, so only
 // test for them on Apple platforms.
 func testApple() {
diff --git a/test/ClangImporter/enum-with-target.swift b/test/ClangImporter/enum-with-target.swift
index 334276c10ae07..35d26fef25b1e 100644
--- a/test/ClangImporter/enum-with-target.swift
+++ b/test/ClangImporter/enum-with-target.swift
@@ -1,5 +1,5 @@
-// RUN: %swift %clang-importer-sdk -target x86_64-apple-macosx10.51 -typecheck %s -verify
-// RUN: %swift %clang-importer-sdk -target x86_64-apple-macosx10.52 -typecheck %s -verify
+// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx10.51 -typecheck %s -verify
+// RUN: %swift %clang-importer-sdk -target %target-cpu-apple-macosx10.52 -typecheck %s -verify
 
 // REQUIRES: OS=macosx
 import Foundation
diff --git a/test/ClangImporter/objc_factory_method.swift b/test/ClangImporter/objc_factory_method.swift
index cef3cae8707a2..4fcfb4d9e7d38 100644
--- a/test/ClangImporter/objc_factory_method.swift
+++ b/test/ClangImporter/objc_factory_method.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %build-clang-importer-objc-overlays
 
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -target x86_64-apple-macosx10.51 -typecheck %s -verify
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -target %target-cpu-apple-macosx10.51 -typecheck %s -verify
 
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
diff --git a/test/ClangImporter/objc_ir.swift b/test/ClangImporter/objc_ir.swift
index a817410b52c29..52adc62aa6c07 100644
--- a/test/ClangImporter/objc_ir.swift
+++ b/test/ClangImporter/objc_ir.swift
@@ -34,7 +34,7 @@ func instanceMethods(_ b: B) {
 func extensionMethods(b b: B) {
   // CHECK:      load i8*, i8** @"\01L_selector(method:separateExtMethod:)", align 8
   // CHECK:      [[T0:%.*]] = call i8* bitcast (void ()* @objc_msgSend to i8*
-  // CHECK-NEXT: [[T1:%.*]] = {{.*}}call i8* @llvm.objc.retainAutoreleasedReturnValue(i8* [[T0]])
+  // CHECK:      [[T1:%.*]] = {{.*}}call i8* @llvm.objc.retainAutoreleasedReturnValue(i8* [[T0]])
   // CHECK-NOT:  [[T0]]
   // CHECK:      [[T1]]
   b.method(1, separateExtMethod:1.5)
diff --git a/test/Compatibility/exhaustive_switch.swift b/test/Compatibility/exhaustive_switch.swift
index 43df960728f50..ca51f109f891c 100644
--- a/test/Compatibility/exhaustive_switch.swift
+++ b/test/Compatibility/exhaustive_switch.swift
@@ -1119,7 +1119,7 @@ enum UnavailableCaseOSSpecific {
   case a
   case b
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   @available(macOS, unavailable)
   @available(iOS, unavailable)
   @available(tvOS, unavailable)
diff --git a/test/Constraints/argument_matching.swift b/test/Constraints/argument_matching.swift
index f316c06dab41a..1a8a1984faf1a 100644
--- a/test/Constraints/argument_matching.swift
+++ b/test/Constraints/argument_matching.swift
@@ -1465,27 +1465,24 @@ _ = acceptTuple2(tuple1)
 _ = acceptTuple2((1, "hello", 3.14159))
 
 
-func generic_and_missing_label(x: Int) {}
-func generic_and_missing_label<T>(x: T) {}
+func generic_and_missing_label(x: Int) {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(x:)')}}
+func generic_and_missing_label<T>(x: T) {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(x:)')}}
 
 generic_and_missing_label(42)
-// expected-error@-1 {{missing argument label 'x:' in call}} {{27-27=x: }}
+// expected-error@-1 {{no exact matches in call to global function 'generic_and_missing_label'}}
 
 // -------------------------------------------
 // Curried functions
 // -------------------------------------------
-
 func f7(_ a: Int) -> (_ b: Int) -> Int {
   return { b in a+b }
 }
 
 _ = f7(1)(1)
 f7(1.0)(2)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
 f7(1)(1.0)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 f7(1)(b: 1.0)    // expected-error{{extraneous argument label 'b:' in call}}
 // expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
 let f10 = f7(2)
 _ = f10(1)
 f10(10)          // expected-warning {{result of call to function returning 'Int' is unused}}
@@ -1493,7 +1490,6 @@ f10(1.0)         // expected-error {{cannot convert value of type 'Double' to ex
 f10(b: 1.0)         // expected-error {{extraneous argument label 'b:' in call}}
 // expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 
-
 class CurriedClass {
   func method1() {}
   func method2(_ a: Int) -> (_ b : Int) -> () { return { b in () } }
@@ -1513,13 +1509,11 @@ c.method2(1)(2.0) // expected-error {{cannot convert value of type 'Double' to e
 c.method2(1.0)(2) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 c.method2(1.0)(2.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 // expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
 CurriedClass.method1(c)()
 _ = CurriedClass.method1(c)
 CurriedClass.method1(c)(1)         // expected-error {{argument passed to call that takes no arguments}}
 CurriedClass.method1(2.0)(1)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'CurriedClass'}}
 // expected-error@-1:27 {{argument passed to call that takes no arguments}}
-
 CurriedClass.method2(c)(32)(b: 1) // expected-error{{extraneous argument label 'b:' in call}}
 _ = CurriedClass.method2(c)
 _ = CurriedClass.method2(c)(32)
@@ -1530,7 +1524,6 @@ CurriedClass.method2(c)(1.0)(b: 1) // expected-error {{cannot convert value of t
 CurriedClass.method2(c)(1)(1.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 CurriedClass.method2(c)(2)(c: 1.0) // expected-error {{extraneous argument label 'c:'}}
 // expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
 CurriedClass.method3(c)(32, b: 1)
 _ = CurriedClass.method3(c)
 _ = CurriedClass.method3(c)(1, 2)        // expected-error {{missing argument label 'b:' in call}} {{32-32=b: }}
@@ -1543,7 +1536,6 @@ CurriedClass.method3(c)(c: 1.0)          // expected-error {{incorrect argument
 // expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 // expected-error@-2 {{missing argument for parameter #1 in call}}
 
-
 extension CurriedClass {
   func f() {
     method3(1, b: 2)
@@ -1557,64 +1549,51 @@ extension CurriedClass {
 
 extension CurriedClass {
   func m1(_ a : Int, b : Int) {}
-  
+
   func m2(_ a : Int) {}
 }
 
 // <rdar://problem/23718816> QoI: "Extra argument" error when accidentally currying a method
 CurriedClass.m1(2, b: 42)   // expected-error {{instance member 'm1' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
 
-
 // <rdar://problem/22108559> QoI: Confusing error message when calling an instance method as a class method
 CurriedClass.m2(12)  // expected-error {{instance member 'm2' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
-
 // -------------------------------------------
 // Multiple label errors
 // -------------------------------------------
-
 func testLabelErrorsBasic() {
   func f(_ aa: Int, _ bb: Int, cc: Int, dd: Int, ee: Int, ff: Int) {}
 
   // 1 wrong
   f(0, 1, ccx: 2, dd: 3, ee: 4, ff: 5)
   // expected-error@-1 {{incorrect argument label in call (have '_:_:ccx:dd:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{none}}
-
   // 1 missing
   f(0, 1, 2, dd: 3, ee: 4, ff: 5)
   // expected-error@-1 {{missing argument label 'cc:' in call}} {{11-11=cc: }} {{none}}
-
   // 1 extra
   f(aa: 0, 1, cc: 2, dd: 3, ee: 4, ff: 5)
   // expected-error@-1 {{extraneous argument label 'aa:' in call}} {{5-9=}} {{none}}
-
   // 1 ooo
   f(0, 1, dd: 3, cc: 2, ee: 4, ff: 5)
   // expected-error@-1 {{argument 'cc' must precede argument 'dd'}} {{16-23=}} {{11-11=cc: 2, }} {{none}}
-
   // 2 wrong
   f(0, 1, ccx: 2, ddx: 3, ee: 4, ff: 5)
   // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:ddx:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{19-22=dd}} {{none}}
-
   // 2 missing
   f(0, 1, 2, 3, ee: 4, ff: 5)
   // expected-error@-1 {{missing argument labels 'cc:dd:' in call}} {{11-11=cc: }} {{14-14=dd: }} {{none}}
-
   // 2 extra
   f(aa: 0, bb: 1, cc: 2, dd: 3, ee: 4, ff: 5)
   // expected-error@-1 {{extraneous argument labels 'aa:bb:' in call}} {{5-9=}} {{12-16=}} {{none}}
-
   // 2 ooo
   f(0, 1, dd: 3, cc: 2, ff: 5, ee: 4)
   // expected-error@-1 {{argument 'cc' must precede argument 'dd'}} {{16-23=}} {{11-11=cc: 2, }} {{none}}
-
   // 1 wrong + 1 missing
   f(0, 1, ccx: 2, 3, ee: 4, ff: 5)
   // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:_:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{19-19=dd: }} {{none}}
-
   // 1 wrong + 1 extra
   f(aa: 0, 1, ccx: 2, dd: 3, ee: 4, ff: 5)
   // expected-error@-1 {{incorrect argument labels in call (have 'aa:_:ccx:dd:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{5-9=}} {{15-18=cc}} {{none}}
-
   // 1 wrong + 1 ooo
   f(0, 1, ccx: 2, dd: 3, ff: 5, ee: 4)
   // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:dd:ff:ee:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{26-28=ee}} {{33-35=ff}} {{none}}
@@ -1625,7 +1604,6 @@ struct DiagnoseAllLabels {
 
   func test() {
     f(aax: 0, bbx: 1, cc: 21, 22, 23, dd: 3, ff: 5) // expected-error {{incorrect argument labels in call (have 'aax:bbx:cc:_:_:dd:ff:', expected 'aa:bb:cc:_:_:dd:ff:')}} {{7-10=aa}} {{15-18=bb}} {{none}}
-
     f(aax: 0, bbx: 1, dd: 3, ff: 5) // expected-error {{incorrect argument labels in call (have 'aax:bbx:dd:ff:', expected 'aa:bb:dd:ff:')}} {{7-10=aa}} {{15-18=bb}} {{none}}
   }
 }
diff --git a/test/Constraints/bridging.swift b/test/Constraints/bridging.swift
index e9424798d3c4f..5dcb206a1fc0d 100644
--- a/test/Constraints/bridging.swift
+++ b/test/Constraints/bridging.swift
@@ -180,7 +180,7 @@ func dictionaryToNSDictionary() {
 // In this case, we should not implicitly convert Dictionary to NSDictionary.
 struct NotEquatable {}
 func notEquatableError(_ d: Dictionary<Int, NotEquatable>) -> Bool {
-  return d == d // expected-error{{operator function '==' requires that 'NotEquatable' conform to 'Equatable'}}
+  return d == d // expected-error{{referencing operator function '==' on 'Dictionary' requires that 'NotEquatable' conform to 'Equatable'}}
 }
 
 // NSString -> String
diff --git a/test/Constraints/casts.swift b/test/Constraints/casts.swift
index 0c84b6cbf1b70..02d6a29224ac0 100644
--- a/test/Constraints/casts.swift
+++ b/test/Constraints/casts.swift
@@ -235,8 +235,8 @@ func test_tuple_casts_no_warn() {
   _ = arr as! [(Foo, Foo, Foo)] // expected-warning {{cast from '[(Any, Any)]' to unrelated type '[(Foo, Foo, Foo)]' always fails}}
   _ = tup as! (Foo, Foo, Foo) // expected-warning {{cast from '(Any, Any)' to unrelated type '(Foo, Foo, Foo)' always fails}}
 
-  _ = arr as! [(a: Foo, Foo)] // expected-warning {{cast from '[(Any, Any)]' to unrelated type '[(a: Foo, Foo)]' always fails}}
-  _ = tup as! (a: Foo, Foo) // expected-warning {{cast from '(Any, Any)' to unrelated type '(a: Foo, Foo)' always fails}}
+  _ = arr as! [(a: Foo, Foo)] // Ok
+  _ = tup as! (a: Foo, Foo) // Ok
 }
 
 infix operator ^^^
@@ -335,3 +335,71 @@ func test_compatibility_coercions(_ arr: [Int], _ optArr: [Int]?, _ dict: [Strin
   // The array can also be inferred to be [Any].
   _ = ([] ?? []) as Array // expected-warning {{left side of nil coalescing operator '??' has non-optional type '[Any]', so the right side is never used}}
 }
+
+// SR-13088
+protocol JSON { }
+protocol JSONLeaf: JSON {}
+extension Int: JSONLeaf { }
+extension Array: JSON where Element: JSON { }
+
+protocol SR13035Error: Error {}
+class ChildError: SR13035Error {}
+
+protocol AnyC {
+  func foo()
+}
+
+protocol AnyEvent {}
+
+protocol A {
+  associatedtype C: AnyC
+}
+
+protocol EventA: A {
+  associatedtype Event
+}
+
+typealias Container<Namespace>
+  = (event: Namespace.Event, c: Namespace.C) where Namespace: EventA
+
+enum ConcreteA: EventA {
+  struct C: AnyC {
+    func foo() {}
+  }
+
+  enum Event: AnyEvent {
+    case test
+  }
+}
+
+func tests_SR13088_false_positive_always_fail_casts() {
+  // SR-13081
+  let x: JSON = [4] // [4]
+  _ = x as? [Any] // Ok
+
+  // SR-13035
+  func SR13035<SomeError: SR13035Error>(_ child: Result<String, ChildError>, _: Result<String, SomeError>) {
+    let _ = child as? Result<String, SomeError> // Ok
+  }
+
+  func SR13035_1<SomeError: SR13035Error, Child: ChildError>(_ child: Result<String, Child>, parent: Result<String, SomeError>) {
+    _ = child as? Result<String, SomeError> // Ok
+    _ = parent as? Result<String, Child> // OK
+  }
+
+  // SR-11434 and SR-12321
+  func encodable(_ value: Encodable) {
+    _ = value as! [String : Encodable] // Ok
+    _ = value as? [String: Encodable] // Ok
+  }   
+
+  // SR-13025
+  func coordinate(_ event: AnyEvent, from c: AnyC) {
+    switch (event, c) {
+    case let container as Container<ConcreteA>: // OK
+      container.c.foo()
+    default:
+      break
+    }
+  }
+}
diff --git a/test/Constraints/closures.swift b/test/Constraints/closures.swift
index 1b290fb44ca1e..29104fa24b268 100644
--- a/test/Constraints/closures.swift
+++ b/test/Constraints/closures.swift
@@ -562,7 +562,6 @@ r32432145 { _,_ in
 // rdar://problem/30106822 - Swift ignores type error in closure and presents a bogus error about the caller
 [1, 2].first { $0.foo = 3 }
 // expected-error@-1 {{value of type 'Int' has no member 'foo'}}
-// expected-error@-2 {{cannot convert value of type '()' to closure result type 'Bool'}}
 
 // rdar://problem/32433193, SR-5030 - Higher-order function diagnostic mentions the wrong contextual type conversion problem
 protocol A_SR_5030 {
@@ -827,7 +826,7 @@ func rdar_40537960() {
   }
 
   var arr: [S] = []
-  _ = A(arr, fn: { L($0.v) }) // expected-error {{cannot convert value of type 'L' to closure result type 'R<P>'}}
+  _ = A(arr, fn: { L($0.v) })
   // expected-error@-1 {{generic parameter 'P' could not be inferred}}
   // expected-note@-2 {{explicitly specify the generic arguments to fix this issue}} {{8-8=<[S], <#P: P_40537960#>>}}
 }
diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift
index 0cda84772d554..b4c4ce1f61839 100644
--- a/test/Constraints/diagnostics.swift
+++ b/test/Constraints/diagnostics.swift
@@ -51,9 +51,9 @@ f0(i, i, // expected-error@:7 {{cannot convert value of type 'Int' to expected a
 
 
 // Cannot conform to protocols.
-f5(f4)  // expected-error {{type '(Int) -> Int' cannot conform to 'P2'; only struct/enum/class types can conform to protocols}}
-f5((1, "hello"))  // expected-error {{type '(Int, String)' cannot conform to 'P2'; only struct/enum/class types can conform to protocols}}
-f5(Int.self) // expected-error {{type 'Int.Type' cannot conform to 'P2'; only struct/enum/class types can conform to protocols}}
+f5(f4)  // expected-error {{type '(Int) -> Int' cannot conform to 'P2'; only concrete types such as structs, enums and classes can conform to protocols}}
+f5((1, "hello"))  // expected-error {{type '(Int, String)' cannot conform to 'P2'; only concrete types such as structs, enums and classes can conform to protocols}}
+f5(Int.self) // expected-error {{type 'Int.Type' cannot conform to 'P2'; only concrete types such as structs, enums and classes can conform to protocols}}
 
 // Tuple element not convertible.
 f0(i,
@@ -104,7 +104,7 @@ func f8<T:P2>(_ n: T, _ f: @escaping (T) -> T) {}  // expected-note {{where 'T'
 f8(3, f4) // expected-error {{global function 'f8' requires that 'Int' conform to 'P2'}}
 typealias Tup = (Int, Double)
 func f9(_ x: Tup) -> Tup { return x }
-f8((1,2.0), f9) // expected-error {{type 'Tup' (aka '(Int, Double)') cannot conform to 'P2'; only struct/enum/class types can conform to protocols}}
+f8((1,2.0), f9) // expected-error {{type 'Tup' (aka '(Int, Double)') cannot conform to 'P2'; only concrete types such as structs, enums and classes can conform to protocols}}
 
 // <rdar://problem/19658691> QoI: Incorrect diagnostic for calling nonexistent members on literals
 1.doesntExist(0)  // expected-error {{value of type 'Int' has no member 'doesntExist'}}
@@ -399,16 +399,16 @@ enum Color {
   static func rainbow() -> Color {}
   
   static func overload(a : Int) -> Color {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(a:)')}}
-  // expected-note@-1 {{candidate has partially matching parameter list (a: Int)}}
+  // expected-note@-1 {{candidate expects value of type 'Int' for parameter #1}}
   static func overload(b : Int) -> Color {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(b:)')}}
-  // expected-note@-1 {{candidate has partially matching parameter list (b: Int)}}
+  // expected-note@-1 {{candidate expects value of type 'Int' for parameter #1}}
   
   static func frob(_ a : Int, b : inout Int) -> Color {}
   static var svar: Color { return .Red }
 }
 
-let _: (Int, Color) = [1,2].map({ ($0, .Unknown("")) }) // expected-error {{cannot convert value of type 'Array<(Int, _)>' to specified type '(Int, Color)'}}
-// expected-error@-1 {{cannot infer contextual base in reference to member 'Unknown'}}
+let _: (Int, Color) = [1,2].map({ ($0, .Unknown("")) })
+// expected-error@-1 {{cannot convert value of type 'Array<(Int, _)>' to specified type '(Int, Color)'}}
 
 let _: [(Int, Color)] = [1,2].map({ ($0, .Unknown("")) })// expected-error {{missing argument label 'description:' in call}}
 
@@ -687,7 +687,7 @@ enum AssocTest {
   case one(Int)
 }
 
-if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{binary operator '==' cannot be applied to two 'AssocTest' operands}}
+if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{referencing operator function '==' on 'Equatable' requires that 'AssocTest' conform to 'Equatable'}}
 // expected-note @-1 {{binary operator '==' cannot be synthesized for enums with associated values}}
 
 
@@ -1100,9 +1100,13 @@ func rdar17170728() {
   }
 
   let _ = [i, j, k].reduce(0 as Int?) {
+    // expected-error@-1 3 {{cannot convert value of type 'Int?' to expected element type 'Int'}}
     $0 && $1 ? $0 + $1 : ($0 ? $0 : ($1 ? $1 : nil))
-    // expected-error@-1 {{binary operator '+' cannot be applied to two 'Int?' operands}}
-    // expected-error@-2 4 {{optional type 'Int?' cannot be used as a boolean; test for '!= nil' instead}}
+    // expected-error@-1 2 {{type 'Int' cannot be used as a boolean; test for '!= 0' instead}}
+    // expected-error@-2   {{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
+    // expected-error@-3 2 {{optional type 'Int?' cannot be used as a boolean; test for '!= nil' instead}}
+    // expected-note@-4:16 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
+    // expected-note@-5:16 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
   }
 }
 
@@ -1117,8 +1121,10 @@ func platypus<T>(a: [T]) {
 // Another case of the above.
 func badTypes() {
   let sequence:AnySequence<[Int]> = AnySequence() { AnyIterator() { [3] }}
+  // Notes, attached to declarations, explain that there is a difference between Array.init(_:) and
+  // RangeReplaceableCollection.init(_:) which are both applicable in this case.
   let array = [Int](sequence)
-  // expected-error@-1 {{initializer 'init(_:)' requires the types 'Int' and '[Int]' be equivalent}}
+  // expected-error@-1 {{no exact matches in call to initializer}}
 }
 
 // rdar://34357545
@@ -1248,10 +1254,9 @@ func f11(_ n: Int) {}
 func f11<T : P2>(_ n: T, _ f: @escaping (T) -> T) {}  // expected-note {{where 'T' = 'Int'}}
 f11(3, f4) // expected-error {{global function 'f11' requires that 'Int' conform to 'P2'}}
 
-// FIXME: Arguably we should also prefer the conformance failure in this case.
-let f12: (Int) -> Void = { _ in }
-func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {}
-f12(3, f4)// expected-error {{extra argument in call}}
+let f12: (Int) -> Void = { _ in } // expected-note {{candidate '(Int) -> Void' requires 1 argument, but 2 were provided}}
+func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {} // expected-note {{candidate requires that 'Int' conform to 'P2' (requirement specified as 'T' == 'P2')}}
+f12(3, f4)// expected-error {{no exact matches in call to global function 'f12'}}
 
 // SR-12242
 struct SR_12242_R<Value> {}
@@ -1341,3 +1346,10 @@ func rdar62989214() {
     arr[flag].isTrue // expected-error {{cannot convert value of type 'Flag' to expected argument type 'Int'}}
   }
 }
+
+// SR-5688
+func SR5688_1() -> String? { "" }
+SR5688_1!.count // expected-error {{function 'SR5688_1' was used as a property; add () to call it}} {{9-9=()}}
+
+func SR5688_2() -> Int? { 0 }
+let _: Int = SR5688_2! // expected-error {{function 'SR5688_2' was used as a property; add () to call it}} {{22-22=()}}
diff --git a/test/Constraints/dynamic_lookup.swift b/test/Constraints/dynamic_lookup.swift
index ce4398116c275..acdb2c7537893 100644
--- a/test/Constraints/dynamic_lookup.swift
+++ b/test/Constraints/dynamic_lookup.swift
@@ -4,6 +4,10 @@
 // RUN: %target-typecheck-verify-swift -swift-version 5 -I %t -verify-ignore-unknown
 
 // REQUIRES: objc_interop
+
+// FIXME(rdar://64425653): We should re-enable this test for other platforms.
+// REQUIRES: OS=macosx
+
 import Foundation
 import PrivateObjC
 
@@ -338,7 +342,7 @@ func testOverloadedWithUnavailable(ao: AnyObject) {
 
 func dynamicInitCrash(ao: AnyObject.Type) {
   let sdk = ao.init(blahblah: ())
-  // expected-error@-1 {{incorrect argument label in call (have 'blahblah:', expected 'toMemory:')}}
+  // expected-error@-1 {{no exact matches in call to initializer}}
 }
 
 // Test that we correctly diagnose ambiguity for different typed members available
diff --git a/test/Constraints/fixes.swift b/test/Constraints/fixes.swift
index 8a8aeb82c55ba..e76f4525aab94 100644
--- a/test/Constraints/fixes.swift
+++ b/test/Constraints/fixes.swift
@@ -110,8 +110,7 @@ class T {
     func m1() {
       // <rdar://problem/17741575>
       let l = self.m2!.prop1
-      // expected-error@-1 {{cannot force unwrap value of non-optional type '() -> U?'}} {{22-23=}}
-      // expected-error@-2 {{method 'm2' was used as a property; add () to call it}}  {{22-22=()}}
+      // expected-error@-1 {{method 'm2' was used as a property; add () to call it}}  {{22-22=()}}
     }
 
     func m2() -> U! {
@@ -358,8 +357,6 @@ func testKeyPathSubscriptArgFixes(_ fn: @escaping () -> Int) {
 }
 
 func sr12426(a: Any, _ str: String?) {
-  a == str // expected-error {{cannot convert value of type 'Any' to expected argument type 'String'}}
-  // expected-error@-1 {{value of optional type 'String?' must be unwrapped to a value of type 'String'}}
-  // expected-note@-2 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
-  // expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
+  a == str // expected-error {{binary operator '==' cannot be applied to operands of type 'Any' and 'String?'}}
+  // expected-note@-1 {{overloads for '==' exist with these partially matching parameter lists: (String, String)}}
 }
diff --git a/test/Constraints/function.swift b/test/Constraints/function.swift
index 16d0bf2455fce..429b4dc865ee4 100644
--- a/test/Constraints/function.swift
+++ b/test/Constraints/function.swift
@@ -62,12 +62,12 @@ func test() {
 
 // <rdar://problem/19962010> QoI: argument label mismatches produce not-great diagnostic
 class A {
-  func a(_ text:String) {
+  func a(_ text:String) { // expected-note {{incorrect labels for candidate (have: '(text:)', expected: '(_:)')}}
   }
-  func a(_ text:String, something:Int?=nil) {
+  func a(_ text:String, something:Int?=nil) { // expected-note {{incorrect labels for candidate (have: '(text:)', expected: '(_:)')}}
   }
 }
-A().a(text:"sometext") // expected-error{{extraneous argument label 'text:' in call}}{{7-12=}}
+A().a(text:"sometext") // expected-error{{no exact matches in call to instance method 'a'}}
 
 
 // <rdar://problem/22451001> QoI: incorrect diagnostic when argument to print has the wrong type
diff --git a/test/Constraints/function_builder_diags.swift b/test/Constraints/function_builder_diags.swift
index 1a04e05892926..552b7a2a3088b 100644
--- a/test/Constraints/function_builder_diags.swift
+++ b/test/Constraints/function_builder_diags.swift
@@ -179,7 +179,7 @@ struct Label<L> : P where L : P { // expected-note 2 {{'L' declared as parameter
 }
 
 func test_51167632() -> some P {
-  AnyP(G { // expected-error {{type 'Label<_>.Type' cannot conform to 'P'; only struct/enum/class types can conform to protocols}}
+  AnyP(G { // expected-error {{type 'Label<_>.Type' cannot conform to 'P'; only concrete types such as structs, enums and classes can conform to protocols}}
     Text("hello")
     Label  // expected-error {{generic parameter 'L' could not be inferred}}
     // expected-note@-1 {{explicitly specify the generic arguments to fix this issue}} {{10-10=<<#L: P#>>}}
@@ -418,11 +418,14 @@ func testNonExhaustiveSwitch(e: E) {
 // rdar://problem/59856491
 struct TestConstraintGenerationErrors {
   @TupleBuilder var buildTupleFnBody: String {
+    let a = nil // expected-error {{'nil' requires a contextual type}}
     String(nothing) // expected-error {{cannot find 'nothing' in scope}}
   }
 
   func buildTupleClosure() {
-    tuplify(true) { _ in
+    // FIXME: suppress the ambiguity error
+    tuplify(true) { _ in // expected-error {{type of expression is ambiguous without more context}}
+      let a = nothing // expected-error {{cannot find 'nothing' in scope}}
       String(nothing) // expected-error {{cannot find 'nothing' in scope}}
     }
   }
diff --git a/test/Constraints/generics.swift b/test/Constraints/generics.swift
index 450af7f1212bd..bb4ed1d14f0f1 100644
--- a/test/Constraints/generics.swift
+++ b/test/Constraints/generics.swift
@@ -188,7 +188,7 @@ func r22459135() {
 
 // <rdar://problem/19710848> QoI: Friendlier error message for "[] as Set"
 // <rdar://problem/22326930> QoI: "argument for generic parameter 'Element' could not be inferred" lacks context
-_ = [] as Set  // expected-error {{value of protocol type 'Any' cannot conform to 'Hashable'; only struct/enum/class types can conform to protocols}}
+_ = [] as Set  // expected-error {{protocol 'Any' as a type cannot conform to 'Hashable'; only concrete types such as structs, enums and classes can conform to protocols}}
 // expected-note@-1 {{required by generic struct 'Set' where 'Element' = 'Any'}}
 
 
diff --git a/test/Constraints/members.swift b/test/Constraints/members.swift
index 54763e96a9c8b..3f35c02bf6b01 100644
--- a/test/Constraints/members.swift
+++ b/test/Constraints/members.swift
@@ -617,12 +617,13 @@ func rdar50679161() {
 func rdar_50467583_and_50909555() {
   if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
     // rdar://problem/50467583
-    let _: Set = [Int][] // expected-error {{no exact matches in call to subscript}}
-    // expected-note@-1 {{found candidate with type '(Int) -> Int'}}
-    // expected-note@-2 {{found candidate with type '(Range<Int>) -> ArraySlice<Int>'}}
-    // expected-note@-3 {{found candidate with type '((UnboundedRange_) -> ()) -> ArraySlice<Int>'}}
-    // expected-note@-4 {{found candidate with type '(RangeSet<Array<Int>.Index>) -> DiscontiguousSlice<[Int]>' (aka '(RangeSet<Int>) -> DiscontiguousSlice<Array<Int>>')}}
-    // expected-note@-5 {{found candidate with type '(Range<Array<Int>.Index>) -> Slice<[Int]>' (aka '(Range<Int>) -> Slice<Array<Int>>')}}
+    let _: Set = [Int][] // expected-error {{no 'subscript' candidates produce the expected contextual result type 'Set'}}
+    // expected-error@-1 {{no exact matches in call to subscript}}
+    // expected-note@-2 {{found candidate with type '(Int) -> Int'}}
+    // expected-note@-3 {{found candidate with type '(Range<Int>) -> ArraySlice<Int>'}}
+    // expected-note@-4 {{found candidate with type '((UnboundedRange_) -> ()) -> ArraySlice<Int>'}}
+    // expected-note@-5 {{found candidate with type '(RangeSet<Array<Int>.Index>) -> DiscontiguousSlice<[Int]>' (aka '(RangeSet<Int>) -> DiscontiguousSlice<Array<Int>>')}}
+    // expected-note@-6 {{found candidate with type '(Range<Array<Int>.Index>) -> Slice<[Int]>' (aka '(Range<Int>) -> Slice<Array<Int>>')}}
   }
   
   // rdar://problem/50909555
diff --git a/test/Constraints/operator.swift b/test/Constraints/operator.swift
index 6b2ffe10644c4..4be7e87ba780e 100644
--- a/test/Constraints/operator.swift
+++ b/test/Constraints/operator.swift
@@ -216,11 +216,13 @@ func rdar46459603() {
   let e = E.foo(value: "String")
   var arr = ["key": e]
 
+  // FIXME(rdar://problem/64844584) - on iOS simulator this diagnostic is flaky,
+  // either `referencing operator function '==' on 'Equatable'` or `operator function '==' requires`
   _ = arr.values == [e]
-  // expected-error@-1 {{referencing operator function '==' on 'Equatable' requires that 'Dictionary<String, E>.Values' conform to 'Equatable'}}
+  // expected-error@-1 {{requires that 'Dictionary<String, E>.Values' conform to 'Equatable'}}
   // expected-error@-2 {{cannot convert value of type '[E]' to expected argument type 'Dictionary<String, E>.Values'}}
   _ = [arr.values] == [[e]]
-  // expected-error@-1 {{operator function '==' requires that 'Dictionary<String, E>.Values' conform to 'Equatable'}}
+  // expected-error@-1 {{requires that 'Dictionary<String, E>.Values' conform to 'Equatable'}}
   // expected-error@-2 {{cannot convert value of type '[E]' to expected element type 'Dictionary<String, E>.Values'}}
 }
 
@@ -288,5 +290,6 @@ func rdar_62054241() {
 
   func test(_ arr: [Foo]) -> [Foo] {
     return arr.sorted(by: <) // expected-error {{no exact matches in reference to operator function '<'}}
+    // expected-note@-1 {{found candidate with type '(Foo, Foo) -> Bool'}}
   }
 }
diff --git a/test/Constraints/optional.swift b/test/Constraints/optional.swift
index d3bf1c65a1121..5e21951a8ed74 100644
--- a/test/Constraints/optional.swift
+++ b/test/Constraints/optional.swift
@@ -424,8 +424,7 @@ func test_force_unwrap_not_being_too_eager() {
 // rdar://problem/57097401
 func invalidOptionalChaining(a: Any) {
   a == "="? // expected-error {{cannot use optional chaining on non-optional value of type 'String'}}
-  // expected-error@-1 {{value of protocol type 'Any' cannot conform to 'Equatable'; only struct/enum/class types can conform to protocols}}
-  // expected-note@-2 {{requirement from conditional conformance of 'Any?' to 'Equatable'}}
+  // expected-error@-1 {{cannot convert value of type 'Any' to expected argument type 'Any.Type?'}}
 }
 
 // SR-12309 - Force unwrapping 'nil' compiles without warning
diff --git a/test/Constraints/overload.swift b/test/Constraints/overload.swift
index 9877c41ec0ab8..e894b8a37ee0b 100644
--- a/test/Constraints/overload.swift
+++ b/test/Constraints/overload.swift
@@ -127,11 +127,12 @@ func test20886179(_ handlers: [(Int) -> Void], buttonIndex: Int) {
 
 // The problem here is that the call has a contextual result type incompatible
 // with *all* overload set candidates.  This is not an ambiguity.
-func overloaded_identity(_ a : Int) -> Int {} // expected-note {{found this candidate}}
-func overloaded_identity(_ b : Float) -> Float {} // expected-note {{found this candidate}}
+func overloaded_identity(_ a : Int) -> Int {} // expected-note {{'overloaded_identity' produces 'Int', not the expected contextual result type '()'}} expected-note {{'overloaded_identity' declared her}}
+func overloaded_identity(_ b : Float) -> Float {} // expected-note {{'overloaded_identity' produces 'Float', not the expected contextual result type '()'}}
 
 func test_contextual_result_1() {
-  return overloaded_identity()  // expected-error {{no exact matches in call to global function 'overloaded_identity'}}
+  return overloaded_identity()  // expected-error {{missing argument for parameter #1 in call}}
+  // expected-error@-1 {{no 'overloaded_identity' candidates produce the expected contextual result type '()'}}
 }
 
 func test_contextual_result_2() {
@@ -238,3 +239,10 @@ func autoclosure1<T>(_: [T], _: X) { }
 func test_autoclosure1(ia: [Int]) {
   autoclosure1(ia, X()) // okay: resolves to the second function
 }
+
+// rdar://problem/64368545 - failed to produce diagnostic (hole propagated to func result without recording a fix)
+func test_no_hole_propagation() {
+  func test(withArguments arguments: [String]) -> String {
+    return arguments.reduce(0, +) // expected-error {{cannot convert value of type 'Int' to expected argument type 'String'}}
+  }
+}
diff --git a/test/Constraints/patterns.swift b/test/Constraints/patterns.swift
index d0ca8f7582397..51de1f54ddfd4 100644
--- a/test/Constraints/patterns.swift
+++ b/test/Constraints/patterns.swift
@@ -274,9 +274,7 @@ struct StaticMembers: Equatable {
   static var optProp: Optional = StaticMembers()
 
   static func method(_: Int) -> StaticMembers { return prop }
-  // expected-note@-1 {{found candidate with type '(Int) -> StaticMembers'}}
   static func method(withLabel: Int) -> StaticMembers { return prop }
-  // expected-note@-1 {{found candidate with type '(Int) -> StaticMembers'}}
   static func optMethod(_: Int) -> StaticMembers? { return optProp }
 
   static func ==(x: StaticMembers, y: StaticMembers) -> Bool { return true }
@@ -301,7 +299,7 @@ switch staticMembers {
   // TODO: repeated error message
   case .optProp: break // expected-error* {{not unwrapped}}
 
-  case .method: break // expected-error{{no exact matches in reference to static method 'method'}}
+  case .method: break // expected-error{{member 'method' expects argument of type 'Int'}}
   case .method(0): break
   case .method(_): break // expected-error{{'_' can only appear in a pattern}}
   case .method(let x): break // expected-error{{cannot appear in an expression}}
@@ -509,3 +507,14 @@ func rdar63510989() {
     // expected-warning@-1 {{immutable value 'v' was never used; consider replacing with '_' or removing it}}
   }
 }
+
+// rdar://problem/64157451 - compiler crash when using undefined type in pattern
+func rdar64157451() {
+  enum E {
+  case foo(Int)
+  }
+
+  func test(e: E) {
+    if case .foo(let v as DoeNotExist) = e {} // expected-error {{cannot find type 'DoeNotExist' in scope}}
+  }
+}
diff --git a/test/Constraints/rdar44770297.swift b/test/Constraints/rdar44770297.swift
index 82d96f7459112..8d0b128b9e136 100644
--- a/test/Constraints/rdar44770297.swift
+++ b/test/Constraints/rdar44770297.swift
@@ -4,11 +4,10 @@ protocol P {
   associatedtype A
 }
 
-func foo<T: P>(_: () throws -> T) -> T.A? { // expected-note {{where 'T' = 'Never'}}
+func foo<T: P>(_: () throws -> T) -> T.A? {
   fatalError()
 }
 
-let _ = foo() {fatalError()} & nil // expected-error {{global function 'foo' requires that 'Never' conform to 'P'}}
-// expected-error@-1 {{value of optional type 'Never.A?' must be unwrapped to a value of type 'Never.A'}}
-// expected-note@-2 {{force-unwrap}}
-// expected-note@-3 {{coalesce using '??'}}
+let _ = foo() {fatalError()} & nil // expected-error {{value of optional type 'Never.A?' must be unwrapped to a value of type 'Never.A'}}
+// expected-note@-1 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
+// expected-note@-2 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
diff --git a/test/Constraints/rdar64890308.swift b/test/Constraints/rdar64890308.swift
new file mode 100644
index 0000000000000..b745850068f5d
--- /dev/null
+++ b/test/Constraints/rdar64890308.swift
@@ -0,0 +1,31 @@
+// RUN: %target-typecheck-verify-swift -parse-stdlib
+
+// rdar://64890308: Make sure we don't leave one-way constraints unsolved.
+
+import Swift
+
+@_functionBuilder
+class ArrayBuilder<Element> {
+  static func buildBlock() -> [Element] { [] }
+  static func buildBlock(_ elt: Element) -> [Element] { [elt] }
+  static func buildBlock(_ elts: Element...) -> [Element] { elts }
+}
+
+func foo<T>(@ArrayBuilder<T> fn: () -> [T]) {}
+
+// FIXME(SR-13132): This should compile.
+foo { // expected-error {{type of expression is ambiguous without more context}}
+  ""
+}
+
+struct S<T> {
+  init(_: T.Type) {}
+  func overloaded() -> [T] { [] }
+  func overloaded(_ x: T) -> [T] { [x] }
+  func overloaded(_ x: T...) -> [T] { x }
+}
+
+func bar<T>(_ x: T, _ fn: (T, T.Type) -> [T]) {}
+bar("") { x, ty in
+  (Builtin.one_way(S(ty).overloaded(x)))
+}
diff --git a/test/Constraints/sr12964.swift b/test/Constraints/sr12964.swift
index 27d48299b144d..b18de10a36f30 100644
--- a/test/Constraints/sr12964.swift
+++ b/test/Constraints/sr12964.swift
@@ -3,5 +3,4 @@
 protocol P {}
 typealias T = (P) -> Void
 let x: T! = [1, 2, 3].reversed().reduce()
-// expected-error@-1 {{no exact matches in call to instance method 'reduce'}}
-// expected-note@-2 2{{candidate has partially matching parameter list}}
+// expected-error@-1 {{missing arguments for parameters #1, #2 in call}}
diff --git a/test/Constraints/super_constructor.swift b/test/Constraints/super_constructor.swift
index 01e15a2990432..d6976b7ec010f 100644
--- a/test/Constraints/super_constructor.swift
+++ b/test/Constraints/super_constructor.swift
@@ -39,15 +39,15 @@ class B {
   init() {
   }
 
-  init(x:Int) { // expected-note{{candidate has partially matching parameter list (x: Int)}}
+  init(x:Int) { // expected-note{{candidate expects value of type 'Int' for parameter #1}}
   }
 
-  init(a:UnicodeScalar) { // expected-note {{candidate has partially matching parameter list (a: UnicodeScalar)}}
+  init(a:UnicodeScalar) { // expected-note {{candidate expects value of type 'UnicodeScalar' (aka 'Unicode.Scalar') for parameter #1}}
   }
-  init(b:UnicodeScalar) { // expected-note{{candidate has partially matching parameter list (b: UnicodeScalar)}}
+  init(b:UnicodeScalar) { // expected-note {{candidate expects value of type 'UnicodeScalar' (aka 'Unicode.Scalar') for parameter #1}}
   }
 
-  init(z:Float) { // expected-note{{candidate has partially matching parameter list (z: Float)}}
+  init(z:Float) { // expected-note{{candidate expects value of type 'Float' for parameter #1}}
     super.init() // expected-error{{'super' members cannot be referenced in a root class}}
   }
 }
diff --git a/test/Constraints/tuple.swift b/test/Constraints/tuple.swift
index c452ea7b2b335..ec557012b835a 100644
--- a/test/Constraints/tuple.swift
+++ b/test/Constraints/tuple.swift
@@ -181,7 +181,7 @@ variadicWithTrailingClosure(fn: +)
 func gcd_23700031<T>(_ a: T, b: T) {
   var a = a
   var b = b
-  (a, b) = (b, a % b)  // expected-error {{referencing operator function '%' on 'BinaryInteger' requires that 'T' conform to 'BinaryInteger'}}
+  (a, b) = (b, a % b)  // expected-error {{binary operator '%' cannot be applied to two 'T' operands}}
 }
 
 // <rdar://problem/24210190>
diff --git a/test/Constraints/tuple_arguments.swift b/test/Constraints/tuple_arguments.swift
index 7b31d6d897e99..c8be9ace19776 100644
--- a/test/Constraints/tuple_arguments.swift
+++ b/test/Constraints/tuple_arguments.swift
@@ -1702,8 +1702,8 @@ x.map { (_: ()) in () }
 // https://bugs.swift.org/browse/SR-9470
 do {
   func f(_: Int...) {}
-  let _ = [(1, 2, 3)].map(f) // expected-error {{cannot convert value of type '(Int...) -> ()' to expected argument type '((Int, Int, Int)) throws -> T'}}
-  // expected-error@-1 {{generic parameter 'T' could not be inferred}}
+  let _ = [(1, 2, 3)].map(f) // expected-error {{no exact matches in call to instance method 'map'}}
+  // expected-note@-1 {{found candidate with type '(((Int, Int, Int)) throws -> _) throws -> Array<_>'}}
 }
 
 // rdar://problem/48443263 - cannot convert value of type '() -> Void' to expected argument type '(_) -> Void'
diff --git a/test/DebugInfo/ASTSection_linker.swift b/test/DebugInfo/ASTSection_linker.swift
index fc6ff338dd37e..dcf3b9f94ff05 100644
--- a/test/DebugInfo/ASTSection_linker.swift
+++ b/test/DebugInfo/ASTSection_linker.swift
@@ -14,6 +14,7 @@
 // RUN: %lldb-moduleimport-test -verbose %t/ASTSection.dylib | %FileCheck %s
 
 // REQUIRES: OS=macosx
+// REQUIRES: CPU=x86_64
 
 // CHECK: - Swift Version: {{.+}}.{{.+}}
 // CHECK: - Compatibility Version: 4
diff --git a/test/DebugInfo/Imports.swift b/test/DebugInfo/Imports.swift
index 5ba4bfe8eab22..0beaaf35e429f 100644
--- a/test/DebugInfo/Imports.swift
+++ b/test/DebugInfo/Imports.swift
@@ -8,7 +8,7 @@
 // CHECK-DAG: ![[FOOMODULE:[0-9]+]] = !DIModule({{.*}}, name: "Foo", includePath: "{{.*}}test{{.*}}DebugInfo{{.*}}"
 // CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, scope: ![[THISFILE:[0-9]+]], entity: ![[FOOMODULE]]
 // CHECK-DAG: ![[THISFILE]] = !DIFile(filename: "{{.*}}test{{/|\\\\}}DebugInfo{{/|\\\\}}Imports.swift",
-// CHECK-DAG: ![[SWIFTFILE:[0-9]+]] = !DIFile(filename: "{{.*}}Swift.swiftmodule{{(/.+[.]swiftmodule)?}}"
+// CHECK-DAG: ![[SWIFTFILE:[0-9]+]] = !DIFile(filename: "{{.*}}Swift.swiftmodule{{([/\\].+[.]swiftmodule)?}}"
 // CHECK-DAG: ![[SWIFTMODULE:[0-9]+]] = !DIModule({{.*}}, name: "Swift"
 // CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, scope: ![[THISFILE]], entity: ![[SWIFTMODULE]]
 // CHECK-DAG: ![[BASICMODULE:[0-9]+]] = !DIModule({{.*}}, name: "basic"
diff --git a/test/DebugInfo/debug_prefix_map_sdk.swift b/test/DebugInfo/debug_prefix_map_sdk.swift
new file mode 100644
index 0000000000000..f99b41ffecf05
--- /dev/null
+++ b/test/DebugInfo/debug_prefix_map_sdk.swift
@@ -0,0 +1,8 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -sdk %t/SOME_SDK -g %s -emit-ir | %FileCheck -check-prefix=WITHOUT-PREFIX-MAP %s
+// RUN: %target-swift-frontend -sdk %t/SOME_SDK -g %s -emit-ir -debug-prefix-map %t/SOME_SDK=foo | %FileCheck -check-prefix=WITH-PREFIX-MAP -implicit-check-not=SOME_SDK %s
+
+func foo() {}
+
+// WITHOUT-PREFIX-MAP: sysroot: "{{.*}}SOME_SDK
+// WITH-PREFIX-MAP: sysroot: "foo
diff --git a/test/DebugInfo/mandatory-inlining-ownership.swift b/test/DebugInfo/mandatory-inlining-ownership.swift
index 4478d695f55ae..ac30b046c5d86 100644
--- a/test/DebugInfo/mandatory-inlining-ownership.swift
+++ b/test/DebugInfo/mandatory-inlining-ownership.swift
@@ -2,7 +2,6 @@
 
 // RUN: %target-swift-frontend -emit-sil %s -Onone -Xllvm \
 // RUN:   -sil-print-after=mandatory-inlining \
-// RUN:   -enable-ownership-stripping-after-serialization \
 // RUN:   -Xllvm -sil-print-debuginfo -o /dev/null 2>&1 | %FileCheck %s
 
 // CHECK: begin_borrow {{.*}} : $OSLog, loc {{.*}}, scope 5
diff --git a/test/DebugInfo/modulecache.swift b/test/DebugInfo/modulecache.swift
index c4eb24e70c66c..5ddb4e800318d 100644
--- a/test/DebugInfo/modulecache.swift
+++ b/test/DebugInfo/modulecache.swift
@@ -9,7 +9,7 @@ import ClangModule
 
 // RUN: %empty-directory(%t)
 // RUN: %swift-ide-test_plain -print-usrs -target %target-triple -module-cache-path %t  -I %S/Inputs -source-filename %s
-// RUN: head -c 4 %t/*/ClangModule-*.pcm | grep -q CPCH
+// RUN: dd bs=1 count=4 < %t/*/ClangModule-*.pcm 2>/dev/null | grep -q CPCH
 
 // 2. Test that swift is creating clang modules with debug info.
 
diff --git a/test/DebugInfo/variables.swift b/test/DebugInfo/variables.swift
index 196802e6f8df5..502c91e04f18a 100644
--- a/test/DebugInfo/variables.swift
+++ b/test/DebugInfo/variables.swift
@@ -41,7 +41,7 @@ print(", \(glob_b)", terminator: "")
 print(", \(glob_s)", terminator: "")
 var unused: Int32 = -1
 
-// CHECK-DAG: ![[RT:[0-9]+]] ={{.*}}"{{.*}}Swift.swiftmodule{{(/.+[.]swiftmodule)?}}"
+// CHECK-DAG: ![[RT:[0-9]+]] ={{.*}}"{{.*}}Swift.swiftmodule{{([/\\].+[.]swiftmodule)?}}"
 
 
 // Stack variables.
diff --git a/test/Driver/Dependencies/chained-additional-kinds-fine.swift b/test/Driver/Dependencies/chained-additional-kinds-fine.swift
index 7e260fc8ec952..d947855e05c6f 100644
--- a/test/Driver/Dependencies/chained-additional-kinds-fine.swift
+++ b/test/Driver/Dependencies/chained-additional-kinds-fine.swift
@@ -4,23 +4,23 @@
 // RUN: cp -r %S/Inputs/chained-additional-kinds-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled yet-another.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/Dependencies/chained-after-fine.swift b/test/Driver/Dependencies/chained-after-fine.swift
index 520007d79a834..ec5ba6c95c265 100644
--- a/test/Driver/Dependencies/chained-after-fine.swift
+++ b/test/Driver/Dependencies/chained-after-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-after-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
diff --git a/test/Driver/Dependencies/chained-fine.swift b/test/Driver/Dependencies/chained-fine.swift
index 27779098b6d86..5df491ef3f126 100644
--- a/test/Driver/Dependencies/chained-fine.swift
+++ b/test/Driver/Dependencies/chained-fine.swift
@@ -4,29 +4,29 @@
 // RUN: cp -r %S/Inputs/chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled yet-another.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240009 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/Dependencies/chained-private-after-fine.swift b/test/Driver/Dependencies/chained-private-after-fine.swift
index bdc6588f348ee..d8cc291bd70a6 100644
--- a/test/Driver/Dependencies/chained-private-after-fine.swift
+++ b/test/Driver/Dependencies/chained-private-after-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/Dependencies/chained-private-after-multiple-fine.swift b/test/Driver/Dependencies/chained-private-after-multiple-fine.swift
index c8c7ad9da4c7e..fb289824a8ce7 100644
--- a/test/Driver/Dependencies/chained-private-after-multiple-fine.swift
+++ b/test/Driver/Dependencies/chained-private-after-multiple-fine.swift
@@ -6,7 +6,7 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 
 
@@ -14,13 +14,13 @@
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-multiple-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v  2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v  2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift
index a96078aa04d0f..37b15cf35baf4 100644
--- a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift
+++ b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/Dependencies/chained-private-fine.swift b/test/Driver/Dependencies/chained-private-fine.swift
index 346559efc86c4..f9c0b022e19d6 100644
--- a/test/Driver/Dependencies/chained-private-fine.swift
+++ b/test/Driver/Dependencies/chained-private-fine.swift
@@ -4,19 +4,19 @@
 // RUN: cp -r %S/Inputs/chained-private-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-THIRD %s < %t/outputToCheck
 
 // Driver now schedules jobs in the order the inputs were given, but
diff --git a/test/Driver/Dependencies/check-interface-implementation-fine.swift b/test/Driver/Dependencies/check-interface-implementation-fine.swift
index c81fa1bcb5d23..5a06f361a5eb5 100644
--- a/test/Driver/Dependencies/check-interface-implementation-fine.swift
+++ b/test/Driver/Dependencies/check-interface-implementation-fine.swift
@@ -6,7 +6,7 @@
 // RUN: cp -r %S/Inputs/check-interface-implementation-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./c.swift  ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./c.swift  ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -20,7 +20,7 @@
 
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t &&  not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental > %t/a.txt 2>&1
+// RUN: cd %t &&  not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -33,7 +33,7 @@
 // CHECK-RECORD-A-DAG: "./bad.swift": !private [
 // CHECK-RECORD-A-DAG: "./c.swift": !private [
 
-// RUN: cd %t &&   %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s
+// RUN: cd %t &&   %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s
 
 // CHECK-BC-NOT: Handled a.swift
 // CHECK-BC-DAG: Handled bad.swift
diff --git a/test/Driver/Dependencies/crash-added-fine.swift b/test/Driver/Dependencies/crash-added-fine.swift
index f42e85e37cae6..71357992712cf 100644
--- a/test/Driver/Dependencies/crash-added-fine.swift
+++ b/test/Driver/Dependencies/crash-added-fine.swift
@@ -4,13 +4,13 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled main.swift
 // CHECK-INITIAL: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-ADDED-NOT: Handled
@@ -26,13 +26,13 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s
 
 // CHECK-FIXED-DAG: Handled crash.swift
 // CHECK-FIXED-DAG: Handled main.swift
diff --git a/test/Driver/Dependencies/crash-new-fine.swift b/test/Driver/Dependencies/crash-new-fine.swift
index 8afca50270449..788aab1492ad1 100644
--- a/test/Driver/Dependencies/crash-new-fine.swift
+++ b/test/Driver/Dependencies/crash-new-fine.swift
@@ -6,7 +6,7 @@
 
 // Initially compile all inputs, crash will fail.
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 // CHECK-NOT: warning
 // CHECK: Handled main.swift
 // CHECK: Handled crash.swift
@@ -15,7 +15,7 @@
 // Put crash.swift first to assure it gets scheduled first.
 // The others get queued, but not dispatched because crash crashes.
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
 
 // CHECK-BAD-ONLY-NOT: warning
 // CHECK-BAD-ONLY-NOT: Handled
@@ -24,7 +24,7 @@
 
 // Make crash succeed and all get compiled, exactly once.
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // CHECK-OKAY: Handled main.swift
 // CHECK-OKAY: Handled crash.swift
 // CHECK-OKAY: Handled other.swift
@@ -34,12 +34,12 @@
 
 // RUN: touch -t 201401240006 %t/crash.swift
 // RUN: rm %t/crash.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // And repair crash:
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
 
 // CHECK-OKAY-2-DAG: Handled crash.swift
 // CHECK-OKAY-2-DAG: Handled other.swift
@@ -51,7 +51,7 @@
 
 // RUN: touch -t 201401240006 %t/main.swift
 // RUN: rm %t/main.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s
 
 // CHECK-NO-MAIN-SWIFTDEPS-NOT: warning
 // CHECK-NO-MAIN-SWIFTDEPS: Handled main.swift
@@ -62,7 +62,7 @@
 // Touch all files earlier than last compiled date in the build record.
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental -disable-direct-intramodule-dependencies | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental -disable-direct-intramodule-dependencies | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s
 
 // CHECK-CURRENT-WITH-CRASH: Handled main.swift
 // CHECK-CURRENT-WITH-CRASH: Handled crash.swift
@@ -73,4 +73,4 @@
 
 // RUN: touch -t 201401240006 %t/other.swift
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
diff --git a/test/Driver/Dependencies/crash-simple-fine.swift b/test/Driver/Dependencies/crash-simple-fine.swift
index e796414b76093..9a59645aaaf55 100644
--- a/test/Driver/Dependencies/crash-simple-fine.swift
+++ b/test/Driver/Dependencies/crash-simple-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -12,7 +12,7 @@
 // CHECK-FIRST: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/crash.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled crash.swift
 // CHECK-SECOND-NOT: Handled main.swift
@@ -24,7 +24,7 @@
 // CHECK-RECORD-DAG: "./main.swift": !private [
 // CHECK-RECORD-DAG: "./other.swift": !private [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled crash.swift
diff --git a/test/Driver/Dependencies/dependencies-preservation-fine.swift b/test/Driver/Dependencies/dependencies-preservation-fine.swift
index 02a8f94322726..adf4fe7b4b626 100644
--- a/test/Driver/Dependencies/dependencies-preservation-fine.swift
+++ b/test/Driver/Dependencies/dependencies-preservation-fine.swift
@@ -6,7 +6,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json
 
 // RUN: %FileCheck -check-prefix CHECK-ORIGINAL %s < main~buildrecord.swiftdeps~
 // CHECK-ORIGINAL: inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}
diff --git a/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift b/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift
index 96da82a52a005..96d579c51185a 100644
--- a/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift
@@ -14,11 +14,11 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s
 // CHECK-ARGS-MISMATCH: Incremental compilation has been disabled{{.*}}different arguments
 // CHECK-ARGS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
diff --git a/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift b/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift
index 8d10999ba8bb7..34c52817ac74e 100644
--- a/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift
@@ -14,19 +14,19 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s
 // CHECK-WMO: Incremental compilation has been disabled{{.*}}whole module optimization
 // CHECK-WMO-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s
 // CHECK-BITCODE: Incremental compilation has been disabled{{.*}}LLVM IR bitcode
 // CHECK-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s
 // CHECK-WMO-AND-BITCODE: Incremental compilation has been disabled{{.*}}whole module optimization
 // CHECK-WMO-AND-BITCODE-NOT: Incremental compilation has been disabled
 // CHECK-WMO-AND-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift b/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift
index 0fbae58d72600..b062753c728b3 100644
--- a/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift
@@ -14,11 +14,11 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s
 // CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled{{.*}}inputs
 // CHECK-INPUTS-MISMATCH: ./other.swift
 // CHECK-INPUTS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift b/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift
index 69b58ec784c3e..ea8d959df7ede 100644
--- a/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift
@@ -13,24 +13,24 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: rm %t/main~buildrecord.swiftdeps && touch %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
 
 // RUN: echo 'foo' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
 
 // CHECK-MALFORMED: Incremental compilation has been disabled{{.*}}malformed build record file
 // CHECK-MALFORMED-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: echo '{version, inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
 
 // CHECK-MISSING-KEY: Incremental compilation has been disabled{{.*}}malformed build record file{{.*}}Malformed value for key
 // CHECK-MISSING-KEY-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift b/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift
index 29aeea5f37e74..6d8ff2201f97d 100644
--- a/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift
@@ -4,16 +4,16 @@
 // RUN: cp -r %S/Inputs/mutual-with-swiftdeps-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // CHECK-FIRST-DAG: Handled main.swift
 // CHECK-FIRST-DAG: Handled other.swift
 // CHECK-FIRST-DAG: Disabling incremental build: could not read build record
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // CHECK-SECOND-NOT: Queuing
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 // CHECK-THIRD: Queuing (initial): {compile: other.o <= other.swift}
 // CHECK-THIRD: Queuing because of the initial set: {compile: main.o <= main.swift}
 // CHECK-THIRD-NEXT: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps
diff --git a/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift b/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift
index 548c83e442b68..2b6ea9e092703 100644
--- a/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift
+++ b/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift
@@ -14,12 +14,12 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s
 // CHECK-VERSION-MISMATCH: Incremental compilation has been disabled{{.*}}compiler version mismatch
 // CHECK-VERSION-MISMATCH: Compiling with:
 // CHECK-VERSION-MISMATCH: Previously compiled with: bogus
diff --git a/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift b/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift
index a0b1a8edd8aa6..22ea909516d84 100644
--- a/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift
+++ b/test/Driver/Dependencies/embed-bitcode-parallel-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -57,7 +57,7 @@
 
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: "kind": "began"
 // CHECK-SECOND: "name": "compile"
diff --git a/test/Driver/Dependencies/fail-added-fine.swift b/test/Driver/Dependencies/fail-added-fine.swift
index 09d6b7bfba419..1d6a984231a78 100644
--- a/test/Driver/Dependencies/fail-added-fine.swift
+++ b/test/Driver/Dependencies/fail-added-fine.swift
@@ -4,13 +4,13 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled main.swift
 // CHECK-INITIAL: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-ADDED-NOT: Handled
@@ -26,7 +26,7 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/Dependencies/fail-chained-fine.swift b/test/Driver/Dependencies/fail-chained-fine.swift
index e222a83a9d903..8f8184cc56d8d 100644
--- a/test/Driver/Dependencies/fail-chained-fine.swift
+++ b/test/Driver/Dependencies/fail-chained-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -26,7 +26,7 @@
 
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v   > %t/a.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v   > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -47,7 +47,7 @@
 // CHECK-RECORD-A-DAG: "./f.swift": [
 // CHECK-RECORD-A-DAG: "./bad.swift": !private [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
@@ -65,10 +65,10 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/b.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps
@@ -89,7 +89,7 @@
 // CHECK-RECORD-B-DAG: "./f.swift": [
 // CHECK-RECORD-B-DAG: "./bad.swift": !private [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
@@ -107,10 +107,10 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -123,7 +123,7 @@
 // NEGATIVE-BAD-NOT: Handled e.swift
 // NEGATIVE-BAD-NOT: Handled f.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/Dependencies/fail-interface-hash-fine.swift b/test/Driver/Dependencies/fail-interface-hash-fine.swift
index 2ecd51a5c0fe7..9e8e4da377817 100644
--- a/test/Driver/Dependencies/fail-interface-hash-fine.swift
+++ b/test/Driver/Dependencies/fail-interface-hash-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-interface-hash-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -16,7 +16,7 @@
 // RUN: cp -r %S/Inputs/fail-interface-hash-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/bad.swift %t/main.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-SECOND: Handled main.swift
@@ -29,7 +29,7 @@
 // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
 // CHECK-RECORD-DAG: "./depends-on-bad.swift": [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled bad
 // CHECK-THIRD-DAG: Handled depends-on-bad
diff --git a/test/Driver/Dependencies/fail-new-fine.swift b/test/Driver/Dependencies/fail-new-fine.swift
index 7d8f82146ba99..dca8549d8e9ef 100644
--- a/test/Driver/Dependencies/fail-new-fine.swift
+++ b/test/Driver/Dependencies/fail-new-fine.swift
@@ -4,20 +4,20 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 // CHECK-NOT: warning
 // CHECK: Handled main.swift
 // CHECK: Handled bad.swift
 // CHECK-NOT: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
 
 // CHECK-BAD-ONLY-NOT: warning
 // CHECK-BAD-ONLY-NOT: Handled
 // CHECK-BAD-ONLY: Handled bad.swift
 // CHECK-BAD-ONLY-NOT: Handled
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // CHECK-OKAY: Handled main.swift
 // CHECK-OKAY: Handled bad.swift
 // CHECK-OKAY: Handled other.swift
@@ -25,10 +25,10 @@
 
 // RUN: touch -t 201401240006 %t/bad.swift
 // RUN: rm %t/bad.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
 
 // CHECK-OKAY-2-DAG: Handled bad.swift
 // CHECK-OKAY-2-DAG: Handled other.swift
@@ -36,10 +36,10 @@
 
 // RUN: touch -t 201401240006 %t/main.swift
 // RUN: rm %t/main.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // RUN: touch -t 201401240006 %t/other.swift
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
diff --git a/test/Driver/Dependencies/fail-simple-fine.swift b/test/Driver/Dependencies/fail-simple-fine.swift
index 662b0a03d0b98..27ebbe9c7f3fc 100644
--- a/test/Driver/Dependencies/fail-simple-fine.swift
+++ b/test/Driver/Dependencies/fail-simple-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -12,7 +12,7 @@
 // CHECK-FIRST: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-SECOND: Handled bad.swift
@@ -23,7 +23,7 @@
 // CHECK-RECORD-DAG: "./main.swift": !private [
 // CHECK-RECORD-DAG: "./other.swift": !private [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled bad.swift
diff --git a/test/Driver/Dependencies/fail-with-bad-deps-fine.swift b/test/Driver/Dependencies/fail-with-bad-deps-fine.swift
index d63519cd410a4..f732a66b3f550 100644
--- a/test/Driver/Dependencies/fail-with-bad-deps-fine.swift
+++ b/test/Driver/Dependencies/fail-with-bad-deps-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -15,14 +15,14 @@
 // Reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s
 // CHECK-NONE-NOT: Handled
 
 // Reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
 
 // CHECK-BUILD-ALL-NOT: warning
 // CHECK-BUILD-ALL: Handled bad.swift
@@ -34,7 +34,7 @@
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240007 %t/bad.swift %t/main.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-WITH-FAIL: Handled main.swift
@@ -47,4 +47,4 @@
 // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
 // CHECK-RECORD-DAG: "./depends-on-bad.swift": [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
diff --git a/test/Driver/Dependencies/file-added-fine.swift b/test/Driver/Dependencies/file-added-fine.swift
index 741e0712cf478..131ed4ab3f2ec 100644
--- a/test/Driver/Dependencies/file-added-fine.swift
+++ b/test/Driver/Dependencies/file-added-fine.swift
@@ -4,16 +4,16 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
diff --git a/test/Driver/Dependencies/independent-fine.swift b/test/Driver/Dependencies/independent-fine.swift
index 7663ac10c8440..c86d2e7ba878a 100644
--- a/test/Driver/Dependencies/independent-fine.swift
+++ b/test/Driver/Dependencies/independent-fine.swift
@@ -4,43 +4,43 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: ls %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 // CHECK-FIRST-MULTI: Handled main.swift
 // CHECK-FIRST-MULTI: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s
 // CHECK-SINGLE: Handled main.swift
 
 // RUN: ls %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/Dependencies/independent-half-dirty-fine.swift b/test/Driver/Dependencies/independent-half-dirty-fine.swift
index 04a9c48811fdd..581bf95409d3d 100644
--- a/test/Driver/Dependencies/independent-half-dirty-fine.swift
+++ b/test/Driver/Dependencies/independent-half-dirty-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -10,14 +10,14 @@
 
 // RUN: touch -t 201401240005 %t/other.o
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND-NOT: Handled main.swift
 
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
diff --git a/test/Driver/Dependencies/independent-parseable-fine.swift b/test/Driver/Dependencies/independent-parseable-fine.swift
index ff935d1950120..57ca65257dab6 100644
--- a/test/Driver/Dependencies/independent-parseable-fine.swift
+++ b/test/Driver/Dependencies/independent-parseable-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -17,7 +17,7 @@
 // CHECK-FIRST: "output": "Handled main.swift{{(\\r)?}}\n"
 // CHECK-FIRST: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "skipped"
@@ -26,14 +26,14 @@
 // CHECK-SECOND: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 // CHECK-FIRST-MULTI: {{^{$}}
 // CHECK-FIRST-MULTI: "kind": "began"
@@ -59,7 +59,7 @@
 // CHECK-FIRST-MULTI: "output": "Handled other.swift{{(\\r)?}}\n"
 // CHECK-FIRST-MULTI: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s
 
 // CHECK-SECOND-MULTI: {{^{$}}
 // CHECK-SECOND-MULTI: "kind": "skipped"
@@ -74,5 +74,5 @@
 // CHECK-SECOND-MULTI: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
diff --git a/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift b/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift
index b231c8719afec..0a3285ac3caf2 100644
--- a/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift
+++ b/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift
@@ -3,24 +3,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -30,18 +30,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/Dependencies/malformed-fine.swift b/test/Driver/Dependencies/malformed-fine.swift
index 34f92709f2902..a1f9979241675 100644
--- a/test/Driver/Dependencies/malformed-fine.swift
+++ b/test/Driver/Dependencies/malformed-fine.swift
@@ -3,24 +3,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -30,18 +30,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/Dependencies/mutual-fine.swift b/test/Driver/Dependencies/mutual-fine.swift
index a85759ff05610..ab5a2ea6c465e 100644
--- a/test/Driver/Dependencies/mutual-fine.swift
+++ b/test/Driver/Dependencies/mutual-fine.swift
@@ -4,21 +4,21 @@
 // RUN: cp -r %S/Inputs/mutual-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
diff --git a/test/Driver/Dependencies/mutual-interface-hash-fine.swift b/test/Driver/Dependencies/mutual-interface-hash-fine.swift
index 035a3b57b77c2..cd1b97038b48d 100644
--- a/test/Driver/Dependencies/mutual-interface-hash-fine.swift
+++ b/test/Driver/Dependencies/mutual-interface-hash-fine.swift
@@ -5,17 +5,17 @@
 // RUN: touch -t 201401240005 %t/*
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 // CHECK-CLEAN-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/does-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s
 
 // CHECK-CHANGE-DAG: Handled does-change.swift
 // CHECK-CHANGE-DAG: Handled does-not-change.swift
@@ -24,7 +24,7 @@
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/does-not-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s
 
 // CHECK-NO-CHANGE-NOT: Handled
 // CHECK-NO-CHANGE: Handled does-not-change.swift
@@ -36,7 +36,7 @@
 // Make sure the files really were dependent on one another.
 
 // RUN: touch -t 201401240007 %t/does-not-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
 
 // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-not-change.swift
 // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-change.swift
@@ -47,4 +47,4 @@
 
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 // RUN: sed -E -e 's/"[^"]*does-not-change.swift":/& !dirty/' -i.prev %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
diff --git a/test/Driver/Dependencies/nominal-members-fine.swift b/test/Driver/Dependencies/nominal-members-fine.swift
index a9f36d3855661..f86599cb8ec7e 100644
--- a/test/Driver/Dependencies/nominal-members-fine.swift
+++ b/test/Driver/Dependencies/nominal-members-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/nominal-members-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled a.swift
@@ -12,12 +12,12 @@
 // CHECK-INITIAL: Handled depends-on-a-foo.swift
 // CHECK-INITIAL: Handled depends-on-a-ext.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 // CHECK-CLEAN-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v > %t/touched-a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v > %t/touched-a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt
 
@@ -26,11 +26,11 @@
 // CHECK-TOUCHED-A-DAG: Handled depends-on-a-ext.swift
 // NEGATIVE-TOUCHED-A-NOT: Handled a-ext.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 
 // RUN: touch -t 201401240007 %t/a-ext.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s
 
 // CHECK-TOUCHED-EXT-NOT: Handled
 // CHECK-TOUCHED-EXT: Handled a-ext.swift
diff --git a/test/Driver/Dependencies/one-way-depends-after-fine.swift b/test/Driver/Dependencies/one-way-depends-after-fine.swift
index 115717e731e6a..4ed427a41525c 100644
--- a/test/Driver/Dependencies/one-way-depends-after-fine.swift
+++ b/test/Driver/Dependencies/one-way-depends-after-fine.swift
@@ -6,25 +6,25 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND-NOT: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 
 // RUN: %empty-directory(%t)
@@ -32,25 +32,25 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD-NOT: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-DAG: Handled other.swift
 // CHECK-FOURTH-DAG: Handled main.swift
diff --git a/test/Driver/Dependencies/one-way-depends-before-fine.swift b/test/Driver/Dependencies/one-way-depends-before-fine.swift
index 3a19bc78b8f54..65b54b1289d4b 100644
--- a/test/Driver/Dependencies/one-way-depends-before-fine.swift
+++ b/test/Driver/Dependencies/one-way-depends-before-fine.swift
@@ -6,24 +6,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -35,22 +35,22 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
 // CHECK-FOURTH-NOT: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/Dependencies/one-way-external-delete-fine.swift b/test/Driver/Dependencies/one-way-external-delete-fine.swift
index e86a46b512d43..320c7db1b649c 100644
--- a/test/Driver/Dependencies/one-way-external-delete-fine.swift
+++ b/test/Driver/Dependencies/one-way-external-delete-fine.swift
@@ -2,13 +2,13 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
@@ -17,7 +17,7 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: rm %t/other1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
@@ -27,14 +27,14 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: touch -t 201401240005 %t/*
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: rm %t/main1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/Dependencies/one-way-external-fine.swift b/test/Driver/Dependencies/one-way-external-fine.swift
index 6135e0bd10c01..a49e3a36adca7 100644
--- a/test/Driver/Dependencies/one-way-external-fine.swift
+++ b/test/Driver/Dependencies/one-way-external-fine.swift
@@ -8,13 +8,13 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
@@ -23,7 +23,7 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/other1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
@@ -32,14 +32,14 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/other2-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 
 // RUN: touch -t 201401240005 %t/*
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/main1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
@@ -49,4 +49,4 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/main2-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
diff --git a/test/Driver/Dependencies/one-way-fine.swift b/test/Driver/Dependencies/one-way-fine.swift
index ecc889bcf651f..e0d30d47c70c7 100644
--- a/test/Driver/Dependencies/one-way-fine.swift
+++ b/test/Driver/Dependencies/one-way-fine.swift
@@ -4,34 +4,34 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
 // CHECK-FOURTH-NOT: Handled other.swift
 
 // RUN: rm %t/main.o
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: rm %t/other.o
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s
 
 // CHECK-FIFTH-NOT: Handled main.swift
 // CHECK-FIFTH: Handled other.swift
@@ -41,34 +41,34 @@
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // Try modifying the inputs /backwards/ in time rather than forwards.
 // RUN: touch -t 201401240004 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240004 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
 
 // CHECK-REV-FIRST: Handled other.swift
 // CHECK-REV-FIRST: Handled main.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s
 
 // CHECK-REV-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s
 
 // CHECK-REV-FOURTH-NOT: Handled other.swift
 // CHECK-REV-FOURTH: Handled main.swift
diff --git a/test/Driver/Dependencies/one-way-merge-module-fine.swift b/test/Driver/Dependencies/one-way-merge-module-fine.swift
index de41a215d5502..052385f13ae62 100644
--- a/test/Driver/Dependencies/one-way-merge-module-fine.swift
+++ b/test/Driver/Dependencies/one-way-merge-module-fine.swift
@@ -4,14 +4,14 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Produced master.swiftmodule
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: warning
 // CHECK-SECOND-NOT: Handled
diff --git a/test/Driver/Dependencies/one-way-parallel-fine.swift b/test/Driver/Dependencies/one-way-parallel-fine.swift
index b5aced8140697..b468c2497a881 100644
--- a/test/Driver/Dependencies/one-way-parallel-fine.swift
+++ b/test/Driver/Dependencies/one-way-parallel-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -32,7 +32,7 @@
 // CHECK-FIRST: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "began"
diff --git a/test/Driver/Dependencies/one-way-parseable-fine.swift b/test/Driver/Dependencies/one-way-parseable-fine.swift
index de2d0d4edba60..2169ffcd2c002 100644
--- a/test/Driver/Dependencies/one-way-parseable-fine.swift
+++ b/test/Driver/Dependencies/one-way-parseable-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -29,7 +29,7 @@
 // CHECK-FIRST: "output": "Handled other.swift{{(\\r)?}}\n"
 // CHECK-FIRST: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "skipped"
@@ -44,7 +44,7 @@
 // CHECK-SECOND: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: {{^{$}}
 // CHECK-THIRD: "kind": "began"
@@ -71,7 +71,7 @@
 // CHECK-THIRD: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH: {{^{$}}
 // CHECK-FOURTH: "kind": "began"
diff --git a/test/Driver/Dependencies/one-way-provides-after-fine.swift b/test/Driver/Dependencies/one-way-provides-after-fine.swift
index bf4466605e15c..27718a54551e6 100644
--- a/test/Driver/Dependencies/one-way-provides-after-fine.swift
+++ b/test/Driver/Dependencies/one-way-provides-after-fine.swift
@@ -6,42 +6,42 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
diff --git a/test/Driver/Dependencies/one-way-provides-before-fine.swift b/test/Driver/Dependencies/one-way-provides-before-fine.swift
index 5f00a4e3d26f6..504ca49ba0cdb 100644
--- a/test/Driver/Dependencies/one-way-provides-before-fine.swift
+++ b/test/Driver/Dependencies/one-way-provides-before-fine.swift
@@ -6,24 +6,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -34,18 +34,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/Dependencies/one-way-while-editing-fine.swift b/test/Driver/Dependencies/one-way-while-editing-fine.swift
index e2be06aa56fa7..fdba1dc166a28 100644
--- a/test/Driver/Dependencies/one-way-while-editing-fine.swift
+++ b/test/Driver/Dependencies/one-way-while-editing-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // CHECK: Handled main.swift
 // CHECK: Handled other.swift
@@ -12,14 +12,14 @@
 // CHECK: error: input file 'other.swift' was modified during the build
 // CHECK-NOT: error
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s
 
 // CHECK-RECOVER: Handled main.swift
 // CHECK-RECOVER: Handled other.swift
 
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED %s
 
 // CHECK-REVERSED: Handled other.swift
 // CHECK-REVERSED: Handled main.swift
@@ -27,7 +27,7 @@
 // CHECK-REVERSED: error: input file 'main.swift' was modified during the build
 // CHECK-REVERSED-NOT: error
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s
 
 // CHECK-REVERSED-RECOVER-NOT: Handled other.swift
 // CHECK-REVERSED-RECOVER: Handled main.swift
diff --git a/test/Driver/Dependencies/private-after-fine.swift b/test/Driver/Dependencies/private-after-fine.swift
index 1b85933b1112d..e3e5a4327401d 100644
--- a/test/Driver/Dependencies/private-after-fine.swift
+++ b/test/Driver/Dependencies/private-after-fine.swift
@@ -6,18 +6,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt
 
@@ -35,13 +35,13 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/f.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-F %s < %t/f.txt
 // RUN: %FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt
 
diff --git a/test/Driver/Dependencies/private-fine.swift b/test/Driver/Dependencies/private-fine.swift
index 3ed93c79568b2..341a40248447c 100644
--- a/test/Driver/Dependencies/private-fine.swift
+++ b/test/Driver/Dependencies/private-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/private-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled a.swift
@@ -14,7 +14,7 @@
 // CHECK-INITIAL: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt
 
@@ -25,7 +25,7 @@
 // CHECK-A-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/b.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt
 
@@ -36,7 +36,7 @@
 // CHECK-B-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/c.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-C %s < %t/c.txt
 // RUN: %FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt
 
@@ -47,7 +47,7 @@
 // CHECK-C-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/d.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-D %s < %t/d.txt
 // RUN: %FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt
 
@@ -58,7 +58,7 @@
 // CHECK-D-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/e.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-E %s < %t/e.txt
 // RUN: %FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt
 
@@ -75,7 +75,7 @@
 // CHECK-E-NEG-NOT: Handled b.swift
 
 // RUN: touch -t 201401240007 %t/a.swift %t/e.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt
 // RUN: %FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt
 
diff --git a/test/Driver/Dependencies/whole-module-build-record.swift b/test/Driver/Dependencies/whole-module-build-record.swift
index af921e8a27448..5423d32296a49 100644
--- a/test/Driver/Dependencies/whole-module-build-record.swift
+++ b/test/Driver/Dependencies/whole-module-build-record.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-whole-module.py" -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-whole-module.py" -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -15,6 +15,6 @@
 
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/../Inputs/fail.py" -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/../Inputs/fail.py" -output-file-map %t/output.json -whole-module-optimization ./main.swift ./other.swift -module-name main -j1 -v 2>&1
 
 // Just don't crash.
diff --git a/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift b/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift
index bf93187d4207a..69bb67abdfb9f 100644
--- a/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift
@@ -4,23 +4,23 @@
 // RUN: cp -r %S/Inputs/chained-additional-kinds-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled yet-another.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/PrivateDependencies/chained-after-fine.swift b/test/Driver/PrivateDependencies/chained-after-fine.swift
index 6bbfaff140f18..10765cf4807a7 100644
--- a/test/Driver/PrivateDependencies/chained-after-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-after-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-after-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
diff --git a/test/Driver/PrivateDependencies/chained-fine.swift b/test/Driver/PrivateDependencies/chained-fine.swift
index 08f75db2d475f..4da7fac3f60cd 100644
--- a/test/Driver/PrivateDependencies/chained-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-fine.swift
@@ -4,29 +4,29 @@
 // RUN: cp -r %S/Inputs/chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled yet-another.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240009 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/PrivateDependencies/chained-private-after-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-fine.swift
index 5e5a007abea23..cd892ea55b4f6 100644
--- a/test/Driver/PrivateDependencies/chained-private-after-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-private-after-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift
index 76fcb8f05b9e7..1a1289d522a24 100644
--- a/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift
@@ -6,7 +6,7 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 
 
@@ -14,13 +14,13 @@
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-multiple-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v  2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v  2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift
index 78d02c537c540..149f200e93b7d 100644
--- a/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift
@@ -6,17 +6,17 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members-fine/*.swiftdeps %t
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/chained-private-fine.swift b/test/Driver/PrivateDependencies/chained-private-fine.swift
index f286de7ba7522..4479c437a25a6 100644
--- a/test/Driver/PrivateDependencies/chained-private-fine.swift
+++ b/test/Driver/PrivateDependencies/chained-private-fine.swift
@@ -4,19 +4,19 @@
 // RUN: cp -r %S/Inputs/chained-private-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Handled yet-another.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-THIRD %s < %t/outputToCheck
 
 // Driver now schedules jobs in the order the inputs were given, but
diff --git a/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift b/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift
index 4aa32c6d90f67..ff0067b52b339 100644
--- a/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift
+++ b/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift
@@ -6,7 +6,7 @@
 // RUN: cp -r %S/Inputs/check-interface-implementation-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./c.swift  ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./c.swift  ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -20,7 +20,7 @@
 
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t &&  not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental > %t/a.txt 2>&1
+// RUN: cd %t &&  not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -33,7 +33,7 @@
 // CHECK-RECORD-A-DAG: "./bad.swift": !private [
 // CHECK-RECORD-A-DAG: "./c.swift": !private [
 
-// RUN: cd %t &&   %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s
+// RUN: cd %t &&   %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift  -module-name main -j1 -v  -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s
 
 // CHECK-BC-NOT: Handled a.swift
 // CHECK-BC-DAG: Handled bad.swift
diff --git a/test/Driver/PrivateDependencies/crash-added-fine.swift b/test/Driver/PrivateDependencies/crash-added-fine.swift
index 6c44728f6ad6a..68f7c08356f74 100644
--- a/test/Driver/PrivateDependencies/crash-added-fine.swift
+++ b/test/Driver/PrivateDependencies/crash-added-fine.swift
@@ -4,13 +4,13 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled main.swift
 // CHECK-INITIAL: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-ADDED-NOT: Handled
@@ -26,13 +26,13 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s
 
 // CHECK-FIXED-DAG: Handled crash.swift
 // CHECK-FIXED-DAG: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/crash-new-fine.swift b/test/Driver/PrivateDependencies/crash-new-fine.swift
index 1d07151753e9a..4af5cfd376d66 100644
--- a/test/Driver/PrivateDependencies/crash-new-fine.swift
+++ b/test/Driver/PrivateDependencies/crash-new-fine.swift
@@ -6,7 +6,7 @@
 
 // Initially compile all inputs, crash will fail.
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 // CHECK-NOT: warning
 // CHECK: Handled main.swift
 // CHECK: Handled crash.swift
@@ -15,7 +15,7 @@
 // Put crash.swift first to assure it gets scheduled first.
 // The others get queued, but not dispatched because crash crashes.
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
 
 // CHECK-BAD-ONLY-NOT: warning
 // CHECK-BAD-ONLY-NOT: Handled
@@ -24,7 +24,7 @@
 
 // Make crash succeed and all get compiled, exactly once.
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // CHECK-OKAY: Handled main.swift
 // CHECK-OKAY: Handled crash.swift
 // CHECK-OKAY: Handled other.swift
@@ -34,12 +34,12 @@
 
 // RUN: touch -t 201401240006 %t/crash.swift
 // RUN: rm %t/crash.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // And repair crash:
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
 
 // CHECK-OKAY-2-DAG: Handled crash.swift
 // CHECK-OKAY-2-DAG: Handled other.swift
@@ -51,7 +51,7 @@
 
 // RUN: touch -t 201401240006 %t/main.swift
 // RUN: rm %t/main.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s
 
 // CHECK-NO-MAIN-SWIFTDEPS-NOT: warning
 // CHECK-NO-MAIN-SWIFTDEPS: Handled main.swift
@@ -62,7 +62,7 @@
 // Touch all files earlier than last compiled date in the build record.
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s
 
 // CHECK-CURRENT-WITH-CRASH: Handled main.swift
 // CHECK-CURRENT-WITH-CRASH: Handled crash.swift
@@ -73,4 +73,4 @@
 
 // RUN: touch -t 201401240006 %t/other.swift
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
diff --git a/test/Driver/PrivateDependencies/crash-simple-fine.swift b/test/Driver/PrivateDependencies/crash-simple-fine.swift
index c04b3d7c01676..5f7420f9fbb30 100644
--- a/test/Driver/PrivateDependencies/crash-simple-fine.swift
+++ b/test/Driver/PrivateDependencies/crash-simple-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/crash-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -12,7 +12,7 @@
 // CHECK-FIRST: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/crash.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 |  %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled crash.swift
 // CHECK-SECOND-NOT: Handled main.swift
@@ -24,7 +24,7 @@
 // CHECK-RECORD-DAG: "./main.swift": !private [
 // CHECK-RECORD-DAG: "./other.swift": !private [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift  ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled crash.swift
diff --git a/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift b/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift
index 52bdac2a03606..7a608cb8b049c 100644
--- a/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift
+++ b/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift
@@ -6,7 +6,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json
 
 // RUN: %FileCheck -check-prefix CHECK-ORIGINAL %s < main~buildrecord.swiftdeps~
 // CHECK-ORIGINAL: inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift
index 3316c39fbd2ef..ab9098e82b4cf 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift
@@ -14,11 +14,11 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s
 // CHECK-ARGS-MISMATCH: Incremental compilation has been disabled{{.*}}different arguments
 // CHECK-ARGS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift
index aa30eb0bfd20c..abc50bf4b2840 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift
@@ -14,19 +14,19 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s
 // CHECK-WMO: Incremental compilation has been disabled{{.*}}whole module optimization
 // CHECK-WMO-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s
 // CHECK-BITCODE: Incremental compilation has been disabled{{.*}}LLVM IR bitcode
 // CHECK-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s
 // CHECK-WMO-AND-BITCODE: Incremental compilation has been disabled{{.*}}whole module optimization
 // CHECK-WMO-AND-BITCODE-NOT: Incremental compilation has been disabled
 // CHECK-WMO-AND-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift
index 83c515d558766..62ecaa7b4aea7 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift
@@ -14,11 +14,11 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s
 // CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled{{.*}}inputs
 // CHECK-INPUTS-MISMATCH: ./other.swift
 // CHECK-INPUTS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift
index 063fb166b155c..b242ae0ab3989 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift
@@ -13,24 +13,24 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: rm %t/main~buildrecord.swiftdeps && touch %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
 
 // RUN: echo 'foo' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s
 
 // CHECK-MALFORMED: Incremental compilation has been disabled{{.*}}malformed build record file
 // CHECK-MALFORMED-NOT: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: echo '{version, inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s
 
 // CHECK-MISSING-KEY: Incremental compilation has been disabled{{.*}}malformed build record file{{.*}}Malformed value for key
 // CHECK-MISSING-KEY-NOT: Queuing (initial): {compile: main.o <= main.swift}
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift
index 000a5d3a1ef7f..7912b3428e450 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift
@@ -4,16 +4,16 @@
 // RUN: cp -r %S/Inputs/mutual-with-swiftdeps-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // CHECK-FIRST-DAG: Handled main.swift
 // CHECK-FIRST-DAG: Handled other.swift
 // CHECK-FIRST-DAG: Disabling incremental build: could not read build record
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // CHECK-SECOND-NOT: Queuing
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 // CHECK-THIRD: Queuing (initial): {compile: other.o <= other.swift}
 // CHECK-THIRD: Queuing because of the initial set: {compile: main.o <= main.swift}
 // CHECK-THIRD-NEXT: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps
diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift
index 0d23556e76336..da1fe811010db 100644
--- a/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift
+++ b/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift
@@ -14,12 +14,12 @@
 // RUN: %{python} %S/Inputs/touch.py 443865900 %t/*
 
 // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s
 // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled
 // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift}
 
 // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s
 // CHECK-VERSION-MISMATCH: Incremental compilation has been disabled{{.*}}compiler version mismatch
 // CHECK-VERSION-MISMATCH: Compiling with:
 // CHECK-VERSION-MISMATCH: Previously compiled with: bogus
diff --git a/test/Driver/PrivateDependencies/embed-bitcode-parallel-fine.swift b/test/Driver/PrivateDependencies/embed-bitcode-parallel-fine.swift
index 50112643381ca..8cce22c245e04 100644
--- a/test/Driver/PrivateDependencies/embed-bitcode-parallel-fine.swift
+++ b/test/Driver/PrivateDependencies/embed-bitcode-parallel-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -57,7 +57,7 @@
 
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-for-bitcode.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./other.swift -embed-bitcode -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: "kind": "began"
 // CHECK-SECOND: "name": "compile"
diff --git a/test/Driver/PrivateDependencies/fail-added-fine.swift b/test/Driver/PrivateDependencies/fail-added-fine.swift
index 96fd48459944b..6863769c1502e 100644
--- a/test/Driver/PrivateDependencies/fail-added-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-added-fine.swift
@@ -4,13 +4,13 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled main.swift
 // CHECK-INITIAL: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-ADDED-NOT: Handled
@@ -26,7 +26,7 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/PrivateDependencies/fail-chained-fine.swift b/test/Driver/PrivateDependencies/fail-chained-fine.swift
index bb3178849247e..cb6266b1a8aaa 100644
--- a/test/Driver/PrivateDependencies/fail-chained-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-chained-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -26,7 +26,7 @@
 
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v   > %t/a.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v   > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -47,7 +47,7 @@
 // CHECK-RECORD-A-DAG: "./f.swift": [
 // CHECK-RECORD-A-DAG: "./bad.swift": !private [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
@@ -65,10 +65,10 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/b.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps
@@ -89,7 +89,7 @@
 // CHECK-RECORD-B-DAG: "./f.swift": [
 // CHECK-RECORD-B-DAG: "./bad.swift": !private [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
@@ -107,10 +107,10 @@
 // RUN: cp -r %S/Inputs/fail-chained-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps
@@ -123,7 +123,7 @@
 // NEGATIVE-BAD-NOT: Handled e.swift
 // NEGATIVE-BAD-NOT: Handled f.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt
 // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift b/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift
index 53c52594063a2..1fe550101af33 100644
--- a/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-interface-hash-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -16,7 +16,7 @@
 // RUN: cp -r %S/Inputs/fail-interface-hash-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/bad.swift %t/main.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-SECOND: Handled main.swift
@@ -29,7 +29,7 @@
 // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
 // CHECK-RECORD-DAG: "./depends-on-bad.swift": [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled bad
 // CHECK-THIRD-DAG: Handled depends-on-bad
diff --git a/test/Driver/PrivateDependencies/fail-new-fine.swift b/test/Driver/PrivateDependencies/fail-new-fine.swift
index b3c917f498628..a53fec7298b02 100644
--- a/test/Driver/PrivateDependencies/fail-new-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-new-fine.swift
@@ -4,20 +4,20 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 // CHECK-NOT: warning
 // CHECK: Handled main.swift
 // CHECK: Handled bad.swift
 // CHECK-NOT: Handled other.swift
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s
 
 // CHECK-BAD-ONLY-NOT: warning
 // CHECK-BAD-ONLY-NOT: Handled
 // CHECK-BAD-ONLY: Handled bad.swift
 // CHECK-BAD-ONLY-NOT: Handled
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // CHECK-OKAY: Handled main.swift
 // CHECK-OKAY: Handled bad.swift
 // CHECK-OKAY: Handled other.swift
@@ -25,10 +25,10 @@
 
 // RUN: touch -t 201401240006 %t/bad.swift
 // RUN: rm %t/bad.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s
 
 // CHECK-OKAY-2-DAG: Handled bad.swift
 // CHECK-OKAY-2-DAG: Handled other.swift
@@ -36,10 +36,10 @@
 
 // RUN: touch -t 201401240006 %t/main.swift
 // RUN: rm %t/main.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s
 // RUN: touch -t 201401240006 %t/other.swift
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
diff --git a/test/Driver/PrivateDependencies/fail-simple-fine.swift b/test/Driver/PrivateDependencies/fail-simple-fine.swift
index 1d4cb299605e7..145fc8bad3341 100644
--- a/test/Driver/PrivateDependencies/fail-simple-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-simple-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-simple-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -12,7 +12,7 @@
 // CHECK-FIRST: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-SECOND: Handled bad.swift
@@ -23,7 +23,7 @@
 // CHECK-RECORD-DAG: "./main.swift": !private [
 // CHECK-RECORD-DAG: "./other.swift": !private [
 
-// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t &&  %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled main.swift
 // CHECK-THIRD-DAG: Handled bad.swift
diff --git a/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift b/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift
index 8639ba7d45d17..06b2442ffba87 100644
--- a/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift
+++ b/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -15,14 +15,14 @@
 // Reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s
 // CHECK-NONE-NOT: Handled
 
 // Reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/bad.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
 
 // CHECK-BUILD-ALL-NOT: warning
 // CHECK-BUILD-ALL: Handled bad.swift
@@ -34,7 +34,7 @@
 // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240007 %t/bad.swift %t/main.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-WITH-FAIL: Handled main.swift
@@ -47,4 +47,4 @@
 // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [
 // CHECK-RECORD-DAG: "./depends-on-bad.swift": [
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s
diff --git a/test/Driver/PrivateDependencies/file-added-fine.swift b/test/Driver/PrivateDependencies/file-added-fine.swift
index b5138e158e222..a91e412397dd6 100644
--- a/test/Driver/PrivateDependencies/file-added-fine.swift
+++ b/test/Driver/PrivateDependencies/file-added-fine.swift
@@ -4,16 +4,16 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/independent-fine.swift b/test/Driver/PrivateDependencies/independent-fine.swift
index c57fe2a2f2ee4..600a619468e7e 100644
--- a/test/Driver/PrivateDependencies/independent-fine.swift
+++ b/test/Driver/PrivateDependencies/independent-fine.swift
@@ -4,43 +4,43 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: ls %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 // CHECK-FIRST-MULTI: Handled main.swift
 // CHECK-FIRST-MULTI: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s
 // CHECK-SINGLE: Handled main.swift
 
 // RUN: ls %t/main~buildrecord.swiftdeps
diff --git a/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift b/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift
index 07abdbcff5cd6..7ebf28ddeb6fb 100644
--- a/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift
+++ b/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
@@ -10,14 +10,14 @@
 
 // RUN: touch -t 201401240005 %t/other.o
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND-NOT: Handled main.swift
 
 // RUN: rm %t/other.swiftdeps
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
diff --git a/test/Driver/PrivateDependencies/independent-parseable-fine.swift b/test/Driver/PrivateDependencies/independent-parseable-fine.swift
index 988306b5509e5..b4bc7bad867c5 100644
--- a/test/Driver/PrivateDependencies/independent-parseable-fine.swift
+++ b/test/Driver/PrivateDependencies/independent-parseable-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -17,7 +17,7 @@
 // CHECK-FIRST: "output": "Handled main.swift{{(\\r)?}}\n"
 // CHECK-FIRST: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "skipped"
@@ -26,14 +26,14 @@
 // CHECK-SECOND: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/independent-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
 // CHECK-FIRST-MULTI: {{^{$}}
 // CHECK-FIRST-MULTI: "kind": "began"
@@ -59,7 +59,7 @@
 // CHECK-FIRST-MULTI: "output": "Handled other.swift{{(\\r)?}}\n"
 // CHECK-FIRST-MULTI: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s
 
 // CHECK-SECOND-MULTI: {{^{$}}
 // CHECK-SECOND-MULTI: "kind": "skipped"
@@ -74,5 +74,5 @@
 // CHECK-SECOND-MULTI: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s
 
diff --git a/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift b/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift
index 94d9ca70fe42c..769a8ffe004c1 100644
--- a/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift
+++ b/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift
@@ -3,24 +3,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -30,18 +30,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/malformed-fine.swift b/test/Driver/PrivateDependencies/malformed-fine.swift
index e778a0b6cfaee..3b0355c3a8657 100644
--- a/test/Driver/PrivateDependencies/malformed-fine.swift
+++ b/test/Driver/PrivateDependencies/malformed-fine.swift
@@ -3,24 +3,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -30,18 +30,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/mutual-fine.swift b/test/Driver/PrivateDependencies/mutual-fine.swift
index b3352f87f50d1..637d50cad56f8 100644
--- a/test/Driver/PrivateDependencies/mutual-fine.swift
+++ b/test/Driver/PrivateDependencies/mutual-fine.swift
@@ -4,21 +4,21 @@
 // RUN: cp -r %S/Inputs/mutual-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
diff --git a/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift b/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift
index 2c1b85b77814d..1adf57499098a 100644
--- a/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift
+++ b/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift
@@ -5,17 +5,17 @@
 // RUN: touch -t 201401240005 %t/*
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 // CHECK-CLEAN-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/does-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v  2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s
 
 // CHECK-CHANGE-DAG: Handled does-change.swift
 // CHECK-CHANGE-DAG: Handled does-not-change.swift
@@ -24,7 +24,7 @@
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/does-not-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s
 
 // CHECK-NO-CHANGE-NOT: Handled
 // CHECK-NO-CHANGE: Handled does-not-change.swift
@@ -36,7 +36,7 @@
 // Make sure the files really were dependent on one another.
 
 // RUN: touch -t 201401240007 %t/does-not-change.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
 
 // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-not-change.swift
 // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-change.swift
@@ -47,4 +47,4 @@
 
 // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t
 // RUN: sed -E -e 's/"[^"]*does-not-change.swift":/& !dirty/' -i.prev %t/main~buildrecord.swiftdeps
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s
diff --git a/test/Driver/PrivateDependencies/nominal-members-fine.swift b/test/Driver/PrivateDependencies/nominal-members-fine.swift
index 036a42b45807f..ff80d585f4628 100644
--- a/test/Driver/PrivateDependencies/nominal-members-fine.swift
+++ b/test/Driver/PrivateDependencies/nominal-members-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/nominal-members-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled a.swift
@@ -12,12 +12,12 @@
 // CHECK-INITIAL: Handled depends-on-a-foo.swift
 // CHECK-INITIAL: Handled depends-on-a-ext.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 // CHECK-CLEAN-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v > %t/touched-a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v > %t/touched-a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt
 // RUN: %FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt
 
@@ -26,11 +26,11 @@
 // CHECK-TOUCHED-A-DAG: Handled depends-on-a-ext.swift
 // NEGATIVE-TOUCHED-A-NOT: Handled a-ext.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s
 
 
 // RUN: touch -t 201401240007 %t/a-ext.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift  -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s
 
 // CHECK-TOUCHED-EXT-NOT: Handled
 // CHECK-TOUCHED-EXT: Handled a-ext.swift
diff --git a/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift b/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift
index 2c14d121f0f96..4bcbb358818ec 100644
--- a/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift
@@ -6,25 +6,25 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 // CHECK-SECOND-NOT: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 
 // RUN: %empty-directory(%t)
@@ -32,25 +32,25 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD-NOT: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-DAG: Handled other.swift
 // CHECK-FOURTH-DAG: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift b/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift
index d3c45cfda9a1b..0fa424d18ca3b 100644
--- a/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift
@@ -6,24 +6,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -35,22 +35,22 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
 // CHECK-FOURTH-NOT: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240008 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
diff --git a/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift b/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift
index c10b5febb09d8..2d08806ff7b39 100644
--- a/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift
@@ -2,13 +2,13 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
@@ -17,7 +17,7 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: rm %t/other1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
@@ -27,14 +27,14 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 
 // RUN: touch -t 201401240005 %t/*
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: rm %t/main1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/one-way-external-fine.swift b/test/Driver/PrivateDependencies/one-way-external-fine.swift
index dc4544bac4404..5697d718cd134 100644
--- a/test/Driver/PrivateDependencies/one-way-external-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-external-fine.swift
@@ -8,13 +8,13 @@
 // RUN: cp -r %S/Inputs/one-way-external-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
@@ -23,7 +23,7 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/other1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-DAG: Handled other.swift
 // CHECK-THIRD-DAG: Handled main.swift
@@ -32,14 +32,14 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/other2-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 
 // RUN: touch -t 201401240005 %t/*
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/main1-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
@@ -49,4 +49,4 @@
 // RUN: touch -t 201401240006 %t/*.o
 // RUN: touch -t 201401240004 %t/*-external
 // RUN: touch -t 203704010005 %t/main2-external
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
diff --git a/test/Driver/PrivateDependencies/one-way-fine.swift b/test/Driver/PrivateDependencies/one-way-fine.swift
index 2c1aaf2bf353a..1535427e8be20 100644
--- a/test/Driver/PrivateDependencies/one-way-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-fine.swift
@@ -4,34 +4,34 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: Handled main.swift
 // CHECK-THIRD: Handled other.swift
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
 // CHECK-FOURTH-NOT: Handled other.swift
 
 // RUN: rm %t/main.o
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: rm %t/other.o
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s
 
 // CHECK-FIFTH-NOT: Handled main.swift
 // CHECK-FIFTH: Handled other.swift
@@ -41,34 +41,34 @@
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // Try modifying the inputs /backwards/ in time rather than forwards.
 // RUN: touch -t 201401240004 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240004 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
 
 // CHECK-REV-FIRST: Handled other.swift
 // CHECK-REV-FIRST: Handled main.swift
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s
 
 // CHECK-REV-SECOND-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents  -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s
 
 // CHECK-REV-FOURTH-NOT: Handled other.swift
 // CHECK-REV-FOURTH: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift b/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift
index b5e2da7cca40e..2d4b6aa9556f1 100644
--- a/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift
@@ -4,14 +4,14 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: Handled main.swift
 // CHECK-FIRST: Handled other.swift
 // CHECK-FIRST: Produced master.swiftmodule
 
-// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-NOT: warning
 // CHECK-SECOND-NOT: Handled
diff --git a/test/Driver/PrivateDependencies/one-way-parallel-fine.swift b/test/Driver/PrivateDependencies/one-way-parallel-fine.swift
index 8ff7c9a318dbb..2e59b0efb9726 100644
--- a/test/Driver/PrivateDependencies/one-way-parallel-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-parallel-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -32,7 +32,7 @@
 // CHECK-FIRST: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "began"
diff --git a/test/Driver/PrivateDependencies/one-way-parseable-fine.swift b/test/Driver/PrivateDependencies/one-way-parseable-fine.swift
index 82bd1cfc2b3f8..021efa44a6ea8 100644
--- a/test/Driver/PrivateDependencies/one-way-parseable-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-parseable-fine.swift
@@ -2,7 +2,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST: {{^{$}}
@@ -29,7 +29,7 @@
 // CHECK-FIRST: "output": "Handled other.swift{{(\\r)?}}\n"
 // CHECK-FIRST: {{^}$}}
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: {{^{$}}
 // CHECK-SECOND: "kind": "skipped"
@@ -44,7 +44,7 @@
 // CHECK-SECOND: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD: {{^{$}}
 // CHECK-THIRD: "kind": "began"
@@ -71,7 +71,7 @@
 // CHECK-THIRD: {{^}$}}
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH: {{^{$}}
 // CHECK-FOURTH: "kind": "began"
diff --git a/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift b/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift
index d33e9fdd3cfef..1672081f69d27 100644
--- a/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift
@@ -6,42 +6,42 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND-DAG: Handled other.swift
 // CHECK-SECOND-DAG: Handled main.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/* %t
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // RUN: touch -t 201401240008 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled other.swift
 // CHECK-THIRD: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift b/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift
index 5b1951b6549a3..d9bb773806dec 100644
--- a/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift
@@ -6,24 +6,24 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // CHECK-FIRST-NOT: warning
 // CHECK-FIRST-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
 
 // CHECK-SECOND: Handled main.swift
 // CHECK-SECOND: Handled other.swift
 
 // RUN: touch -t 201401240007 %t/other.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s
 
 // CHECK-THIRD-NOT: Handled main.swift
 // CHECK-THIRD: Handled other.swift
@@ -34,18 +34,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 
 // RUN: touch -t 201401240006 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // RUN: touch -t 201401240007 %t/main.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s
 
 // CHECK-FOURTH-NOT: Handled other.swift
 // CHECK-FOURTH: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift b/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift
index 2b7d04de643aa..d0a0999b1c3a3 100644
--- a/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift
+++ b/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s
 
 // CHECK: Handled main.swift
 // CHECK: Handled other.swift
@@ -12,14 +12,14 @@
 // CHECK: error: input file 'other.swift' was modified during the build
 // CHECK-NOT: error
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s
 
 // CHECK-RECOVER: Handled main.swift
 // CHECK-RECOVER: Handled other.swift
 
 
 // RUN: touch -t 201401240005 %t/*
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED %s
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/modify-non-primary-files.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED %s
 
 // CHECK-REVERSED: Handled other.swift
 // CHECK-REVERSED: Handled main.swift
@@ -27,7 +27,7 @@
 // CHECK-REVERSED: error: input file 'main.swift' was modified during the build
 // CHECK-REVERSED-NOT: error
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s
 
 // CHECK-REVERSED-RECOVER-NOT: Handled other.swift
 // CHECK-REVERSED-RECOVER: Handled main.swift
diff --git a/test/Driver/PrivateDependencies/private-after-fine.swift b/test/Driver/PrivateDependencies/private-after-fine.swift
index a9fd575eedfb4..d58ebd5d5da0f 100644
--- a/test/Driver/PrivateDependencies/private-after-fine.swift
+++ b/test/Driver/PrivateDependencies/private-after-fine.swift
@@ -6,18 +6,18 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL-NOT: Handled
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt
 
@@ -35,13 +35,13 @@
 // RUN: touch -t 201401240005 %t/*.swift
 
 // Generate the build record...
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v
 
 // ...then reset the .swiftdeps files.
 // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t
 
 // RUN: touch -t 201401240006 %t/f.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-F %s < %t/f.txt
 // RUN: %FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt
 
diff --git a/test/Driver/PrivateDependencies/private-fine.swift b/test/Driver/PrivateDependencies/private-fine.swift
index 90a46a7fdf288..301263258215d 100644
--- a/test/Driver/PrivateDependencies/private-fine.swift
+++ b/test/Driver/PrivateDependencies/private-fine.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/private-fine/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s
 
 // CHECK-INITIAL-NOT: warning
 // CHECK-INITIAL: Handled a.swift
@@ -14,7 +14,7 @@
 // CHECK-INITIAL: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/a.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt
 // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt
 
@@ -25,7 +25,7 @@
 // CHECK-A-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/b.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt
 // RUN: %FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt
 
@@ -36,7 +36,7 @@
 // CHECK-B-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/c.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-C %s < %t/c.txt
 // RUN: %FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt
 
@@ -47,7 +47,7 @@
 // CHECK-C-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/d.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-D %s < %t/d.txt
 // RUN: %FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt
 
@@ -58,7 +58,7 @@
 // CHECK-D-NEG-NOT: Handled e.swift
 
 // RUN: touch -t 201401240006 %t/e.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-E %s < %t/e.txt
 // RUN: %FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt
 
@@ -75,7 +75,7 @@
 // CHECK-E-NEG-NOT: Handled b.swift
 
 // RUN: touch -t 201401240007 %t/a.swift %t/e.swift
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1
 // RUN: %FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt
 // RUN: %FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt
 
diff --git a/test/Driver/PrivateDependencies/whole-module-build-record.swift b/test/Driver/PrivateDependencies/whole-module-build-record.swift
index fbe76d0ff23dd..91432d723da67 100644
--- a/test/Driver/PrivateDependencies/whole-module-build-record.swift
+++ b/test/Driver/PrivateDependencies/whole-module-build-record.swift
@@ -4,7 +4,7 @@
 // RUN: cp -r %S/Inputs/one-way/* %t
 // RUN: touch -t 201401240005 %t/*
 
-// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/fake-build-whole-module.py" -output-file-map %t/output.json -whole-module-optimization -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
+// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/Inputs/fake-build-whole-module.py" -output-file-map %t/output.json -whole-module-optimization -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
 // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps
 
 // CHECK-FIRST-NOT: warning
@@ -15,6 +15,6 @@
 
 
 // RUN: touch -t 201401240006 %t/other.swift
-// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/../Inputs/fail.py" -output-file-map %t/output.json -whole-module-optimization -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1
+// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python.unquoted};%S/../Inputs/fail.py" -output-file-map %t/output.json -whole-module-optimization -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1
 
 // Just don't crash.
diff --git a/test/Driver/SourceRanges/range-incremental-no-build-record.swift b/test/Driver/SourceRanges/range-incremental-no-build-record.swift
index 035adc6f8db04..3fb929a7a6cb0 100644
--- a/test/Driver/SourceRanges/range-incremental-no-build-record.swift
+++ b/test/Driver/SourceRanges/range-incremental-no-build-record.swift
@@ -4,6 +4,7 @@
 // First, build without range dependencies with no new options.
 // =============================================================================
 
+// REQUIRES: executable_test
 
 // Copy in the inputs.
 // The lack of a build record or swiftdeps files should disable incremental compilation
@@ -12,7 +13,7 @@
 // Ensure that the extra outputs are not generated when they should not be:
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/range-incremental-no-build-record/* %t
-// RUN: cd %t && %swiftc_driver -output-file-map %t/output.json -incremental -enable-batch-mode ./main.swift ./fileA.swift ./fileB.swift -module-name main -j2 -driver-show-job-lifecycle -driver-show-incremental  >& %t/output0
+// RUN: cd %t && %target-swiftc_driver -output-file-map %t/output.json -incremental -enable-batch-mode ./main.swift ./fileA.swift ./fileB.swift -module-name main -j2 -driver-show-job-lifecycle -driver-show-incremental  >& %t/output0
 
 // RUN: %FileCheck -match-full-lines -check-prefix=CHECK-NO-BUILD-REC %s < %t/output0
 // CHECK-NO-BUILD-REC: Incremental compilation could not read build record.
@@ -29,7 +30,7 @@
 
 // CHECK-HAS-BATCHES: Batchable: {compile:
 
-// RUN: %t/main | tee run0 | grep Any > /dev/null && rm %t/main
+// RUN: %target-run %t/main | tee run0 | grep Any > /dev/null && rm %t/main
 
 // =============================================================================
 // Same, except force the driver to compute both strategies via -driver-compare-incremental-schemes
@@ -43,11 +44,11 @@
 // Ensure that the extra outputs are not generated when they should not be:
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/range-incremental-no-build-record/* %t
-// RUN: cd %t && %swiftc_driver -driver-compare-incremental-schemes -output-file-map %t/output.json -incremental -enable-batch-mode ./main.swift ./fileA.swift ./fileB.swift -module-name main -j2 -driver-show-job-lifecycle -driver-show-incremental  >& %t/output1
+// RUN: cd %t && %target-swiftc_driver -driver-compare-incremental-schemes -output-file-map %t/output.json -incremental -enable-batch-mode ./main.swift ./fileA.swift ./fileB.swift -module-name main -j2 -driver-show-job-lifecycle -driver-show-incremental  >& %t/output1
 
 // RUN: %FileCheck -match-full-lines -check-prefix=CHECK-NO-BUILD-REC %s < %t/output1
 
 // RUN: %FileCheck -match-full-lines -check-prefix=CHECK-COMPARE-DISABLED-NO-BUILD-RECORD %s < %t/output1
 // CHECK-COMPARE-DISABLED-NO-BUILD-RECORD: *** Incremental build disabled because could not read build record, cannot compare ***
 
-// RUN: %t/main | tee run1 | grep Any > /dev/null && rm %t/main
+// RUN: %target-run %t/main | tee run1 | grep Any > /dev/null && rm %t/main
diff --git a/test/Driver/advanced_output_file_map.swift b/test/Driver/advanced_output_file_map.swift
index 98d9d21175745..798c5cc4f0e32 100644
--- a/test/Driver/advanced_output_file_map.swift
+++ b/test/Driver/advanced_output_file_map.swift
@@ -36,10 +36,10 @@
 // RUN: test ! -e %t/d/lib.d
 
 
-// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "./obj/advanced_output_file_map.o", dependencies: "./d/advanced_output_file_map.d", swiftmodule: "./swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "./swiftmodule/advanced_output_file_map_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}advanced_output_file_map.swiftsourceinfo", diagnostics: "./dia/advanced_output_file_map.dia"}
-// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "./obj/main.o", dependencies: "./d/main.d", swiftmodule: "./swiftmodule/main.swiftmodule", swiftdoc: "./swiftmodule/main_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}main.swiftsourceinfo", diagnostics: "./dia/main.dia"}
-// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "./obj/lib.o", dependencies: "./d/lib.d", swiftmodule: "./swiftmodule/lib.swiftmodule", swiftdoc: "./swiftmodule/lib_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}lib.swiftsourceinfo", diagnostics: "./dia/lib.dia"}
-// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o"], output: {swiftmodule: "./OutputFileMap.swiftmodule", swiftdoc: ".{{[/\\]}}OutputFileMap.swiftdoc", swiftsourceinfo: ".{{[/\\]}}OutputFileMap.swiftsourceinfo"}
+// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "./obj/advanced_output_file_map.o", dependencies: "./d/advanced_output_file_map.d", swiftmodule: "./swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "./swiftmodule/advanced_output_file_map_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}advanced_output_file_map.swiftsourceinfo", diagnostics: "./dia/advanced_output_file_map.dia"}
+// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "./obj/main.o", dependencies: "./d/main.d", swiftmodule: "./swiftmodule/main.swiftmodule", swiftdoc: "./swiftmodule/main_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}main.swiftsourceinfo", diagnostics: "./dia/main.dia"}
+// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "./obj/lib.o", dependencies: "./d/lib.d", swiftmodule: "./swiftmodule/lib.swiftmodule", swiftdoc: "./swiftmodule/lib_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}lib.swiftsourceinfo", diagnostics: "./dia/lib.dia"}
+// BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o"], output: {swiftmodule: "./OutputFileMap.swiftmodule", swiftdoc: ".{{[/\\]}}OutputFileMap.swiftdoc", swiftsourceinfo: ".{{[/\\]}}OutputFileMap.swiftsourceinfo"}
 // BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o", "./OutputFileMap.swiftmodule"], output: {image: "./advanced_output_file_map.out"}
 // BINDINGS-DIS: # "x86_64-apple-macosx10.9" - "dsymutil{{(\.exe)?}}", inputs: ["./advanced_output_file_map.out"], output: {dSYM: "./advanced_output_file_map.out.dSYM"}
 
@@ -75,10 +75,10 @@
 // RUN: test -e %t/d/lib.d  -a ! -s %t/d/lib.d
 
 
-// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "./obj/advanced_output_file_map.o", dependencies: "./d/advanced_output_file_map.d", swiftmodule: "./swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "./swiftmodule/advanced_output_file_map_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}advanced_output_file_map.swiftsourceinfo", diagnostics: "./dia/advanced_output_file_map.dia"}
-// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "./obj/main.o", swiftmodule: "./swiftmodule/main.swiftmodule", swiftdoc: "./swiftmodule/main_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}main.swiftsourceinfo", diagnostics: "./dia/main.dia"}
-// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "./obj/lib.o", swiftmodule: "./swiftmodule/lib.swiftmodule", swiftdoc: "./swiftmodule/lib_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}lib.swiftsourceinfo", diagnostics: "./dia/lib.dia"}
-// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o"], output: {swiftmodule: "./OutputFileMap.swiftmodule", swiftdoc: ".{{[/\\]}}OutputFileMap.swiftdoc", swiftsourceinfo: ".{{[/\\]}}OutputFileMap.swiftsourceinfo"}
+// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/advanced_output_file_map.swift"], output: {object: "./obj/advanced_output_file_map.o", dependencies: "./d/advanced_output_file_map.d", swiftmodule: "./swiftmodule/advanced_output_file_map.swiftmodule", swiftdoc: "./swiftmodule/advanced_output_file_map_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}advanced_output_file_map.swiftsourceinfo", diagnostics: "./dia/advanced_output_file_map.dia"}
+// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "./obj/main.o", swiftmodule: "./swiftmodule/main.swiftmodule", swiftdoc: "./swiftmodule/main_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}main.swiftsourceinfo", diagnostics: "./dia/main.dia"}
+// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "./obj/lib.o", swiftmodule: "./swiftmodule/lib.swiftmodule", swiftdoc: "./swiftmodule/lib_x.swiftdoc", swiftsourceinfo: "./swiftmodule{{[/\\]}}lib.swiftsourceinfo", diagnostics: "./dia/lib.dia"}
+// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o"], output: {swiftmodule: "./OutputFileMap.swiftmodule", swiftdoc: ".{{[/\\]}}OutputFileMap.swiftdoc", swiftsourceinfo: ".{{[/\\]}}OutputFileMap.swiftsourceinfo"}
 // BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o", "./OutputFileMap.swiftmodule"], output: {image: "./advanced_output_file_map.out"}
 // BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "dsymutil{{(\.exe)?}}", inputs: ["./advanced_output_file_map.out"], output: {dSYM: "./advanced_output_file_map.out.dSYM"}
 
diff --git a/test/Driver/autolink-force-load-comdat.swift b/test/Driver/autolink-force-load-comdat.swift
index 4870a5f12a132..74b011897c7d0 100644
--- a/test/Driver/autolink-force-load-comdat.swift
+++ b/test/Driver/autolink-force-load-comdat.swift
@@ -1,5 +1,5 @@
-// RUN: %swiftc_driver -incremental -autolink-force-load %s 2>&1 | %FileCheck -check-prefix=AUTOLINK_FORCE_LOAD %s
-// RUN: %swiftc_driver -autolink-force-load -incremental %s 2>&1 | %FileCheck -check-prefix=AUTOLINK_FORCE_LOAD %s
+// RUN: %target-swiftc_driver -incremental -autolink-force-load %s 2>&1 | %FileCheck -check-prefix=AUTOLINK_FORCE_LOAD %s
+// RUN: %target-swiftc_driver -autolink-force-load -incremental %s 2>&1 | %FileCheck -check-prefix=AUTOLINK_FORCE_LOAD %s
 
 // MACHO targets do not support COMDAT
 // UNSUPPORTED: OS=macosx
@@ -8,4 +8,3 @@
 // UNSUPPORTED: OS=ios
 
 // AUTOLINK_FORCE_LOAD-NOT: error: '-autolink-force-load' is not supported with '-incremental'
-
diff --git a/test/Driver/basic_output_file_map.swift b/test/Driver/basic_output_file_map.swift
index 278955337cdf0..b1bde3204a649 100644
--- a/test/Driver/basic_output_file_map.swift
+++ b/test/Driver/basic_output_file_map.swift
@@ -7,7 +7,7 @@
 // DUMPOFM: {{.*}}/Inputs/main.swift -> object: "/build/main.o"
 // DUMPOFM: {{.*}}/basic_output_file_map.swift -> object: "/build/basic_output_file_map.o"
 
-// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/basic_output_file_map.swift"], output: {object: "/build/basic_output_file_map.o"}
-// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "/build/main.o"}
-// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "/build/lib.o"}
+// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/basic_output_file_map.swift"], output: {object: "/build/basic_output_file_map.o"}
+// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/main.swift"], output: {object: "/build/main.o"}
+// BINDINGS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/lib.swift"], output: {object: "/build/lib.o"}
 // BINDINGS: # "x86_64-apple-macosx10.9" - "ld{{(\.exe)?}}", inputs: ["/build/basic_output_file_map.o", "/build/main.o", "/build/lib.o"], output: {image: "/build/basic_output_file_map.out"}
diff --git a/test/Driver/batch_mode_aux_file_order.swift b/test/Driver/batch_mode_aux_file_order.swift
index 6973eb5f5b0ba..d2af550865be3 100644
--- a/test/Driver/batch_mode_aux_file_order.swift
+++ b/test/Driver/batch_mode_aux_file_order.swift
@@ -12,9 +12,9 @@
 //
 // Each batch should get 3 primaries; check that each has 3 modules _in the same numeric order_.
 //
-// CHECK: {{.*[\\/]}}swift{{c?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A3:[0-9]+]].swift{{"?}}
+// CHECK: {{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[A3:[0-9]+]].swift{{"?}}
 // CHECK-SAME: -o {{.*[\\/]}}file-[[A1]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[A2]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[A3]]-{{[a-z0-9]+}}.swiftmodule{{"?}}
-// CHECK: {{.*[\\/]}}swift{{c?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B3:[0-9]+]].swift{{"?}}
+// CHECK: {{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[B3:[0-9]+]].swift{{"?}}
 // CHECK-SAME: -o {{.*[\\/]}}file-[[B1]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[B2]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[B3]]-{{[a-z0-9]+}}.swiftmodule{{"?}}
-// CHECK: {{.*[\\/]}}swift{{c?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C3:[0-9]+]].swift{{"?}}
+// CHECK: {{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C1:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C2:[0-9]+]].swift{{"?}} {{.*}}-primary-file {{[^ ]*[\\/]}}file-[[C3:[0-9]+]].swift{{"?}}
 // CHECK-SAME: -o {{.*[\\/]}}file-[[C1]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[C2]]-{{[a-z0-9]+}}.swiftmodule{{"?}} -o {{.*[\\/]}}file-[[C3]]-{{[a-z0-9]+}}.swiftmodule{{"?}}
diff --git a/test/Driver/batch_mode_dependencies_make_wrong_order.swift b/test/Driver/batch_mode_dependencies_make_wrong_order.swift
index 8e26f32a3e87e..fb7d9f031d87e 100644
--- a/test/Driver/batch_mode_dependencies_make_wrong_order.swift
+++ b/test/Driver/batch_mode_dependencies_make_wrong_order.swift
@@ -6,14 +6,14 @@
 // RUN: echo 'public func main() {}' >%t/main.swift
 //
 // First prime the incremental state, but note that we're building in the d c b a (reverse-alphabetical) order.
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift
 //
 // Now perturb the interface of a.swift and delete its output
 // RUN: echo 'class a { var x : Int = 10 }' >%t/a.swift
 // RUN: rm %t/a.o
 //
 // Now rebuild, which will rebuild a.swift then do a cascading dep-graph invalidation
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift -driver-show-incremental -driver-show-job-lifecycle >%t/out.txt 2>&1
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -incremental -output-file-map %S/Inputs/abcd_filemap.yaml -module-name main -j 1 d.swift c.swift b.swift a.swift main.swift -driver-show-incremental -driver-show-job-lifecycle >%t/out.txt 2>&1
 // RUN: %FileCheck %s <%t/out.txt
 //
 // Check that we saw invalidation happen in command-line argument order
diff --git a/test/Driver/batch_mode_parseable_output-fine.swift b/test/Driver/batch_mode_parseable_output-fine.swift
index 21b3b3e0f1190..f3ecc62b2492e 100644
--- a/test/Driver/batch_mode_parseable_output-fine.swift
+++ b/test/Driver/batch_mode_parseable_output-fine.swift
@@ -9,8 +9,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*}}/file-01.swift{{(\\")?}} {{.*}}file-02.swift{{(\\")?}} {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-01-[[MODULE01:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-01-[[SWIFTDOC01:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-01-[[OBJ01:[a-z0-9]+]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*}}/file-01.swift{{(\\")?}} {{.*}}file-02.swift{{(\\")?}} {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-01-[[MODULE01:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-01-[[SWIFTDOC01:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-01-[[OBJ01:[a-z0-9]+]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -58,8 +58,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -c {{.*}}file-01.swift{{(\\")?}} -primary-file {{.*}}file-02.swift{{(\\")?}} {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-02-[[MODULE02:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-02-[[SWIFTDOC02:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-02-[[OBJ02:[a-z0-9]+]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c {{.*}}file-01.swift{{(\\")?}} -primary-file {{.*}}file-02.swift{{(\\")?}} {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-02-[[MODULE02:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-02-[[SWIFTDOC02:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-02-[[OBJ02:[a-z0-9]+]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -107,8 +107,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*}}swift{{c?(\.exe)?(\\")?}} -frontend -c {{.*}}file-01.swift{{(\\")?}} {{.*}}file-02.swift{{(\\")?}} -primary-file {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-03-[[MODULE03:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-03-[[SWIFTDOC03:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-03-[[OBJ03:[a-z0-9]+]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c {{.*}}file-01.swift{{(\\")?}} {{.*}}file-02.swift{{(\\")?}} -primary-file {{.*}}file-03.swift{{(\\")?}} {{.*}}main.swift{{(\\")?}} -emit-module-path {{.*}}file-03-[[MODULE03:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*}}file-03-[[SWIFTDOC03:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*}}file-03-[[OBJ03:[a-z0-9]+]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -156,8 +156,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -c {{.*[\\/]}}file-01.swift{{(\\")?}} {{.*[\\/]}}file-02.swift{{(\\")?}} {{.*[\\/]}}file-03.swift{{(\\")?}} -primary-file {{.*[\\/]}}main.swift{{(\\")?}} -emit-module-path {{.*[\\/]}}main-[[MODULEMAIN:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*[\\/]}}main-[[SWIFTDOCMAIN:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*[\\/]}}main-[[OBJMAIN:[a-z0-9]+]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c {{.*[\\/]}}file-01.swift{{(\\")?}} {{.*[\\/]}}file-02.swift{{(\\")?}} {{.*[\\/]}}file-03.swift{{(\\")?}} -primary-file {{.*[\\/]}}main.swift{{(\\")?}} -emit-module-path {{.*[\\/]}}main-[[MODULEMAIN:[a-z0-9]+]].swiftmodule{{(\\")?}} -emit-module-doc-path {{.*[\\/]}}main-[[SWIFTDOCMAIN:[a-z0-9]+]].swiftdoc{{(\\")?}} {{.*}} {{.*}} -module-name main -o {{.*[\\/]}}main-[[OBJMAIN:[a-z0-9]+]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -249,8 +249,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "merge-module",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}file-01-[[MODULE01]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-02-[[MODULE02]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-03-[[MODULE03]].swiftmodule{{(\\")?}} {{.*[\\/]}}main-[[MODULEMAIN]].swiftmodule{{(\\")?}} {{.*}} -emit-module-doc-path main.swiftdoc -emit-module-source-info-path main.swiftsourceinfo -module-name main -o main.swiftmodule",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}file-01-[[MODULE01]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-02-[[MODULE02]].swiftmodule{{(\\")?}} {{.*[\\/]}}file-03-[[MODULE03]].swiftmodule{{(\\")?}} {{.*[\\/]}}main-[[MODULEMAIN]].swiftmodule{{(\\")?}} {{.*}} -emit-module-doc-path main.swiftdoc -emit-module-source-info-path main.swiftsourceinfo -module-name main -o main.swiftmodule",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-merge-modules",
diff --git a/test/Driver/bindings.swift b/test/Driver/bindings.swift
index c9d5111d15d69..dfdca5d9a4aa8 100644
--- a/test/Driver/bindings.swift
+++ b/test/Driver/bindings.swift
@@ -1,47 +1,47 @@
 // RUN: %empty-directory(%t)
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %/s 2>&1 | %FileCheck %s -check-prefix=BASIC
-// BASIC: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"}
+// BASIC: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"}
 // BASIC: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["[[OBJECT]]"], output: {image: "bindings"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 - 2>&1 | %FileCheck %s -check-prefix=STDIN
-// STDIN: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["-"], output: {object: "[[OBJECT:.*\.o]]"}
+// STDIN: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["-"], output: {object: "[[OBJECT:.*\.o]]"}
 // STDIN: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["[[OBJECT]]"], output: {image: "main"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %/S/Inputs/invalid-module-name.swift 2>&1 | %FileCheck %s -check-prefix=INVALID-NAME-SINGLE-FILE
-// INVALID-NAME-SINGLE-FILE: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}/Inputs/invalid-module-name.swift"], output: {object: "[[OBJECT:.*\.o]]"}
+// INVALID-NAME-SINGLE-FILE: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}/Inputs/invalid-module-name.swift"], output: {object: "[[OBJECT:.*\.o]]"}
 // INVALID-NAME-SINGLE-FILE: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["[[OBJECT]]"], output: {image: "invalid-module-name"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -o NamedOutput %/s 2>&1 | %FileCheck %s -check-prefix=NAMEDIMG
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -module-name NamedOutput %/s 2>&1 | %FileCheck %s -check-prefix=NAMEDIMG
-// NAMEDIMG: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"}
+// NAMEDIMG: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "[[OBJECT:.*\.o]]"}
 // NAMEDIMG: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["[[OBJECT]]"], output: {image: "NamedOutput"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %/s 2>&1 | %FileCheck %s -check-prefix=OBJ
-// OBJ: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "bindings.o"}
+// OBJ: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "bindings.o"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c %/s -o /build/bindings.o 2>&1 | %FileCheck %s -check-prefix=NAMEDOBJ
-// NAMEDOBJ: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "/build/bindings.o"}
+// NAMEDOBJ: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "/build/bindings.o"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-sil %/s 2>&1 | %FileCheck %s -check-prefix=SIL
-// SIL: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {sil: "-"}
+// SIL: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {sil: "-"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-ir %S/Inputs/empty.sil 2>&1 | %FileCheck %s -check-prefix=SIL-INPUT
-// SIL-INPUT: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}empty.sil"], output: {llvm-ir: "-"}
+// SIL-INPUT: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}empty.sil"], output: {llvm-ir: "-"}
 
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -c -incremental %/s 2>&1 | %FileCheck %s -check-prefix=OBJ-AND-DEPS
-// OBJ-AND-DEPS: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {
+// OBJ-AND-DEPS: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {
 // OBJ-AND-DEPS-DAG: swift-dependencies: "bindings.swiftdeps"
 // OBJ-AND-DEPS-DAG: object: "bindings.o"
 // OBJ-AND-DEPS: }
 
 // RUN: echo '{"%/s": {"object": "objroot/bindings.o"}}' > %t/map.json
 // RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -target x86_64-apple-macosx10.9 %/s 2>&1 | %FileCheck %s -check-prefix=MAP
-// MAP: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "objroot/bindings.o"}
+// MAP: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift"], output: {object: "objroot/bindings.o"}
 
 // RUN: echo '{"": {"object": "objroot/bindings.o"}}' > %t/map.json
 // RUN: %swiftc_driver -driver-print-bindings -output-file-map %t/map.json -whole-module-optimization -target x86_64-apple-macosx10.9 %/s %S/Inputs/lib.swift 2>&1 | %FileCheck %s -check-prefix=MAP-WFO
-// MAP-WFO: # "x86_64-apple-macosx10.9" - "swift{{c?(\.exe)?}}", inputs: ["{{.*}}bindings.swift", "{{.*}}lib.swift"], output: {object: "objroot/bindings.o"}
+// MAP-WFO: # "x86_64-apple-macosx10.9" - "swift{{(-frontend|c)?(\.exe)?}}", inputs: ["{{.*}}bindings.swift", "{{.*}}lib.swift"], output: {object: "objroot/bindings.o"}
 
 // RUN: touch %t/a.o %t/b.o
 // RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 %t/a.o %t/b.o -o main 2>&1 | %FileCheck %s -check-prefix=LINK-ONLY
diff --git a/test/Driver/bridging-pch.swift b/test/Driver/bridging-pch.swift
index 844698b42d47d..4e585f74d7592 100644
--- a/test/Driver/bridging-pch.swift
+++ b/test/Driver/bridging-pch.swift
@@ -11,20 +11,20 @@
 // NOPCHACT: 1: compile, {0}, none
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h %s 2>&1 | %FileCheck %s -check-prefix=YESPCHJOB
-// YESPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -emit-pch -o {{.*}}bridging-header-{{.*}}.pch
-// YESPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header-{{.*}}.pch
+// YESPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -emit-pch -o {{.*}}bridging-header-{{.*}}.pch
+// YESPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header-{{.*}}.pch
 
 // RUN: %target-build-swift -typecheck -disable-bridging-pch  -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h %s 2>&1 | %FileCheck %s -check-prefix=NOPCHJOB
-// NOPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}Inputs/bridging-header.h
+// NOPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}Inputs/bridging-header.h
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -index-store-path %t/idx -import-objc-header %S/Inputs/bridging-header.h %s 2>&1 | %FileCheck %s -check-prefix=INDEXSTORE
-// INDEXSTORE: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -index-store-path {{.*}}/idx{{"?}} -emit-pch -o {{.*}}bridging-header-{{.*}}.pch
+// INDEXSTORE: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -index-store-path {{.*}}/idx{{"?}} -emit-pch -o {{.*}}bridging-header-{{.*}}.pch
 
 // RUN: echo "{\"\": {\"swift-dependencies\": \"%/t/master.swiftdeps\"}, \"%/s\": {\"swift-dependencies\": \"%/t/bridging-header.swiftdeps\"}}" > %t.json
 // RUN: %target-build-swift -typecheck -incremental -enable-bridging-pch -output-file-map %t.json -import-objc-header %S/Inputs/bridging-header.h %s
 
 // RUN: mkdir %t/tmp
-// RUN: env TMP="%t/tmp/" TMPDIR="%t/tmp/" not %target-build-swift -typecheck -import-objc-header %S/../Inputs/empty.h -driver-use-frontend-path "%{python};%S/Inputs/crash-after-generating-pch.py" -v %s
+// RUN: env TMP="%t/tmp/" TMPDIR="%t/tmp/" not %target-build-swift -typecheck -import-objc-header %S/../Inputs/empty.h -driver-use-frontend-path "%{python.unquoted};%S/Inputs/crash-after-generating-pch.py" -v %s
 // RUN: ls %/t/tmp/ | grep .*pch
 
 // Test persistent PCH
@@ -49,25 +49,25 @@
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch %s 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-YESPCHJOB
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch %s %S/Inputs/error.swift -driver-batch-count 2 -enable-batch-mode 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-YESPCHJOB
-// PERSISTENT-YESPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -emit-pch -pch-output-dir {{.*}}/pch
-// PERSISTENT-YESPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header.h{{"?}} -pch-output-dir {{.*}}/pch{{"?}} -pch-disable-validation
+// PERSISTENT-YESPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -emit-pch -pch-output-dir {{.*}}/pch
+// PERSISTENT-YESPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header.h{{"?}} -pch-output-dir {{.*}}/pch{{"?}} -pch-disable-validation
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch -serialize-diagnostics %s 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-YESPCHJOB-DIAG1
-// PERSISTENT-YESPCHJOB-DIAG1: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -serialize-diagnostics-path {{.*}}bridging-header-{{.*}}.dia{{"?}} {{.*}} -emit-pch -pch-output-dir {{.*}}/pch
+// PERSISTENT-YESPCHJOB-DIAG1: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -serialize-diagnostics-path {{.*}}bridging-header-{{.*}}.dia{{"?}} {{.*}} -emit-pch -pch-output-dir {{.*}}/pch
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch-out-dir -serialize-diagnostics %s -emit-module -emit-module-path /module-path-dir 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-YESPCHJOB-DIAG2
-// PERSISTENT-YESPCHJOB-DIAG2: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -serialize-diagnostics-path {{.*}}/pch-out-dir{{/|\\\\}}bridging-header-{{.*}}.dia{{"?}} {{.*}} -emit-pch -pch-output-dir {{.*}}/pch-out-dir
+// PERSISTENT-YESPCHJOB-DIAG2: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -serialize-diagnostics-path {{.*}}/pch-out-dir{{/|\\\\}}bridging-header-{{.*}}.dia{{"?}} {{.*}} -emit-pch -pch-output-dir {{.*}}/pch-out-dir
 
 // RUN: %target-build-swift -typecheck -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch -parseable-output -driver-skip-execution %s 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-OUTPUT
 // PERSISTENT-OUTPUT-NOT: "outputs": [
 
 // RUN: %target-build-swift -typecheck -driver-print-jobs -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch -whole-module-optimization %s 2>&1 | %FileCheck %s -check-prefix=PERSISTENT-WMO-YESPCHJOB --implicit-check-not pch-disable-validation
-// PERSISTENT-WMO-YESPCHJOB: {{.*}}swift{{c?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header.h{{"?}} -pch-output-dir {{.*}}/pch
+// PERSISTENT-WMO-YESPCHJOB: {{.*}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend {{.*}} -import-objc-header {{.*}}bridging-header.h{{"?}} -pch-output-dir {{.*}}/pch
 
 // RUN: %target-build-swift -typecheck -disable-bridging-pch  -driver-print-jobs -import-objc-header %/S/Inputs/bridging-header.h -pch-output-dir %t/pch %/s 2>&1 | %FileCheck %s -check-prefix=NOPCHJOB
 // RUN: %target-build-swift -typecheck -incremental -enable-bridging-pch -output-file-map %t.json -import-objc-header %S/Inputs/bridging-header.h -pch-output-dir %t/pch %s
 
 // RUN: %target-build-swift -### -typecheck -O -import-objc-header %S/Inputs/bridging-header.h %s 2>&1 | %FileCheck %s -check-prefix=OPTPCH
-// OPTPCH: swift{{c?(\.exe)?"?}} -frontend
+// OPTPCH: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // OPTPCH-SAME: -O{{ }}
 // OPTPCH-SAME: -emit-pch
diff --git a/test/Driver/coverage-prefix-map.swift b/test/Driver/coverage-prefix-map.swift
new file mode 100644
index 0000000000000..fd2ff8a5cbc2c
--- /dev/null
+++ b/test/Driver/coverage-prefix-map.swift
@@ -0,0 +1,9 @@
+// RUN: not %target-swiftc_driver -coverage-prefix-map old %s 2>&1 | %FileCheck %s -check-prefix CHECK-INVALID
+// RUN: %target-swiftc_driver -### -coverage-prefix-map old=new %s 2>&1 | %FileCheck %s -check-prefix CHECK-SIMPLE
+// RUN: %target-swiftc_driver -### -coverage-prefix-map old=n=ew %s 2>&1 | %FileCheck %s -check-prefix CHECK-COMPLEX
+// RUN: %target-swiftc_driver -### -coverage-prefix-map old= %s 2>&1 | %FileCheck %s -check-prefix CHECK-EMPTY
+
+// CHECK-INVALID: error: invalid argument 'old' to -coverage-prefix-map
+// CHECK-SIMPLE: coverage-prefix-map old=new
+// CHECK-COMPLEX: coverage-prefix-map old=n=ew
+// CHECK-EMPTY: coverage-prefix-map old=
diff --git a/test/Driver/driver-compile.swift b/test/Driver/driver-compile.swift
index 8c5b17693393a..b8217f1ec1a16 100644
--- a/test/Driver/driver-compile.swift
+++ b/test/Driver/driver-compile.swift
@@ -46,7 +46,7 @@
 // RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.9 %s %S/../Inputs/empty.swift -module-name main -driver-filelist-threshold=0 2>&1 | %FileCheck -check-prefix=FILELIST %s
 
 // RUN: %empty-directory(%t)/DISTINCTIVE-PATH/usr/bin/
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
 // RUN: ln -s "swiftc" %t/DISTINCTIVE-PATH/usr/bin/swift-update
 // RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc -driver-print-jobs -c -update-code -target x86_64-apple-macosx10.9 %s 2>&1 > %t.upd.txt
 // RUN: %FileCheck -check-prefix UPDATE-CODE %s < %t.upd.txt
diff --git a/test/Driver/embed-bitcode.swift b/test/Driver/embed-bitcode.swift
index 60bee1411ec8d..1b21eedd0c01b 100644
--- a/test/Driver/embed-bitcode.swift
+++ b/test/Driver/embed-bitcode.swift
@@ -1,13 +1,13 @@
 // RUN: %target-swiftc_driver -driver-print-bindings -embed-bitcode %s 2>&1 | %FileCheck -check-prefix=CHECK-%target-object-format %s
-// CHECK-macho: "swift", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"}
-// CHECK-macho: "swift", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"}
+// CHECK-macho: "swift-frontend", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"}
+// CHECK-macho: "swift-frontend", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"}
 // CHECK-macho: "ld", inputs: ["[[OBJECT]]"], output: {image: "embed-bitcode"}
 // CHECK-coff: "swiftc.{{exe}}", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"}
 // CHECK-coff: "swiftc.{{exe}}", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"}
 // CHECK-coff: "clang.exe", inputs: ["[[OBJECT]]"], output: {image: "embed-bitcode"}
 
-// CHECK-elf: "swift", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"}
-// CHECK-elf: "swift", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"}
+// CHECK-elf: "swift-frontend", inputs: ["{{.*}}embed-bitcode.swift"], output: {llvm-bc: "[[BC:.*\.bc]]"}
+// CHECK-elf: "swift-frontend", inputs: ["[[BC]]"], output: {object: "[[OBJECT:.*\.o]]"}
 // CHECK-elf: "swift-autolink-extract", inputs: ["[[OBJECT]]"], output: {autolink: "[[AUTOLINK:.*\.autolink]]"}
 // CHECK-elf: "clang", inputs: ["[[OBJECT]]", "[[AUTOLINK]]"], output: {image: "main"}
 
@@ -93,23 +93,23 @@
 // CHECK-LIB-WMO: -parse-stdlib
 
 // RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module %s %S/../Inputs/empty.swift -module-name ABC 2>&1 -### | %FileCheck %s -check-prefix=CHECK-LIB
-// CHECK-LIB: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-LIB: -emit-bc
 // CHECK-LIB: -primary-file
-// CHECK-LIB: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-LIB: -emit-bc
 // CHECK-LIB: -primary-file
-// CHECK-LIB: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-LIB: -c
 // CHECK-LIB: -embed-bitcode
 // CHECK-LIB: -disable-llvm-optzns
-// CHECK-LIB: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-LIB: -c
 // CHECK-LIB: -embed-bitcode
 // CHECK-LIB: -disable-llvm-optzns
-// CHECK-LIB: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-LIB: -emit-module
-// CHECK-LIB-NOT: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-LIB-NOT: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 
 // RUN: %target-swiftc_driver -embed-bitcode -emit-module %s 2>&1 -### | %FileCheck %s -check-prefix=WARN-EMBED-BITCODE
 // RUN: %target-swiftc_driver -embed-bitcode -emit-module-path a.swiftmodule %s 2>&1 -### | %FileCheck %s -check-prefix=WARN-EMBED-BITCODE
diff --git a/test/Driver/emit-interface.swift b/test/Driver/emit-interface.swift
index 739aeb1455ed3..2b71d6cc523d7 100644
--- a/test/Driver/emit-interface.swift
+++ b/test/Driver/emit-interface.swift
@@ -1,14 +1,14 @@
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo 2>&1 | %FileCheck %s
 
-// CHECK: swift{{c?(\.exe)?"?}} -frontend
+// CHECK: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-SAME: emit-interface.swift
-// CHECK: swift{{c?(\.exe)?"?}} -frontend -merge-modules
+// CHECK: swift{{(-frontend|c)?(\.exe)?"?}} -frontend -merge-modules
 // CHECK-SAME: -emit-module-interface-path {{.+[/\\]}}foo.swiftinterface
 // CHECK: {{(bin/)?}}ld
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
 
-// CHECK-WHOLE-MODULE: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-WHOLE-MODULE: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-WHOLE-MODULE-SAME: emit-interface.swift
 // CHECK-WHOLE-MODULE-SAME: -emit-module-interface-path {{.+[/\\]}}foo.swiftinterface
 // CHECK-WHOLE-MODULE-NOT: -merge-modules
@@ -16,13 +16,13 @@
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface-path %t/unrelated.swiftinterface -o %t/foo -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-EXPLICIT-PATH %s
 
-// CHECK-EXPLICIT-PATH: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-EXPLICIT-PATH: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-EXPLICIT-PATH-SAME: emit-interface.swift
 // CHECK-EXPLICIT-PATH-SAME: -emit-module-interface-path {{.+[/\\]}}unrelated.swiftinterface
 
 // Ensure that we emit arguments when we force filelists as well
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -module-name foo -whole-module-optimization -driver-filelist-threshold=0 2>&1 | %FileCheck -check-prefix=CHECK-FILELIST %s
 
-// CHECK-FILELIST: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-FILELIST: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-FILELIST-SAME: -supplementary-output-file-map
 // CHECK-FILELIST-NOT: emit-interface.swift{{ }}
diff --git a/test/Driver/emit-objc-header.swift b/test/Driver/emit-objc-header.swift
index cfea2b91bd014..841b367bbb3bc 100644
--- a/test/Driver/emit-objc-header.swift
+++ b/test/Driver/emit-objc-header.swift
@@ -1,14 +1,14 @@
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-objc-header-path %t/foo.h 2>&1 | %FileCheck %s
 
-// CHECK: swift{{c?(\.exe)?"?}} -frontend
+// CHECK: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-SAME: emit-objc-header.swift
-// CHECK: swift{{c?(\.exe)?"?}} -frontend -merge-modules
+// CHECK: swift{{(-frontend|c)?(\.exe)?"?}} -frontend -merge-modules
 // CHECK-SAME: -emit-objc-header-path {{.+}}/foo.h
 // CHECK: {{(bin/)?}}ld
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-objc-header-path %t/foo.h -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
 
-// CHECK-WHOLE-MODULE: swift{{c?(\.exe)?"?}} -frontend
+// CHECK-WHOLE-MODULE: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK-WHOLE-MODULE-SAME: emit-objc-header.swift
 // CHECK-WHOLE-MODULE-SAME: -emit-objc-header-path {{.+}}/foo.h
 // CHECK-WHOLE-MODULE-NOT: -merge-modules
diff --git a/test/Driver/frontend.swift b/test/Driver/frontend.swift
new file mode 100644
index 0000000000000..f0ee617810814
--- /dev/null
+++ b/test/Driver/frontend.swift
@@ -0,0 +1,5 @@
+// RUN: %swiftc_driver %s -### 2>&1 | %FileCheck %s
+
+// UNSUPPORTED: windows
+// CHECK: swift-frontend
+
diff --git a/test/Driver/infer-simulator.swift b/test/Driver/infer-simulator.swift
index 8cdf9f82725c8..3817ca7abb3ca 100644
--- a/test/Driver/infer-simulator.swift
+++ b/test/Driver/infer-simulator.swift
@@ -1,13 +1,13 @@
 // Test the inference of the "simulator" environment within the driver.
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios11.0 %s > %t.simple.txt 2>&1
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios11.0 %s > %t.simple.txt 2>&1
 // RUN: %FileCheck -check-prefix WARN_IOS_SIMULATOR %s < %t.simple.txt
 // WARN_IOS_SIMULATOR:  warning: inferring simulator environment for target 'x86_64-apple-ios11.0'; use '-target x86_64-apple-ios11.0-simulator' instead
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-tvos10.0 %s > %t.simple.txt 2>&1
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-tvos10.0 %s > %t.simple.txt 2>&1
 // RUN: %FileCheck -check-prefix WARN_TVOS_SIMULATOR %s < %t.simple.txt
 // WARN_TVOS_SIMULATOR: inferring simulator environment for target 'x86_64-apple-tvos10.0'; use '-target x86_64-apple-tvos10.0-simulator' instead
 
-// RUN: %swiftc_driver -driver-print-jobs -target i386-apple-watchos4.0 %s > %t.simple.txt 2>&1
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target i386-apple-watchos4.0 %s > %t.simple.txt 2>&1
 // RUN: %FileCheck -check-prefix WARN_WATCHOS_SIMULATOR %s < %t.simple.txt
 // WARN_WATCHOS_SIMULATOR: warning: inferring simulator environment for target 'i386-apple-watchos4.0'; use '-target i386-apple-watchos4.0-simulator' instead
diff --git a/test/Driver/linker-args-order-linux.swift b/test/Driver/linker-args-order-linux.swift
index 380be7f4f28e3..9ee7a634c2c6d 100644
--- a/test/Driver/linker-args-order-linux.swift
+++ b/test/Driver/linker-args-order-linux.swift
@@ -4,6 +4,6 @@
 print("hello world!")
 // RUN: %empty-directory(%t)
 // RUN: %target-swiftc_driver -driver-print-jobs -static-stdlib -o %t/static-stdlib %s -Xlinker --no-allow-multiple-definition 2>&1| %FileCheck %s
-// CHECK: {{.*}}/swift -frontend -c -primary-file {{.*}}/linker-args-order-linux.swift
+// CHECK: {{.*}}/swift-frontend -frontend -c -primary-file {{.*}}/linker-args-order-linux.swift
 // CHECK: {{.*}}/swift-autolink-extract{{.*}}
 // CHECK: {{.*}}swiftrt.o /{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.o @/{{.*}}/linker-args-order-linux-{{[a-z0-9]+}}.autolink {{.*}} @{{.*}}/static-stdlib-args.lnk {{.*}} -Xlinker --no-allow-multiple-definition
diff --git a/test/Driver/linker-autolink-extract.swift b/test/Driver/linker-autolink-extract.swift
index d689d057b679e..907607af0486d 100644
--- a/test/Driver/linker-autolink-extract.swift
+++ b/test/Driver/linker-autolink-extract.swift
@@ -5,7 +5,7 @@
 // DEBUG_LINUX: bin/swift
 // DEBUG_LINUX-NEXT: bin/swift-autolink-extract
 // DEBUG_LINUX-NEXT: bin/swift
-// DEBUG_LINUX-NEXT: bin/swift -modulewrap
+// DEBUG_LINUX-NEXT: bin/swift-frontend -modulewrap
 // DEBUG_LINUX-NEXT: bin/clang{{"? }}
 // DEBUG_LINUX: -o main
 // DEBUG_LINUX-NOT: dsymutil
diff --git a/test/Driver/linker-clang_rt.swift b/test/Driver/linker-clang_rt.swift
index 7c8ad36805a54..1ffd9d2beb9b7 100644
--- a/test/Driver/linker-clang_rt.swift
+++ b/test/Driver/linker-clang_rt.swift
@@ -6,7 +6,7 @@
 
 // RUN: rm -rf %t
 // RUN: %empty-directory(%t/bin)
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/bin/swiftc)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/bin/swiftc)
 // RUN: %empty-directory(%t/lib/swift/clang/lib/darwin/)
 
 // RUN: %t/bin/swiftc -driver-print-jobs -target x86_64-apple-macosx10.9 %S/../Inputs/empty.swift | %FileCheck -check-prefix CHECK -check-prefix CHECK-NO-RUNTIME %s
diff --git a/test/Driver/linker.swift b/test/Driver/linker.swift
index 257172b735c17..991963830c960 100644
--- a/test/Driver/linker.swift
+++ b/test/Driver/linker.swift
@@ -15,53 +15,53 @@
 // RUN: %swiftc_driver -sdk "" -driver-print-jobs -target i386-apple-watchos2.0-simulator %s 2>&1 > %t.simple.txt
 // RUN: %FileCheck -check-prefix watchOS_SIMPLE %s < %t.simple.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-linux-gnu -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-x86_64 %s < %t.linux.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target armv6-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target armv6-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-armv6 %s < %t.linux.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-armv7 %s < %t.linux.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target thumbv7-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target thumbv7-unknown-linux-gnueabihf -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-thumbv7 %s < %t.linux.txt
 
 // RUN: %swiftc_driver_plain -driver-print-jobs -target armv7-none-linux-androideabi -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.android.txt
 // RUN: %FileCheck -check-prefix ANDROID-armv7 %s < %t.android.txt
 // RUN: %FileCheck -check-prefix ANDROID-armv7-NEGATIVE %s < %t.android.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-cygnus -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.cygwin.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-windows-cygnus -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.cygwin.txt
 // RUN: %FileCheck -check-prefix CYGWIN-x86_64 %s < %t.cygwin.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.windows.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-windows-msvc -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.windows.txt
 // RUN: %FileCheck -check-prefix WINDOWS-x86_64 %s < %t.windows.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target amd64-unknown-openbsd -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.openbsd.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target amd64-unknown-openbsd -Ffoo -Fsystem car -F cdr -framework bar -Lbaz -lboo -Xlinker -undefined %s 2>&1 > %t.openbsd.txt
 // RUN: %FileCheck -check-prefix OPENBSD-amd64 %s < %t.openbsd.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -emit-library -target x86_64-unknown-linux-gnu %s -Lbar -o dynlib.out 2>&1 > %t.linux.dynlib.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -emit-library -target x86_64-unknown-linux-gnu %s -Lbar -o dynlib.out 2>&1 > %t.linux.dynlib.txt
 // RUN: %FileCheck -check-prefix LINUX_DYNLIB-x86_64 %s < %t.linux.dynlib.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -emit-library -target x86_64-apple-macosx10.9.1 %s -sdk %S/../Inputs/clang-importer-sdk -lfoo -framework bar -Lbaz -Fgarply -Fsystem car -F cdr -Xlinker -undefined -Xlinker dynamic_lookup -o sdk.out 2>&1 > %t.complex.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -emit-library -target x86_64-apple-macosx10.9.1 %s -sdk %S/../Inputs/clang-importer-sdk -lfoo -framework bar -Lbaz -Fgarply -Fsystem car -F cdr -Xlinker -undefined -Xlinker dynamic_lookup -o sdk.out 2>&1 > %t.complex.txt
 // RUN: %FileCheck %s < %t.complex.txt
 // RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios7.1-simulator -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.simple.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios7.1-simulator -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.simple.txt
 // RUN: %FileCheck -check-prefix IOS-linker-order %s < %t.simple.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-linker-order %s < %t.linux.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -Xclang-linker -foo -Xclang-linker foopath %s 2>&1 > %t.linux.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-linux-gnu -Xclang-linker -foo -Xclang-linker foopath %s 2>&1 > %t.linux.txt
 // RUN: %FileCheck -check-prefix LINUX-clang-linker-order %s < %t.linux.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -Xclang-linker -foo -Xclang-linker foopath %s 2>&1 > %t.windows.txt
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-windows-msvc -Xclang-linker -foo -Xclang-linker foopath %s 2>&1 > %t.windows.txt
 // RUN: %FileCheck -check-prefix WINDOWS-clang-linker-order %s < %t.windows.txt
 
-// RUN: %swiftc_driver -driver-print-jobs -target wasm32-unknown-wasi -Xclang-linker -flag -Xclang-linker arg %s 2>&1 | %FileCheck -check-prefix WASI-clang-linker-order %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target wasm32-unknown-wasi -Xclang-linker -flag -Xclang-linker arg %s 2>&1 | %FileCheck -check-prefix WASI-clang-linker-order %s
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g %s | %FileCheck -check-prefix DEBUG %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -g %s | %FileCheck -check-prefix DEBUG %s
 
 // RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-unknown-linux-gnu -toolchain-stdlib-rpath %s 2>&1 | %FileCheck -check-prefix LINUX-STDLIB-RPATH %s
 // RUN: %swiftc_driver_plain -driver-print-jobs -target x86_64-unknown-linux-gnu -no-toolchain-stdlib-rpath %s 2>&1 | %FileCheck -check-prefix LINUX-NO-STDLIB-RPATH %s
@@ -74,7 +74,7 @@
 // RUN: touch %t/a.swiftmodule
 // RUN: touch %t/b.o
 // RUN: touch %t/b.swiftmodule
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o %t/a.swiftmodule %t/b.o %t/b.swiftmodule -o linker | %FileCheck -check-prefix LINK-SWIFTMODULES %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o %t/a.swiftmodule %t/b.o %t/b.swiftmodule -o linker | %FileCheck -check-prefix LINK-SWIFTMODULES %s
 
 // RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.10   %s > %t.simple-macosx10.10.txt
 // RUN: %FileCheck %s < %t.simple-macosx10.10.txt
@@ -83,33 +83,49 @@
 // RUN: %empty-directory(%t)
 // RUN: echo "int dummy;" >%t/a.cpp
 // RUN: cc -c %t/a.cpp -o %t/a.o
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -o linker 2>&1 | %FileCheck -check-prefix COMPILE_AND_LINK %s
-// RUN: %swiftc_driver -save-temps -driver-print-jobs  -target x86_64-apple-macosx10.9 %s %t/a.o -driver-filelist-threshold=0 -o linker  2>&1 | tee %t/forFilelistCapture | %FileCheck -check-prefix FILELIST %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 %s %t/a.o -o linker 2>&1 | %FileCheck -check-prefix COMPILE_AND_LINK %s
+// RUN: %swiftc_driver -sdk "" -save-temps -driver-print-jobs  -target x86_64-apple-macosx10.9 %s %t/a.o -driver-filelist-threshold=0 -o linker  2>&1 | tee %t/forFilelistCapture | %FileCheck -check-prefix FILELIST %s
 
 // Extract filelist name and check it out
 // RUN: tail -1 %t/forFilelistCapture | sed 's/.*-filelist //' | sed 's/ .*//' >%t/filelistName
 // RUN: %FileCheck -check-prefix FILELIST-CONTENTS %s < `cat %t/filelistName`
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_DARWIN %s
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_LINUX %s
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-cygnus -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WINDOWS %s
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WINDOWS %s
-// RUN: %swiftc_driver -driver-print-jobs -target wasm32-unknown-wasi -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WASI %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_DARWIN %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-linux-gnu -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_LINUX %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-windows-cygnus -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-unknown-windows-msvc -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target wasm32-unknown-wasi -emit-library %s -module-name LINKER | %FileCheck -check-prefix INFERRED_NAME_WASI %s
 
 // Here we specify an output file name using '-o'. For ease of writing these
 // tests, we happen to specify the same file name as is inferred in the
 // INFERRED_NAMED_DARWIN tests above: 'libLINKER.dylib'.
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -o libLINKER.dylib | %FileCheck -check-prefix INFERRED_NAME_DARWIN %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -emit-library %s -o libLINKER.dylib | %FileCheck -check-prefix INFERRED_NAME_DARWIN %s
 
 // Check reading the SDKSettings.json from an SDK
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15 %s
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4 %s
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_UNVERSIONED %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15 %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4 %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.9 -sdk %S/Inputs/MacOSX10.15.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_UNVERSIONED %s
+
+// Check arm64 macOS first deployment version adjustment.
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-macosx10.15.1 %s 2>&1 | %FileCheck -check-prefix ARM64E_MACOS_LINKER %s
+
+// Check x86 macOS 11 deployment version adjustment.
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix X86_MACOS11_LINKER %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-macosx11.0 %s 2>&1 | %FileCheck -check-prefix ARM64E_MACOS_LINKER %s
+
+// Check arm64 simulators first deployment version adjustment.
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-ios13.0-simulator %s 2>&1 | %FileCheck -check-prefix ARM64_IOS_SIMULATOR_LINKER %s
+
 
 // MACOS_10_15: -platform_version macos 10.9.0 10.15.0
 // MACOS_10_15_4: -platform_version macos 10.9.0 10.15.4
 // MACOS_UNVERSIONED: -platform_version macos 10.9.0 0.0.0
 
+// ARM64E_MACOS_LINKER: -platform_version macos 11.0.0
+// X86_MACOS11_LINKER: -platform_version macos 10.16.0
+// X86_64_WATCHOS_SIM_LINKER: -platform_version watchos-simulator 7.0.0
+// ARM64_IOS_SIMULATOR_LINKER: -platform_version ios-simulator 14.0.0
+
 // There are more RUN lines further down in the file.
 
 // CHECK: swift
@@ -415,7 +431,7 @@
 // RUN: %empty-directory(%t/DISTINCTIVE-PATH/usr/bin)
 // RUN: touch %t/DISTINCTIVE-PATH/usr/bin/ld
 // RUN: chmod +x %t/DISTINCTIVE-PATH/usr/bin/ld
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/DISTINCTIVE-PATH/usr/bin/swiftc)
 // RUN: %t/DISTINCTIVE-PATH/usr/bin/swiftc -target x86_64-apple-macosx10.9 %s -### | %FileCheck -check-prefix=RELATIVE-LINKER %s
 
 // RELATIVE-LINKER: {{/|\\\\}}DISTINCTIVE-PATH{{/|\\\\}}usr{{/|\\\\}}bin{{/|\\\\}}swift
diff --git a/test/Driver/loaded_module_trace_swiftinterface.swift b/test/Driver/loaded_module_trace_swiftinterface.swift
index a92a34e974d0c..140215561e1b7 100644
--- a/test/Driver/loaded_module_trace_swiftinterface.swift
+++ b/test/Driver/loaded_module_trace_swiftinterface.swift
@@ -1,4 +1,5 @@
 // UNSUPPORTED: -windows-msvc
+// REQUIRES: SR13034
 
 // 1) If there is no swiftmodule, use the swiftinterface
 //
diff --git a/test/Driver/macabi-environment.swift b/test/Driver/macabi-environment.swift
index 5a53a012f57e2..358894416710e 100644
--- a/test/Driver/macabi-environment.swift
+++ b/test/Driver/macabi-environment.swift
@@ -2,7 +2,7 @@
 
 // UNSUPPORTED: windows
 
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios13.0-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-MACABI %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -target x86_64-apple-ios13.0-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-MACABI %s
 // IOS13-MACABI: bin/swift
 // IOS13-MACABI: -target x86_64-apple-ios13.0-macabi
 
@@ -19,7 +19,7 @@
 
 // Adjust iOS versions < 13.0 to 13.0 for the linker's sake.
 
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios12.0-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS12-MACABI %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -target x86_64-apple-ios12.0-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS12-MACABI %s
 // IOS12-MACABI: bin/swift
 // IOS12-MACABI: -target x86_64-apple-ios12.0-macabi
 
@@ -34,13 +34,16 @@
 // IOS12-MACABI-DAG: -rpath [[MACOSX_SDK_STDLIB_PATH]]
 // IOS12-MACABI-DAG: -platform_version mac-catalyst 13.0.0 0.0.0
 
+// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-ios12.0-macabi -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS14-MACABI %s
+// IOS14-MACABI: -platform_version mac-catalyst 14.0.0 0.0.0
+
 // Test using target-variant to build zippered outputs
 
-// RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-OBJECT %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -c -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-OBJECT %s
 // ZIPPERED-VARIANT-OBJECT: bin/swift
 // ZIPPERED-VARIANT-OBJECT: -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi
 
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -emit-library -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -module-name foo %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-LIBRARY %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -emit-library -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -module-name foo %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-LIBRARY %s
 // ZIPPERED-VARIANT-LIBRARY: bin/swift
 // ZIPPERED-VARIANT-LIBRARY: -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi
 
@@ -48,7 +51,7 @@
 // ZIPPERED-VARIANT-LIBRARY: -platform_version macos 10.14.0 0.0.0 -platform_version mac-catalyst 13.0.0 0.0.0
 
 // Make sure we pass the -target-variant when creating the pre-compiled header.
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-PCH %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=ZIPPERED-VARIANT-PCH %s
 // ZIPPERED-VARIANT-PCH: bin/swift
 // ZIPPERED-VARIANT-PCH: -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi
 // ZIPPERED_VARIANT-PCH  -emit-pch
@@ -60,11 +63,11 @@
 // Test using 'reverse' target-variant to build zippered outputs when the primary
 // target is ios-macabi
 
-// RUN: %swiftc_driver -driver-print-jobs -c -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-OBJECT %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -c -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-OBJECT %s
 // REVERSE-ZIPPERED-VARIANT-OBJECT: bin/swift
 // REVERSE-ZIPPERED-VARIANT-OBJECT: -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14
 
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -emit-library -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 -module-name foo %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-LIBRARY %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -emit-library -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 -module-name foo %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-LIBRARY %s
 // REVERSE-ZIPPERED-VARIANT-LIBRARY: bin/swift
 // REVERSE-ZIPPERED-VARIANT-LIBRARY: -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14
 
@@ -72,7 +75,7 @@
 // REVERSE-ZIPPERED-VARIANT-LIBRARY: -platform_version mac-catalyst 13.0.0 0.0.0 -platform_version macos 10.14.0
 
 // Make sure we pass the -target-variant when creating the pre-compiled header.
-// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-PCH %s
+// RUN: %swiftc_driver -sdk "" -sdk "" -driver-print-jobs -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14 -enable-bridging-pch -import-objc-header %S/Inputs/bridging-header.h %s | %FileCheck -check-prefix=REVERSE-ZIPPERED-VARIANT-PCH %s
 // REVERSE-ZIPPERED-VARIANT-PCH: bin/swift
 // REVERSE-ZIPPERED-VARIANT-PCH: -target x86_64-apple-ios13.0-macabi -target-variant x86_64-apple-macosx10.14
 // REVERSE-ZIPPERED_VARIANT-PCH  -emit-pch
@@ -81,15 +84,15 @@
 // REVERSE-ZIPPERED-VARIANT-PCH: bin/ld
 // REVERSE-ZIPPERED-VARIANT-PCH: -platform_version mac-catalyst 13.0.0 0.0.0 -platform_version macos 10.14.0 0.0.0
 
-// RUN: not %swiftc_driver -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET-VARIANT %s
-// RUN: not %swiftc_driver -target x86_64-apple-ios13.0 -target-variant x86_64-apple-macosx10.14 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET-VARIANT %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-ios13.0 -target-variant x86_64-apple-macosx10.14 %s 2>&1 | %FileCheck --check-prefix=UNSUPPORTED-TARGET %s
 
 // UNSUPPORTED-TARGET-VARIANT: error: unsupported '-target-variant' value {{.*}}; use 'ios-macabi' instead
 // UNSUPPORTED-TARGET: error: unsupported '-target' value {{.*}}; use 'ios-macabi' instead
 
 // When compiling for iOS, pass iphoneos_version_min to the linker, not maccatalyst_version_min.
 
-// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-ios13.0 -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-NO-MACABI -implicit-check-not=mac-catalyst %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target arm64-apple-ios13.0 -sdk %S/../Inputs/clang-importer-sdk %s | %FileCheck -check-prefix=IOS13-NO-MACABI -implicit-check-not=mac-catalyst %s
 // IOS13-NO-MACABI: bin/swift
 // IOS13-NO-MACABI: -target arm64-apple-ios13.0
 
@@ -101,19 +104,19 @@
 // Check reading the SDKSettings.json from an SDK and using it to map Catalyst
 // SDK version information.
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_ZIPPERED %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_ZIPPERED %s
 // MACOS_10_15_ZIPPERED: -target-sdk-version 10.15
 // MACOS_10_15_ZIPPERED: -target-variant-sdk-version 13.1
 // MACOS_10_15_ZIPPERED: -platform_version macos 10.14.0 10.15.0
 // MACOS_10_15_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.1.0
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_ZIPPERED %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_ZIPPERED %s
 // MACOS_10_15_4_ZIPPERED: -target-sdk-version 10.15.4
 // MACOS_10_15_4_ZIPPERED: -target-variant-sdk-version 13.4
 // MACOS_10_15_4_ZIPPERED: -platform_version macos 10.14.0 10.15.4
 // MACOS_10_15_4_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
 
-// RUN: %swiftc_driver -driver-print-jobs -target-variant x86_64-apple-macosx10.14 -target x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_REVERSE_ZIPPERED %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -target-variant x86_64-apple-macosx10.14 -target x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_REVERSE_ZIPPERED %s
 // MACOS_10_15_4_REVERSE_ZIPPERED: -target-sdk-version 13.4
 // MACOS_10_15_4_REVERSE_ZIPPERED: -target-variant-sdk-version 10.15.4
 // MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
diff --git a/test/Driver/merge-module.swift b/test/Driver/merge-module.swift
index 436929598b675..b8cf77ba0ee13 100644
--- a/test/Driver/merge-module.swift
+++ b/test/Driver/merge-module.swift
@@ -16,27 +16,27 @@
 
 // RUN: %swiftc_driver -emit-module -driver-print-jobs -driver-filelist-threshold=0 %s %S/../Inputs/empty.swift -module-name main 2>&1 | %FileCheck -check-prefix FILELISTS %s
 
-// CHECK: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// CHECK: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK: -module-name {{[^ ]+}}
 // CHECK: -o [[OBJECTFILE:.*]]
 
-// CHECK-NEXT: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// CHECK-NEXT: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // CHECK: -emit-module
 // CHECK: -module-name {{[^ ]+}}
 // CHECK: -o {{[^ ]+}}
 
 
-// SIMPLE: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// SIMPLE: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // SIMPLE: -emit-module
 // SIMPLE: -primary-file
 // SIMPLE: -emit-module-doc-path {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.swiftdoc
 // SIMPLE: -o {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.swiftmodule
-// SIMPLE: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// SIMPLE: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // SIMPLE: -emit-module
 // SIMPLE: -o main.swiftmodule
 
 
-// COMPLEX: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// COMPLEX: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // COMPLEX: -emit-module
 // COMPLEX-DAG: -emit-module-doc-path {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.swiftdoc
 // COMPLEX-DAG: -sdk {{.*}}/Inputs/clang-importer-sdk
@@ -44,7 +44,7 @@
 // COMPLEX-DAG: -F /path/to/frameworks -F /path/to/more/frameworks
 // COMPLEX-DAG: -I /path/to/headers -I path/to/more/headers
 // COMPLEX-DAG: -module-cache-path /tmp/modules
-// COMPLEX: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// COMPLEX: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // COMPLEX: -emit-module
 // COMPLEX-DAG: -F /path/to/frameworks -F /path/to/more/frameworks
 // COMPLEX-DAG: -I /path/to/headers -I path/to/more/headers
@@ -52,27 +52,27 @@
 // COMPLEX: -o sdk.out
 
 
-// TWO-OUTPUTS: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// TWO-OUTPUTS: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // TWO-OUTPUTS: -emit-module-path [[MODULE:[^ ]+]]
 // TWO-OUTPUTS: -emit-module-doc-path {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.swiftdoc
 // TWO-OUTPUTS: -o {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.o
-// TWO-OUTPUTS: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// TWO-OUTPUTS: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // TWO-OUTPUTS: -emit-module [[MODULE]]
 // TWO-OUTPUTS: -o main.swiftmodule
 
-// THREE-OUTPUTS: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// THREE-OUTPUTS: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // THREE-OUTPUTS: -emit-module-path [[MODULE:[^ ]+]]
 // THREE-OUTPUTS: -emit-module-doc-path {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.swiftdoc
 // THREE-OUTPUTS: -o {{[^ ]*[/\\]}}merge-module-{{[^ ]*}}.o
-// THREE-OUTPUTS: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// THREE-OUTPUTS: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // THREE-OUTPUTS: -emit-module [[MODULE]]
 // THREE-OUTPUTS: -emit-objc-header-path sdk.foo.h
 // THREE-OUTPUTS: -o sdk.foo.out
 
 
-// FILELISTS: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
-// FILELISTS-NEXT: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
-// FILELISTS-NEXT: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend
+// FILELISTS: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
+// FILELISTS-NEXT: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
+// FILELISTS-NEXT: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend
 // FILELISTS-NOT: .swiftmodule
 // FILELISTS: -filelist {{[^ ]+}}
 // FILELISTS-NOT: .swiftmodule
@@ -83,15 +83,15 @@
 // RUN: %FileCheck %s < %t.complex.txt
 // RUN: %FileCheck -check-prefix MERGE_1 %s < %t.complex.txt
 
-// MERGE_1: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend -emit-module -primary-file {{[^ ]+[/\\]}}Inputs{{/|\\\\}}main.swift{{"?}} {{[^ ]+[/\\]}}Inputs{{/|\\\\}}lib.swift
+// MERGE_1: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend -emit-module -primary-file {{[^ ]+[/\\]}}Inputs{{/|\\\\}}main.swift{{"?}} {{[^ ]+[/\\]}}Inputs{{/|\\\\}}lib.swift
 // MERGE_1: -emit-module-doc-path [[PARTIAL_MODULE_A:[^ ]+]].swiftdoc
 // MERGE_1: -module-name merge
 // MERGE_1: -o [[PARTIAL_MODULE_A]].swiftmodule
-// MERGE_1: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend -emit-module {{[^ ]+[/\\]}}Inputs{{/|\\\\}}main.swift{{"?}} -primary-file {{[^ ]+[/\\]}}Inputs{{/|\\\\}}lib.swift
+// MERGE_1: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend -emit-module {{[^ ]+[/\\]}}Inputs{{/|\\\\}}main.swift{{"?}} -primary-file {{[^ ]+[/\\]}}Inputs{{/|\\\\}}lib.swift
 // MERGE_1: -emit-module-doc-path [[PARTIAL_MODULE_B:[^ ]+]].swiftdoc
 // MERGE_1: -module-name merge
 // MERGE_1: -o [[PARTIAL_MODULE_B]].swiftmodule
-// MERGE_1: {{bin(/|\\\\)swiftc?(\.exe)?"?}} -frontend -merge-modules -emit-module [[PARTIAL_MODULE_A]].swiftmodule{{"?}} [[PARTIAL_MODULE_B]].swiftmodule
+// MERGE_1: {{bin(/|\\\\)swift(-frontend|c)?(\.exe)?"?}} -frontend -merge-modules -emit-module [[PARTIAL_MODULE_A]].swiftmodule{{"?}} [[PARTIAL_MODULE_B]].swiftmodule
 // MERGE_1: -parse-as-library
 // MERGE_1: -emit-module-doc-path {{"?}}/tmp{{(/|\\\\)}}modules.swiftdoc{{"?}}
 // MERGE_1: -module-name merge
diff --git a/test/Driver/modulewrap.swift b/test/Driver/modulewrap.swift
index 8adbe0afdc6e2..28f59bbc17329 100644
--- a/test/Driver/modulewrap.swift
+++ b/test/Driver/modulewrap.swift
@@ -1,7 +1,7 @@
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -g %s | %FileCheck %s
 
-// CHECK: bin{{/|\\\\}}swift{{c?(\.exe)?"?}} -frontend{{.*}}-emit-module-path [[MOD:.*\.swiftmodule]]
-// CHECK: bin{{/|\\\\}}swift{{c?(\.exe)?"?}} {{.*}}-emit-module [[MOD]]
+// CHECK: bin{{/|\\\\}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend{{.*}}-emit-module-path [[MOD:.*\.swiftmodule]]
+// CHECK: bin{{/|\\\\}}swift{{(-frontend|c)?(\.exe)?"?}} {{.*}}-emit-module [[MOD]]
 // CHECK-SAME:                                 -o [[MERGED:.*\.swiftmodule]]
-// CHECK: bin{{/|\\\\}}swift{{c?(\.exe)?"?}} -modulewrap [[MERGED]]{{"?}} -target x86_64-unknown-linux-gnu -o [[OBJ:.*\.o]]
+// CHECK: bin{{/|\\\\}}swift{{(-frontend|c)?(\.exe)?"?}} -modulewrap [[MERGED]]{{"?}} -target x86_64-unknown-linux-gnu -o [[OBJ:.*\.o]]
 // CHECK: bin{{/|\\\\}}clang{{.*}} [[OBJ]]
diff --git a/test/Driver/opt-record-bitstream.swift b/test/Driver/opt-record-bitstream.swift
index e3ad0ca0f76fe..9dd4fac343e7b 100644
--- a/test/Driver/opt-record-bitstream.swift
+++ b/test/Driver/opt-record-bitstream.swift
@@ -3,7 +3,7 @@
 // RUN: llvm-bcanalyzer -dump %t/optrecordmod.opt.bitstream | %FileCheck -check-prefix=BITSTREAM %s
 // RUN: otool -l %t/opt-record.o | %FileCheck -check-prefix=OBJ %s
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Ensure we emitted the appropriate section
 
diff --git a/test/Driver/options-repl.swift b/test/Driver/options-repl.swift
index d629a8c86d502..118ebd7b834f9 100644
--- a/test/Driver/options-repl.swift
+++ b/test/Driver/options-repl.swift
@@ -7,7 +7,7 @@
 
 // RUN: %empty-directory(%t)
 // RUN: mkdir -p %t/usr/bin
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/usr/bin/swift)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/usr/bin/swift)
 
 // RUN: %t/usr/bin/swift -sdk "" -deprecated-integrated-repl -### | %FileCheck -check-prefix=INTEGRATED %s
 
diff --git a/test/Driver/options.swift b/test/Driver/options.swift
index 7b98acf88d4b3..130eb959bf901 100644
--- a/test/Driver/options.swift
+++ b/test/Driver/options.swift
@@ -1,3 +1,5 @@
+// REQUIRES: swift_interpreter
+
 // RUN: not %swiftc_driver -emit-silgen -parse-as-library %s -module-name "Swift" 2>&1 | %FileCheck -check-prefix=STDLIB_MODULE %s
 // RUN: %target-swiftc_driver -emit-silgen -parse-as-library %s -module-name "Swift" -parse-stdlib -###
 // STDLIB_MODULE: error: module name "Swift" is reserved for the standard library{{$}}
@@ -83,11 +85,11 @@
 
 // RUN: %swiftc_driver -incremental %s -### 2>&1 | %FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM %s
 // INCREMENTAL_WITHOUT_OFM: warning: ignoring -incremental (currently requires an output file map)
-// INCREMENTAL_WITHOUT_OFM: swift{{c?(\.exe)?"?}} -frontend
+// INCREMENTAL_WITHOUT_OFM: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 
 // RUN: %swiftc_driver -incremental -output-file-map %S/Inputs/empty-ofm.json %s -### 2>&1 | %FileCheck -check-prefix=INCREMENTAL_WITHOUT_OFM_ENTRY %s
 // INCREMENTAL_WITHOUT_OFM_ENTRY: ignoring -incremental; output file map has no master dependencies entry ("swift-dependencies" under "")
-// INCREMENTAL_WITHOUT_OFM_ENTRY: swift{{c?(\.exe)?"?}} -frontend
+// INCREMENTAL_WITHOUT_OFM_ENTRY: swift{{(-frontend|c)?(\.exe)?"?}} -frontend
 
 // RUN: %swiftc_driver -driver-print-jobs -enforce-exclusivity=checked %s | %FileCheck -check-prefix=EXCLUSIVITY_CHECKED %s
 // EXCLUSIVITY_CHECKED: swift
@@ -121,11 +123,11 @@
 // BAD_DEBUG_LEVEL_ERROR: error: argument '-debug-info-format=codeview' is not allowed with '{{.*}}'
 
 // RUN: %swift_driver -F %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
-// RUN: %swiftc_driver -F %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
+// RUN: %target-swiftc_driver -F %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
 // RUN: %swift_driver -Fsystem %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
-// RUN: %swiftc_driver -Fsystem %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
+// RUN: %target-swiftc_driver -Fsystem %t/test.framework %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
 // RUN: %swift_driver -F %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
-// RUN: %swiftc_driver -F %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
+// RUN: %target-swiftc_driver -F %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
 // RUN: %swift_driver -Fsystem %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
-// RUN: %swiftc_driver -Fsystem %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
+// RUN: %target-swiftc_driver -Fsystem %t/test.framework/ %s 2>&1 | %FileCheck -check-prefix SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION %s
 // SEARCH_PATH_INCLUDES_FRAMEWORK_EXTENSION: warning: framework search path ends in ".framework"
diff --git a/test/Driver/os-deployment.swift b/test/Driver/os-deployment.swift
index f3d2fcbe1a735..538c8253d8912 100644
--- a/test/Driver/os-deployment.swift
+++ b/test/Driver/os-deployment.swift
@@ -1,16 +1,16 @@
-// RUN: not %swiftc_driver -target x86_64-apple-macosx10.8 %s 2>&1 | %FileCheck --check-prefix=CHECK-OSX %s
-// RUN: not %swiftc_driver -target x86_64-apple-ios6.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-IOS %s
-// RUN: not %swiftc_driver -target x86_64-apple-tvos8.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-tvOS %s
-// RUN: not %swiftc_driver -target x86_64-apple-watchos1.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-watchOS %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-macosx10.8 %s 2>&1 | %FileCheck --check-prefix=CHECK-OSX %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-ios6.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-IOS %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-tvos8.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-tvOS %s
+// RUN: not %swiftc_driver -sdk "" -target x86_64-apple-watchos1.0 %s 2>&1 | %FileCheck --check-prefix=CHECK-watchOS %s
 
-// RUN: not %swiftc_driver -target i386-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
-// RUN: not %swiftc_driver -target armv7-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
-// RUN: not %swiftc_driver -target i386-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
-// RUN: not %swiftc_driver -target armv7-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
-// RUN: %swiftc_driver -target i386-apple-ios10.3 %s -### >/dev/null
-// RUN: %swiftc_driver -target armv7-apple-ios10.3 %s -### >/dev/null
-// RUN: %swiftc_driver -target x86_64-apple-ios11.0 %s -### >/dev/null
-// RUN: %swiftc_driver -target arm64-apple-ios11.0 %s -### >/dev/null
+// RUN: not %swiftc_driver -sdk "" -target i386-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
+// RUN: not %swiftc_driver -sdk "" -target armv7-apple-ios11.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-11 %s
+// RUN: not %swiftc_driver -sdk "" -target i386-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
+// RUN: not %swiftc_driver -sdk "" -target armv7-apple-ios12.0 %s -### 2>&1 | %FileCheck --check-prefix=CHECK-IOS-12 %s
+// RUN: %swiftc_driver -sdk "" -target i386-apple-ios10.3 %s -### >/dev/null
+// RUN: %swiftc_driver -sdk "" -target armv7-apple-ios10.3 %s -### >/dev/null
+// RUN: %swiftc_driver -sdk "" -target x86_64-apple-ios11.0 %s -### >/dev/null
+// RUN: %swiftc_driver -sdk "" -target arm64-apple-ios11.0 %s -### >/dev/null
 
 
 // CHECK-OSX: Swift requires a minimum deployment target of OS X 10.9
diff --git a/test/Driver/parseable_output.swift b/test/Driver/parseable_output.swift
index 1c3f02bb54963..b955298cfd568 100644
--- a/test/Driver/parseable_output.swift
+++ b/test/Driver/parseable_output.swift
@@ -6,8 +6,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*[\\/]}}parseable_output.swift{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output-[[OUTPUT:.*]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*[\\/]}}parseable_output.swift{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output-[[OUTPUT:.*]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -67,8 +67,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "merge-module",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}parseable_output-[[OUTPUT]].swiftmodule{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output.swift.tmp.swiftmodule{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}parseable_output-[[OUTPUT]].swiftmodule{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output.swift.tmp.swiftmodule{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-merge-modules",
diff --git a/test/Driver/parseable_output_unicode.swift b/test/Driver/parseable_output_unicode.swift
index fba7dbbb05d84..e9065ee92be91 100644
--- a/test/Driver/parseable_output_unicode.swift
+++ b/test/Driver/parseable_output_unicode.swift
@@ -8,8 +8,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "compile",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*[\\/]}}你好.swift{{(\\")? .*}} -o {{.*[\\/]}}你好-[[OUTPUT:.*]].o{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -c -primary-file {{.*[\\/]}}你好.swift{{(\\")? .*}} -o {{.*[\\/]}}你好-[[OUTPUT:.*]].o{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-c",
@@ -69,8 +69,8 @@
 // CHECK-NEXT: {
 // CHECK-NEXT:   "kind": "began",
 // CHECK-NEXT:   "name": "merge-module",
-// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}你好-[[OUTPUT]].swiftmodule{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftmodule{{(\\")?}}",
-// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{c?(\.exe)?(\\")?}}",
+// CHECK-NEXT:   "command": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}} -frontend -merge-modules -emit-module {{.*[\\/]}}你好-[[OUTPUT]].swiftmodule{{(\\")?}} {{.*}} -o {{.*[\\/]}}parseable_output_unicode.swift.tmp.swiftmodule{{(\\")?}}",
+// CHECK-NEXT:   "command_executable": "{{.*[\\/]}}swift{{(-frontend|c)?(\.exe)?(\\")?}}",
 // CHECK-NEXT:   "command_arguments": [
 // CHECK-NEXT:     "-frontend",
 // CHECK-NEXT:     "-merge-modules",
diff --git a/test/Driver/print_target_info_macos.swift b/test/Driver/print_target_info_macos.swift
index 14074424cf484..a66420b5fa595 100644
--- a/test/Driver/print_target_info_macos.swift
+++ b/test/Driver/print_target_info_macos.swift
@@ -7,5 +7,5 @@
 
 // REQUIRES: OS=macosx
 
-// CHECK: "triple": "x86_64-apple-macosx10
-// CHECK: "unversionedTriple": "x86_64-apple-macosx"
+// CHECK: "triple": "{{.*}}-apple-macosx{{[0-9][0-9]}}
+// CHECK: "unversionedTriple": "{{.*}}-apple-macosx"
diff --git a/test/Driver/profiling.swift b/test/Driver/profiling.swift
index 3966758c21b17..bdc04e574d6a5 100644
--- a/test/Driver/profiling.swift
+++ b/test/Driver/profiling.swift
@@ -1,26 +1,26 @@
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK -check-prefix=OSX %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=CHECK -check-prefix=OSX %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-ios7.1-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOSSIM %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-ios7.1 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=IOS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-apple-tvos9.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target arm64-apple-tvos9.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=tvOS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir-old/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target i386-apple-watchos2.0-simulator -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target armv7k-apple-watchos2.0 -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ %s | %FileCheck -check-prefix=CHECK -check-prefix=watchOS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | %FileCheck -check-prefix=CHECK -check-prefix=LINUX %s
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target x86_64-unknown-windows-msvc %s | %FileCheck -check-prefix=CHECK -check-prefix=WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-unknown-linux-gnu %s | %FileCheck -check-prefix=CHECK -check-prefix=LINUX %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target x86_64-unknown-windows-msvc %s | %FileCheck -check-prefix=CHECK -check-prefix=WINDOWS %s
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-generate -target wasm32-unknown-wasi %s | %FileCheck -check-prefix CHECK -check-prefix WASI %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -target wasm32-unknown-wasi %s | %FileCheck -check-prefix CHECK -check-prefix WASI %s
 
 // CHECK: swift
 // CHECK: -profile-generate
@@ -58,12 +58,12 @@
 // WASI: lib{{(\\\\|/)}}swift{{(\\\\|/)}}clang{{(\\\\|/)}}lib{{(\\\\|/)}}wasi{{(\\\\|/)}}libclang_rt.profile-wasm32.a
 // WASI: -u__llvm_profile_runtime
 
-// RUN: not %swiftc_driver -driver-print-jobs -profile-generate -profile-use=/dev/null %s 2>&1 | %FileCheck -check-prefix=MIX_GEN_USE %s
+// RUN: not %swiftc_driver -sdk "" -driver-print-jobs -profile-generate -profile-use=/dev/null %s 2>&1 | %FileCheck -check-prefix=MIX_GEN_USE %s
 // MIX_GEN_USE: conflicting options '-profile-generate' and '-profile-use'
 
-// RUN: not %swiftc_driver -driver-print-jobs -profile-use=%t.does_not_exist %s 2>&1 | %FileCheck -check-prefix=USE_MISSING_FILE %s
+// RUN: not %swiftc_driver -sdk "" -driver-print-jobs -profile-use=%t.does_not_exist %s 2>&1 | %FileCheck -check-prefix=USE_MISSING_FILE %s
 // USE_MISSING_FILE: no profdata file exists at '{{[^']+}}.does_not_exist'
 
-// RUN: %swiftc_driver -driver-print-jobs -profile-use=/dev/null %s | %FileCheck -check-prefix=USE_DEVNULL %s
+// RUN: %swiftc_driver -sdk "" -driver-print-jobs -profile-use=/dev/null %s | %FileCheck -check-prefix=USE_DEVNULL %s
 // USE_DEVNULL: swift
 // USE_DEVNULL: -profile-use={{/dev/null|(.*profiling-[^ ]*.o)}}
diff --git a/test/Driver/response-file.swift b/test/Driver/response-file.swift
index 5aa6b65a8fb96..596be09747fbf 100644
--- a/test/Driver/response-file.swift
+++ b/test/Driver/response-file.swift
@@ -33,7 +33,7 @@
 // RUN: %target-build-swift -typecheck -v @%t.5.resp %s 2>&1 | %FileCheck %s -check-prefix=VERBOSE
 // VERBOSE: @{{[^ ]*}}arguments-{{[0-9a-zA-Z]+}}.resp{{"?}} # -frontend -typecheck -primary-file
 // RUN: not %target-swiftc_driver %s @%t.5.resp -Xfrontend -debug-crash-immediately 2>&1 | %FileCheck %s -check-prefix=TRACE
-// TRACE: Program arguments: {{[^ ]*}}swift{{c?(\.exe)?}} -frontend -c -primary-file
+// TRACE: Program arguments: {{[^ ]*}}swift{{(-frontend|c)?(\.exe)?}} -frontend -c -primary-file
 
 
 #if TEST0
diff --git a/test/Driver/sanitize_recover.swift b/test/Driver/sanitize_recover.swift
index ca7ca240acb41..d35b20946a330 100644
--- a/test/Driver/sanitize_recover.swift
+++ b/test/Driver/sanitize_recover.swift
@@ -1,3 +1,4 @@
+// REQUIRES: 64784401
 // RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-recover=foo %s 2>&1 | %FileCheck -check-prefix=SAN_RECOVER_INVALID_ARG %s
 // RUN: not %swiftc_driver -driver-print-jobs -sanitize=address -sanitize-recover=thread %s 2>&1 | %FileCheck -check-prefix=SAN_RECOVER_UNSUPPORTED_ARG %s
 // RUN: %swiftc_driver -v -sanitize-recover=address %s -o %t 2>&1 | %FileCheck -check-prefix=SAN_RECOVER_MISSING_INSTRUMENTATION_OPTION %s
diff --git a/test/Driver/sanitizers.swift b/test/Driver/sanitizers.swift
index d4dc5cea6de30..79dd44989b731 100644
--- a/test/Driver/sanitizers.swift
+++ b/test/Driver/sanitizers.swift
@@ -1,63 +1,63 @@
 /*
  * Address Sanitizer Tests  (asan)
  */
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_OSX %s
-// RUN: not %swiftc_driver -driver-print-jobs -sanitize=fuzzer -target x86_64-apple-macosx10.9 -resource-dir %S/Inputs/nonexistent-resource-dir %s 2>&1 | %FileCheck -check-prefix=FUZZER_NONEXISTENT %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-ios7.1-simulator %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOSSIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target arm64-apple-ios7.1 %s  | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-tvos9.0-simulator %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS_SIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target arm64-apple-tvos9.0 %s  | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target i386-apple-watchos2.0-simulator %s   | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS_SIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=ASAN_LINUX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=ASAN_WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_OSX %s
+// RUN: not %swiftc_driver -sdk "" -driver-print-jobs -sanitize=fuzzer -target x86_64-apple-macosx10.9 -resource-dir %S/Inputs/nonexistent-resource-dir %s 2>&1 | %FileCheck -check-prefix=FUZZER_NONEXISTENT %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-ios7.1-simulator %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOSSIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target arm64-apple-ios7.1 %s  | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_IOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-apple-tvos9.0-simulator %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target arm64-apple-tvos9.0 %s  | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_tvOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target i386-apple-watchos2.0-simulator %s   | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix=ASAN -check-prefix=ASAN_watchOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=ASAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=ASAN_WINDOWS %s
 
 /*
  * Thread Sanitizer Tests  (tsan)
  */
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=TSAN -check-prefix=TSAN_OSX %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86-apple-macosx10.9 %s 2>&1 | %FileCheck -check-prefix=TSAN_OSX_32 %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-ios7.1-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_IOSSIM %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target arm64-apple-ios7.1 %s 2>&1 | %FileCheck -check-prefix=TSAN_IOS %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-tvos9.0-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_tvOS_SIM %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target arm64-apple-tvos9.0 %s 2>&1 | %FileCheck -check-prefix=TSAN_tvOS %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target i386-apple-watchos2.0-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_watchOS_SIM %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target armv7k-apple-watchos2.0 %s 2>&1  | %FileCheck -check-prefix=TSAN_watchOS %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=TSAN_WINDOWS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=TSAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=TSAN -check-prefix=TSAN_OSX %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86-apple-macosx10.9 %s 2>&1 | %FileCheck -check-prefix=TSAN_OSX_32 %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-ios7.1-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_IOSSIM %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target arm64-apple-ios7.1 %s 2>&1 | %FileCheck -check-prefix=TSAN_IOS %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-apple-tvos9.0-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_tvOS_SIM %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target arm64-apple-tvos9.0 %s 2>&1 | %FileCheck -check-prefix=TSAN_tvOS %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target i386-apple-watchos2.0-simulator %s 2>&1 | %FileCheck -check-prefix=TSAN_watchOS_SIM %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target armv7k-apple-watchos2.0 %s 2>&1  | %FileCheck -check-prefix=TSAN_watchOS %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=TSAN_WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=TSAN_LINUX %s
 
 /*
  * Undefined Behavior Sanitizer Tests  (ubsan)
  */
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_OSX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-ios7.1-simulator %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_IOSSIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target arm64-apple-ios7.1 %s  | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_IOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-tvos9.0-simulator %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_tvOS_SIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target arm64-apple-tvos9.0 %s  | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_tvOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target i386-apple-watchos2.0-simulator %s   | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_watchOS_SIM %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_watchOS %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=UBSAN_LINUX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=UBSAN_WINDOWS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-macosx10.9 %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_OSX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-ios7.1-simulator %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_IOSSIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target arm64-apple-ios7.1 %s  | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_IOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-apple-tvos9.0-simulator %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_tvOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target arm64-apple-tvos9.0 %s  | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_tvOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target i386-apple-watchos2.0-simulator %s   | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_watchOS_SIM %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target armv7k-apple-watchos2.0 %s | %FileCheck -check-prefix=UBSAN -check-prefix=UBSAN_watchOS %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=UBSAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=undefined -target x86_64-unknown-windows-msvc %s 2>&1 | %FileCheck -check-prefix=UBSAN_WINDOWS %s
 
 /*
  * Multiple Sanitizers At Once
  */
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address,undefined,fuzzer -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=MULTIPLE_SAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -sanitize=address,undefined,fuzzer -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck -check-prefix=MULTIPLE_SAN_LINUX %s
 
 /*
  * Bad Argument Tests
  */
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address,unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address -sanitize=unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s
-// RUN: not %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address,thread %s 2>&1 | %FileCheck -check-prefix=INCOMPATIBLESANITIZERS %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address,unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address -sanitize=unknown %s 2>&1 | %FileCheck -check-prefix=BADARG %s
+// RUN: not %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -target x86_64-apple-macosx10.9 -sanitize=address,thread %s 2>&1 | %FileCheck -check-prefix=INCOMPATIBLESANITIZERS %s
 
 /*
  * Make sure we don't accidentally add the sanitizer library path when building libraries or modules
  */
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-library -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=ASAN_LINUX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-module -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=ASAN_LINUX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-library -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=TSAN_LINUX %s
-// RUN: %swiftc_driver -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-module -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=TSAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-library -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=ASAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-module -sanitize=address -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=ASAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-library -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=TSAN_LINUX %s
+// RUN: %swiftc_driver -sdk "" -resource-dir %S/Inputs/fake-resource-dir/lib/swift/ -driver-print-jobs -emit-module -sanitize=thread -target x86_64-unknown-linux-gnu %s 2>&1 | %FileCheck --implicit-check-not=TSAN_LINUX %s
 
 // ASAN: swift
 // ASAN: -sanitize=address
diff --git a/test/Driver/subcommands.swift b/test/Driver/subcommands.swift
index 72bcc98b93a22..14024c71579fb 100644
--- a/test/Driver/subcommands.swift
+++ b/test/Driver/subcommands.swift
@@ -3,12 +3,12 @@
 
 // RUN: rm -rf %t.dir
 // RUN: mkdir -p %t.dir/usr/bin
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t.dir/usr/bin/swift)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t.dir/usr/bin/swift)
 
 // RUN: %t.dir/usr/bin/swift -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s
 // RUN: %t.dir/usr/bin/swift repl -### 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-REPL %s
 
-// CHECK-SWIFT-INVOKES-REPL: {{.*}}/swift -frontend -repl
+// CHECK-SWIFT-INVOKES-REPL: {{.*}}/swift{{.*}} -repl
 
 
 // RUN: %empty-directory(%t.dir)
@@ -20,7 +20,7 @@
 // RUN: cd %t.dir && %swift_driver_plain -### t.swift 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-INTERPRETER %s
 // RUN: cd %t.dir && %swift_driver_plain -### subpath/build 2>&1 | %FileCheck -check-prefix=CHECK-SWIFT-INVOKES-INTERPRETER %s
 
-// CHECK-SWIFT-INVOKES-INTERPRETER: {{.*}}/swift -frontend -interpret
+// CHECK-SWIFT-INVOKES-INTERPRETER: {{.*}}/swift-frontend -frontend -interpret
 
 
 // Check that 'swift foo' invokes 'swift-foo'.
diff --git a/test/Driver/verbose.swift b/test/Driver/verbose.swift
index c180ff99b2781..3a52cb4abb7e8 100644
--- a/test/Driver/verbose.swift
+++ b/test/Driver/verbose.swift
@@ -1,4 +1,4 @@
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -v %s 2>&1 | %FileCheck %s -check-prefix=VERBOSE_CLANG
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -v %s 2>&1 | %FileCheck %s -check-prefix=VERBOSE_CLANG
 
-// VERBOSE_CLANG: clang{{.*}} -v -o
+// VERBOSE_CLANG: clang{{.*}} -v {{.*}}-o
diff --git a/test/Driver/vfs.swift b/test/Driver/vfs.swift
index 21409e5d276d2..52f7731558196 100644
--- a/test/Driver/vfs.swift
+++ b/test/Driver/vfs.swift
@@ -1,9 +1,9 @@
 // Verifies that the driver passes the -vfsoverlay flag to the frontend (SR-12834).
 // RUN: %swiftc_driver -driver-print-jobs -c -vfsoverlay overlay.yaml %s | %FileCheck --check-prefix=CHECK-ONE %s
 
-// CHECK-ONE: bin{{/|\\\\}}swift{{c?(\.exe)?"?}} -frontend{{.*}}-c{{.*}}-vfsoverlay overlay.yaml
+// CHECK-ONE: bin{{/|\\\\}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend{{.*}}-c{{.*}}-vfsoverlay overlay.yaml
 
 // Verifies that multiple occurrences are passed in order.
 // RUN: %swiftc_driver -driver-print-jobs -c -vfsoverlay overlay1.yaml -vfsoverlay overlay2.yaml -vfsoverlay overlay3.yaml %s | %FileCheck --check-prefix=CHECK-MULTIPLE %s
 
-// CHECK-MULTIPLE: bin{{/|\\\\}}swift{{c?(\.exe)?"?}} -frontend{{.*}}-c{{.*}}-vfsoverlay overlay1.yaml -vfsoverlay overlay2.yaml -vfsoverlay overlay3.yaml
+// CHECK-MULTIPLE: bin{{/|\\\\}}swift{{(-frontend|c)?(\.exe)?"?}} -frontend{{.*}}-c{{.*}}-vfsoverlay overlay1.yaml -vfsoverlay overlay2.yaml -vfsoverlay overlay3.yaml
diff --git a/test/Driver/windows-link-job.swift b/test/Driver/windows-link-job.swift
index 34e7b292daad0..1f536f24dc5fc 100644
--- a/test/Driver/windows-link-job.swift
+++ b/test/Driver/windows-link-job.swift
@@ -1,4 +1,4 @@
 // RUN: %empty-directory(%t/DISTINCTIVE-WINDOWS-PATH/usr/bin)
-// RUN: %hardlink-or-copy(from: %swift_driver_plain, to: %t/DISTINCTIVE-WINDOWS-PATH/usr/bin/swiftc)
+// RUN: %hardlink-or-copy(from: %swift_frontend_plain, to: %t/DISTINCTIVE-WINDOWS-PATH/usr/bin/swiftc)
 // RUN: env PATH= %t/DISTINCTIVE-WINDOWS-PATH/usr/bin/swiftc -target x86_64-unknown-windows-msvc -### -module-name link -emit-library %s 2>&1 | %FileCheck %s
 // CHECK: {{^}}clang
diff --git a/test/Frontend/Fingerprints/class-fingerprint.swift b/test/Frontend/Fingerprints/class-fingerprint.swift
index 48bcae8d5f0b2..6bc7fe2437b69 100644
--- a/test/Frontend/Fingerprints/class-fingerprint.swift
+++ b/test/Frontend/Fingerprints/class-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -53,7 +53,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -67,7 +67,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/Fingerprints/enum-fingerprint.swift b/test/Frontend/Fingerprints/enum-fingerprint.swift
index 9c851417a3423..cb4e6bbf03b59 100644
--- a/test/Frontend/Fingerprints/enum-fingerprint.swift
+++ b/test/Frontend/Fingerprints/enum-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -53,7 +53,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -67,7 +67,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/Fingerprints/extension-adds-member.swift b/test/Frontend/Fingerprints/extension-adds-member.swift
index 80344ee827c49..a880a3a2d5939 100644
--- a/test/Frontend/Fingerprints/extension-adds-member.swift
+++ b/test/Frontend/Fingerprints/extension-adds-member.swift
@@ -21,7 +21,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output1
 
 
 // Change one type, but uses of all types get recompiled
@@ -33,7 +33,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json  >& %t/output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json  >& %t/output2
 
 
 // This test checks for the status quo; it would be OK to be more conservative
@@ -60,7 +60,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output3
 
 // Change one type, only uses of that type get recompiled
 
@@ -71,7 +71,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output4
 
 // RUN: %FileCheck -check-prefix=CHECK-RECOMPILED-W %s < %t/output4
 // RUN: %FileCheck -check-prefix=CHECK-NOT-RECOMPILED-W %s < %t/output4
diff --git a/test/Frontend/Fingerprints/protocol-fingerprint.swift b/test/Frontend/Fingerprints/protocol-fingerprint.swift
index 25146291407b7..22bdfb4d90c7b 100644
--- a/test/Frontend/Fingerprints/protocol-fingerprint.swift
+++ b/test/Frontend/Fingerprints/protocol-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -53,7 +53,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -67,9 +67,8 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
 // RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4
-
diff --git a/test/Frontend/Fingerprints/struct-fingerprint.swift b/test/Frontend/Fingerprints/struct-fingerprint.swift
index 40de452e25aab..af8b582818299 100644
--- a/test/Frontend/Fingerprints/struct-fingerprint.swift
+++ b/test/Frontend/Fingerprints/struct-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -53,7 +53,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -67,7 +67,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/PrivateFingerprints/class-fingerprint.swift b/test/Frontend/PrivateFingerprints/class-fingerprint.swift
index b52c7809df951..67b29178057e4 100644
--- a/test/Frontend/PrivateFingerprints/class-fingerprint.swift
+++ b/test/Frontend/PrivateFingerprints/class-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -52,7 +52,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -66,7 +66,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/PrivateFingerprints/enum-fingerprint.swift b/test/Frontend/PrivateFingerprints/enum-fingerprint.swift
index 44747dee30b41..138d16f211a88 100644
--- a/test/Frontend/PrivateFingerprints/enum-fingerprint.swift
+++ b/test/Frontend/PrivateFingerprints/enum-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -52,7 +52,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -66,7 +66,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/PrivateFingerprints/extension-adds-member.swift b/test/Frontend/PrivateFingerprints/extension-adds-member.swift
index 1bac527921a73..63726480b3c37 100644
--- a/test/Frontend/PrivateFingerprints/extension-adds-member.swift
+++ b/test/Frontend/PrivateFingerprints/extension-adds-member.swift
@@ -21,7 +21,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output1
 
 
 // Change one type, but uses of all types get recompiled
@@ -33,7 +33,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json  >& %t/output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json  >& %t/output2
 
 
 // This test checks for the status quo; it would be OK to be more conservative
@@ -60,7 +60,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output3
 
 // Change one type, only uses of that type get recompiled
 
@@ -71,7 +71,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json  >& %t/output4
 
 // RUN: %FileCheck -check-prefix=CHECK-RECOMPILED-W %s < %t/output4
 // RUN: %FileCheck -check-prefix=CHECK-NOT-RECOMPILED-W %s < %t/output4
diff --git a/test/Frontend/PrivateFingerprints/protocol-fingerprint.swift b/test/Frontend/PrivateFingerprints/protocol-fingerprint.swift
index b2a54125f0444..a48649f0b11ee 100644
--- a/test/Frontend/PrivateFingerprints/protocol-fingerprint.swift
+++ b/test/Frontend/PrivateFingerprints/protocol-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -52,7 +52,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -66,9 +66,8 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
 // RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output4
-
diff --git a/test/Frontend/PrivateFingerprints/struct-fingerprint.swift b/test/Frontend/PrivateFingerprints/struct-fingerprint.swift
index ea9e7a153956e..a02cef5fd649e 100644
--- a/test/Frontend/PrivateFingerprints/struct-fingerprint.swift
+++ b/test/Frontend/PrivateFingerprints/struct-fingerprint.swift
@@ -16,7 +16,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
 
@@ -29,7 +29,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
 
 // Save for debugging:
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
@@ -52,7 +52,7 @@
 // Seeing weird failure on CI, so set the mod times
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
 
@@ -66,7 +66,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesAB.swift
 
-// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+// RUN: cd %t && %target-swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
 
 // only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
 
diff --git a/test/Frontend/crash.swift b/test/Frontend/crash.swift
index 951b9db6e6bcd..a95e6cca6c1b0 100644
--- a/test/Frontend/crash.swift
+++ b/test/Frontend/crash.swift
@@ -3,7 +3,7 @@
 
 // Check that we see the contents of the input file list in the crash log.
 // CHECK-LABEL: Stack dump
-// CHECK-NEXT: Program arguments: {{.*swift(c?)(\.exe)?}} -frontend
+// CHECK-NEXT: Program arguments: {{.*swift(-frontend)?(c?)(\.exe)?}}
 // CHECK-NEXT: Swift version
 // CHECK-NEXT: Contents of {{.*}}.filelist.txt:
 // CHECK-NEXT: ---
diff --git a/test/Frontend/dump-parse.swift b/test/Frontend/dump-parse.swift
index b70dbb019e6de..900ad3643c816 100644
--- a/test/Frontend/dump-parse.swift
+++ b/test/Frontend/dump-parse.swift
@@ -73,3 +73,53 @@ nonescaping({ $0 })
 // CHECK-AST:        (declref_expr type='((Int) -> Int) -> ()'
 // CHECK-AST-NEXT:        (paren_expr
 // CHECK-AST-NEXT:          (closure_expr type='(Int) -> Int' {{.*}} discriminator=1 single-expression
+
+// CHECK-LABEL: (struct_decl range=[{{.+}}] "MyStruct")
+struct MyStruct {}
+
+// CHECK-LABEL: (enum_decl range=[{{.+}}] "MyEnum"
+enum MyEnum {
+
+    // CHECK-LABEL: (enum_case_decl range=[{{.+}}]
+    // CHECK-NEXT:    (enum_element_decl range=[{{.+}}]  "foo(x:)"
+    // CHECK-NEXT:      (parameter_list range=[{{.+}}]
+    // CHECK-NEXT:         (parameter "x" apiName=x)))
+    // CHECK-NEXT:     (enum_element_decl range=[{{.+}}] "bar"))
+    // CHECK-NEXT:  (enum_element_decl range=[{{.+}}] "foo(x:)"
+    // CHECK-NEXT:    (parameter_list range=[{{.+}}]
+    // CHECK-NEXT:      (parameter "x" apiName=x)))
+    // CHECK-NEXT:  (enum_element_decl range=[{{.+}}] "bar"))
+    case foo(x: MyStruct), bar
+}
+
+// CHECK-LABEL: (top_level_code_decl range=[{{.+}}]
+// CHECK-NEXT:    (brace_stmt implicit range=[{{.+}}]
+// CHECK-NEXT:      (sequence_expr type='<null>'
+// CHECK-NEXT:        (discard_assignment_expr type='<null>')
+// CHECK-NEXT:        (assign_expr type='<null>'
+// CHECK-NEXT:          (**NULL EXPRESSION**)
+// CHECK-NEXT:          (**NULL EXPRESSION**))
+// CHECK-NEXT:        (closure_expr type='<null>' discriminator={{[0-9]+}}
+// CHECK-NEXT:          (parameter_list range=[{{.+}}]
+// CHECK-NEXT:            (parameter "v"))
+// CHECK-NEXT:          (brace_stmt range=[{{.+}}])))))
+_ = { (v: MyEnum) in }
+
+// CHECK-LABEL: (struct_decl range=[{{.+}}] "SelfParam"
+struct SelfParam {
+
+  // CHECK-LABEL: (func_decl range=[{{.+}}] "createOptional()" type
+  // CHECK-NEXT:    (parameter "self")
+  // CHECK-NEXT:    (parameter_list range=[{{.+}}])
+  // CHECK-NEXT:    (result
+  // CHECK-NEXT:      (type_optional
+  // CHECK-NEXT:        (type_ident
+  // CHECK-NEXT:          (component id='SelfParam' bind=none))))
+  static func createOptional() -> SelfParam? {
+
+    // CHECK-LABEL: (call_expr type='<null>' arg_labels=
+    // CHECK-NEXT:    (unresolved_decl_ref_expr type='<null>' name=SelfParam function_ref=unapplied)
+    // CHECK-NEXT:    (tuple_expr type='()'{{.*}}))
+    SelfParam()
+  }
+}
diff --git a/test/Frontend/emit-interface-macos-canonical-version.swift b/test/Frontend/emit-interface-macos-canonical-version.swift
new file mode 100644
index 0000000000000..e21c9348887f2
--- /dev/null
+++ b/test/Frontend/emit-interface-macos-canonical-version.swift
@@ -0,0 +1,18 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck %s -enable-library-evolution -emit-module-interface-path %t/Module.swiftinterface -experimental-skip-non-inlinable-function-bodies
+// RUN: %FileCheck %s --check-prefixes CHECK < %t/Module.swiftinterface
+
+// REQUIRES: OS=macosx
+
+@available(macOS 10.16, *)
+public func introduced10_16() { }
+// CHECK: @available(OSX 11.0, *)
+// CHECK-NEXT: public func introduced10_16()
+
+
+@available(OSX 11.0, *)
+public func introduced11_0() { }
+// CHECK-NEXT: @available(OSX 11.0, *)
+// CHECK-NEXT: public func introduced11_0()
+
+
diff --git a/test/Frontend/supplementary-output-support.swift b/test/Frontend/supplementary-output-support.swift
index 9d7aeb068fe62..a669dcd1e5978 100644
--- a/test/Frontend/supplementary-output-support.swift
+++ b/test/Frontend/supplementary-output-support.swift
@@ -28,3 +28,8 @@
 // PARSE_NO_INTERFACE: error: this mode does not support emitting module interface files{{$}}
 // RUN: not %target-swift-frontend -emit-silgen -emit-module-interface-path %t %s 2>&1 | %FileCheck -check-prefix=SILGEN_NO_INTERFACE %s
 // SILGEN_NO_INTERFACE: error: this mode does not support emitting module interface files{{$}}
+
+// RUN: not %target-swift-frontend -parse -emit-private-module-interface-path %t %s 2>&1 | %FileCheck -check-prefix=PARSE_NO_PRIVATE_INTERFACE %s
+// PARSE_NO_PRIVATE_INTERFACE: error: this mode does not support emitting module interface files{{$}}
+// RUN: not %target-swift-frontend -emit-silgen -emit-private-module-interface-path %t %s 2>&1 | %FileCheck -check-prefix=SILGEN_NO_PRIVATE_INTERFACE %s
+// SILGEN_NO_PRIVATE_INTERFACE: error: this mode does not support emitting module interface files{{$}}
diff --git a/test/Frontend/version.swift b/test/Frontend/version.swift
new file mode 100644
index 0000000000000..717c102bac18c
--- /dev/null
+++ b/test/Frontend/version.swift
@@ -0,0 +1,4 @@
+// RUN: %target-swift-frontend --version | %FileCheck %s
+
+// CHECK: Swift version
+// CHECK-NEXT: Target
diff --git a/test/Generics/conditional_conformances.swift b/test/Generics/conditional_conformances.swift
index 7aa6f7497ba1e..791d1a4b3ffff 100644
--- a/test/Generics/conditional_conformances.swift
+++ b/test/Generics/conditional_conformances.swift
@@ -413,9 +413,9 @@ extension Foo: P where Bar: P {
 extension BinaryInteger {
   var foo: Self {
     return self <= 1
-            ? 1
+            ? 1 // expected-error {{cannot convert return expression of type 'Int' to return type 'Self'}}
             : (2...self).reduce(1, *)
-            // expected-error@-1 {{referencing instance method 'reduce' on 'ClosedRange' requires that 'Self.Stride' conform to 'SignedInteger'}}
+            // expected-error@-1 {{cannot convert value of type 'Self' to expected argument type 'Int'}} {{20-20=Int(}} {{24-24=)}}
   }
 }
 
diff --git a/test/Generics/conditional_conformances_literals.swift b/test/Generics/conditional_conformances_literals.swift
index 932a51aa76f76..37f4729f14d17 100644
--- a/test/Generics/conditional_conformances_literals.swift
+++ b/test/Generics/conditional_conformances_literals.swift
@@ -128,9 +128,9 @@ func combined() {
 
     // Needs self conforming protocols:
     let _: Conforms = [[0: [1 : [works]] as Conforms]]
-    // expected-error@-1 {{value of protocol type 'Conforms' cannot conform to 'Conforms'; only struct/enum/class types can conform to protocols}}
+    // expected-error@-1 {{protocol 'Conforms' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
 
     let _: Conforms = [[0: [1 : [fails]] as Conforms]]
     // expected-error@-1 {{protocol 'Conforms' requires that 'Fails' conform to 'Conforms'}}
-    // expected-error@-2 {{value of protocol type 'Conforms' cannot conform to 'Conforms'; only struct/enum/class types can conform to protocols}}
+    // expected-error@-2 {{protocol 'Conforms' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
 }
diff --git a/test/Generics/deduction.swift b/test/Generics/deduction.swift
index f3e4d4b70cfa2..07f593d1d7786 100644
--- a/test/Generics/deduction.swift
+++ b/test/Generics/deduction.swift
@@ -25,7 +25,7 @@ func useIdentity(_ x: Int, y: Float, i32: Int32) {
   // Deduction where the result type and input type can get different results
   var xx : X, yy : Y
   xx = identity(yy) // expected-error{{cannot assign value of type 'Y' to type 'X'}}
-  xx = identity2(yy) // expected-error{{no exact matches in call to global function 'identity2'}}
+  xx = identity2(yy) // expected-error{{no 'identity2' candidates produce the expected contextual result type 'X'}}
 }
 
 func twoIdentical<T>(_ x: T, _ y: T) -> T {}
@@ -89,7 +89,7 @@ func testReturnTuple(_ x: Int, y: Float) {
   var _ : (Float, Float) = returnTuple(y)
 
   // <rdar://problem/22333090> QoI: Propagate contextual information in a call to operands
-  var _ : (Int, Float) = returnTuple(y) // expected-error{{cannot convert value of type 'Float' to expected argument type 'Int'}}
+  var _ : (Int, Float) = returnTuple(y) // expected-error{{conflicting arguments to generic parameter 'T' ('Float' vs. 'Int')}}
 }
 
 
@@ -247,8 +247,7 @@ protocol Addable {
   static func +(x: Self, y: Self) -> Self
 }
 func addAddables<T : Addable, U>(_ x: T, y: T, u: U) -> T {
-  // FIXME(diagnostics): This should report the "no exact matches" diagnostic.
-  u + u // expected-error{{referencing operator function '+' on 'RangeReplaceableCollection' requires that 'U' conform to 'RangeReplaceableCollection'}}
+  u + u // expected-error{{binary operator '+' cannot be applied to two 'U' operands}}
   return x+y
 }
 
diff --git a/test/Generics/existential_restrictions.swift b/test/Generics/existential_restrictions.swift
index fbf2f29375fc5..425308b798901 100644
--- a/test/Generics/existential_restrictions.swift
+++ b/test/Generics/existential_restrictions.swift
@@ -23,7 +23,7 @@ func fAOE(_ t: AnyObject) { }
 func fT<T>(_ t: T) { }
 
 func testPassExistential(_ p: P, op: OP, opp: OP & P, cp: CP, sp: SP, any: Any, ao: AnyObject) {
-  fP(p) // expected-error{{value of protocol type 'P' cannot conform to 'P'; only struct/enum/class types can conform to protocols}}
+  fP(p) // expected-error{{protocol 'P' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
   fAO(p) // expected-error{{global function 'fAO' requires that 'P' be a class type}}
   fAOE(p) // expected-error{{argument type 'P' expected to be an instance of a class or class-constrained type}}
   fT(p)
@@ -37,8 +37,8 @@ func testPassExistential(_ p: P, op: OP, opp: OP & P, cp: CP, sp: SP, any: Any,
   fAOE(cp)
   fT(cp)
 
-  fP(opp) // expected-error{{value of protocol type 'OP & P' cannot conform to 'P'; only struct/enum/class types can conform to protocols}}
-  fOP(opp) // expected-error{{value of protocol type 'OP & P' cannot conform to 'OP'; only struct/enum/class types can conform to protocols}}
+  fP(opp) // expected-error{{protocol 'OP & P' as a type cannot conform to 'P'; only concrete types such as structs, enums and classes can conform to protocols}}
+  fOP(opp) // expected-error{{protocol 'OP & P' as a type cannot conform to 'OP'; only concrete types such as structs, enums and classes can conform to protocols}}
   fAO(opp) // expected-error{{global function 'fAO' requires that 'OP & P' be a class type}}
   fAOE(opp)
   fT(opp)
@@ -64,9 +64,9 @@ class GAO<T : AnyObject> {} // expected-note 2{{requirement specified as 'T' : '
 func blackHole(_ t: Any) {}
 
 func testBindExistential() {
-  blackHole(GP<P>()) // expected-error{{value of protocol type 'P' cannot conform to 'P'; only struct/enum/class types can conform to protocols}}
+  blackHole(GP<P>()) // expected-error{{protocol 'P' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
   blackHole(GOP<OP>())
-  blackHole(GCP<CP>()) // expected-error{{value of protocol type 'CP' cannot conform to 'CP'; only struct/enum/class types can conform to protocols}}
+  blackHole(GCP<CP>()) // expected-error{{protocol 'CP' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
   blackHole(GAO<P>()) // expected-error{{'GAO' requires that 'P' be a class type}}
   blackHole(GAO<OP>())
   blackHole(GAO<CP>()) // expected-error{{'GAO' requires that 'CP' be a class type}}
@@ -92,5 +92,5 @@ func foo() {
   // generic no overloads error path. The error should actually talk
   // about the return type, and this can happen in other contexts as well;
   // <rdar://problem/21900971> tracks improving QoI here.
-  allMine.takeAll() // expected-error{{value of protocol type 'Mine' cannot conform to 'Mine'; only struct/enum/class types can conform to protocols}}
+  allMine.takeAll() // expected-error{{protocol 'Mine' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
 }
diff --git a/test/Generics/function_defs.swift b/test/Generics/function_defs.swift
index db836e2641733..0a271eec4f2ae 100644
--- a/test/Generics/function_defs.swift
+++ b/test/Generics/function_defs.swift
@@ -78,9 +78,9 @@ protocol Overload {
   func f1(_: B) -> B // expected-note {{candidate expects value of type 'OtherOvl.B' for parameter #1}}
   func f2(_: Int) -> A // expected-note{{found this candidate}}
   func f2(_: Int) -> B // expected-note{{found this candidate}}
-  func f3(_: Int) -> Int // expected-note {{found this candidate}}
-  func f3(_: Float) -> Float // expected-note {{found this candidate}}
-  func f3(_: Self) -> Self // expected-note {{found this candidate}}
+  func f3(_: Int) -> Int // expected-note {{found candidate with type '(Int) -> Int'}}
+  func f3(_: Float) -> Float // expected-note {{found candidate with type '(Float) -> Float'}}
+  func f3(_: Self) -> Self // expected-note {{found candidate with type '(OtherOvl) -> OtherOvl'}}
 
   var prop : Self { get }
 }
@@ -112,7 +112,7 @@ func testOverload<Ovl : Overload, OtherOvl : Overload>(_ ovl: Ovl, ovl2: Ovl,
   var f3f : (Float) -> Float = ovl.f3
   var f3ovl_1 : (Ovl) -> Ovl = ovl.f3
   var f3ovl_2 : (Ovl) -> Ovl = ovl2.f3
-  var f3ovl_3 : (Ovl) -> Ovl = other.f3 // expected-error{{no exact matches in reference to instance method 'f3'}}
+  var f3ovl_3 : (Ovl) -> Ovl = other.f3 // expected-error{{no 'f3' candidates produce the expected contextual result type '(Ovl) -> Ovl'}}
 
   var f3i_unbound : (Ovl) -> (Int) -> Int = Ovl.f3
   var f3f_unbound : (Ovl) -> (Float) -> Float = Ovl.f3
@@ -131,7 +131,7 @@ protocol Subscriptable {
   func getIndex() -> Index
   func getValue() -> Value
 
-  subscript (index : Index) -> Value { get set }
+  subscript (index : Index) -> Value { get set } // expected-note {{found this candidate}}
 }
 
 protocol IntSubscriptable {
@@ -139,7 +139,7 @@ protocol IntSubscriptable {
 
   func getElement() -> ElementType
 
-  subscript (index : Int) -> ElementType { get  }
+  subscript (index : Int) -> ElementType { get  } // expected-note {{found this candidate}}
 }
 
 func subscripting<T : Subscriptable & IntSubscriptable>(_ t: T) {
@@ -152,9 +152,7 @@ func subscripting<T : Subscriptable & IntSubscriptable>(_ t: T) {
   element = t[17]
   t[42] = element // expected-error{{cannot assign through subscript: subscript is get-only}}
 
-  // Suggests the Int form because we prefer concrete matches to generic matches in diagnosis.
-  t[value] = 17 // expected-error{{cannot convert value of type 'T.Value' to expected argument type 'Int'}}
-  // expected-error@-1 {{cannot assign value of type 'Int' to subscript of type 'T.ElementType'}}
+  t[value] = 17 // expected-error{{no exact matches in call to subscript}}
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/test/Generics/superclass_constraint_self_derived.swift b/test/Generics/superclass_constraint_self_derived.swift
new file mode 100644
index 0000000000000..074fc3c22f7ae
--- /dev/null
+++ b/test/Generics/superclass_constraint_self_derived.swift
@@ -0,0 +1,25 @@
+// RUN: %target-typecheck-verify-swift
+
+protocol P {
+  associatedtype T : Q
+}
+
+protocol Q {
+  associatedtype T : R
+
+  var t: T { get }
+}
+
+protocol R {}
+
+func takesR<T : R>(_: T) {}
+
+class C<T : Q> : P {}
+
+struct Outer<T : P> {
+  struct Inner<U> where T : C<U> {
+    func doStuff(_ u: U) {
+      takesR(u.t)
+    }
+  }
+}
diff --git a/test/IDE/complete_at_top_level.swift b/test/IDE/complete_at_top_level.swift
index 681177f0d5372..def887d6f7c19 100644
--- a/test/IDE/complete_at_top_level.swift
+++ b/test/IDE/complete_at_top_level.swift
@@ -471,7 +471,7 @@ var stringInterp = "\(#^STRING_INTERP_3^#)"
 _ = "" + "\(#^STRING_INTERP_4^#)" + ""
 // STRING_INTERP: Begin completions
 // STRING_INTERP-DAG: Decl[InstanceMethod]/CurrNominal/IsSystem: ['(']{#(value): T#}[')'][#Void#];
-// STRING_INTERP-DAG: Decl[Struct]/CurrModule: FooStruct[#FooStruct#];
+// STRING_INTERP-DAG: Decl[Struct]/CurrModule/TypeRelation[Convertible]: FooStruct[#FooStruct#]; name=FooStruct
 // STRING_INTERP-DAG: Decl[FreeFunction]/CurrModule/TypeRelation[Invalid]: fooFunc1()[#Void#];
 // STRING_INTERP-DAG: Decl[FreeFunction]/CurrModule: optStr()[#String?#];
 // STRING_INTERP-DAG: Decl[GlobalVar]/Local: fooObject[#FooStruct#];
diff --git a/test/IDE/complete_decl_attribute.swift b/test/IDE/complete_decl_attribute.swift
index 8fc1fcce7ecc3..1861cd5944abf 100644
--- a/test/IDE/complete_decl_attribute.swift
+++ b/test/IDE/complete_decl_attribute.swift
@@ -32,11 +32,11 @@ struct MyStruct {}
 // AVAILABILITY1-NEXT: Keyword/None:                       iOS[#Platform#]; name=iOS{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       tvOS[#Platform#]; name=tvOS{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       watchOS[#Platform#]; name=watchOS{{$}}
-// AVAILABILITY1-NEXT: Keyword/None:                       OSX[#Platform#]; name=OSX{{$}}
+// AVAILABILITY1-NEXT: Keyword/None:                       macOS[#Platform#]; name=macOS{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       iOSApplicationExtension[#Platform#]; name=iOSApplicationExtension{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       tvOSApplicationExtension[#Platform#]; name=tvOSApplicationExtension{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       watchOSApplicationExtension[#Platform#]; name=watchOSApplicationExtension{{$}}
-// AVAILABILITY1-NEXT: Keyword/None:                       OSXApplicationExtension[#Platform#]; name=OSXApplicationExtension{{$}}
+// AVAILABILITY1-NEXT: Keyword/None:                       macOSApplicationExtension[#Platform#]; name=macOSApplicationExtension{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       macCatalyst[#Platform#]; name=macCatalyst
 // AVAILABILITY1-NEXT: Keyword/None:                       macCatalystApplicationExtension[#Platform#]; name=macCatalystApplicationExtension
 // AVAILABILITY1-NEXT: End completions
@@ -88,7 +88,6 @@ struct MyStruct {}
 // KEYWORD3-NEXT:             Keyword/None:                       NSApplicationMain[#Class Attribute#]; name=NSApplicationMain{{$}}
 // KEYWORD3-NEXT:             Keyword/None:                       usableFromInline[#Class Attribute#]; name=usableFromInline
 // KEYWORD3-NEXT:             Keyword/None:                       propertyWrapper[#Class Attribute#]; name=propertyWrapper
-// KEYWORD3-NEXT:             Keyword/None:                       _functionBuilder[#Class Attribute#]; name=_functionBuilder
 // KEYWORD3-NEXT:             End completions
 
 @#^KEYWORD3_2^#IB class C2 {}
@@ -104,7 +103,6 @@ struct MyStruct {}
 // KEYWORD4-NEXT:             Keyword/None:                       usableFromInline[#Enum Attribute#]; name=usableFromInline
 // KEYWORD4-NEXT:             Keyword/None:                       frozen[#Enum Attribute#]; name=frozen
 // KEYWORD4-NEXT:             Keyword/None:                       propertyWrapper[#Enum Attribute#]; name=propertyWrapper
-// KEYWORD4-NEXT:             Keyword/None:                       _functionBuilder[#Enum Attribute#]; name=_functionBuilder
 // KEYWORD4-NEXT:             End completions
 
 
@@ -117,7 +115,6 @@ struct MyStruct {}
 // KEYWORD5-NEXT:             Keyword/None:                       usableFromInline[#Struct Attribute#]; name=usableFromInline
 // KEYWORD5-NEXT:             Keyword/None:                       frozen[#Struct Attribute#]; name=frozen
 // KEYWORD5-NEXT:             Keyword/None:                       propertyWrapper[#Struct Attribute#]; name=propertyWrapper
-// KEYWORD5-NEXT:             Keyword/None:                       _functionBuilder[#Struct Attribute#]; name=_functionBuilder
 // KEYWORD5-NEXT:             End completions
 
 @#^ON_GLOBALVAR^# var globalVar
@@ -243,7 +240,6 @@ struct _S {
 // ON_MEMBER_LAST-DAG: Keyword/None:                       GKInspectable[#Declaration Attribute#]; name=GKInspectable
 // ON_MEMBER_LAST-DAG: Keyword/None:                       IBSegueAction[#Declaration Attribute#]; name=IBSegueAction
 // ON_MEMBER_LAST-DAG: Keyword/None:                       propertyWrapper[#Declaration Attribute#]; name=propertyWrapper
-// ON_MEMBER_LAST-DAG: Keyword/None:                       _functionBuilder[#Declaration Attribute#]; name=_functionBuilder
 // ON_MEMBER_LAST-DAG: Keyword/None:                       differentiable[#Declaration Attribute#]; name=differentiable
 // ON_MEMBER_LAST-DAG: Keyword/None:                       derivative[#Declaration Attribute#]; name=derivative
 // ON_MEMBER_LAST-DAG: Keyword/None:                       transpose[#Declaration Attribute#]; name=transpose
@@ -290,7 +286,6 @@ func dummy2() {}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       GKInspectable[#Declaration Attribute#]; name=GKInspectable{{$}}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       frozen[#Declaration Attribute#]; name=frozen
 // KEYWORD_LAST-NEXT:             Keyword/None:                       propertyWrapper[#Declaration Attribute#]; name=propertyWrapper
-// KEYWORD_LAST-NEXT:             Keyword/None:                       _functionBuilder[#Declaration Attribute#]; name=_functionBuilder{{$}}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       differentiable[#Declaration Attribute#]; name=differentiable
 // KEYWORD_LAST-NEXT:             Keyword/None:                       IBSegueAction[#Declaration Attribute#]; name=IBSegueAction{{$}}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       derivative[#Declaration Attribute#]; name=derivative
diff --git a/test/IDE/complete_in_accessors.swift b/test/IDE/complete_in_accessors.swift
index b040f0d58c09d..8e46fd1d5d2de 100644
--- a/test/IDE/complete_in_accessors.swift
+++ b/test/IDE/complete_in_accessors.swift
@@ -113,6 +113,13 @@
 // RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt
 // RUN: %FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_2 < %t.txt
 
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_COPIED | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_COPIED
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_MEMBER | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_MEMBER
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_COPIEDMEMBER | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_COPIEDMEMBER
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_COPIED | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_COPIED
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_MEMBER | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_MEMBER
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_COPIEDMEMBER | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_COPIEDMEMBER
+
 //===--- Helper types that are used in this test
 
 struct FooStruct {
@@ -247,18 +254,18 @@ willSet {
 }
 
 var globalAccessorDidSet1: Int {
-  didSet(oldValue) {
+  didSet {
     #^GLOBAL_ACCESSOR_DIDSET_1^#
   }
 }
 var globalAccessorDidSet2: Int {
-  didSet(oldValue) {
+  didSet {
     var fs = FooStruct()
     fs.#^GLOBAL_ACCESSOR_DIDSET_2^#
   }
 }
 var globalAccessorDidSet3 = 42 {
-didSet(oldValue) {
+didSet {
   #^GLOBAL_ACCESSOR_DIDSET_3^#
 }
 }
@@ -337,18 +344,18 @@ struct MemberAccessors {
   }
 
   var memberAccessorDidSet1: Int {
-    didSet(oldValue) {
+    didSet {
       #^MEMBER_ACCESSOR_DIDSET_1^#
     }
   }
   var memberAccessorDidSet2: Int {
-    didSet(oldValue) {
+    didSet {
       var fs = FooStruct()
       fs.#^MEMBER_ACCESSOR_DIDSET_2^#
     }
   }
   var memberAccessorDidSet3 = 42 {
-    didSet(oldValue) {
+    didSet {
       #^MEMBER_ACCESSOR_DIDSET_3^#
     }
   }
@@ -424,18 +431,18 @@ func accessorsInFunction(_ functionParam: Int) {
   }
 
   var memberAccessorDidSet1: Int {
-    didSet(oldValue) {
+    didSet {
       #^LOCAL_ACCESSOR_DIDSET_1^#
     }
   }
   var memberAccessorDidSet2: Int {
-    didSet(oldValue) {
+    didSet {
       var fs = FooStruct()
       fs.#^LOCAL_ACCESSOR_DIDSET_2^#
     }
   }
   var memberAccessorDidSet3: Int {
-    didSet(oldValue) {
+    didSet {
       #^LOCAL_ACCESSOR_DIDSET_3^#
     }
   }
@@ -481,3 +488,61 @@ struct AccessorsInMemberFunction {
     }
   }
 }
+
+var testImplicitOldValue1: Int = 0 {
+  didSet {
+    var oldV = oldValue
+    #^IMPLICIT_OLDVALUE_COPIED^#
+// IMPLICIT_OLDVALUE_COPIED: Begin completions
+// IMPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local:               oldV[#Int#];
+// IMPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local:               oldValue[#Int#];
+// IMPLICIT_OLDVALUE_COPIED: End completions
+  }
+}
+var testImplicitOldValue2: Int = 0 {
+  didSet {
+    oldValue.#^IMPLICIT_OLDVALUE_MEMBER^#
+// IMPLICIT_OLDVALUE_MEMBER: Begin completions
+// IMPLICIT_OLDVALUE_MEMBER-DAG: Keyword[self]/CurrNominal:          self[#Int#];
+// IMPLICIT_OLDVALUE_MEMBER: End completions
+  }
+}
+var testImplicitOldValue3: Int = 0 {
+  didSet {
+    var oldV = oldValue
+    oldV.#^IMPLICIT_OLDVALUE_COPIEDMEMBER^#
+// IMPLICIT_OLDVALUE_COPIEDMEMBER: Begin completions
+// IMPLICIT_OLDVALUE_COPIEDMEMBER-DAG: Keyword[self]/CurrNominal:          self[#Int#];
+// IMPLICIT_OLDVALUE_COPIEDMEMBER: End completions
+  }
+}
+
+var testExplicitOldValue1: Int = 0 {
+  didSet(oldVal) {
+    var oldV = oldVal
+    #^EXPLICIT_OLDVALUE_COPIED^#
+// EXPLICIT_OLDVALUE_COPIED: Begin completions
+// EXPLICIT_OLDVALUE_COPIED-NOT: oldValue
+// EXPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local:               oldV[#Int#];
+// EXPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local:               oldVal[#Int#];
+// EXPLICIT_OLDVALUE_COPIED-NOT: oldValue
+// EXPLICIT_OLDVALUE_COPIED: End completions
+  }
+}
+var testExplicitOldValue2: Int = 0 {
+  didSet(oldVal) {
+    oldVal.#^EXPLICIT_OLDVALUE_MEMBER^#
+// EXPLICIT_OLDVALUE_MEMBER: Begin completions
+// EXPLICIT_OLDVALUE_MEMBER-DAG: Keyword[self]/CurrNominal:          self[#Int#];
+// EXPLICIT_OLDVALUE_MEMBER: End completions
+  }
+}
+var testExplicitOldValue3: Int = 0 {
+  didSet(oldVal) {
+    var oldV = oldVal
+    oldV.#^EXPLICIT_OLDVALUE_COPIEDMEMBER^#
+// EXPLICIT_OLDVALUE_COPIEDMEMBER: Begin completions
+// EXPLICIT_OLDVALUE_COPIEDMEMBER-DAG: Keyword[self]/CurrNominal:          self[#Int#];
+// EXPLICIT_OLDVALUE_COPIEDMEMBER: End completions
+  }
+}
diff --git a/test/IDE/complete_multiple_trailingclosure.swift b/test/IDE/complete_multiple_trailingclosure.swift
index f75dab6080939..efef1d98aca64 100644
--- a/test/IDE/complete_multiple_trailingclosure.swift
+++ b/test/IDE/complete_multiple_trailingclosure.swift
@@ -13,6 +13,10 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_REQUIRED_NEWLINE_2 | %FileCheck %s -check-prefix=INIT_REQUIRED_NEWLINE_2
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_REQUIRED_SAMELINE_3 | %FileCheck %s -check-prefix=INIT_REQUIRED_SAMELINE_3
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_REQUIRED_NEWLINE_3 | %FileCheck %s -check-prefix=INIT_REQUIRED_NEWLINE_3
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FALLBACK_1 | %FileCheck %s -check-prefix=INIT_FALLBACK
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INIT_FALLBACK_2 | %FileCheck %s -check-prefix=INIT_FALLBACK
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBERDECL_SAMELINE | %FileCheck %s -check-prefix=MEMBERDECL_SAMELINE
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBERDECL_NEWLINE | %FileCheck %s -check-prefix=MEMBERDECL_NEWLINE
 
 func globalFunc1(fn1: () -> Int, fn2: () -> String) {}
 func testGlobalFunc() {
@@ -184,3 +188,49 @@ func testOptionalInit() {
 // INIT_REQUIRED_NEWLINE_3-NOT: name=fn3
 // INIT_REQUIRED_NEWLINE_3: End completions
 }
+
+struct MyStruct4<T> {
+  init(arg1: Int = 0, arg2: () -> T) {}
+  init(name: String, arg2: () -> String, arg3: () -> T) {}
+
+  func testStructMethod() {}
+}
+func testFallbackPostfix() {
+  let _ = MyStruct4 {
+    1
+  } #^INIT_FALLBACK_1^#
+// INIT_FALLBACK: Begin completions, 2 items
+// INIT_FALLBACK-DAG: Decl[InstanceMethod]/CurrNominal:   .testStructMethod()[#Void#];
+// INIT_FALLBACK-DAG: Keyword[self]/CurrNominal:          .self[#MyStruct4<Int>#];
+// INIT_FALLBACK: End completions
+  let _ = MyStruct4(name: "test") {
+    ""
+  } arg3: {
+    1
+  } #^INIT_FALLBACK_2^#
+}
+
+protocol P {
+  func foo()
+}
+struct TestNominalMember: P {
+  var value = MyStruct().method1 { 1 } #^MEMBERDECL_SAMELINE^#
+  #^MEMBERDECL_NEWLINE^#
+
+// MEMBERDECL_SAMELINE: Begin completions, 4 items
+// MEMBERDECL_SAMELINE-DAG: Pattern/ExprSpecific:               {#fn2: (() -> String)? {() -> String in|}#}[#(() -> String)?#]; name=fn2: (() -> String)?
+// MEMBERDECL_SAMELINE-DAG: Decl[InstanceMethod]/CurrNominal:   .enumFunc()[#Void#]; name=enumFunc()
+// MEMBERDECL_SAMELINE-DAG: Decl[InfixOperatorFunction]/OtherModule[Swift]/IsSystem: [' ']+ {#SimpleEnum#}[#SimpleEnum#]; name=+ SimpleEnum
+// MEMBERDECL_SAMELINE-DAG: Keyword[self]/CurrNominal:          .self[#SimpleEnum#]; name=self
+// MEMBERDECL_SAMELINE: End completions
+
+// MEMBERDECL_NEWLINE: Begin completions
+// MEMBERDECL_NEWLINE-DAG: Pattern/ExprSpecific:               {#fn2: (() -> String)? {() -> String in|}#}[#(() -> String)?#]; name=fn2: (() -> String)?
+// MEMBERDECL_NEWLINE-DAG: Keyword[enum]/None:                 enum; name=enum
+// MEMBERDECL_NEWLINE-DAG: Keyword[func]/None:                 func; name=func
+// MEMBERDECL_NEWLINE-DAG: Keyword[private]/None:              private; name=private
+// MEMBERDECL_NEWLINE-DAG: Keyword/None:                       lazy; name=lazy
+// MEMBERDECL_NEWLINE-DAG: Keyword[var]/None:                  var; name=var
+// MEMBERDECL_NEWLINE-DAG: Decl[InstanceMethod]/Super:         func foo() {|}; name=foo()
+// MEMBERDECL_NEWLINE: End completions
+}
diff --git a/test/IDE/complete_pound_statement.swift b/test/IDE/complete_pound_statement.swift
index ce4dfa2a32b03..3298340ed33c5 100644
--- a/test/IDE/complete_pound_statement.swift
+++ b/test/IDE/complete_pound_statement.swift
@@ -18,11 +18,19 @@
 {
   #available(iOS >= 7.0, #^PLATFORM4^#
 }
-// PLATFORM1: Keyword/None:                       *[#Platform#]; name=*{{$}}
-// PLATFORM1: Keyword/None:                       iOS[#Platform#]; name=iOS{{$}}
-// PLATFORM1: Keyword/None:                       tvOS[#Platform#]; name=tvOS{{$}}
-// PLATFORM1: Keyword/None:                       watchOS[#Platform#]; name=watchOS{{$}}
-// PLATFORM1: Keyword/None:                       OSX[#Platform#]; name=OSX{{$}}
+// PLATFORM1: Begin completions
+// PLATFORM1-DAG: Keyword/None:                       *[#Platform#]; name=*{{$}}
+// PLATFORM1-DAG: Keyword/None:                       iOS[#Platform#]; name=iOS{{$}}
+// PLATFORM1-DAG: Keyword/None:                       tvOS[#Platform#]; name=tvOS{{$}}
+// PLATFORM1-DAG: Keyword/None:                       watchOS[#Platform#]; name=watchOS{{$}}
+// PLATFORM1-DAG: Keyword/None:                       macOS[#Platform#]; name=macOS{{$}}
+// PLATFORM1-DAG: Keyword/None:                       iOSApplicationExtension[#Platform#]; name=iOSApplicationExtension{{$}}
+// PLATFORM1-DAG: Keyword/None:                       tvOSApplicationExtension[#Platform#]; name=tvOSApplicationExtension{{$}}
+// PLATFORM1-DAG: Keyword/None:                       watchOSApplicationExtension[#Platform#]; name=watchOSApplicationExtension{{$}}
+// PLATFORM1-DAG: Keyword/None:                       macOSApplicationExtension[#Platform#]; name=macOSApplicationExtension{{$}}
+// PLATFORM1-DAG: Keyword/None:                       macCatalyst[#Platform#]; name=macCatalyst
+// PLATFORM1-DAG: Keyword/None:                       macCatalystApplicationExtension[#Platform#]; name=macCatalystApplicationExtension
+// PLATFORM1: End completions
 
 class C1 {
   func foo() {
diff --git a/test/IDE/complete_type.swift b/test/IDE/complete_type.swift
index c3ffb661adffd..04b9158fda578 100644
--- a/test/IDE/complete_type.swift
+++ b/test/IDE/complete_type.swift
@@ -1,404 +1,4 @@
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_PROTOCOL < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_2 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_3 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_4 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_GENERIC_5 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_FUNC_PARAM_GENERIC_5 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_RETURN_GEN_PARAM_NO_DUP > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_RETURN_GEN_PARAM_NO_DUP < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IVAR_GEN_PARAM_NO_DUP > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IVAR_GEN_PARAM_NO_DUP < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_SUBSCR_GEN_PARAM_NO_DUP > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_SUBSCR_GEN_PARAM_NO_DUP < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_CONSTRUCTOR_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_DESTRUCTOR_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_IN_INSTANCE_FUNC_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_GLOBAL_VAR_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TYPEALIAS_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ASSOC_TYPE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ASSOC_TYPE_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_EXTENSION_INHERITANCE_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_5 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_6 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_7 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_STRUCT_INHERITANCE_8 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CLASS_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_CLASS_INHERITANCE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ENUM_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_ENUM_INHERITANCE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_INHERITANCE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_INHERITANCE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_5 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_TUPLE_TYPE_6 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_5 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNCTION_TYPE_6 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_PROTOCOL_COMPOSITION_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_FUNC_PARAM_NESTED_TYPES_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_INSTANCE_VAR_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IN_LOCAL_VAR_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES_INCONTEXT < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_4 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_BASE_NO_DOT_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_BASE_1_NO_DOT_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_DERIVED_3 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=VAR_DERIVED_1_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_1 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_2 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_2 < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITHOUT_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_GENERIC_3 | %FileCheck %s -check-prefix=TYPE_IDENTIFIER_GENERIC_3
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TYPE_IDENTIFIER_IRRELEVANT_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=TYPE_IDENTIFIER_IRRELEVANT_1 < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=INSIDE_AS_CAST_1 > %t.types.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.types.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.types.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_1 | %FileCheck %s -check-prefix=GENERIC_TYPEALIAS_1
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_TYPEALIAS_2 > %t.gentypealias.txt
-// RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES < %t.gentypealias.txt
-// RUN: %FileCheck %s -check-prefix=GLOBAL_NEGATIVE < %t.gentypealias.txt
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_TOPLEVEL_VAR | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_TOPLEVEL_PARAM | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_TOPLEVEL_RETURN | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_MEMBER_VAR | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_MEMBER_PARAM | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_MEMBER_RETURN | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_LOCAL_VAR | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_LOCAL_PARAM | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=GENERIC_ARGS_LOCAL_RETURN | %FileCheck %s -check-prefix=WITH_GLOBAL_TYPES
-
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=PROTOCOL_DOT_1 | %FileCheck %s -check-prefix=PROTOCOL_DOT_1
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNBOUND_DOT | %FileCheck %s -check-prefix=UNBOUND_DOT
-// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=UNBOUND_DOT_2 | %FileCheck %s -check-prefix=UNBOUND_DOT_2
+// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
 
 //===--- Helper types that are used in this test
 
@@ -464,7 +64,7 @@ typealias FooTypealias = Int
 // TYPE_IN_PROTOCOL: End completions
 
 protocol TestSelf1 {
-  func instanceFunc() -> #^TYPE_IN_PROTOCOL_1^#
+  func instanceFunc() -> #^TYPE_IN_PROTOCOL_1?check=TYPE_IN_PROTOCOL;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
@@ -475,7 +75,7 @@ protocol TestSelf1 {
 func testTypeInParamGeneric1<
     GenericFoo : FooProtocol,
     GenericBar : FooProtocol & BarProtocol,
-    GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_1^#
+    GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_1?check=TYPE_IN_FUNC_PARAM_GENERIC_1;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 // TYPE_IN_FUNC_PARAM_GENERIC_1: Begin completions
 // Generic parameters of the function.
@@ -488,7 +88,7 @@ struct TestTypeInParamGeneric2<
     StructGenericFoo : FooProtocol,
     StructGenericBar : FooProtocol & BarProtocol,
     StructGenericBaz> {
-  func testTypeInParamGeneric2(a: #^TYPE_IN_FUNC_PARAM_GENERIC_2^#
+  func testTypeInParamGeneric2(a: #^TYPE_IN_FUNC_PARAM_GENERIC_2?check=TYPE_IN_FUNC_PARAM_GENERIC_2;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_FUNC_PARAM_GENERIC_2: Begin completions
@@ -501,7 +101,7 @@ struct TestTypeInParamGeneric3 {
   func testTypeInParamGeneric3<
       GenericFoo : FooProtocol,
       GenericBar : FooProtocol & BarProtocol,
-      GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_3^#
+      GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_3?check=TYPE_IN_FUNC_PARAM_GENERIC_3;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_FUNC_PARAM_GENERIC_3: Begin completions
@@ -517,7 +117,7 @@ struct TestTypeInParamGeneric4<
   func testTypeInParamGeneric4<
       GenericFoo : FooProtocol,
       GenericBar : FooProtocol & BarProtocol,
-      GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_4^#
+      GenericBaz>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_4?check=TYPE_IN_FUNC_PARAM_GENERIC_4;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_FUNC_PARAM_GENERIC_4: Begin completions
@@ -534,7 +134,7 @@ struct TestTypeInParamGeneric4<
 struct TestTypeInParamGeneric5<StructGenericFoo> {
   struct TestTypeInParamGeneric5a<StructGenericBar> {
     struct TestTypeInParamGeneric5b<StructGenericBaz> {
-      func testTypeInParamGeneric5<GenericFoo>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_5^#
+      func testTypeInParamGeneric5<GenericFoo>(a: #^TYPE_IN_FUNC_PARAM_GENERIC_5?check=TYPE_IN_FUNC_PARAM_GENERIC_5;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
     }
   }
 }
@@ -552,7 +152,7 @@ struct TestTypeInConstructorParamGeneric1<
     StructGenericFoo : FooProtocol,
     StructGenericBar : FooProtocol & BarProtocol,
     StructGenericBaz> {
-  init(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1^#
+  init(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1?check=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_1: Begin completions
@@ -564,7 +164,7 @@ struct TestTypeInConstructorParamGeneric1<
 struct TestTypeInConstructorParamGeneric2 {
   init<GenericFoo : FooProtocol,
        GenericBar : FooProtocol & BarProtocol,
-       GenericBaz>(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2^#
+       GenericBaz>(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2?check=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_2: Begin completions
@@ -579,7 +179,7 @@ struct TestTypeInConstructorParamGeneric3<
     StructGenericBaz> {
   init<GenericFoo : FooProtocol,
        GenericBar : FooProtocol & BarProtocol,
-       GenericBaz>(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3^#
+       GenericBaz>(a: #^TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3?check=TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 // TYPE_IN_CONSTRUCTOR_PARAM_GENERIC_3: Begin completions
@@ -628,7 +228,7 @@ class A<T> {
 //===---
 
 func testTypeInLocalVarInFreeFunc1() {
-  var localVar: #^TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_1^#
+  var localVar: #^TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInLocalVarInFreeFunc2() {
@@ -640,7 +240,7 @@ func testTypeInLocalVarInFreeFunc2() {
 
   typealias NestedTypealias = Int
 
-  var localVar: #^TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2^#
+  var localVar: #^TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2?check=TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 // TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2: Begin completions
 // TYPE_IN_LOCAL_VAR_IN_FREE_FUNC_2-DAG: Decl[Struct]/Local:    NestedStruct[#NestedStruct#]{{; name=.+$}}
@@ -659,15 +259,15 @@ class TestTypeInLocalVarInMemberFunc1 {
   typealias NestedTypealias = Int
 
   init() {
-    var localVar: #^TYPE_IN_LOCAL_VAR_IN_CONSTRUCTOR_1^#
+    var localVar: #^TYPE_IN_LOCAL_VAR_IN_CONSTRUCTOR_1?check=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   deinit {
-    var localVar: #^TYPE_IN_LOCAL_VAR_IN_DESTRUCTOR_1^#
+    var localVar: #^TYPE_IN_LOCAL_VAR_IN_DESTRUCTOR_1?check=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   func test() {
-    var localVar: #^TYPE_IN_LOCAL_VAR_IN_INSTANCE_FUNC_1^#
+    var localVar: #^TYPE_IN_LOCAL_VAR_IN_INSTANCE_FUNC_1?check=TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 }
 // TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1: Begin completions
@@ -677,19 +277,19 @@ class TestTypeInLocalVarInMemberFunc1 {
 // TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1-DAG: Decl[TypeAlias]/CurrNominal: NestedTypealias[#Int#]{{; name=.+$}}
 // TYPE_IN_LOCAL_VAR_IN_MEMBER_FUNC_1: End completions
 
-var TypeInGlobalVar1: #^TYPE_IN_GLOBAL_VAR_1^#
+var TypeInGlobalVar1: #^TYPE_IN_GLOBAL_VAR_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 //===---
 //===--- Test that we can complete types in typealias declarations.
 //===---
 
-typealias TypeInTypealias1 = #^TYPE_IN_TYPEALIAS_1^#
+typealias TypeInTypealias1 = #^TYPE_IN_TYPEALIAS_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-typealias TypeInTypealias2 = (#^TYPE_IN_TYPEALIAS_2^#
+typealias TypeInTypealias2 = (#^TYPE_IN_TYPEALIAS_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 func resyncParser0() {}
 
-typealias TypeInTypealias3 = ((#^TYPE_IN_TYPEALIAS_3^#
+typealias TypeInTypealias3 = ((#^TYPE_IN_TYPEALIAS_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 func resyncParser1() {}
 
@@ -698,7 +298,7 @@ func resyncParser1() {}
 //===---
 
 protocol AssocType1 {
-  associatedtype AssocType = #^TYPE_IN_ASSOC_TYPE_1^#
+  associatedtype AssocType = #^TYPE_IN_ASSOC_TYPE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
@@ -706,76 +306,76 @@ protocol AssocType1 {
 //===---
 
 protocol AssocType1 {
-  associatedtype AssocType : #^TYPE_IN_ASSOC_TYPE_INHERITANCE_1^#
+  associatedtype AssocType : #^TYPE_IN_ASSOC_TYPE_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
 //===--- Test that we can complete types in extension declarations.
 //===---
 
-extension #^TYPE_IN_EXTENSION_1^#
+extension #^TYPE_IN_EXTENSION_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 //===---
 //===--- Test that we can complete types in the extension inheritance clause.
 //===---
 
-extension TypeInExtensionInheritance1 : #^TYPE_IN_EXTENSION_INHERITANCE_1^#
+extension TypeInExtensionInheritance1 : #^TYPE_IN_EXTENSION_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-extension TypeInExtensionInheritance2 : #^TYPE_IN_EXTENSION_INHERITANCE_2^# {
+extension TypeInExtensionInheritance2 : #^TYPE_IN_EXTENSION_INHERITANCE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
-extension TypeInExtensionInheritance3 : FooProtocol, #^TYPE_IN_EXTENSION_INHERITANCE_3^# {
+extension TypeInExtensionInheritance3 : FooProtocol, #^TYPE_IN_EXTENSION_INHERITANCE_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
 //===---
 //===--- Test that we can complete types in the struct inheritance clause.
 //===---
 
-struct TypeInStructInheritance1 : #^TYPE_IN_STRUCT_INHERITANCE_1^#
+struct TypeInStructInheritance1 : #^TYPE_IN_STRUCT_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-struct TypeInStructInheritance2 : , #^TYPE_IN_STRUCT_INHERITANCE_2^#
+struct TypeInStructInheritance2 : , #^TYPE_IN_STRUCT_INHERITANCE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-struct TypeInStructInheritance3 : FooProtocol, #^TYPE_IN_STRUCT_INHERITANCE_3^#
+struct TypeInStructInheritance3 : FooProtocol, #^TYPE_IN_STRUCT_INHERITANCE_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-struct TypeInStructInheritance4 : FooProtocol., #^TYPE_IN_STRUCT_INHERITANCE_4^#
+struct TypeInStructInheritance4 : FooProtocol., #^TYPE_IN_STRUCT_INHERITANCE_4?check=WITH_GLOBAL_TYPES^#
 
-struct TypeInStructInheritance5 : #^TYPE_IN_STRUCT_INHERITANCE_5^# {
+struct TypeInStructInheritance5 : #^TYPE_IN_STRUCT_INHERITANCE_5?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
-struct TypeInStructInheritance6 : , #^TYPE_IN_STRUCT_INHERITANCE_6^# {
+struct TypeInStructInheritance6 : , #^TYPE_IN_STRUCT_INHERITANCE_6?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
-struct TypeInStructInheritance7 : FooProtocol, #^TYPE_IN_STRUCT_INHERITANCE_7^# {
+struct TypeInStructInheritance7 : FooProtocol, #^TYPE_IN_STRUCT_INHERITANCE_7?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
-struct TypeInStructInheritance8 : FooProtocol., #^TYPE_IN_STRUCT_INHERITANCE_8^# {
+struct TypeInStructInheritance8 : FooProtocol., #^TYPE_IN_STRUCT_INHERITANCE_8?check=WITH_GLOBAL_TYPES^# {
 }
 
 //===---
 //===--- Test that we can complete types in the class inheritance clause.
 //===---
 
-class TypeInClassInheritance1 : #^TYPE_IN_CLASS_INHERITANCE_1^# {
+class TypeInClassInheritance1 : #^TYPE_IN_CLASS_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
-class TypeInClassInheritance2 : #^TYPE_IN_CLASS_INHERITANCE_2^#
+class TypeInClassInheritance2 : #^TYPE_IN_CLASS_INHERITANCE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 //===---
 //===--- Test that we can complete types in the enum inheritance clause.
 //===---
 
-enum TypeInEnumInheritance1 : #^TYPE_IN_ENUM_INHERITANCE_1^#
+enum TypeInEnumInheritance1 : #^TYPE_IN_ENUM_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-enum TypeInEnumInheritance2 : #^TYPE_IN_ENUM_INHERITANCE_2^# {
+enum TypeInEnumInheritance2 : #^TYPE_IN_ENUM_INHERITANCE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
 //===---
 //===--- Test that we can complete types in the protocol inheritance clause.
 //===---
 
-protocol TypeInProtocolInheritance1 : #^TYPE_IN_PROTOCOL_INHERITANCE_1^#
+protocol TypeInProtocolInheritance1 : #^TYPE_IN_PROTOCOL_INHERITANCE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-protocol TypeInProtocolInheritance2 : #^TYPE_IN_PROTOCOL_INHERITANCE_2^# {
+protocol TypeInProtocolInheritance2 : #^TYPE_IN_PROTOCOL_INHERITANCE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# {
 }
 
 //===---
@@ -783,31 +383,31 @@ protocol TypeInProtocolInheritance2 : #^TYPE_IN_PROTOCOL_INHERITANCE_2^# {
 //===---
 
 func testTypeInTupleType1() {
-  var localVar: (#^TYPE_IN_TUPLE_TYPE_1^#
+  var localVar: (#^TYPE_IN_TUPLE_TYPE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType2() {
-  var localVar: (a: #^TYPE_IN_TUPLE_TYPE_2^#
+  var localVar: (a: #^TYPE_IN_TUPLE_TYPE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType3() {
-  var localVar: (Int, #^TYPE_IN_TUPLE_TYPE_3^#
+  var localVar: (Int, #^TYPE_IN_TUPLE_TYPE_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType4() {
-  var localVar: (a: Int, #^TYPE_IN_TUPLE_TYPE_4^#
+  var localVar: (a: Int, #^TYPE_IN_TUPLE_TYPE_4?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType5() {
-  var localVar: (Int, a: #^TYPE_IN_TUPLE_TYPE_5^#
+  var localVar: (Int, a: #^TYPE_IN_TUPLE_TYPE_5?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType6() {
-  var localVar: (a:, #^TYPE_IN_TUPLE_TYPE_6^#
+  var localVar: (a:, #^TYPE_IN_TUPLE_TYPE_6?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInTupleType7() {
-  var localVar: (a: b: #^TYPE_IN_TUPLE_TYPE_7^#
+  var localVar: (a: b: #^TYPE_IN_TUPLE_TYPE_7?skip=FIXME^#
 }
 
 //===---
@@ -815,27 +415,27 @@ func testTypeInTupleType7() {
 //===---
 
 func testTypeInFunctionType1() {
-  var localVar: #^TYPE_IN_FUNCTION_TYPE_1^# ->
+  var localVar: #^TYPE_IN_FUNCTION_TYPE_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^# ->
 }
 
 func testTypeInFunctionType2() {
-  var localVar: (#^TYPE_IN_FUNCTION_TYPE_2^#) -> ()
+  var localVar: (#^TYPE_IN_FUNCTION_TYPE_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#) -> ()
 }
 
 func testTypeInFunctionType3() {
-  var localVar: () -> #^TYPE_IN_FUNCTION_TYPE_3^#
+  var localVar: () -> #^TYPE_IN_FUNCTION_TYPE_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInFunctionType4() {
-  var localVar: (Int) -> #^TYPE_IN_FUNCTION_TYPE_4^#
+  var localVar: (Int) -> #^TYPE_IN_FUNCTION_TYPE_4?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInFunctionType5() {
-  var localVar: (a: Int) -> #^TYPE_IN_FUNCTION_TYPE_5^#
+  var localVar: (a: Int) -> #^TYPE_IN_FUNCTION_TYPE_5?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInFunctionType6() {
-  var localVar: (a: Int, ) -> #^TYPE_IN_FUNCTION_TYPE_6^#
+  var localVar: (a: Int, ) -> #^TYPE_IN_FUNCTION_TYPE_6?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
@@ -843,15 +443,15 @@ func testTypeInFunctionType6() {
 //===---
 
 func testTypeInProtocolComposition1() {
-  var localVar: protocol<#^TYPE_IN_PROTOCOL_COMPOSITION_1^#
+  var localVar: protocol<#^TYPE_IN_PROTOCOL_COMPOSITION_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInProtocolComposition2() {
-  var localVar: protocol<, #^TYPE_IN_PROTOCOL_COMPOSITION_2^#
+  var localVar: protocol<, #^TYPE_IN_PROTOCOL_COMPOSITION_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 func testTypeInProtocolComposition3() {
-  var localVar: protocol<FooProtocol, #^TYPE_IN_PROTOCOL_COMPOSITION_3^#
+  var localVar: protocol<FooProtocol, #^TYPE_IN_PROTOCOL_COMPOSITION_3?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
@@ -859,12 +459,12 @@ func testTypeInProtocolComposition3() {
 //===---
 
 class VarBase1 {
-  var instanceVarBase1: #^TYPE_IN_INSTANCE_VAR_1^#
+  var instanceVarBase1: #^TYPE_IN_INSTANCE_VAR_1?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-  func paramNestedTypesBase1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_1^#
+  func paramNestedTypesBase1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_1?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
   func localVarBaseTest1() {
-    var localVar: #^TYPE_IN_LOCAL_VAR_1^#
+    var localVar: #^TYPE_IN_LOCAL_VAR_1?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   // Define types after all tests to test delayed parsing of decls.
@@ -879,12 +479,12 @@ class VarBase1 {
 }
 
 extension VarBase1 {
-  var instanceVarBaseExt1: #^TYPE_IN_INSTANCE_VAR_2^#
+  var instanceVarBaseExt1: #^TYPE_IN_INSTANCE_VAR_2?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-  func paramNestedTypesBaseExt1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_2^#
+  func paramNestedTypesBaseExt1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_2?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
   func localVarBaseExtTest1() {
-    var localVar: #^TYPE_IN_LOCAL_VAR_2^#
+    var localVar: #^TYPE_IN_LOCAL_VAR_2?check=VAR_BASE_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   // Define types after all tests to test delayed parsing of decls.
@@ -938,12 +538,12 @@ extension VarBase1 {
 // VAR_BASE_1_NO_DOT_TYPES: End completions
 
 class VarDerived1 : VarBase1 {
-  var instanceVarDerived1 : #^TYPE_IN_INSTANCE_VAR_3^#
+  var instanceVarDerived1 : #^TYPE_IN_INSTANCE_VAR_3?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-  func paramNestedTypesDerived1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_3^#
+  func paramNestedTypesDerived1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_3?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
   func localVarDerivedTest1() {
-    var localVar : #^TYPE_IN_LOCAL_VAR_3^#
+    var localVar : #^TYPE_IN_LOCAL_VAR_3?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   // Define types after all tests to test delayed parsing of decls.
@@ -958,12 +558,12 @@ class VarDerived1 : VarBase1 {
 }
 
 extension VarDerived1 {
-  var instanceVarDerivedExt1 : #^TYPE_IN_INSTANCE_VAR_4^#
+  var instanceVarDerivedExt1 : #^TYPE_IN_INSTANCE_VAR_4?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-  func paramNestedTypesDerivedExt1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_4^#
+  func paramNestedTypesDerivedExt1(a: #^TYPE_IN_FUNC_PARAM_NESTED_TYPES_4?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
   func localVarDerivedExtTest1() {
-    var localVar : #^TYPE_IN_LOCAL_VAR_4^#
+    var localVar : #^TYPE_IN_LOCAL_VAR_4?check=VAR_DERIVED_1_TYPES_INCONTEXT;check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
   }
 
   // Define types after all tests to test delayed parsing of decls.
@@ -1027,30 +627,30 @@ extension VarDerived1 {
 //===--- Test that we can complete based on user-provided type-identifier.
 //===---
 
-func testTypeIdentifierBase1(a: VarBase1.#^TYPE_IDENTIFIER_BASE_1^#
-func testTypeIdentifierBase2(a: Int, b: VarBase1.#^TYPE_IDENTIFIER_BASE_2^#
-func testTypeIdentifierBase3(a: unknown_type, b: VarBase1.#^TYPE_IDENTIFIER_BASE_3^#
-func testTypeIdentifierBase4(a: , b: VarBase1.#^TYPE_IDENTIFIER_BASE_4^#
+func testTypeIdentifierBase1(a: VarBase1.#^TYPE_IDENTIFIER_BASE_1?check=VAR_BASE_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
+func testTypeIdentifierBase2(a: Int, b: VarBase1.#^TYPE_IDENTIFIER_BASE_2?check=VAR_BASE_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
+func testTypeIdentifierBase3(a: unknown_type, b: VarBase1.#^TYPE_IDENTIFIER_BASE_3?check=VAR_BASE_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
+func testTypeIdentifierBase4(a: , b: VarBase1.#^TYPE_IDENTIFIER_BASE_4?check=VAR_BASE_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-func testTypeIdentifierBaseNoDot1(a: VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_1^#
+func testTypeIdentifierBaseNoDot1(a: VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_1?check=VAR_BASE_1_NO_DOT_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 func testTypeIdentifierBaseNoDot2() {
-  var localVar : protocol<VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_2^#
+  var localVar : protocol<VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_2?check=VAR_BASE_1_NO_DOT_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
-typealias testTypeIdentifierBaseNoDot3 = VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_3^#
+typealias testTypeIdentifierBaseNoDot3 = VarBase1#^TYPE_IDENTIFIER_BASE_NO_DOT_3?check=VAR_BASE_1_NO_DOT_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
-func testTypeIdentifierDerived1(a: VarDerived1.#^TYPE_IDENTIFIER_DERIVED_1^#
+func testTypeIdentifierDerived1(a: VarDerived1.#^TYPE_IDENTIFIER_DERIVED_1?check=VAR_DERIVED_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 func testTypeIdentifierDerived2() {
-  var localVar : protocol<VarDerived1.#^TYPE_IDENTIFIER_DERIVED_2^#
+  var localVar : protocol<VarDerived1.#^TYPE_IDENTIFIER_DERIVED_2?check=VAR_DERIVED_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
-typealias testTypeIdentifierDerived3 = VarDerived1.#^TYPE_IDENTIFIER_DERIVED_3^#
+typealias testTypeIdentifierDerived3 = VarDerived1.#^TYPE_IDENTIFIER_DERIVED_3?check=VAR_DERIVED_1_TYPES;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 func testTypeIdentifierGeneric1<
     GenericFoo : FooProtocol
-    >(a: GenericFoo.#^TYPE_IDENTIFIER_GENERIC_1^#
+    >(a: GenericFoo.#^TYPE_IDENTIFIER_GENERIC_1?check=TYPE_IDENTIFIER_GENERIC_1;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 // TYPE_IDENTIFIER_GENERIC_1: Begin completions
 // TYPE_IDENTIFIER_GENERIC_1-NEXT: Decl[AssociatedType]/CurrNominal: FooTypeAlias1{{; name=.+$}}
@@ -1059,7 +659,7 @@ func testTypeIdentifierGeneric1<
 
 func testTypeIdentifierGeneric2<
     GenericFoo : FooProtocol & BarProtocol
-    >(a: GenericFoo.#^TYPE_IDENTIFIER_GENERIC_2^#
+    >(a: GenericFoo.#^TYPE_IDENTIFIER_GENERIC_2?check=TYPE_IDENTIFIER_GENERIC_2;check=WITHOUT_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 
 // TYPE_IDENTIFIER_GENERIC_2: Begin completions
 // TYPE_IDENTIFIER_GENERIC_2-NEXT: Decl[AssociatedType]/CurrNominal: BarTypeAlias1{{; name=.+$}}
@@ -1089,7 +689,7 @@ func testTypeIdentifierIrrelevant1() {
 //===---
 
 func testAsCast1(a: Int) {
-  a as #^INSIDE_AS_CAST_1^#
+  a as #^INSIDE_AS_CAST_1?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#
 }
 
 //===---
@@ -1104,23 +704,23 @@ func testGenericTypealias1() {
 // GENERIC_TYPEALIAS_1: Decl[TypeAlias]/Local: MyPair[#(T, T)#];
 func testGenericTypealias2() {
   typealias MyPair<T> = (T, T)
-  let x: MyPair<#^GENERIC_TYPEALIAS_2^#>
+  let x: MyPair<#^GENERIC_TYPEALIAS_2?check=WITH_GLOBAL_TYPES;check=GLOBAL_NEGATIVE^#>
 }
 
 // In generic argument
 struct GenStruct<T> { }
-let a : GenStruct<#^GENERIC_ARGS_TOPLEVEL_VAR^#
-func foo1(x: GenStruct<#^GENERIC_ARGS_TOPLEVEL_PARAM^#
-func foo2() -> GenStruct<#^GENERIC_ARGS_TOPLEVEL_RETURN^#
+let a : GenStruct<#^GENERIC_ARGS_TOPLEVEL_VAR?check=WITH_GLOBAL_TYPES^#
+func foo1(x: GenStruct<#^GENERIC_ARGS_TOPLEVEL_PARAM?check=WITH_GLOBAL_TYPES^#
+func foo2() -> GenStruct<#^GENERIC_ARGS_TOPLEVEL_RETURN?check=WITH_GLOBAL_TYPES^#
 class _TestForGenericArg_ {
-  let a : GenStruct<#^GENERIC_ARGS_MEMBER_VAR^#
-  func foo1(x: GenStruct<#^GENERIC_ARGS_MEMBER_PARAM^#
-  func foo2() -> GenStruct<#^GENERIC_ARGS_MEMBER_RETURN^#
+  let a : GenStruct<#^GENERIC_ARGS_MEMBER_VAR?check=WITH_GLOBAL_TYPES^#
+  func foo1(x: GenStruct<#^GENERIC_ARGS_MEMBER_PARAM?check=WITH_GLOBAL_TYPES^#
+  func foo2() -> GenStruct<#^GENERIC_ARGS_MEMBER_RETURN?check=WITH_GLOBAL_TYPES^#
 }
 func _testForGenericArg_() {
-  let a : GenStruct<#^GENERIC_ARGS_LOCAL_VAR^#
-  func foo1(x: GenStruct<#^GENERIC_ARGS_LOCAL_PARAM^#
-  func foo2() -> GenStruct<#^GENERIC_ARGS_LOCAL_RETURN^#
+  let a : GenStruct<#^GENERIC_ARGS_LOCAL_VAR?check=WITH_GLOBAL_TYPES^#
+  func foo1(x: GenStruct<#^GENERIC_ARGS_LOCAL_PARAM?check=WITH_GLOBAL_TYPES^#
+  func foo2() -> GenStruct<#^GENERIC_ARGS_LOCAL_RETURN?check=WITH_GLOBAL_TYPES^#
 }
 
 func testProtocol() {
@@ -1148,8 +748,8 @@ extension Task.Inner {
     fatalError()
   }
 }
-extension Task.Inner.#^UNBOUND_DOT^# {}
-func testUnbound(x: Task.Inner.#^UNBOUND_DOT^#) {}
+extension Task.Inner.#^UNBOUND_DOT_1?check=UNBOUND_DOT^# {}
+func testUnbound(x: Task.Inner.#^UNBOUND_DOT_2?check=UNBOUND_DOT^#) {}
 // UNBOUND_DOT: Begin completions
 // UNBOUND_DOT-DAG: Decl[TypeAlias]/CurrNominal:        Failure[#Int#]; name=Failure
 // UNBOUND_DOT-DAG: Keyword/None:                       Type[#Task.Inner.Type#]; name=Type
@@ -1161,7 +761,7 @@ struct OuterStruct<U>  {
   class Inner<V>: MyProtocol {}
 }
 
-func testUnbound2(x: OuterStruct<Int>.Inner.#^UNBOUND_DOT_2^#) {}
-// UNBOUND_DOT_2: Begin completions
-// UNBOUND_DOT_2-DAG: Keyword/None:                       Type[#OuterStruct<Int>.Inner.Type#]; name=Type
-// UNBOUND_DOT_2: End completions
+func testUnbound2(x: OuterStruct<Int>.Inner.#^UNBOUND_DOT_3^#) {}
+// UNBOUND_DOT_3: Begin completions
+// UNBOUND_DOT_3-DAG: Keyword/None:                       Type[#OuterStruct<Int>.Inner.Type#]; name=Type
+// UNBOUND_DOT_3: End completions
diff --git a/test/IDE/print_ast_tc_decls_macosx_canonical_versions.swift b/test/IDE/print_ast_tc_decls_macosx_canonical_versions.swift
new file mode 100644
index 0000000000000..86a6565b740af
--- /dev/null
+++ b/test/IDE/print_ast_tc_decls_macosx_canonical_versions.swift
@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+//
+//
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -swift-version 4 -typecheck -verify %s -F %S/Inputs/mock-sdk -enable-objc-interop -disable-objc-attr-requires-foundation-module
+//
+// RUN: %target-swift-ide-test(mock-sdk: -sdk %S/../Inputs/clang-importer-sdk -I %t) -swift-version 4 -skip-deinit=false -print-ast-typechecked -source-filename %s -F %S/Inputs/mock-sdk -function-definitions=false -prefer-type-repr=false -print-implicit-attrs=true -enable-objc-interop -disable-objc-attr-requires-foundation-module > %t.printed.txt
+// RUN: %FileCheck %s -check-prefix=PASS_COMMON -strict-whitespace < %t.printed.txt
+
+
+// FIXME: rdar://problem/19648117 Needs splitting objc parts out
+// REQUIRES: objc_interop
+
+@available(iOS 10.16, OSX 10.16, *)
+func introduced10_16() {}
+// PASS_COMMON: {{^}}@available(iOS 10.16, OSX 11.0, *){{$}}
+// PASS_COMMON-NEXT: {{^}}func introduced10_16(){{$}}
diff --git a/test/IDE/print_clang_header_i386.swift b/test/IDE/print_clang_header_i386.swift
index 5f514182ce9fb..4774771e3fb83 100644
--- a/test/IDE/print_clang_header_i386.swift
+++ b/test/IDE/print_clang_header_i386.swift
@@ -1,4 +1,5 @@
 // REQUIRES: OS=macosx
+// REQUIRES: CPU=x86_64
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
 // XFAIL: linux, freebsd
 
diff --git a/test/IDE/print_module_bad_target.swift b/test/IDE/print_module_bad_target.swift
index da4a02bb5684b..5ebec7359c244 100644
--- a/test/IDE/print_module_bad_target.swift
+++ b/test/IDE/print_module_bad_target.swift
@@ -1,7 +1,7 @@
 // RUN: not %swift-ide-test -source-filename %s -print-module -module-to-print Swift -target x86_64-unknown-solaris
 
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -o %t -module-name Dummy -target x86_64-apple-macosx10.99 %s
+// RUN: %target-swift-frontend -emit-module -o %t -module-name Dummy -target %target-cpu-apple-macosx10.99 %s
 // RUN: not %target-swift-ide-test -source-filename %s -print-module -module-to-print Dummy -I %t
 
 // REQUIRES: OS=macosx
diff --git a/test/IDE/range_info_declattr.swift b/test/IDE/range_info_declattr.swift
index a821791b4299f..6daddeeb75417 100644
--- a/test/IDE/range_info_declattr.swift
+++ b/test/IDE/range_info_declattr.swift
@@ -23,16 +23,16 @@ class Derived : ObjCBase {
   }
 }
 
-// RUN: %target-swift-ide-test -range -pos=4:1 -end-pos=9:2 -source-filename %s | %FileCheck %s -check-prefix=CHECK1
-// RUN: %target-swift-ide-test -range -pos=5:3 -end-pos=7:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK2
-// RUN: %target-swift-ide-test -range -pos=5:25 -end-pos=7:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK3
-// RUN: %target-swift-ide-test -range -pos=8:3 -end-pos=8:31 -source-filename %s | %FileCheck %s -check-prefix=CHECK4
-// RUN: %target-swift-ide-test -range -pos=13:5 -end-pos=13:32 -source-filename %s | %FileCheck %s -check-prefix=CHECK5
-// RUN: %target-swift-ide-test -range -pos=13:16 -end-pos=13:32 -source-filename %s | %FileCheck %s -check-prefix=CHECK6
-// RUN: %target-swift-ide-test -range -pos=12:26 -end-pos=14:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK7
-// RUN: %target-swift-ide-test -range -pos=17:5 -end-pos=18:21 -source-filename %s | %FileCheck %s -check-prefix=CHECK8
-// RUN: %target-swift-ide-test -range -pos=20:5 -end-pos=22:12 -source-filename %s | %FileCheck %s -check-prefix=CHECK9
-// RUN: %target-swift-ide-test -range -pos=21:5 -end-pos=22:12 -source-filename %s | %FileCheck %s -check-prefix=CHECK10
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=4:1 -end-pos=9:2 -source-filename %s | %FileCheck %s -check-prefix=CHECK1
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=5:3 -end-pos=7:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK2
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=5:25 -end-pos=7:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK3
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=8:3 -end-pos=8:31 -source-filename %s | %FileCheck %s -check-prefix=CHECK4
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=13:5 -end-pos=13:32 -source-filename %s | %FileCheck %s -check-prefix=CHECK5
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=13:16 -end-pos=13:32 -source-filename %s | %FileCheck %s -check-prefix=CHECK6
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=12:26 -end-pos=14:4 -source-filename %s | %FileCheck %s -check-prefix=CHECK7
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=17:5 -end-pos=18:21 -source-filename %s | %FileCheck %s -check-prefix=CHECK8
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=20:5 -end-pos=22:12 -source-filename %s | %FileCheck %s -check-prefix=CHECK9
+// RUN: %target-swift-ide-test -enable-objc-interop -disable-objc-attr-requires-foundation-module -range -pos=21:5 -end-pos=22:12 -source-filename %s | %FileCheck %s -check-prefix=CHECK10
 
 // CHECK1: <Kind>SingleDecl</Kind>
 // CHECK1-NEXT: <Content>@objc class ObjCClass : ObjCBase {
diff --git a/test/IRGen/Inputs/ObjectiveC.swift b/test/IRGen/Inputs/ObjectiveC.swift
index 2a21acf99b142..f455271717cab 100644
--- a/test/IRGen/Inputs/ObjectiveC.swift
+++ b/test/IRGen/Inputs/ObjectiveC.swift
@@ -2,7 +2,8 @@
 @_exported import ObjectiveC
 
 public struct ObjCBool : CustomStringConvertible {
-#if os(macOS) || (os(iOS) && (arch(i386) || arch(arm)))
+#if (os(macOS) && arch(x86_64)) || (os(iOS) && (arch(i386) || arch(arm) || targetEnvironment(macCatalyst)))
+
   // On macOS and 32-bit iOS, Objective-C's BOOL type is a "signed char".
   private var value: Int8
 
diff --git a/test/IRGen/abitypes.swift b/test/IRGen/abitypes.swift
index b542eaedf1153..0158278f8a8f7 100644
--- a/test/IRGen/abitypes.swift
+++ b/test/IRGen/abitypes.swift
@@ -17,6 +17,7 @@ import Foundation
 // arm64e-ios: [[ARM64E_MYRECT:%.*]] = type { float, float, float, float }
 // arm64-tvos: [[ARM64_MYRECT:%.*]] = type { float, float, float, float }
 // armv7k-watchos: [[ARMV7K_MYRECT:%.*]] = type { float, float, float, float }
+// arm64-macosx: [[ARM64E_MYRECT:%.*]] = type { float, float, float, float }
 
 class Foo {
   // x86_64-macosx: define hidden swiftcc { float, float, float, float } @"$s8abitypes3FooC3bar{{[_0-9a-zA-Z]*}}F"(%T8abitypes3FooC* swiftself %0) {{.*}} {
@@ -428,7 +429,12 @@ class Foo {
   // armv7k-watchos: [[TOOBJCBOOL:%[0-9]+]] = call swiftcc i1 @"$s10ObjectiveC22_convertBoolToObjCBool{{[_0-9a-zA-Z]*}}F"(i1 [[NEG]])
   // armv7k-watchos: ret i1 [[TOOBJCBOOL]]
   //
-  @objc dynamic func negate2(_ b: Bool) -> Bool {
+
+  // arm64-macosx: define hidden zeroext i1 @"$s8abitypes3FooC7negate2{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, i1 zeroext %2)
+  // arm64-macosx: [[NEG:%[0-9]+]] = call swiftcc i1 @"$s8abitypes3FooC7negate2{{[_0-9a-zA-Z]*}}F"(i1
+  // arm64-macosx: [[TOOBJCBOOL:%[0-9]+]] = call swiftcc i1 @"$s10ObjectiveC22_convertBoolToObjCBool{{[_0-9a-zA-Z]*}}F"(i1 [[NEG]])
+  // arm64-macosx: ret i1 [[TOOBJCBOOL]]
+@objc dynamic func negate2(_ b: Bool) -> Bool {
     var g = Gadget()
     return g.negate(b)
   }
@@ -532,6 +538,8 @@ class Foo {
   //
   // arm64-tvos: define hidden swiftcc { i64, i64, i64, i64 } @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, i64 %1, i64 %2, i64 %3, i64 %4, %T8abitypes3FooC* swiftself %5) {{.*}} {
   // arm64-tvos: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret %0, i8* %1, i8* %2, [[OPAQUE:.*]]* %3, %TSo9BigStructV* %4) {{[#0-9]*}} {
+  // arm64-macosx: define hidden swiftcc { i64, i64, i64, i64 } @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, i64 %1, i64 %2, i64 %3, i64 %4, %T8abitypes3FooC* swiftself %5) {{.*}} {
+  // arm64-macosx: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret %0, i8* %1, i8* %2, [[OPAQUE:.*]]* %3, %TSo9BigStructV* %4) {{.*}} {
   @objc dynamic func callJustReturn(_ r: StructReturns, with v: BigStruct) -> BigStruct {
     return r.justReturn(v)
   }
@@ -585,6 +593,15 @@ public func testInlineAgg(_ rect: MyRect) -> Float {
 // arm64e-ios:  store i1 false, i1* [[PTR2]], align 8
 // arm64e-ios:  [[ARG:%.*]] = load i64, i64* [[COERCED]]
 // arm64e-ios:  call void bitcast (void ()* @objc_msgSend to void (i8*, i8*, i64)*)(i8* {{.*}}, i8* {{.*}}, i64 [[ARG]])
+// arm64-macosx: define swiftcc void @"$s8abitypes14testBOOLStructyyF"()
+// arm64-macosx:  [[COERCED:%.*]] = alloca i64
+// arm64-macosx:  [[STRUCTPTR:%.*]] = bitcast i64* [[COERCED]] to %TSo14FiveByteStructV
+// arm64-macosx:  [[PTR0:%.*]] = getelementptr inbounds %TSo14FiveByteStructV, %TSo14FiveByteStructV* [[STRUCTPTR]], {{i.*}} 0, {{i.*}} 0
+// arm64-macosx:  [[PTR1:%.*]] = getelementptr inbounds %T10ObjectiveC8ObjCBoolV, %T10ObjectiveC8ObjCBoolV* [[PTR0]], {{i.*}} 0, {{i.*}} 0
+// arm64-macosx:  [[PTR2:%.*]] = getelementptr inbounds %TSb, %TSb* [[PTR1]], {{i.*}} 0, {{i.*}} 0
+// arm64-macosx:  store i1 false, i1* [[PTR2]], align 8
+// arm64-macosx:  [[ARG:%.*]] = load i64, i64* [[COERCED]]
+// arm64-macosx:  call void bitcast (void ()* @objc_msgSend to void (i8*, i8*, i64)*)(i8* {{.*}}, i8* {{.*}}, i64 [[ARG]])
 public func testBOOLStruct() {
   let s = FiveByteStruct()
   MyClass.mymethod(s)
diff --git a/test/IRGen/autolink-runtime-compatibility-arm64-maccatalyst.swift b/test/IRGen/autolink-runtime-compatibility-arm64-maccatalyst.swift
new file mode 100644
index 0000000000000..9f6d38802a5b2
--- /dev/null
+++ b/test/IRGen/autolink-runtime-compatibility-arm64-maccatalyst.swift
@@ -0,0 +1,13 @@
+// REQUIRES: CPU=arm64,OS=maccatalyst
+
+// Doesn't autolink compatibility library because target OS doesn't need it
+// RUN: %target-swift-frontend -target arm64-apple-ios12.0-macabi  -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
+
+public func foo() {}
+
+// NO-FORCE-LOAD-NOT: FORCE_LOAD
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility50"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility51"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility52"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility53"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibilityDynamicReplacements"}
diff --git a/test/IRGen/autolink-runtime-compatibility-arm64-macos.swift b/test/IRGen/autolink-runtime-compatibility-arm64-macos.swift
new file mode 100644
index 0000000000000..48e9c61955e44
--- /dev/null
+++ b/test/IRGen/autolink-runtime-compatibility-arm64-macos.swift
@@ -0,0 +1,13 @@
+// REQUIRES: CPU=arm64,OS=macosx
+
+// Doesn't autolink compatibility library because target OS doesn't need it
+// RUN: %target-swift-frontend -target arm64-apple-macosx10.14  -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
+
+public func foo() {}
+
+// NO-FORCE-LOAD-NOT: FORCE_LOAD
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility50"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility51"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility52"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibility53"}
+// NO-FORCE-LOAD-NOT: !{!"-lswiftCompatibilityDynamicReplacements"}
diff --git a/test/IRGen/autolink-runtime-compatibility.swift b/test/IRGen/autolink-runtime-compatibility.swift
index 99dc558382103..54102577c19b3 100644
--- a/test/IRGen/autolink-runtime-compatibility.swift
+++ b/test/IRGen/autolink-runtime-compatibility.swift
@@ -1,23 +1,23 @@
 // REQUIRES: OS=macosx
 
 // Doesn't autolink compatibility library because autolinking is disabled
-// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -target x86_64-apple-macosx10.9 -disable-autolinking-runtime-compatibility -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
+// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -target %target-cpu-apple-macosx10.9 -disable-autolinking-runtime-compatibility -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
 // RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version 5.0 -disable-autolinking-runtime-compatibility -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
 
 // Doesn't autolink compatibility library because runtime compatibility library is disabled
 // RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
 
 // Doesn't autolink compatibility library because target OS doesn't need it
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.24 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.24 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=NO-FORCE-LOAD %s
 
 // Only autolinks 5.1 compatibility library because target OS has 5.1
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.15 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD-51 %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.15 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD-51 %s
 
 // Autolinks because compatibility library was explicitly asked for
 // RUN: %target-swift-frontend -runtime-compatibility-version 5.0 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD %s
 // RUN: %target-swift-frontend -runtime-compatibility-version 5.1 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD-51 %s
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.24 -runtime-compatibility-version 5.0 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD %s
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.24 -runtime-compatibility-version 5.1 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD-51 %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.24 -runtime-compatibility-version 5.0 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.24 -runtime-compatibility-version 5.1 -emit-ir -parse-stdlib %s | %FileCheck -check-prefix=FORCE-LOAD-51 %s
 
 public func foo() {}
 
diff --git a/test/IRGen/builtin_math.swift b/test/IRGen/builtin_math.swift
index a5f8ffa803288..3602af70075cf 100644
--- a/test/IRGen/builtin_math.swift
+++ b/test/IRGen/builtin_math.swift
@@ -1,8 +1,8 @@
 // RUN: %target-swift-frontend -emit-ir -O %s | %FileCheck %s -check-prefix CHECK -check-prefix CHECK-%target-os
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/IRGen/class_update_callback_without_fixed_layout.sil b/test/IRGen/class_update_callback_without_fixed_layout.sil
index a905c46986b8b..7c95a5a104894 100644
--- a/test/IRGen/class_update_callback_without_fixed_layout.sil
+++ b/test/IRGen/class_update_callback_without_fixed_layout.sil
@@ -5,6 +5,7 @@
 // RUN: %target-swift-frontend  -I %t -emit-ir -enable-library-evolution -O %s -target %target-pre-stable-abi-triple
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 // UNSUPPORTED: CPU=arm64e
 
 // With the old deployment target, these classes use the 'singleton' metadata
diff --git a/test/IRGen/condfail.sil b/test/IRGen/condfail.sil
index 528e63a65474e..ebdc6b92318bc 100644
--- a/test/IRGen/condfail.sil
+++ b/test/IRGen/condfail.sil
@@ -17,8 +17,8 @@ import Swift
 // CHECK-powerpc64:   .cfi_startproc
 // CHECK-powerpc64le: .cfi_startproc
 // CHECK-s390x:       .cfi_startproc
-// CHECK-OPT-macosx:  ## InlineAsm Start
-// CHECK-OPT-macosx:  ## InlineAsm End
+// CHECK-OPT-macosx:  InlineAsm Start
+// CHECK-OPT-macosx:  InlineAsm End
 // CHECK-OPT-linux:   ##APP
 // CHECK-OPT-linux:   ##NO_APP
 // CHECK-OPT-windows:   ##APP
@@ -27,8 +27,8 @@ import Swift
 // CHECK-OPT-linux-androideabi:   @NO_APP
 // CHECK-OPT-linux-android:       //APP
 // CHECK-OPT-linux-android:       //NO_APP
-// CHECK-NOOPT-macosx-NOT: ## InlineAsm Start
-// CHECK-NOOPT-macosx-NOT: ## InlineAsm End
+// CHECK-NOOPT-macosx-NOT: InlineAsm Start
+// CHECK-NOOPT-macosx-NOT: InlineAsm End
 // CHECK-NOOPT-linux-NOT:  ##APP
 // CHECK-NOOPT-linux-NOT:  ##NO_APP
 // CHECK-NOOPT-windows-NOT:  ##APP
@@ -55,14 +55,14 @@ import Swift
 // CHECK-NOT-powerpc64:   .cfi_endproc
 // CHECK-NOT-powerpc64le: .cfi_endproc
 // CHECK-NOT-s390x:       .cfi_endproc
-// CHECK-OPT-macosx:  ## InlineAsm Start
-// CHECK-OPT-macosx:  ## InlineAsm End
+// CHECK-OPT-macosx:  InlineAsm Start
+// CHECK-OPT-macosx:  InlineAsm End
 // CHECK-OPT-linux:   ##APP
 // CHECK-OPT-linux:   ##NO_APP
 // CHECK-OPT-windows:   ##APP
 // CHECK-OPT-windows:   ##NO_APP
-// CHECK-NOOPT-macosx-NOT: ## InlineAsm Start
-// CHECK-NOOPT-macosx-NOT: ## InlineAsm End
+// CHECK-NOOPT-macosx-NOT: InlineAsm Start
+// CHECK-NOOPT-macosx-NOT: InlineAsm End
 // CHECK-NOOPT-linux-NOT:  ##APP
 // CHECK-NOOPT-linux-NOT:  ##NO_APP
 // CHECK-NOOPT-windows-NOT:  ##APP
diff --git a/test/IRGen/conditional_conformances_future.swift b/test/IRGen/conditional_conformances_future.swift
index 3bce444de7eff..03df2b2f64380 100644
--- a/test/IRGen/conditional_conformances_future.swift
+++ b/test/IRGen/conditional_conformances_future.swift
@@ -5,5 +5,5 @@
 
 // Too many pointer-sized integers in the IR
 // REQUIRES: PTRSIZE=64
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 
diff --git a/test/IRGen/conditional_conformances_gettypemetdatabyname.swift b/test/IRGen/conditional_conformances_gettypemetdatabyname.swift
index 7ab1f91295f61..a194e081a7a01 100644
--- a/test/IRGen/conditional_conformances_gettypemetdatabyname.swift
+++ b/test/IRGen/conditional_conformances_gettypemetdatabyname.swift
@@ -1,5 +1,7 @@
-// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -target x86_64-apple-macosx10.99 -emit-ir %S/../Inputs/conditional_conformance_basic_conformances.swift | %FileCheck %S/../Inputs/conditional_conformance_basic_conformances.swift --check-prefix=TYPEBYNAME
-// RUN: %target-swift-frontend -prespecialize-generic-metadata -target x86_64-apple-macosx10.99 -emit-ir %S/../Inputs/conditional_conformance_basic_conformances.swift | %FileCheck %S/../Inputs/conditional_conformance_basic_conformances.swift --check-prefix=TYPEBYNAME_PRESPECIALIZED
+// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -target %target-cpu-apple-macosx10.15.4 -emit-ir %S/../Inputs/conditional_conformance_basic_conformances.swift | %FileCheck %S/../Inputs/conditional_conformance_basic_conformances.swift --check-prefix=TYPEBYNAME
+// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %target-cpu-apple-macosx99.99 -emit-ir %S/../Inputs/conditional_conformance_basic_conformances.swift | %FileCheck %S/../Inputs/conditional_conformance_basic_conformances.swift --check-prefix=TYPEBYNAME_PRESPECIALIZED
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.15.4 -emit-ir %S/../Inputs/conditional_conformance_basic_conformances.swift | %FileCheck %S/../Inputs/conditional_conformance_basic_conformances.swift --check-prefix=CHECK --check-prefix=CHECK-STABLE-ABI-TRUE
+
 
 // Too many pointer-sized integers in the IR
 // REQUIRES: PTRSIZE=64
diff --git a/test/IRGen/dynamic_self_metadata_future.swift b/test/IRGen/dynamic_self_metadata_future.swift
index a0873c054f925..9a6f760db7279 100644
--- a/test/IRGen/dynamic_self_metadata_future.swift
+++ b/test/IRGen/dynamic_self_metadata_future.swift
@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata %s -target %module-target-future -emit-ir -parse-as-library | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // REQUIRES: CPU=x86_64
 
 // FIXME: Not a SIL test because we can't parse dynamic Self in SIL.
diff --git a/test/IRGen/eager-class-initialization.swift b/test/IRGen/eager-class-initialization.swift
index c3d0bf4bc705d..53b172256bca3 100644
--- a/test/IRGen/eager-class-initialization.swift
+++ b/test/IRGen/eager-class-initialization.swift
@@ -3,6 +3,7 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -target %target-pre-stable-abi-triple | %FileCheck %s -DINT=i%target-ptrsize --check-prefix=CHECK --check-prefix=CHECK-OLD
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 // UNSUPPORTED: CPU=arm64e
 
 // See also eager-class-initialization-stable-abi.swift, for the stable ABI
diff --git a/test/IRGen/enum_future.sil b/test/IRGen/enum_future.sil
index 77f060d7c1dce..b538b63093269 100644
--- a/test/IRGen/enum_future.sil
+++ b/test/IRGen/enum_future.sil
@@ -4,7 +4,7 @@
 // RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata %s -target %module-target-future -gnone -emit-ir -disable-diagnostic-passes -disable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-native --check-prefix=CHECK-native-%target-ptrsize -DWORD=i%target-ptrsize
 
 // REQUIRES: CPU=i386 || CPU=x86_64
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/enum_value_semantics_future.sil b/test/IRGen/enum_value_semantics_future.sil
index 86b706aefd558..5e70e20dc297a 100644
--- a/test/IRGen/enum_value_semantics_future.sil
+++ b/test/IRGen/enum_value_semantics_future.sil
@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata %s -target %module-target-future -gnone -emit-ir -disable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-native --check-prefix=CHECK-native-%target-ptrsize --check-prefix=CHECK-%target-os --check-prefix=CHECK-native-%target-os
 
 // REQUIRES: CPU=x86_64
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/foreign_types_future.sil b/test/IRGen/foreign_types_future.sil
index d66891e01fde0..43a15a306e784 100644
--- a/test/IRGen/foreign_types_future.sil
+++ b/test/IRGen/foreign_types_future.sil
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -I %S/Inputs/abi %s -emit-ir | %FileCheck %s -DINT=i%target-ptrsize
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/generic_metatypes_future.swift b/test/IRGen/generic_metatypes_future.swift
index 3e9fb48513d35..bf18d17617de0 100644
--- a/test/IRGen/generic_metatypes_future.swift
+++ b/test/IRGen/generic_metatypes_future.swift
@@ -1,5 +1,5 @@
 
-// RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target x86_64-apple-macosx10.99  -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 -DINT=i64 %s
+// RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target x86_64-apple-macosx50.99  -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 -DINT=i64 %s
 // RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target x86_64-apple-ios99.0      -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 -DINT=i64  %s
 // RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target x86_64-apple-tvos99.0     -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 -DINT=i64  %s
 // RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target i386-apple-watchos9.99    -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 -DINT=i32  %s
@@ -10,7 +10,7 @@
 // RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target armv7k-apple-watchos9.99  -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 -DINT=i32 %s
 
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // REQUIRES: CODEGENERATOR=X86
 // REQUIRES: CODEGENERATOR=ARM
 
diff --git a/test/IRGen/generic_structs_future.sil b/test/IRGen/generic_structs_future.sil
index 1b8543f13f793..e9b49c850e0e9 100644
--- a/test/IRGen/generic_structs_future.sil
+++ b/test/IRGen/generic_structs_future.sil
@@ -2,7 +2,7 @@
 // RUN: %{python} %utils/chex.py < %s > %t/generic_structs_future.sil
 // RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata -target %module-target-future %t/generic_structs_future.sil -emit-ir | %FileCheck %t/generic_structs_future.sil
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // REQUIRES: CPU=x86_64
 
 import Builtin
diff --git a/test/IRGen/lazy_metadata_with-g.swift b/test/IRGen/lazy_metadata_with-g.swift
index b5f02f6720249..d532778d2fe96 100644
--- a/test/IRGen/lazy_metadata_with-g.swift
+++ b/test/IRGen/lazy_metadata_with-g.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swiftc_driver -parse-as-library -module-name=test -target x86_64-apple-macosx10.15 -wmo -O -g -emit-ir %s  | %FileCheck %s
+// RUN: %target-swiftc_driver -parse-as-library -module-name=test -target %target-cpu-apple-macosx10.15 -wmo -O -g -emit-ir %s  | %FileCheck %s
 // REQUIRES: OS=macosx
 
 // Check that the compiler does not emit any metadata for unused internal
diff --git a/test/IRGen/metadata.swift b/test/IRGen/metadata.swift
index f838c4e1f43b4..54fbd30a6d31a 100644
--- a/test/IRGen/metadata.swift
+++ b/test/IRGen/metadata.swift
@@ -10,7 +10,7 @@ enum Singleton {
 
 // CHECK: @"$s1A1GC14zeroSizedFieldAA9SingletonOvpWvd" = hidden constant i{{(64|32)}} 0
 // Check that the instance start is after the header (at 8 or 16).
-// CHECK-macosx: _DATA__TtC1A1G = private constant {{.*}} { i32 128, i32 {{(16|8)}}
+// CHECK-macosx: _DATA__TtC1A1G = private constant {{.*}} { i32 {{(128|129)}}, i32 {{(16|8|40)}}
 // CHECK-ios: _DATA__TtC1A1G = private constant {{.*}} { i32 {{(128|129)}}, i32 {{(16|8|40)}}
 // CHECK-watchos: _DATA__TtC1A1G = private constant {{.*}} { i32 128, i32 {{(16|8)}}
 // CHECK-tvos: _DATA__TtC1A1G = private constant {{.*}} { i32 128, i32 {{(16|8)}}
diff --git a/test/IRGen/objc_properties.swift b/test/IRGen/objc_properties.swift
index bcf966829a886..8d740e51985b1 100644
--- a/test/IRGen/objc_properties.swift
+++ b/test/IRGen/objc_properties.swift
@@ -1,7 +1,7 @@
 // This file is also used by objc_properties_ios.swift.
 
-// RUN: %swift -target x86_64-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s
-// RUN: %swift -target x86_64-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s
+// RUN: %swift -target %target-cpu-apple-macosx10.11 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-NEW %s
+// RUN: %swift -target %target-cpu-apple-macosx10.10 %s -disable-target-os-checking -emit-ir -disable-objc-attr-requires-foundation-module | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-OLD %s
 
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
@@ -118,7 +118,7 @@ class SomeWrapperTests {
 // CHECK-SAME:   i32 {{[0-9]+}}, i32 {{[0-9]+}}, i32 {{[0-9]+}}, i32 {{[0-9]+}},
 // CHECK-SAME:   i8* null,
 // CHECK-SAME:   i8* getelementptr inbounds ([{{.+}} x i8], [{{.+}} x i8]* {{@.+}}, i64 0, i64 0),
-// CHECK-SAME:   { {{.+}} }* @_CLASS_METHODS__TtC15objc_properties10SomeObject,
+// CHECK-SAME:   { {{.+}} }* @_CLASS_METHODS__TtC15objc_properties10SomeObject{{(\.ptrauth)?}}
 // CHECK-SAME:   i8* null, i8* null, i8* null,
 // CHECK-NEW-SAME:   { {{.+}} }* @_CLASS_PROPERTIES__TtC15objc_properties10SomeObject
 // CHECK-OLD-SAME:   i8* null
@@ -133,35 +133,35 @@ class SomeWrapperTests {
 // CHECK:   [8 x { i8*, i8*, i8* }] [{
 // CHECK:     i8* getelementptr inbounds ([9 x i8], [9 x i8]* @"\01L_selector_data(readonly)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast ([[OPAQUE0:%.*]]* ([[OPAQUE1:%.*]]*, i8*)* @"$s15objc_properties10SomeObjectC8readonlyACvgTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC8readonlyACvgTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([10 x i8], [10 x i8]* @"\01L_selector_data(readwrite)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast ([[OPAQUE0]]* ([[OPAQUE1]]*, i8*)* @"$s15objc_properties10SomeObjectC9readwriteACvgTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC9readwriteACvgTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([14 x i8], [14 x i8]* @"\01L_selector_data(setReadwrite:)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([11 x i8], [11 x i8]* [[SETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast (void ([[OPAQUE3:%.*]]*, i8*, [[OPAQUE4:%.*]]*)* @"$s15objc_properties10SomeObjectC9readwriteACvsTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC9readwriteACvsTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([9 x i8], [9 x i8]* @"\01L_selector_data(bareIvar)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast ([[OPAQUE0]]* ([[OPAQUE1]]*, i8*)* @"$s15objc_properties10SomeObjectC8bareIvarACvgTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC8bareIvarACvgTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([13 x i8], [13 x i8]* @"\01L_selector_data(setBareIvar:)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([11 x i8], [11 x i8]* [[SETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast (void ([[OPAQUE3]]*, i8*, [[OPAQUE4]]*)* @"$s15objc_properties10SomeObjectC8bareIvarACvsTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC8bareIvarACvsTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([7 x i8], [7 x i8]* @"\01L_selector_data(wobble)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast (%0* (%0*, i8*)* @"$s15objc_properties10SomeObjectC6wibbleACvgTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC6wibbleACvgTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([11 x i8], [11 x i8]* @"\01L_selector_data(setWobble:)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([11 x i8], [11 x i8]* [[SETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast (void (%0*, i8*, %0*)* @"$s15objc_properties10SomeObjectC6wibbleACvsTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC6wibbleACvsTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([5 x i8], [5 x i8]* @"\01L_selector_data(init)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast ([[OPAQUE5:%.*]]* ([[OPAQUE6:%.*]]*, i8*)* @"$s15objc_properties10SomeObjectCACycfcTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectCACycfcTo{{(.ptrauth)?}}"
 // CHECK:   }]
 // CHECK: }, section "__DATA, __objc_const", align 8
 
@@ -201,7 +201,7 @@ class SomeWrapperTests {
 // CHECK:   i32 {{[0-9]+}}, i32 {{[0-9]+}}, i32 {{[0-9]+}}, i32 {{[0-9]+}},
 // CHECK:   i8* null,
 // CHECK:   i8* getelementptr inbounds ([{{.+}} x i8], [{{.+}} x i8]* {{@.+}}, i64 0, i64 0),
-// CHECK:   { {{.+}} }* @_INSTANCE_METHODS__TtC15objc_properties10SomeObject,
+// CHECK:   { {{.+}} }* @_INSTANCE_METHODS__TtC15objc_properties10SomeObject{{(\.ptrauth)?}}
 // CHECK:   i8* null,
 // CHECK:   { {{.+}} }* @_IVARS__TtC15objc_properties10SomeObject,
 // CHECK:   i8* null,
@@ -214,11 +214,11 @@ class SomeWrapperTests {
 // CHECK:   [2 x { i8*, i8*, i8* }] [{
 // CHECK:     { i8* getelementptr inbounds ([18 x i8], [18 x i8]* @"\01L_selector_data(extensionProperty)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast ([[OPAQUE0]]* ([[OPAQUE1]]*, i8*)* @"$s15objc_properties10SomeObjectC17extensionPropertyACvgTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC17extensionPropertyACvgTo{{(.ptrauth)?}}"
 // CHECK:   }, {
 // CHECK:     i8* getelementptr inbounds ([22 x i8], [22 x i8]* @"\01L_selector_data(setExtensionProperty:)", i64 0, i64 0),
 // CHECK:     i8* getelementptr inbounds ([11 x i8], [11 x i8]* [[SETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:     i8* bitcast (void ([[OPAQUE3]]*, i8*, [[OPAQUE4]]*)* @"$s15objc_properties10SomeObjectC17extensionPropertyACvsTo" to i8*)
+// CHECK:     @"$s15objc_properties10SomeObjectC17extensionPropertyACvsTo{{(.ptrauth)?}}"
 // CHECK:   }]
 // CHECK: }, section "__DATA, __objc_const", align 8
 
@@ -250,11 +250,11 @@ class SomeWrapperTests {
 
 // CHECK: @"_CATEGORY__TtC15objc_properties10SomeObject_$_objc_properties" = private constant { {{.+}} } {
 // CHECK:   i8* getelementptr inbounds ([{{.+}} x i8], [{{.+}} x i8]* {{@.+}}, i64 0, i64 0),
-// CHECK:   %swift.type* bitcast (i64* getelementptr inbounds (<{ {{.+}} }>* @"$s15objc_properties10SomeObjectCMf", i32 0, i32 2) to %swift.type*),
-// CHECK:   { {{.+}} }* @"_CATEGORY_INSTANCE_METHODS__TtC15objc_properties10SomeObject_$_objc_properties",
-// CHECK:   { {{.+}} }* @"_CATEGORY_CLASS_METHODS__TtC15objc_properties10SomeObject_$_objc_properties",
+// CHECK:   @"$s15objc_properties10SomeObjectCMf", i32 0, i32 2
+// CHECK:   { {{.+}} }* @"_CATEGORY_INSTANCE_METHODS__TtC15objc_properties10SomeObject_$_objc_properties{{(\.ptrauth)?}}"
+// CHECK:   { {{.+}} }* @"_CATEGORY_CLASS_METHODS__TtC15objc_properties10SomeObject_$_objc_properties{{(\.ptrauth)?}}"
 // CHECK:   i8* null,
-// CHECK:   { {{.+}} }* @"_CATEGORY_PROPERTIES__TtC15objc_properties10SomeObject_$_objc_properties", 
+// CHECK:   { {{.+}} }* @"_CATEGORY_PROPERTIES__TtC15objc_properties10SomeObject_$_objc_properties{{(\.ptrauth)?}}", 
 // CHECK-NEW:   { {{.+}} }* @"_CATEGORY_CLASS_PROPERTIES__TtC15objc_properties10SomeObject_$_objc_properties",
 // CHECK-OLD:   i8* null,
 // CHECK:   i32 60
@@ -264,10 +264,10 @@ class SomeWrapperTests {
 // CHECK: @_INSTANCE_METHODS__TtC15objc_properties4Tree =
 // CHECK:    i8* getelementptr inbounds ([7 x i8], [7 x i8]* @"\01L_selector_data(parent)", i64 0, i64 0),
 // CHECK:    i8* getelementptr inbounds ([8 x i8], [8 x i8]* [[GETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:    i8* bitcast (%2* (%2*, i8*)* @"$s15objc_properties4TreeC6parentACSgvgTo" to i8*)
+// CHECK:    @"$s15objc_properties4TreeC6parentACSgvgTo{{(.ptrauth)?}}"
 // CHECK:    i8* getelementptr inbounds ([11 x i8], [11 x i8]* @"\01L_selector_data(setParent:)", i64 0, i64 0),
 // CHECK:    i8* getelementptr inbounds ([11 x i8], [11 x i8]* [[SETTER_SIGNATURE]], i64 0, i64 0),
-// CHECK:    i8* bitcast (void (%2*, i8*, %2*)* @"$s15objc_properties4TreeC6parentACSgvsTo" to i8*)
+// CHECK:    @"$s15objc_properties4TreeC6parentACSgvsTo{{(.ptrauth)?}}"
 
 // CHECK: @_PROTOCOL__TtP15objc_properties5Proto_ = private constant { {{.+}} } {
 // CHECK:   i8* null,
diff --git a/test/IRGen/objc_protocol_extended_method_types.swift b/test/IRGen/objc_protocol_extended_method_types.swift
index 3b23b810e7ec7..173e51d289587 100644
--- a/test/IRGen/objc_protocol_extended_method_types.swift
+++ b/test/IRGen/objc_protocol_extended_method_types.swift
@@ -102,26 +102,26 @@ print(P.self)
 // CHECK-JIT: [[NEW_PROTOCOL:%.+]] = call %swift.protocol* @objc_allocateProtocol(i8* getelementptr inbounds ([45 x i8], [45 x i8]* @2, i64 0, i64 0))
 // -- requiredInstanceMethod:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredInstanceMethod:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- optionalInstanceMethod:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(optionalInstanceMethod:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 0, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 0|i1 false)}}, {{(i8 1|i1 true)}})
 // -- requiredClassMethod:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredClassMethod:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 1, i8 0)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 0|i1 false)}})
 // -- optionalClassMethod:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(optionalClassMethod:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), i8 0, i8 0)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), {{(i8 0|i1 false)}}, {{(i8 0|i1 false)}})
 // -- requiredInstanceProperty
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredInstanceProperty)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 
 // Make sure we don't emit storage accessors multiple times.
 // CHECK-JIT-NOT: requiredInstanceProperty
 
 // -- setRequiredInstanceProperty:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(setRequiredInstanceProperty:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 
 // Make sure we don't emit storage accessors multiple times.
 // CHECK-JIT-NOT: requiredInstanceProperty
@@ -129,34 +129,34 @@ print(P.self)
 
 // -- requiredROInstanceProperty
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredROInstanceProperty)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- requiredInstanceMethod2:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredInstanceMethod2:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- optionalInstanceMethod2:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(optionalInstanceMethod2:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 0, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 0|i1 false)}}, {{(i8 1|i1 true)}})
 // -- requiredClassMethod2:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredClassMethod2:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), i8 1, i8 0)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 0|i1 false)}})
 // -- optionalClassMethod2:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(optionalClassMethod2:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), i8 0, i8 0)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), {{(i8 0|i1 false)}}, {{(i8 0|i1 false)}})
 // -- requiredInstanceProperty2
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredInstanceProperty2)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- setRequiredInstanceProperty2:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(setRequiredInstanceProperty2:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_VOID_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- requiredROInstanceProperty2
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(requiredROInstanceProperty2)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- objectAtIndexedSubscript:
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(objectAtIndexedSubscript:)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_INT_INT]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_INT_INT]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // -- init
 // CHECK-JIT: [[SELECTOR:%.+]] = call i8* @sel_registerName(i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* @"\01L_selector_data(init)", i64 0, i64 0))
-// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), i8 1, i8 1)
+// CHECK-JIT: call void @protocol_addMethodDescription(%swift.protocol* [[NEW_PROTOCOL]], i8* [[SELECTOR]], i8* getelementptr inbounds ([{{[0-9]+}} x i8], [{{[0-9]+}} x i8]* [[TY_ID]], i64 0, i64 0), {{(i8 1|i1 true)}}, {{(i8 1|i1 true)}})
 // CHECK-JIT: call void @objc_registerProtocol(%swift.protocol* [[NEW_PROTOCOL]])
 // CHECK-JIT: br label %[[FINISH_LABEL]]
 
diff --git a/test/IRGen/opaque_result_type_availability.swift b/test/IRGen/opaque_result_type_availability.swift
index ebbc05a55bfaa..06d7e6d245e82 100644
--- a/test/IRGen/opaque_result_type_availability.swift
+++ b/test/IRGen/opaque_result_type_availability.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -enable-implicit-dynamic -target x86_64-apple-macosx10.9 -Onone -emit-ir %s | %FileCheck --check-prefix=MAYBE-AVAILABLE %s
-// RUN: %target-swift-frontend -enable-implicit-dynamic -target x86_64-apple-macosx10.15 -Onone -emit-ir %s | %FileCheck --check-prefix=ALWAYS-AVAILABLE %s
+// RUN: %target-swift-frontend -enable-implicit-dynamic -target %target-cpu-apple-macosx10.15 -Onone -emit-ir %s | %FileCheck --check-prefix=ALWAYS-AVAILABLE %s
 // REQUIRES: OS=macosx
 
 protocol P {}
diff --git a/test/IRGen/osx-targets.swift b/test/IRGen/osx-targets.swift
index 32d0f9e9cf2c9..b967650dc2f9c 100644
--- a/test/IRGen/osx-targets.swift
+++ b/test/IRGen/osx-targets.swift
@@ -1,11 +1,12 @@
 // RUN: %swift %s -emit-ir | %FileCheck %s
-// RUN: %swift -target x86_64-apple-macosx10.51 %s -emit-ir | %FileCheck -check-prefix=CHECK-SPECIFIC %s
-// RUN: %swift -target x86_64-apple-darwin55 %s -emit-ir | %FileCheck -check-prefix=CHECK-SPECIFIC %s
+// RUN: %swift -target %target-cpu-apple-macosx10.51 %s -emit-ir | %FileCheck -check-prefix=CHECK-SPECIFIC-MAC-10-X %s
+// RUN: %swift -target %target-cpu-apple-darwin55 %s -emit-ir | %FileCheck -check-prefix=CHECK-DARWIN-OVER-11 %s
 
 // REQUIRES: OS=macosx
 
-// CHECK: target triple = "x86_64-apple-macosx10.
-// CHECK-SPECIFIC: target triple = "x86_64-apple-macosx10.51.0"
+// CHECK: target triple = "{{.*}}-apple-macosx{{[0-9][0-9]}}.
+// CHECK-SPECIFIC-MAC-10-X: target triple = "{{.*}}-apple-macosx10.51.0"
+// CHECK-DARWIN-OVER-11: target triple = "{{.*}}-apple-macosx46.0.0"
 
 public func anchor() {}
 anchor()
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_distinct_generic_class.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_distinct_generic_class.swift
index f045e31e2f5e2..4343391e57e12 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_distinct_generic_class.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_distinct_generic_class.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_different_value.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_different_value.swift
index 3ff7c47b16878..782a1c22d4cc7 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_different_value.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_different_value.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_same_value.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_same_value.swift
index 7efc10cb2d1a5..063e19e254d90 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_same_value.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_same_value.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift
index 402898bc25d73..04e01f00adbc6 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_con_double.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift
index e3579a782d7e0..1441ee49f2a05 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_con_int-2nd_anc_gen-1st-arg_subclass_arg.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift
index fbbe8d06720fc..9cca1c2489be4 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subclass_arg-2nd_anc_gen-1st-arg_con_int.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subcls_arg-2nd_anc_gen-1st-arg_subcls_arg.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subcls_arg-2nd_anc_gen-1st-arg_subcls_arg.swift
index c6083b4647e43..1558d95bea74a 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subcls_arg-2nd_anc_gen-1st-arg_subcls_arg.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1arg-2ancs-1distinct_use-1st_anc_gen-1arg-1st_arg_subcls_arg-2nd_anc_gen-1st-arg_subcls_arg.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int.swift
index fe625d4dfdeff..1b3e85f0ba59a 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_constant_int.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument.swift
index 248ec77302280..8e08ba643b58a 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_subclass_argument.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_superclass.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_superclass.swift
index db94ac2a480f3..2bc5e3cecfedb 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_superclass.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_generic-1argument-1st_argument_superclass.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-nonresilient.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-nonresilient.swift
index 69dac11039380..57d845df0081d 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-nonresilient.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-nonresilient.swift
@@ -3,7 +3,7 @@
 // RUN: %target-build-swift -emit-library -module-name TestModule -module-link-name TestModule %S/Inputs/class-open-0argument.swift -emit-module-interface -swift-version 5 -o %t/%target-library-name(TestModule)
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-resilient.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-resilient.swift
index 26e84f7acb306..f1950be21f984 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-resilient.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-external-resilient.swift
@@ -3,7 +3,7 @@
 // RUN: %target-build-swift -emit-library -module-name TestModule -module-link-name TestModule %S/Inputs/class-open-0argument.swift -emit-module-interface -swift-version 5 -o %t/%target-library-name(TestModule) -enable-library-evolution
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-fileprivate.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-fileprivate.swift
index 3f998316005ef..7670c9b354281 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-fileprivate.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1ancestor-1distinct_use-1st_ancestor_nongeneric-fileprivate.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use-1st_argument_generic_class-1argument.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use-1st_argument_generic_class-1argument.swift
index c440750f3aac3..1648484f0de4c 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use-1st_argument_generic_class-1argument.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use-1st_argument_generic_class-1argument.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use.swift
index 40b88d1ed682b..d1b52bed77166 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_class.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_class.swift
index 91a49c7939815..148276d019d5d 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_class.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_class.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_function.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_function.swift
index f6adf363d78ea..4a54fe85b9420 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_function.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_function.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class.swift
index b59a73de90db9..2cf41486a5b49 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class_specialized_at_generic_class.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class_specialized_at_generic_class.swift
index b1830362feb68..8579ac2e32306 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class_specialized_at_generic_class.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_class_specialized_at_generic_class.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_enum.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_enum.swift
index 3933284f2f590..73d90d620d033 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_enum.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_enum.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_struct.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_struct.swift
index 0cf7179111d8f..5d0d352c4716d 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_struct.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_generic_struct.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_tuple.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_tuple.swift
index a3d194849e5a7..f40eadced7ed6 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_tuple.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-1distinct_use_tuple.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_generic-fileprivate-2nd_ancestor_nongeneric.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_generic-fileprivate-2nd_ancestor_nongeneric.swift
index e429d59278289..d80cfd56a7cf5 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_generic-fileprivate-2nd_ancestor_nongeneric.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_generic-fileprivate-2nd_ancestor_nongeneric.swift
@@ -2,7 +2,7 @@
 
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_nongeneric-fileprivate-2nd_ancestor_generic.swift b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_nongeneric-fileprivate-2nd_ancestor_generic.swift
index 025e1ea48261a..620a2d8d2c329 100644
--- a/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_nongeneric-fileprivate-2nd_ancestor_generic.swift
+++ b/test/IRGen/prespecialized-metadata/class-fileprivate-inmodule-1argument-2ancestor-1du-1st_ancestor_nongeneric-fileprivate-2nd_ancestor_generic.swift
@@ -2,7 +2,7 @@
 
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-0argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/class-inmodule-0argument-within-class-1argument-1distinct_use.swift
index 30b4e4ab3ab3f..30bb4843b9b03 100644
--- a/test/IRGen/prespecialized-metadata/class-inmodule-0argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/class-inmodule-0argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -parse-stdlib -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift
index fbcec42049a03..71366df123142 100644
--- a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift
+++ b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-metatype-run.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/main.swift %S/Inputs/consume-logging-metadata-value.swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future) | %FileCheck %s
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift
index 97bb8273d6707..a7c64380c32f5 100644
--- a/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift
+++ b/test/IRGen/prespecialized-metadata/class-inmodule-1argument-run.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/main.swift %S/Inputs/consume-logging-metadata-value.swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future) | %FileCheck %s
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift b/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift
index bc50de1b6d5e7..cc7539a0ac302 100644
--- a/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift
+++ b/test/IRGen/prespecialized-metadata/class-inmodule-2argument-1super-2argument-run.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/main.swift %S/Inputs/consume-logging-metadata-value.swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future) | %FileCheck %s
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-no_trailing_flags.swift b/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-no_trailing_flags.swift
index 897218efb5673..94b2d6c3faf82 100644
--- a/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-no_trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-no_trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-trailing_flags.swift b/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-trailing_flags.swift
index 3c2fe18a686f9..defd6aec5c00e 100644
--- a/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/enum-extradata-no_payload_size-trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-no_trailing_flags.swift b/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-no_trailing_flags.swift
index 8c09908bec35e..de93249e0241c 100644
--- a/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-no_trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-no_trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -enable-library-evolution -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-trailing_flags.swift b/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-trailing_flags.swift
index ccd66b7944c4e..5ffd7506bef78 100644
--- a/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/enum-extradata-payload_size-trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -enable-library-evolution -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-fileprivate-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-fileprivate-inmodule-1argument-1distinct_use.swift
index 189efc4770b1d..8a7e7f5b64002 100644
--- a/test/IRGen/prespecialized-metadata/enum-fileprivate-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-fileprivate-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-0argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-0argument-within-class-1argument-1distinct_use.swift
index edc2e5c2fa271..944f264a0642c 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-0argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-0argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-0distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-0distinct_use.swift
index 10cd548bd85e1..fd56298a50d7f 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-0distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-0distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-1distinct_use.swift
index 129e4e580ea9b..5eef993d54324 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -72,7 +72,12 @@ doit()
 // CHECK: [[TYPE_COMPARISON_LABEL]]:
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), [[ERASED_TYPE]]
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[ARGUMENT_BUFFER:%[0-9]+]] = bitcast i8* [[ERASED_TABLE]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = load i8*, i8** [[ARGUMENT_BUFFER]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { 
 // CHECK-SAME:     %swift.type* getelementptr inbounds (
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_nonresilient-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_nonresilient-1distinct_use.swift
index b01eaee58d60b..c120da958118a 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_nonresilient-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_nonresilient-1distinct_use.swift
@@ -3,7 +3,7 @@
 // RUN: %target-build-swift -emit-library -module-name TestModule -module-link-name TestModule %S/Inputs/protocol-public.swift -emit-module-interface -swift-version 5 -o %t/%target-library-name(TestModule)
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_resilient-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_resilient-1distinct_use.swift
index 941e5195b3471..b5c328fa6c385 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_resilient-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-external_resilient-1distinct_use.swift
@@ -3,7 +3,7 @@
 // RUN: %target-build-swift -enable-library-evolution -emit-library -module-name TestModule -module-link-name TestModule %S/Inputs/protocol-public.swift -emit-module-interface -swift-version 5 -o %t/%target-library-name(TestModule)
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-public-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-public-1distinct_use.swift
index de96de5c8537c..f41f665832d95 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-public-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-public-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -72,7 +72,12 @@ doit()
 // CHECK: [[TYPE_COMPARISON_LABEL]]:
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), [[ERASED_TYPE]]
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[ARGUMENT_BUFFER:%[0-9]+]] = bitcast i8* [[ERASED_TABLE]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = load i8*, i8** [[ARGUMENT_BUFFER]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { 
 // CHECK-SAME:     %swift.type* getelementptr inbounds (
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
index 8d395f11186d9..435bf0d6eaa35 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_generic_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_generic_use.swift
index a991e4041c361..b07e3fab85c64 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_generic_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_generic_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_use.swift
index f3b9bf1e8c802..2a779835e9856 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-class-1argument-1distinct_use.swift
index 97411bb9e3a8d..9b30b71caf0cf 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-enum-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-enum-1argument-1distinct_use.swift
index 16d18ceb2d919..26b68649a8ab9 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-enum-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-enum-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-struct-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-struct-1argument-1distinct_use.swift
index a94543fd86e22..31a2ac1032fcc 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-struct-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-1argument-within-struct-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-2argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-2argument-1distinct_use.swift
index 3e84bbf699608..456565a9e6d8e 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-2argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-2argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-3argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-3argument-1distinct_use.swift
index f934d9f75d0a1..5d7a94d8356ec 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-3argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-3argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-4argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-4argument-1distinct_use.swift
index 8f1bdc4aa4aaf..1bdf941808ad3 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-4argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-4argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-5argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-5argument-1distinct_use.swift
index 72fce0915a4fd..2749bacd8e23f 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-5argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-5argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-external_resilient-frozen.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-external_resilient-frozen.swift
index acaf0cff5542f..9e45d4f245786 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-external_resilient-frozen.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-external_resilient-frozen.swift
@@ -3,7 +3,7 @@
 // RUN: %target-build-swift -enable-library-evolution -emit-library -module-name TestModule -module-link-name TestModule %S/Inputs/struct-public-frozen-0argument.swift -emit-module-interface -swift-version 5 -o %t/%target-library-name(TestModule)
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -I %t -L %t %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-payload_size.swift b/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-payload_size.swift
index 2707ad41f4d57..5b944e2618b4a 100644
--- a/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-payload_size.swift
+++ b/test/IRGen/prespecialized-metadata/enum-inmodule-evolution-1argument-1distinct_use-payload_size.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -enable-library-evolution -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/enum-outmodule-1argument-1distinct_use-struct-inmodule.swift b/test/IRGen/prespecialized-metadata/enum-outmodule-1argument-1distinct_use-struct-inmodule.swift
index 360ff61dc64d5..8d7dfb969dd85 100644
--- a/test/IRGen/prespecialized-metadata/enum-outmodule-1argument-1distinct_use-struct-inmodule.swift
+++ b/test/IRGen/prespecialized-metadata/enum-outmodule-1argument-1distinct_use-struct-inmodule.swift
@@ -2,7 +2,7 @@
 // RUN: %target-build-swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future %S/Inputs/enum-public-nonfrozen-1argument.swift -emit-library -o %t/libArgument.dylib -emit-module -module-name Argument -emit-module-path %t/Argument.swiftmodule
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -L %t -I %t -lArgument | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment 
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-no_trailing_flags.swift b/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-no_trailing_flags.swift
index deeaf9333c2ac..9e98091837ca5 100644
--- a/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-no_trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-no_trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-trailing_flags.swift b/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-trailing_flags.swift
index a14ece68c5028..28b84bd16f072 100644
--- a/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/struct-extradata-field_offsets-trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-no_trailing_flags.swift b/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-no_trailing_flags.swift
index 06c2c80f01c4d..598260b1c6f46 100644
--- a/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-no_trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-no_trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-trailing_flags.swift b/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-trailing_flags.swift
index fead7de1d813c..2d2df7014faff 100644
--- a/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-trailing_flags.swift
+++ b/test/IRGen/prespecialized-metadata/struct-extradata-no_field_offsets-trailing_flags.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-fileprivate-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-fileprivate-inmodule-1argument-1distinct_use.swift
index ba6d6e172b0d8..cdddc211799bb 100644
--- a/test/IRGen/prespecialized-metadata/struct-fileprivate-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-fileprivate-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-0argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-0argument-within-class-1argument-1distinct_use.swift
index c977ff866059f..02abab0244ef8 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-0argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-0argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-0argument.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-0argument.swift
index 037bfd746e419..c467c0683f330 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-0argument.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-0argument.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-0distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-0distinct_use.swift
index 43c1694f983b3..2bfcd4ddc9ece 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-0distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-0distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-1distinct_use.swift
index 4b904ed09cc01..ef64635e40c72 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -55,7 +55,12 @@ doit()
 // CHECK: [[TYPE_COMPARISON_LABEL]]:
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), [[ERASED_TYPE]]
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[ARGUMENT_BUFFER:%[0-9]+]] = bitcast i8* [[ERASED_TABLE]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = load i8*, i8** [[ARGUMENT_BUFFER]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { %swift.type* getelementptr inbounds (%swift.full_type, %swift.full_type* bitcast (<{ i8**, [[INT]], %swift.type_descriptor*, %swift.type*, i8**, i32{{(, \[4 x i8\])?}}, i64 }>* @"$s4main5ValueVySiGMf" to %swift.full_type*), i32 0, i32 1), [[INT]] 0 }
 // CHECK: [[EXIT_NORMAL]]:
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
index 81e9ef5b5c96a..f9aee8825cda2 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1conformance-stdlib_equatable-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_generic_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_generic_use.swift
index 174353f07fc17..7dc812bb048c3 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_generic_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_generic_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_use.swift
index 4fe989575ef83..fc8e54dcce67a 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2conformance-1distinct_use.swift
index 15874f76018ff..719f33d6371d3 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -60,7 +60,17 @@ doit()
 // CHECK: [[TYPE_COMPARISON_LABEL]]:
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), [[ERASED_TYPE]]
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[UNERASED_TABLE_1:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_1]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_1]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_1:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_1]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_1:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS_1]]
+// CHECK:   [[UNERASED_TABLE_2:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_2]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_2]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_2:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_2]], %swift.protocol_conformance_descriptor* @"$sSi4main1QAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_2:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_1]], [[EQUAL_DESCRIPTORS_2]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS_2]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { %swift.type* getelementptr inbounds (%swift.full_type, %swift.full_type* bitcast (<{ i8**, [[INT]], %swift.type_descriptor*, %swift.type*, i8**, i8**, i32{{(, \[4 x i8\])?}}, i64 }>* @"$s4main5ValueVySiGMf" to %swift.full_type*), i32 0, i32 1), [[INT]] 0 }
 // CHECK: [[EXIT_NORMAL]]:
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2distinct_use.swift
index 604f867e7efb0..09d7aea9c2cc5 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-2distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3conformance-1distinct_use.swift
index 9b0790f395684..0e1974e1df5c3 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -64,7 +64,28 @@ doit()
 // CHECK:   %"load argument at index 0 from buffer" = load i8*, i8** [[ERASED_TYPE_ADDRESS]]
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), %"load argument at index 0 from buffer"
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_1:%[0-9]+]] = getelementptr i8*, i8** %1, i64 1
+// CHECK:   [[ERASED_TABLE_1:%"load argument at index 1 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_1]], align 1
+// CHECK:   [[UNERASED_TABLE_1:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_1]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_1]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_1:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_1]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_1:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS_1]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_2:%[0-9]+]] = getelementptr i8*, i8** %1, i64 2
+// CHECK:   [[ERASED_TABLE_2:%"load argument at index 2 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_2]], align 1
+// CHECK:   [[UNERASED_TABLE_2:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_2]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_2]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_2:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_2]], %swift.protocol_conformance_descriptor* @"$sSi4main1QAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_2:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_1]], [[EQUAL_DESCRIPTORS_2]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_3:%[0-9]+]] = getelementptr i8*, i8** %1, i64 3
+// CHECK:   [[ERASED_TABLE_3:%"load argument at index 3 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_3]], align 1
+// CHECK:   [[UNERASED_TABLE_3:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_3]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_3]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_3:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_3]], %swift.protocol_conformance_descriptor* @"$sSi4main1RAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_3:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_2]], [[EQUAL_DESCRIPTORS_3]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS_3]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { %swift.type* getelementptr inbounds (%swift.full_type, %swift.full_type* bitcast (<{ i8**, [[INT]], %swift.type_descriptor*, %swift.type*, i8**, i8**, i8**, i32{{(, \[4 x i8\])?}}, i64 }>* @"$s4main5ValueVySiGMf" to %swift.full_type*), i32 0, i32 1), [[INT]] 0 }
 // CHECK: [[EXIT_NORMAL]]:
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3distinct_use.swift
index 3e3c890e24d46..614d85ee5a084 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-3distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4conformance-1distinct_use.swift
index 64632a842a242..d59b500546590 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -68,7 +68,35 @@ doit()
 // CHECK:   %"load argument at index 0 from buffer" = load i8*, i8** [[ERASED_TYPE_ADDRESS]]
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), %"load argument at index 0 from buffer"
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_1:%[0-9]+]] = getelementptr i8*, i8** %1, i64 1
+// CHECK:   [[ERASED_TABLE_1:%"load argument at index 1 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_1]], align 1
+// CHECK:   [[UNERASED_TABLE_1:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_1]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_1]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_1:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_1]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_1:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS_1]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_2:%[0-9]+]] = getelementptr i8*, i8** %1, i64 2
+// CHECK:   [[ERASED_TABLE_2:%"load argument at index 2 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_2]], align 1
+// CHECK:   [[UNERASED_TABLE_2:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_2]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_2]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_2:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_2]], %swift.protocol_conformance_descriptor* @"$sSi4main1QAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_2:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_1]], [[EQUAL_DESCRIPTORS_2]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_3:%[0-9]+]] = getelementptr i8*, i8** %1, i64 3
+// CHECK:   [[ERASED_TABLE_3:%"load argument at index 3 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_3]], align 1
+// CHECK:   [[UNERASED_TABLE_3:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_3]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_3]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_3:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_3]], %swift.protocol_conformance_descriptor* @"$sSi4main1RAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_3:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_2]], [[EQUAL_DESCRIPTORS_3]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_4:%[0-9]+]] = getelementptr i8*, i8** %1, i64 4
+// CHECK:   [[ERASED_TABLE_4:%"load argument at index 4 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_4]], align 1
+// CHECK:   [[UNERASED_TABLE_4:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_4]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_4:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_4]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_4:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_4]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_4:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_4]], %swift.protocol_conformance_descriptor* @"$sSi4main1SAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_4:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_3]], [[EQUAL_DESCRIPTORS_4]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS_4]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { %swift.type* getelementptr inbounds (%swift.full_type, %swift.full_type* bitcast (<{ i8**, [[INT]], %swift.type_descriptor*, %swift.type*, i8**, i8**, i8**, i8**, i32{{(, \[4 x i8\])?}}, i64 }>* @"$s4main5ValueVySiGMf" to %swift.full_type*), i32 0, i32 1), [[INT]] 0 }
 // CHECK: [[EXIT_NORMAL]]:
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4distinct_use.swift
index 80e50226d64bf..a60f667a627fe 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-4distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5conformance-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5conformance-1distinct_use.swift
index ff974470aa1a3..0f883e478e94f 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5conformance-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5conformance-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
@@ -72,7 +72,42 @@ doit()
 // CHECK:   %"load argument at index 0 from buffer" = load i8*, i8** [[ERASED_TYPE_ADDRESS]]
 // CHECK:   [[EQUAL_TYPE:%[0-9]+]] = icmp eq i8* bitcast (%swift.type* @"$sSiN" to i8*), %"load argument at index 0 from buffer"
 // CHECK:   [[EQUAL_TYPES:%[0-9]+]] = and i1 true, [[EQUAL_TYPE]]
-// CHECK:   br i1 [[EQUAL_TYPES]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_1:%[0-9]+]] = getelementptr i8*, i8** %1, i64 1
+// CHECK:   [[ERASED_TABLE_1:%"load argument at index 1 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_1]], align 1
+// CHECK:   [[UNERASED_TABLE_1:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_1]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_1]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_1:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_1]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_1:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_1]], %swift.protocol_conformance_descriptor* @"$sSi4main1PAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_1:%[0-9]+]] = and i1 [[EQUAL_TYPES]], [[EQUAL_DESCRIPTORS_1]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_2:%[0-9]+]] = getelementptr i8*, i8** %1, i64 2
+// CHECK:   [[ERASED_TABLE_2:%"load argument at index 2 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_2]], align 1
+// CHECK:   [[UNERASED_TABLE_2:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_2]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_2]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_2:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_2]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_2:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_2]], %swift.protocol_conformance_descriptor* @"$sSi4main1QAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_2:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_1]], [[EQUAL_DESCRIPTORS_2]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_3:%[0-9]+]] = getelementptr i8*, i8** %1, i64 3
+// CHECK:   [[ERASED_TABLE_3:%"load argument at index 3 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_3]], align 1
+// CHECK:   [[UNERASED_TABLE_3:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_3]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_3]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_3:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_3]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_3:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_3]], %swift.protocol_conformance_descriptor* @"$sSi4main1RAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_3:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_2]], [[EQUAL_DESCRIPTORS_3]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_4:%[0-9]+]] = getelementptr i8*, i8** %1, i64 4
+// CHECK:   [[ERASED_TABLE_4:%"load argument at index 4 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_4]], align 1
+// CHECK:   [[UNERASED_TABLE_4:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_4]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_4:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_4]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_4:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_4]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_4:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_4]], %swift.protocol_conformance_descriptor* @"$sSi4main1SAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_4:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_3]], [[EQUAL_DESCRIPTORS_4]]
+// CHECK:   [[POINTER_TO_ERASED_TABLE_5:%[0-9]+]] = getelementptr i8*, i8** %1, i64 5
+// CHECK:   [[ERASED_TABLE_5:%"load argument at index 5 from buffer"]] = load i8*, i8** [[POINTER_TO_ERASED_TABLE_5]], align 1
+// CHECK:   [[UNERASED_TABLE_5:%[0-9]+]] = bitcast i8* [[ERASED_TABLE_5]] to i8**
+// CHECK:   [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_5:%[0-9]+]] = load i8*, i8** [[UNERASED_TABLE_5]], align 1
+// CHECK:   [[PROVIDED_PROTOCOL_DESCRIPTOR_5:%[0-9]+]] = bitcast i8* [[UNCAST_PROVIDED_PROTOCOL_DESCRIPTOR_5]] to %swift.protocol_conformance_descriptor*
+// CHECK:   [[EQUAL_DESCRIPTORS_5:%[0-9]+]] = call swiftcc i1 @swift_compareProtocolConformanceDescriptors(%swift.protocol_conformance_descriptor* [[PROVIDED_PROTOCOL_DESCRIPTOR_5]], %swift.protocol_conformance_descriptor* @"$sSi4main1TAAMc")
+// CHECK:   [[EQUAL_ARGUMENTS_5:%[0-9]+]] = and i1 [[EQUAL_ARGUMENTS_4]], [[EQUAL_DESCRIPTORS_5]]
+// CHECK:   br i1 [[EQUAL_ARGUMENTS_5]], label %[[EXIT_PRESPECIALIZED:[0-9]+]], label %[[EXIT_NORMAL:[0-9]+]]
 // CHECK: [[EXIT_PRESPECIALIZED]]:
 // CHECK:   ret %swift.metadata_response { %swift.type* getelementptr inbounds (%swift.full_type, %swift.full_type* bitcast (<{ i8**, [[INT]], %swift.type_descriptor*, %swift.type*, i8**, i8**, i8**, i8**, i8**, i32{{(, \[4 x i8\])?}}, i64 }>* @"$s4main5ValueVySiGMf" to %swift.full_type*), i32 0, i32 1), [[INT]] 0 }
 // CHECK: [[EXIT_NORMAL]]:
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5distinct_use.swift
index 365fd0fb65d4e..3a98fe75c3016 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-5distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-clang_node-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-clang_node-1distinct_use.swift
index 6ecb89750a045..ab357b6245a4e 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-clang_node-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-clang_node-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %build-irgen-test-overlays(mock-sdk-directory: %S/../Inputs)
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../Inputs -I %t) -prespecialize-generic-metadata -target %module-target-future -primary-file %s -emit-ir | %FileCheck %s -DINT=i%target-ptrsize
 
 // UNSUPPORTED: CPU=i386 && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-class-1argument-1distinct_use.swift
index e9a4f074aedf8..f4e8311a2ebf1 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-enum-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-enum-1argument-1distinct_use.swift
index 2c4b5d76c63dc..1a789c3b3e237 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-enum-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-enum-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-1argument-1distinct_use.swift
index f2cdb53ab20cc..2a28be73413a7 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-2argument-constrained_extension-equal_arguments-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-2argument-constrained_extension-equal_arguments-1distinct_use.swift
index 5895295b7b6ee..9d8885fb6b3da 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-2argument-constrained_extension-equal_arguments-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-1argument-within-struct-2argument-constrained_extension-equal_arguments-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-0distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-0distinct_use.swift
index 8381bcfec18b0..0d32c85539ffe 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-0distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-0distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-1distinct_use.swift
index da1183d3c20ac..eba0602f76ed8 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-2distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-2distinct_use.swift
index b21075d56c43c..4e862e3793f8b 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-2distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-2distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-3distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-3distinct_use.swift
index 31fce124fd51f..c3ca169770277 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-3distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-3distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-4distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-4distinct_use.swift
index 4a151bbe6db25..47ba39cc3dd87 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-4distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-4distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-5distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-5distinct_use.swift
index 90e8cc77ac434..d71408f206a8a 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-5distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-5distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-within-class-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-within-class-1argument-1distinct_use.swift
index 7701e761a485f..670d11205f865 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-within-class-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-2argument-within-class-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-inmodule-otherfile-1argument-run.swift b/test/IRGen/prespecialized-metadata/struct-inmodule-otherfile-1argument-run.swift
index 6feb7838433df..6bac16a11a750 100644
--- a/test/IRGen/prespecialized-metadata/struct-inmodule-otherfile-1argument-run.swift
+++ b/test/IRGen/prespecialized-metadata/struct-inmodule-otherfile-1argument-run.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/main.swift %S/Inputs/consume-logging-metadata-value.swift %S/Inputs/struct-nonfrozen-1argument.swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future) | %FileCheck %s
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-multi-conformance.swift b/test/IRGen/prespecialized-metadata/struct-multi-conformance.swift
new file mode 100644
index 0000000000000..6b5673c8ce58a
--- /dev/null
+++ b/test/IRGen/prespecialized-metadata/struct-multi-conformance.swift
@@ -0,0 +1,158 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-build-swift -c %s -DBASE -emit-library -emit-module -module-name Base -target %module-target-future -Xfrontend -prespecialize-generic-metadata -emit-module-path %t/Base.swiftmodule -o %t/%target-library-name(Base)
+// RUN: %target-build-swift -c %s -DCONFORMANCE_1 -emit-library -emit-module -module-name Conformance1 -target %module-target-future -Xfrontend -prespecialize-generic-metadata -emit-module-path %t/Conformance1.swiftmodule -o %t/%target-library-name(Conformance1) -lBase -I %t -L %t
+// RUN: %target-build-swift -c %s -DCONFORMANCE_2 -emit-library -emit-module -module-name Conformance2 -target %module-target-future -Xfrontend -prespecialize-generic-metadata -emit-module-path %t/Conformance2.swiftmodule -o %t/%target-library-name(Conformance2) -lBase -I %t -L %t
+// RUN: %target-build-swift -c %s -DGENERIC -emit-library -emit-module -module-name Generic -target %module-target-future -Xfrontend -prespecialize-generic-metadata -emit-module-path %t/Generic.swiftmodule -o %t/%target-library-name(Generic) -lBase -lConformance1 -I %t -L %t
+// RUN: %target-build-swift -c %s -DERASE -emit-library -emit-module -module-name Erase -target %module-target-future -Xfrontend -prespecialize-generic-metadata -emit-module-path %t/Erase.swiftmodule -o %t/%target-library-name(Erase) -lBase -lConformance2 -I %t -L %t
+// RUN: %clang -c -v %target-cc-options -g -O0 -isysroot %sdk %S/Inputs/isPrespecialized.cpp -o %t/isPrespecialized.o -I %clang-include-dir -I %swift_src_root/include/ -I %swift_src_root/../llvm-project/llvm/include -I %clang-include-dir/../../llvm-macosx-x86_64/include -L %clang-include-dir/../lib/swift/macosx
+// RUN: %target-build-swift %s %S/Inputs/main.swift %S/Inputs/consume-logging-metadata-value.swift %t/isPrespecialized.o -import-objc-header %S/Inputs/isPrespecialized.h -DMAIN -target %module-target-future -Xfrontend -prespecialize-generic-metadata -lBase -lConformance1 -lConformance2 -lGeneric -lErase -lc++ -I %t -L %t -L %clang-include-dir/../lib/swift/macosx -o %t/main
+
+// RUN: %target-codesign %t/main
+// RUN: %target-run %t/main | %FileCheck %s
+
+// REQUIRES: OS=macosx
+// REQUIRES: executable_test
+// UNSUPPORTED: use_os_stdlib
+// UNSUPPORTED: swift_test_mode_optimize
+// UNSUPPORTED: swift_test_mode_optimize_size
+// UNSUPPORTED: remote_run
+
+#if BASE
+public struct K {
+    public init() {}
+}
+
+public protocol P {
+    var name: String { get }
+}
+#endif
+
+#if CONFORMANCE_1
+import Base
+
+extension K : P {
+
+    public var name: String { "Conformance1" }
+
+}
+#endif
+
+#if CONFORMANCE_2
+import Base
+
+extension K : P {
+
+    public var name: String { "Conformance2" }
+
+}
+#endif
+
+#if GENERIC
+import Base
+import Conformance1
+
+public struct G<T : P> {
+    public let t: T
+
+    public init(_ t: T) {
+        self.t = t
+    }
+
+    public var name: String {
+        t.name
+    }
+}
+
+@inline(never)
+func consume<T>(_ t: T) {
+    withExtendedLifetime(t) {}
+}
+
+
+public func prespecialize() {
+    consume(G<K>.self)
+}
+#endif
+
+#if ERASE
+import Base
+import Conformance2
+
+public struct AnyP : P {
+
+    private class _BoxBase {
+        public var name: String {
+            fatalError()
+        }
+        public func visit<Visitor : PVisitor>(_ v: Visitor) {
+            fatalError()
+        }
+    }
+
+    private final class _Box<T : P> : _BoxBase {
+        private let t: T
+
+        init(_ t: T) {
+            self.t = t
+        }
+
+        override var name: String {
+            t.name
+        }
+        override func visit<Visitor : PVisitor>(_ v: Visitor) {
+            v.visit(t)
+        }
+    }
+
+    private let _box: _BoxBase
+
+    init<T : P>(_ t: T) {
+        self._box = _Box(t)
+    }
+
+    public var name: String {
+        _box.name
+    }
+
+    public func visit<Visitor : PVisitor>(_ v: Visitor) {
+        _box.visit(v)
+    }
+
+}
+
+public protocol PVisitor {
+    func visit<T : P>(_ t: T)
+}
+
+public func getKAsAnyP() -> AnyP {
+    AnyP(K())
+}
+#endif
+
+#if MAIN
+import Base
+import Generic
+import Conformance2
+import Erase
+
+func ptr<T>(to ty: T.Type) -> UnsafeMutableRawPointer {
+    UnsafeMutableRawPointer(mutating: unsafePointerToMetadata(of: ty))!
+}
+
+func printTheName<T : P>(_ t: T, prespecialized: Bool) {
+    print(G(t).name)
+    assert(isCanonicalStaticallySpecializedGenericMetadata(ptr(to: G<T>.self)) == prespecialized)
+}
+struct Visitor : PVisitor {
+    func visit<T : P>(_ t: T) {
+        printTheName(t, prespecialized: false)
+    }
+}
+func doit() {
+  // CHECK: Conformance1
+  printTheName(K(), prespecialized: true)
+  // CHECK: Conformance2
+  getKAsAnyP().visit(Visitor())
+}
+#endif
diff --git a/test/IRGen/prespecialized-metadata/struct-outmodule-1argument-1distinct_use-struct-inmodule.swift b/test/IRGen/prespecialized-metadata/struct-outmodule-1argument-1distinct_use-struct-inmodule.swift
index d85345483bf30..15016566f2ac1 100644
--- a/test/IRGen/prespecialized-metadata/struct-outmodule-1argument-1distinct_use-struct-inmodule.swift
+++ b/test/IRGen/prespecialized-metadata/struct-outmodule-1argument-1distinct_use-struct-inmodule.swift
@@ -2,7 +2,7 @@
 // RUN: %target-build-swift -Xfrontend -prespecialize-generic-metadata -target %module-target-future %S/Inputs/struct-public-nonfrozen-1argument.swift -emit-library -o %t/libArgument.dylib -emit-module -module-name Argument -emit-module-path %t/Argument.swiftmodule
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -L %t -I %t -lArgument | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment 
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/prespecialized-metadata/struct-public-inmodule-1argument-1distinct_use.swift b/test/IRGen/prespecialized-metadata/struct-public-inmodule-1argument-1distinct_use.swift
index 38549082d4bac..e02b67617cea8 100644
--- a/test/IRGen/prespecialized-metadata/struct-public-inmodule-1argument-1distinct_use.swift
+++ b/test/IRGen/prespecialized-metadata/struct-public-inmodule-1argument-1distinct_use.swift
@@ -1,6 +1,6 @@
 // RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/sanitize_coverage.swift b/test/IRGen/sanitize_coverage.swift
index 27ef3f9e5325e..3114e5a7c7040 100644
--- a/test/IRGen/sanitize_coverage.swift
+++ b/test/IRGen/sanitize_coverage.swift
@@ -9,9 +9,9 @@
 // RUN: %target-swift-frontend -emit-ir -sanitize=address -sanitize-coverage=edge,8bit-counters %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_8BIT_COUNTERS
 // RUN: %target-swift-frontend -emit-ir -sanitize=fuzzer %s | %FileCheck %s -check-prefix=SANCOV -check-prefix=SANCOV_TRACE_CMP
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -23,7 +23,7 @@
 // LLVM IR generated from this code.
 func test() {
   // Use random numbers so the compiler can't constant fold
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   let x = arc4random()
   let y = arc4random()
 #else
diff --git a/test/IRGen/signature_conformances_multifile_future.swift b/test/IRGen/signature_conformances_multifile_future.swift
index 5b4f2da3cf1f1..f874783809b1d 100644
--- a/test/IRGen/signature_conformances_multifile_future.swift
+++ b/test/IRGen/signature_conformances_multifile_future.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir -primary-file %s %S/Inputs/signature_conformances_other.swift | %FileCheck %s -DINT=i%target-ptrsize
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/synthesized_conformance_future.swift b/test/IRGen/synthesized_conformance_future.swift
index ff78804db5e5c..2b34a0b18c9dc 100644
--- a/test/IRGen/synthesized_conformance_future.swift
+++ b/test/IRGen/synthesized_conformance_future.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -swift-version 4 | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/IRGen/weak_import_clang.swift b/test/IRGen/weak_import_clang.swift
index df29eed02992e..52630b5233810 100644
--- a/test/IRGen/weak_import_clang.swift
+++ b/test/IRGen/weak_import_clang.swift
@@ -4,8 +4,8 @@
 // Specify explicit target triples for the deployment target to test weak
 // linking for a symbol introduced in OS X 10.51.
 //
-// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.50 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_50 %s
-// RUN: %target-swift-frontend(mock-sdk: -target x86_64-apple-macosx10.51 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_51 %s
+// RUN: %target-swift-frontend(mock-sdk: -target %target-cpu-apple-macosx10.50 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_50 %s
+// RUN: %target-swift-frontend(mock-sdk: -target %target-cpu-apple-macosx10.51 -sdk %S/Inputs -I %t) -primary-file %s -emit-ir | %FileCheck -check-prefix=CHECK-10_51 %s
 
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
diff --git a/test/IRGen/weak_import_deployment_target.swift b/test/IRGen/weak_import_deployment_target.swift
index cbab1d9dce2ef..b906c7df5383d 100644
--- a/test/IRGen/weak_import_deployment_target.swift
+++ b/test/IRGen/weak_import_deployment_target.swift
@@ -1,12 +1,12 @@
 // RUN: %empty-directory(%t)
 //
-// RUN: %target-swift-frontend -enable-library-evolution -emit-module -target x86_64-apple-macosx10.50 -emit-module-path %t/weak_import_deployment_target_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_deployment_target_helper.swift
-// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target x86_64-apple-macosx10.50 | %FileCheck %s --check-prefix=CHECK-OLD
-// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target x86_64-apple-macosx10.60 | %FileCheck %s --check-prefix=CHECK-NEW
+// RUN: %target-swift-frontend -enable-library-evolution -emit-module -target %target-cpu-apple-macosx10.50 -emit-module-path %t/weak_import_deployment_target_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_deployment_target_helper.swift
+// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 | %FileCheck %s --check-prefix=CHECK-OLD
+// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 | %FileCheck %s --check-prefix=CHECK-NEW
 //
-// RUN: %target-swift-frontend -enable-library-evolution -emit-module -target x86_64-apple-macosx10.60 -emit-module-path %t/weak_import_deployment_target_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_deployment_target_helper.swift
-// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target x86_64-apple-macosx10.50 | %FileCheck %s --check-prefix=CHECK-OLD
-// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target x86_64-apple-macosx10.60 | %FileCheck %s --check-prefix=CHECK-NEW
+// RUN: %target-swift-frontend -enable-library-evolution -emit-module -target %target-cpu-apple-macosx10.60 -emit-module-path %t/weak_import_deployment_target_helper.swiftmodule -parse-as-library %S/Inputs/weak_import_deployment_target_helper.swift
+// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.50 | %FileCheck %s --check-prefix=CHECK-OLD
+// RUN: %target-swift-frontend -primary-file %s -I %t -emit-ir -target %target-cpu-apple-macosx10.60 | %FileCheck %s --check-prefix=CHECK-NEW
 //
 // REQUIRES: OS=macosx
 
diff --git a/test/ImportResolution/import-resolution-overload.swift b/test/ImportResolution/import-resolution-overload.swift
index ce9c493560811..e19ef173eb9e5 100644
--- a/test/ImportResolution/import-resolution-overload.swift
+++ b/test/ImportResolution/import-resolution-overload.swift
@@ -46,7 +46,7 @@ scopedFunction = 42
 // FIXME: Should be an error -- a type name and a function cannot overload.
 var _ : Int = TypeNameWins(42)
 
-TypeNameWins = 42 // expected-error {{no exact matches in reference to global function 'TypeNameWins'}}
+TypeNameWins = 42 // expected-error {{cannot assign to immutable expression of type 'Int'}}
 var _ : TypeNameWins // no-warning
 
 // rdar://problem/21739333
diff --git a/test/Incremental/Verifier/gen-output-file-map.py b/test/Incremental/Verifier/gen-output-file-map.py
index f3e1c7727c8e3..9a5286a2ff133 100644
--- a/test/Incremental/Verifier/gen-output-file-map.py
+++ b/test/Incremental/Verifier/gen-output-file-map.py
@@ -3,6 +3,7 @@
 from __future__ import print_function
 
 import argparse
+import io
 import json
 import os
 import sys
@@ -61,13 +62,22 @@ def main(arguments):
         'swift-dependencies': './main-buildrecord.swiftdeps'
     }
 
-    with open(output_path, 'wb') as f:
-        json.dump(all_records, f)
+    # TODO: this is for python 2 and python 3 compatibility.  Once Python 2 is
+    # removed, this function can be removed.
+    def to_unicode(r):
+        import sys
+        if sys.version_info[0] < 3:
+            return unicode(r)
+        return str(r)
+
+    with io.open(output_path, 'w', encoding='utf-8', newline='\n') as f:
+        f.write(to_unicode(json.dumps(all_records, ensure_ascii=False)))
 
     if args.response_output_file is not None:
-        with open(args.response_output_file, 'wb') as f:
+        with io.open(args.response_output_file, 'w',
+                     encoding='utf-8', newline='\n') as f:
             for line in response_file_contents:
-                f.write(line + " ")
+                f.write(to_unicode(line + " "))
 
 
 if __name__ == '__main__':
diff --git a/test/Incremental/superfluous-cascade.swift b/test/Incremental/superfluous-cascade.swift
index e9d26f9b40507..a7abedafcdf88 100644
--- a/test/Incremental/superfluous-cascade.swift
+++ b/test/Incremental/superfluous-cascade.swift
@@ -9,7 +9,7 @@
 // RUN: cp %t/definesPoint{-before,}.swift
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output1
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json >&output1
 
 // Change one type - the cascading edge causes us to rebuild everything but main
 
@@ -18,7 +18,7 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesPoint.swift
 
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift  -module-name main -output-file-map ofm.json >&output2
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -j2 -incremental -disable-direct-intramodule-dependencies -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift  -module-name main -output-file-map ofm.json >&output2
 
 // RUN: %FileCheck -check-prefix=CHECK-STATUS-QUO-RECOMPILED %s < %t/output2
 
@@ -37,7 +37,7 @@
 // RUN: cp %t/definesPoint{-before,}.swift
 // RUN: touch -t 200101010101 %t/*.swift
 
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json -enable-direct-intramodule-dependencies >&output3
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift -module-name main -output-file-map ofm.json -enable-direct-intramodule-dependencies >&output3
 
 // Change one type - now only the user of that type rebuilds
 
@@ -46,11 +46,9 @@
 // RUN: touch -t 200101010101 %t/*.swift
 // RUN: touch -t 200301010101 %t/definesPoint.swift
 
-// RUN: cd %t && %swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift  -module-name main -output-file-map ofm.json -enable-direct-intramodule-dependencies >&output4
+// RUN: cd %t && %target-swiftc_driver -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesPoint.swift usesPoint.swift usesDisplay.swift  -module-name main -output-file-map ofm.json -enable-direct-intramodule-dependencies >&output4
 
 // RUN: %FileCheck -check-prefix=CHECK-PRIVATE-RECOMPILED %s --dump-input=always < %t/output4
 
 // CHECK-PRIVATE-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesPoint.o <= usesPoint.swift}
 // CHECK-PRIVATE-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesDisplay.o <= usesDisplay.swift}
-
-
diff --git a/test/Index/Store/driver-index.swift b/test/Index/Store/driver-index.swift
index b6737f869c1b8..a45c4f0daaf48 100644
--- a/test/Index/Store/driver-index.swift
+++ b/test/Index/Store/driver-index.swift
@@ -1,2 +1,2 @@
 // RUN: %swiftc_driver -driver-print-jobs -index-file -index-file-path %s %S/Inputs/SwiftModuleA.swift %s -o %t.output_for_index -index-store-path %t.index_store -module-name driver_index 2>&1 | %FileCheck %s
-// CHECK: {{.*}}swift{{(c\.exe")?}} -frontend -typecheck {{.*}}SwiftModuleA.swift{{"?}} -primary-file {{.*}}driver-index.swift{{"?}} {{.*}}-o {{.*}}.output_for_index{{"?}} {{.*}}-disable-typo-correction {{.*}}-index-store-path {{.*}}.index_store{{"?}} -index-system-modules
+// CHECK: {{.*}}swift{{(-frontend)?(c\.exe")?}} -frontend -typecheck {{.*}}SwiftModuleA.swift{{"?}} -primary-file {{.*}}driver-index.swift{{"?}} {{.*}}-o {{.*}}.output_for_index{{"?}} {{.*}}-disable-typo-correction {{.*}}-index-store-path {{.*}}.index_store{{"?}} -index-system-modules
diff --git a/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift b/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
index f56fd986c4460..278fb9d340760 100644
--- a/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
+++ b/test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
@@ -2,38 +2,33 @@
 
 // The iOS/arm64 target uses _Bool for Objective-C's BOOL.  We include
 // x86_64 here as well because the iOS simulator also uses _Bool.
-#if ((os(iOS) || os(tvOS)) && (arch(arm64) || arch(x86_64))) || os(watchOS)
 public struct ObjCBool {
-  private var value : Bool
+#if (os(macOS) && arch(x86_64)) || (os(iOS) && (arch(i386) || arch(arm) || targetEnvironment(macCatalyst)))
+
+  // On macOS and 32-bit iOS, Objective-C's BOOL type is a "signed char".
+  private var value: UInt8
 
   public init(_ value: Bool) {
-    self.value = value
+    self.value = value ? 1 : 0
   }
 
+  /// Allow use in a Boolean context.
   public var boolValue: Bool {
-    return value
+    return value != 0
   }
-}
-
 #else
-
-public struct ObjCBool {
-  private var value : UInt8
+  // Everywhere else it is C/C++'s "Bool"
+  private var value: Bool
 
   public init(_ value: Bool) {
-    self.value = value ? 1 : 0
-  }
-
-  public init(_ value: UInt8) {
     self.value = value
   }
 
   public var boolValue: Bool {
-    if value == 0 { return false }
-    return true
+    return value
   }
-}
 #endif
+}
 
 extension ObjCBool : ExpressibleByBooleanLiteral {
   public init(booleanLiteral: Bool) {
diff --git a/test/Interop/Cxx/class/Inputs/module.modulemap b/test/Interop/Cxx/class/Inputs/module.modulemap
index cb61582d4b941..d4460da89db64 100644
--- a/test/Interop/Cxx/class/Inputs/module.modulemap
+++ b/test/Interop/Cxx/class/Inputs/module.modulemap
@@ -21,3 +21,7 @@ module MemberVariables {
 module ProtocolConformance {
   header "protocol-conformance.h"
 }
+
+module SynthesizedInitializers {
+  header "synthesized-initializers.h"
+}
diff --git a/test/Interop/Cxx/class/Inputs/synthesized-initializers.h b/test/Interop/Cxx/class/Inputs/synthesized-initializers.h
new file mode 100644
index 0000000000000..da20bf036bd10
--- /dev/null
+++ b/test/Interop/Cxx/class/Inputs/synthesized-initializers.h
@@ -0,0 +1,5 @@
+struct EmptyStruct {};
+
+struct IntBox {
+  int x;
+};
diff --git a/test/Interop/Cxx/class/synthesized-initializers.swift b/test/Interop/Cxx/class/synthesized-initializers.swift
new file mode 100644
index 0000000000000..ea74f8ab4eecb
--- /dev/null
+++ b/test/Interop/Cxx/class/synthesized-initializers.swift
@@ -0,0 +1,46 @@
+// RUN: %target-swift-frontend -I %S/Inputs -enable-cxx-interop -emit-silgen %s | %FileCheck %s
+
+import SynthesizedInitializers
+
+// CHECK-LABEL: sil shared [transparent] [serializable] [ossa] @$sSo11EmptyStructVABycfC : $@convention(method) (@thin EmptyStruct.Type) -> EmptyStruct
+// CHECK: bb0(%{{[0-9]+}} : $@thin EmptyStruct.Type):
+// CHECK-NEXT: [[BOX:%.*]] = alloc_box ${ var EmptyStruct }
+// CHECK-NEXT: [[UNINIT:%.*]] = mark_uninitialized [rootself] [[BOX]] : ${ var EmptyStruct }
+// CHECK-NEXT: [[PTR:%.*]] = project_box [[UNINIT]] : ${ var EmptyStruct }, 0
+// CHECK-NEXT: [[OBJ:%.*]] = builtin "zeroInitializer"<EmptyStruct>() : $EmptyStruct
+// CHECK-NEXT: [[PA:%.*]] = begin_access [modify] [unknown] [[PTR]] : $*EmptyStruct
+// CHECK-NEXT: assign [[OBJ]] to [[PA]]
+// CHECK-NEXT: end_access [[PA]]
+// CHECK-NEXT: [[OUT:%.*]] = load [trivial] [[PTR]]
+// CHECK-NEXT: destroy_value [[UNINIT]]
+// CHECK-NEXT: return [[OUT]]
+// CHECK-LABEL: end sil function '$sSo11EmptyStructVABycfC'
+public func emptyTypeNoArgInit() {
+  let e = EmptyStruct()
+}
+
+// CHECK-LABEL: sil shared [transparent] [serializable] [ossa] @$sSo6IntBoxVABycfC : $@convention(method) (@thin IntBox.Type) -> IntBox
+// CHECK: bb0(%{{[0-9]+}} : $@thin IntBox.Type):
+// CHECK-NEXT: [[BOX:%.*]] = alloc_box ${ var IntBox }
+// CHECK-NEXT: [[UNINIT:%.*]] = mark_uninitialized [rootself] [[BOX]] : ${ var IntBox }
+// CHECK-NEXT: [[PTR:%.*]] = project_box [[UNINIT]] : ${ var IntBox }, 0
+// CHECK-NEXT: [[OBJ:%.*]] = builtin "zeroInitializer"<IntBox>() : $IntBox
+// CHECK-NEXT: [[PA:%.*]] = begin_access [modify] [unknown] [[PTR]] : $*IntBox
+// CHECK-NEXT: assign [[OBJ]] to [[PA]]
+// CHECK-NEXT: end_access [[PA]]
+// CHECK-NEXT: [[OUT:%.*]] = load [trivial] [[PTR]]
+// CHECK-NEXT: destroy_value [[UNINIT]]
+// CHECK-NEXT: return [[OUT]]
+// CHECK-LABEL: end sil function '$sSo6IntBoxVABycfC'
+public func singleMemberTypeNoArgInit() {
+  let i = IntBox()
+}
+
+// CHECK-LABEL: sil shared [transparent] [serializable] [ossa] @$sSo6IntBoxV1xABs5Int32V_tcfC : $@convention(method) (Int32, @thin IntBox.Type) -> IntBox
+// CHECK: bb0([[I:%[0-9]+]] : $Int32, %{{[0-9]+}} : $@thin IntBox.Type):
+// CHECK-NEXT: [[S:%.*]] = struct $IntBox ([[I]] : $Int32)
+// CHECK-NEXT: return [[S]]
+// CHECK-LABEL: end sil function '$sSo6IntBoxV1xABs5Int32V_tcfC'
+public func singleMemberTypeValueInit() {
+  let i = IntBox(x: 42)
+}
diff --git a/test/Interop/Cxx/extern-var/extern-var-silgen.swift b/test/Interop/Cxx/extern-var/extern-var-silgen.swift
index 08d06c316e3dd..ccc81163cab78 100644
--- a/test/Interop/Cxx/extern-var/extern-var-silgen.swift
+++ b/test/Interop/Cxx/extern-var/extern-var-silgen.swift
@@ -7,9 +7,9 @@ func getCounter() -> CInt {
 }
 
 // CHECK: // clang name: counter
-// CHECK: sil_global @counter : $Int32
+// CHECK: sil_global public_external @counter : $Int32
 // CHECK: // clang name: Namespaced::counter
-// CHECK: sil_global @{{_ZN10Namespaced7counterE|\?counter@Namespaced@@3HA}} : $Int32
+// CHECK: sil_global public_external @{{_ZN10Namespaced7counterE|\?counter@Namespaced@@3HA}} : $Int32
 
 // CHECK: sil hidden @$s4main10getCounters5Int32VyF : $@convention(thin) () -> Int32
 // CHECK: [[COUNTER:%.*]] = global_addr @counter : $*Int32
diff --git a/test/Interop/Cxx/operators/Inputs/member-inline.h b/test/Interop/Cxx/operators/Inputs/member-inline.h
new file mode 100644
index 0000000000000..8204aa0644848
--- /dev/null
+++ b/test/Interop/Cxx/operators/Inputs/member-inline.h
@@ -0,0 +1,9 @@
+#ifndef TEST_INTEROP_CXX_OPERATORS_INPUTS_MEMBER_INLINE_H
+#define TEST_INTEROP_CXX_OPERATORS_INPUTS_MEMBER_INLINE_H
+
+struct IntBox {
+  int value;
+  IntBox operator+(IntBox rhs) { return IntBox{.value = value + rhs.value}; }
+};
+
+#endif
diff --git a/test/Interop/Cxx/operators/Inputs/module.modulemap b/test/Interop/Cxx/operators/Inputs/module.modulemap
index 2cc3fa14cd834..a811dbe61fa0e 100644
--- a/test/Interop/Cxx/operators/Inputs/module.modulemap
+++ b/test/Interop/Cxx/operators/Inputs/module.modulemap
@@ -1,3 +1,7 @@
+module MemberInline {
+  header "member-inline.h"
+}
+
 module NonMemberInline {
   header "non-member-inline.h"
 }
diff --git a/test/Interop/Cxx/operators/Inputs/non-member-inline.h b/test/Interop/Cxx/operators/Inputs/non-member-inline.h
index 7704289b1ab1e..1190360ffa2ab 100644
--- a/test/Interop/Cxx/operators/Inputs/non-member-inline.h
+++ b/test/Interop/Cxx/operators/Inputs/non-member-inline.h
@@ -41,6 +41,26 @@ inline IntBox operator>>(IntBox lhs, IntBox rhs) {
   return IntBox{.value = lhs.value >> rhs.value};
 }
 
+inline bool operator<(IntBox lhs, IntBox rhs) { return lhs.value < rhs.value; }
+
+inline bool operator>(IntBox lhs, IntBox rhs) { return lhs.value > rhs.value; }
+
+inline bool operator==(IntBox lhs, IntBox rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline bool operator!=(IntBox lhs, IntBox rhs) {
+  return lhs.value != rhs.value;
+}
+
+inline bool operator<=(IntBox lhs, IntBox rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline bool operator>=(IntBox lhs, IntBox rhs) {
+  return lhs.value != rhs.value;
+}
+
 struct BoolBox {
   bool value;
 };
diff --git a/test/Interop/Cxx/operators/member-inline-irgen.swift b/test/Interop/Cxx/operators/member-inline-irgen.swift
new file mode 100644
index 0000000000000..797682073a393
--- /dev/null
+++ b/test/Interop/Cxx/operators/member-inline-irgen.swift
@@ -0,0 +1,11 @@
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+//
+// We can't yet call member functions correctly on Windows (SR-13129).
+// XFAIL: OS=windows-msvc
+
+import MemberInline
+
+public func add(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
+
+// CHECK: call [[RES:i32|i64]] [[NAME:@(_ZN6IntBoxplES_|"\?\?HIntBox@@QEAA\?AU0@U0@@Z")]](%struct.IntBox* {{%[0-9]+}}, {{i32|\[1 x i32\]|i64|%struct.IntBox\* byval align 4}} {{%[0-9]+}})
+// CHECK: define linkonce_odr [[RES]] [[NAME]](%struct.IntBox* %this, {{i32 %rhs.coerce|\[1 x i32\] %rhs.coerce|i64 %rhs.coerce|%struct.IntBox\* byval\(%struct.IntBox\) align 4 %rhs}})
diff --git a/test/Interop/Cxx/operators/member-inline-module-interface.swift b/test/Interop/Cxx/operators/member-inline-module-interface.swift
new file mode 100644
index 0000000000000..aef362f01c207
--- /dev/null
+++ b/test/Interop/Cxx/operators/member-inline-module-interface.swift
@@ -0,0 +1,5 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=MemberInline -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK: struct IntBox {
+// CHECK:   static func + (lhs: inout IntBox, rhs: IntBox) -> IntBox
+// CHECK: }
diff --git a/test/Interop/Cxx/operators/member-inline-silgen.swift b/test/Interop/Cxx/operators/member-inline-silgen.swift
new file mode 100644
index 0000000000000..96d89a4a4fa86
--- /dev/null
+++ b/test/Interop/Cxx/operators/member-inline-silgen.swift
@@ -0,0 +1,14 @@
+// RUN: %target-swift-emit-sil %s -I %S/Inputs -enable-cxx-interop | %FileCheck %s
+
+import MemberInline
+
+public func add(_ lhs: inout IntBox, _ rhs: IntBox) -> IntBox { lhs + rhs }
+
+// CHECK: bb0([[SELF:%.*]] : $*IntBox, [[RHS:%.*]] : $IntBox):
+
+// CHECK: [[SELFACCESS:%.*]] = begin_access [modify] [static] [[SELF]] : $*IntBox
+// CHECK: [[OP:%.*]] = function_ref [[NAME:@(_ZN6IntBoxplES_|\?\?HIntBox@@QEAA\?AU0@U0@@Z)]] : $@convention(c) (@inout IntBox, IntBox) -> IntBox
+// CHECK: apply [[OP]]([[SELFACCESS]], [[RHS]]) : $@convention(c) (@inout IntBox, IntBox) -> IntBox
+// CHECK: end_access [[SELFACCESS]] : $*IntBox
+
+// CHECK: sil [clang IntBox."+"] [[NAME]] : $@convention(c) (@inout IntBox, IntBox) -> IntBox
diff --git a/test/Interop/Cxx/operators/member-inline-typechecker.swift b/test/Interop/Cxx/operators/member-inline-typechecker.swift
new file mode 100644
index 0000000000000..635875a05c71b
--- /dev/null
+++ b/test/Interop/Cxx/operators/member-inline-typechecker.swift
@@ -0,0 +1,8 @@
+// RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-cxx-interop
+
+import MemberInline
+
+var lhs = IntBox(value: 42)
+let rhs = IntBox(value: 23)
+
+let resultPlus = lhs + rhs
diff --git a/test/Interop/Cxx/operators/member-inline.swift b/test/Interop/Cxx/operators/member-inline.swift
new file mode 100644
index 0000000000000..0313d849da70b
--- /dev/null
+++ b/test/Interop/Cxx/operators/member-inline.swift
@@ -0,0 +1,22 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+//
+// We can't yet call member functions correctly on Windows (SR-13129).
+// XFAIL: OS=windows-msvc
+
+import MemberInline
+import StdlibUnittest
+
+var OperatorsTestSuite = TestSuite("Operators")
+
+OperatorsTestSuite.test("plus") {
+  var lhs = IntBox(value: 42)
+  let rhs = IntBox(value: 23)
+
+  let result = lhs + rhs
+
+  expectEqual(65, result.value)
+}
+
+runAllTests()
diff --git a/test/Interop/Cxx/operators/non-member-inline-module-interface.swift b/test/Interop/Cxx/operators/non-member-inline-module-interface.swift
index 36970d2fd2ddf..561c6077de5a5 100644
--- a/test/Interop/Cxx/operators/non-member-inline-module-interface.swift
+++ b/test/Interop/Cxx/operators/non-member-inline-module-interface.swift
@@ -9,6 +9,12 @@
 // CHECK-NEXT: func | (lhs: IntBox, rhs: IntBox) -> IntBox
 // CHECK-NEXT: func << (lhs: IntBox, rhs: IntBox) -> IntBox
 // CHECK-NEXT: func >> (lhs: IntBox, rhs: IntBox) -> IntBox
+// CHECK-NEXT: func < (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func > (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func == (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func != (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func <= (lhs: IntBox, rhs: IntBox) -> Bool
+// CHECK-NEXT: func >= (lhs: IntBox, rhs: IntBox) -> Bool
 
 // CHECK:      func && (lhs: BoolBox, rhs: BoolBox) -> BoolBox
 // CHECK-NEXT: func || (lhs: BoolBox, rhs: BoolBox) -> BoolBox
diff --git a/test/Interop/Cxx/operators/non-member-inline-typechecker.swift b/test/Interop/Cxx/operators/non-member-inline-typechecker.swift
index ca4585b5a097a..a3f5a0c4b049c 100644
--- a/test/Interop/Cxx/operators/non-member-inline-typechecker.swift
+++ b/test/Interop/Cxx/operators/non-member-inline-typechecker.swift
@@ -14,6 +14,12 @@ let resultAmp = lhs & rhs
 let resultPipe = lhs | rhs
 let resultLessLess = lhs << rhs
 let resultGreaterGreater = lhs >> rhs
+let resultLess = lhs < rhs
+let resultGreater = lhs > rhs
+let resultEqualEqual = lhs == rhs
+let resultExclaimEqual = lhs != rhs
+let resultLessEqual = lhs <= rhs
+let resultGreaterEqual = lhs >= rhs
 
 var lhsBool = BoolBox(value: true)
 var rhsBool = BoolBox(value: false)
diff --git a/test/Interop/Cxx/operators/non-member-inline.swift b/test/Interop/Cxx/operators/non-member-inline.swift
index 8d23461d9cd06..9ea763827d70f 100644
--- a/test/Interop/Cxx/operators/non-member-inline.swift
+++ b/test/Interop/Cxx/operators/non-member-inline.swift
@@ -43,7 +43,7 @@ OperatorsTestSuite.test("slash (/)") {
   expectEqual(1, result.value)
 }
 
-OperatorsTestSuite.test("percent") {
+OperatorsTestSuite.test("percent (%)") {
   let lhs = IntBox(value: 11)
   let rhs = IntBox(value: 2)
 
@@ -52,7 +52,7 @@ OperatorsTestSuite.test("percent") {
   expectEqual(1, result.value)
 }
 
-OperatorsTestSuite.test("amp") {
+OperatorsTestSuite.test("amp (&)") {
   let lhs = IntBox(value: 6)
   let rhs = IntBox(value: 5)
 
@@ -61,7 +61,7 @@ OperatorsTestSuite.test("amp") {
   expectEqual(4, result.value)
 }
 
-OperatorsTestSuite.test("pipe") {
+OperatorsTestSuite.test("pipe (|)") {
   let lhs = IntBox(value: 6)
   let rhs = IntBox(value: 5)
 
@@ -70,6 +70,24 @@ OperatorsTestSuite.test("pipe") {
   expectEqual(7, result.value)
 }
 
+OperatorsTestSuite.test("less (<)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 6)
+
+  let result = lhs < rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("greater (>)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 6)
+
+  let result = lhs > rhs
+
+  expectEqual(false, result)
+}
+
 OperatorsTestSuite.test("less less (<<)") {
   let lhs = IntBox(value: 2)
   let rhs = IntBox(value: 4)
@@ -88,6 +106,42 @@ OperatorsTestSuite.test("greater greater (>>)") {
   expectEqual(2, result.value)
 }
 
+OperatorsTestSuite.test("equal equal (==)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs == rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("exclaim equal (!=)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs != rhs
+
+  expectEqual(false, result)
+}
+
+OperatorsTestSuite.test("less equal (<=)") {
+  let lhs = IntBox(value: 5)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs <= rhs
+
+  expectEqual(true, result)
+}
+
+OperatorsTestSuite.test("greater equal (>=)") {
+  let lhs = IntBox(value: 6)
+  let rhs = IntBox(value: 5)
+
+  let result = lhs >= rhs
+
+  expectEqual(true, result)
+}
+
 OperatorsTestSuite.test("amp amp (&&)") {
   let lhs = BoolBox(value: true)
   let rhs = BoolBox(value: false)
diff --git a/test/Interop/Cxx/static/inline-static-member-var-silgen.swift b/test/Interop/Cxx/static/inline-static-member-var-silgen.swift
index 4779f3b68cce1..9def284cffd19 100644
--- a/test/Interop/Cxx/static/inline-static-member-var-silgen.swift
+++ b/test/Interop/Cxx/static/inline-static-member-var-silgen.swift
@@ -7,7 +7,7 @@ func readStaticMember() -> CInt {
 }
 
 // CHECK: // clang name: WithInlineStaticMember::staticMember
-// CHECK: sil_global @{{_ZN22WithInlineStaticMember12staticMemberE|\?staticMember@WithInlineStaticMember@@2HA}} : $Int32
+// CHECK: sil_global public_external @{{_ZN22WithInlineStaticMember12staticMemberE|\?staticMember@WithInlineStaticMember@@2HA}} : $Int32
 
 // CHECK: sil hidden @$s4main16readStaticMembers5Int32VyF : $@convention(thin) () -> Int32
 // CHECK: [[ADDR:%.*]] = global_addr @{{_ZN22WithInlineStaticMember12staticMemberE|\?staticMember@WithInlineStaticMember@@2HA}} : $*Int32
diff --git a/test/Interop/Cxx/static/static-member-var-silgen.swift b/test/Interop/Cxx/static/static-member-var-silgen.swift
index 9723daa86652c..946928e048f8e 100644
--- a/test/Interop/Cxx/static/static-member-var-silgen.swift
+++ b/test/Interop/Cxx/static/static-member-var-silgen.swift
@@ -1,15 +1,15 @@
 // RUN: %target-swift-emit-sil -I %S/Inputs -enable-cxx-interop %s | %FileCheck %s
 
 // CHECK: // clang name: WithStaticMember::staticMember
-// CHECK: sil_global @{{_ZN16WithStaticMember12staticMemberE|\?staticMember@WithStaticMember@@2HA}} : $Int32
+// CHECK: sil_global public_external @{{_ZN16WithStaticMember12staticMemberE|\?staticMember@WithStaticMember@@2HA}} : $Int32
 // CHECK: // clang name: WithIncompleteStaticMember::selfMember
-// CHECK: sil_global @{{_ZN26WithIncompleteStaticMember10selfMemberE|\?selfMember@WithIncompleteStaticMember@@2V1@A}} : $WithIncompleteStaticMember
+// CHECK: sil_global public_external @{{_ZN26WithIncompleteStaticMember10selfMemberE|\?selfMember@WithIncompleteStaticMember@@2V1@A}} : $WithIncompleteStaticMember
 // CHECK: // clang name: WithConstStaticMember::defined
-// CHECK: sil_global [let] @{{_ZN21WithConstStaticMember7definedE|\?defined@WithConstStaticMember@@2HB}} : $Int32
+// CHECK: sil_global public_external [let] @{{_ZN21WithConstStaticMember7definedE|\?defined@WithConstStaticMember@@2HB}} : $Int32
 // CHECK: // clang name: WithConstStaticMember::definedOutOfLine
-// CHECK: sil_global [let] @{{_ZN21WithConstStaticMember16definedOutOfLineE|\?definedOutOfLine@WithConstStaticMember@@2HB}} : $Int32
+// CHECK: sil_global public_external [let] @{{_ZN21WithConstStaticMember16definedOutOfLineE|\?definedOutOfLine@WithConstStaticMember@@2HB}} : $Int32
 // CHECK: // clang name: WithConstexprStaticMember::definedInline
-// CHECK: sil_global [let] @{{_ZN25WithConstexprStaticMember13definedInlineE|\?definedInline@WithConstexprStaticMember@@2HB}} : $Int32
+// CHECK: sil_global public_external [let] @{{_ZN25WithConstexprStaticMember13definedInlineE|\?definedInline@WithConstexprStaticMember@@2HB}} : $Int32
 
 import StaticMemberVar
 
diff --git a/test/Interop/Cxx/static/static-var-silgen.swift b/test/Interop/Cxx/static/static-var-silgen.swift
index 285bcfea4e8be..f76792b41b77c 100644
--- a/test/Interop/Cxx/static/static-var-silgen.swift
+++ b/test/Interop/Cxx/static/static-var-silgen.swift
@@ -9,25 +9,25 @@ func initStaticVars() -> CInt {
 }
 
 // CHECK: // clang name: staticVar
-// CHECK: sil_global @staticVar : $Int32
+// CHECK: sil_global public_external @staticVar : $Int32
 // CHECK: // clang name: staticVarInit
-// CHECK: sil_global @staticVarInit : $Int32
+// CHECK: sil_global public_external @staticVarInit : $Int32
 // CHECK: // clang name: staticVarInlineInit
-// CHECK: sil_global @staticVarInlineInit : $Int32
+// CHECK: sil_global public_external @staticVarInlineInit : $Int32
 // CHECK: // clang name: staticConst
-// CHECK: sil_global [let] @staticConst : $Int32
+// CHECK: sil_global public_external [let] @staticConst : $Int32
 // CHECK: // clang name: staticConstInit
-// CHECK: sil_global [let] @staticConstInit : $Int32
+// CHECK: sil_global public_external [let] @staticConstInit : $Int32
 // CHECK: // clang name: staticConstInlineInit
-// CHECK: sil_global [let] @staticConstInlineInit : $Int32
+// CHECK: sil_global public_external [let] @staticConstInlineInit : $Int32
 // CHECK: // clang name: staticConstexpr
-// CHECK: sil_global [let] @staticConstexpr : $Int32
+// CHECK: sil_global public_external [let] @staticConstexpr : $Int32
 // CHECK: // clang name: staticNonTrivial
-// CHECK: sil_global @staticNonTrivial : $NonTrivial
+// CHECK: sil_global public_external @staticNonTrivial : $NonTrivial
 // CHECK: // clang name: staticConstNonTrivial
-// CHECK: sil_global [let] @staticConstNonTrivial : $NonTrivial
+// CHECK: sil_global public_external [let] @staticConstNonTrivial : $NonTrivial
 // CHECK: // clang name: staticConstexprNonTrivial
-// CHECK: sil_global [let] @staticConstexprNonTrivial : $NonTrivial
+// CHECK: sil_global public_external [let] @staticConstexprNonTrivial : $NonTrivial
 
 func readStaticVar() -> CInt {
   return staticVar
diff --git a/test/Interpreter/Inputs/availability_host_os.h b/test/Interpreter/Inputs/availability_host_os.h
index aaab1ee10f87a..b6fc096f9548c 100644
--- a/test/Interpreter/Inputs/availability_host_os.h
+++ b/test/Interpreter/Inputs/availability_host_os.h
@@ -2,5 +2,5 @@
 static inline int mavericks() { return 9; }
  __attribute__((availability(macosx,introduced=10.10)))
 static inline int yosemite() { return 10; }
- __attribute__((availability(macosx,introduced=10.99)))
+ __attribute__((availability(macosx,introduced=99.99)))
 static inline int todosSantos() { return 99; }
diff --git a/test/Interpreter/SDK/Accelerate.swift b/test/Interpreter/SDK/Accelerate.swift
deleted file mode 100644
index 416e9d5a298f3..0000000000000
--- a/test/Interpreter/SDK/Accelerate.swift
+++ /dev/null
@@ -1,79 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-//
-// vU1024Divide() is only available on OS X.
-// REQUIRES: OS=macosx
-
-import Accelerate
-
-extension vU1024: ExpressibleByIntegerLiteral, CustomStringConvertible, Equatable {
-  public init(integerLiteral: Int) {
-    var integerLiteral = integerLiteral
-    self.init()
-    memcpy(&self, &integerLiteral, MemoryLayout<Int>.size)
-  }
-
-  init(_ int: Int) {
-    self.init(integerLiteral: int)
-  }
-
-  public var description: String {
-    if self == 0 {
-      return "0"
-    }
-    var digits: [Character] = []
-    var intermediate = self
-    var digit: vU1024 = 0
-    repeat {
-      (intermediate, digit) = quorem(intermediate, 10)
-      digits.append(Character(UnicodeScalar(Int(digit) + 48)!))
-    } while intermediate != 0
-    return String(digits.reversed())
-  }
-}
-
-extension Int {
-  init(_ u1024: vU1024) {
-    var u1024 = u1024
-    // NB: Doesn't overflow check
-    self.init()
-    memcpy(&self, &u1024, MemoryLayout<Int>.size)
-  }
-}
-
-func *(x: vU1024, y: vU1024) -> vU1024 {
-  var x = x
-  var y = y
-  var result = vU1024()
-  vU1024HalfMultiply(&x, &y, &result)
-  return result
-}
-
-func quorem(_ x: vU1024, _ y: vU1024) -> (vU1024, vU1024) {
-  var x = x
-  var y = y
-  var quo = vU1024()
-  var rem = vU1024()
-  vU1024Divide(&x, &y, &quo, &rem)
-  return (quo, rem)
-}
-
-public func ==(x: vU1024, y: vU1024) -> Bool {
-  var x = x
-  var y = y
-  return memcmp(&x, &y, MemoryLayout<vU1024>.size) == 0
-}
-
-func factorial(_ x: Int) -> vU1024 {
-  var result: vU1024 = 1
-
-  for i in 1...x {
-    result = result * vU1024(i)
-  }
-
-  return result
-}
-
-// CHECK: 7257415615307998967396728211129263114716991681296451376543577798900561843401706157852350749242617459511490991237838520776666022565442753025328900773207510902400430280058295603966612599658257104398558294257568966313439612262571094946806711205568880457193340212661452800000000000000000000000000000000000000000
-print(factorial(170))
-
diff --git a/test/Interpreter/SDK/UIActionSheetHack.swift b/test/Interpreter/SDK/UIActionSheetHack.swift
deleted file mode 100644
index 442ff55d494a7..0000000000000
--- a/test/Interpreter/SDK/UIActionSheetHack.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-// RUN: %target-run-simple-swift | %FileCheck %s
-// REQUIRES: executable_test
-// REQUIRES: OS=ios
-
-import UIKit
-
-let actionSheet = UIActionSheet(title: nil, delegate: nil, cancelButtonTitle: "ABC", destructiveButtonTitle: "DEF")
-
-// CHECK: <UIActionSheet: 0x{{.+}}>{{$}}
-print(actionSheet.description)
-// CHECK-NEXT: 0
-print(actionSheet.destructiveButtonIndex)
-// CHECK-NEXT: 2
-print(actionSheet.numberOfButtons)
-
-
-let actionSheet2 = UIActionSheet(title: nil, delegate: nil, cancelButtonTitle: "ABC", destructiveButtonTitle: "DEF", otherButtonTitles: "G", "H")
-
-// CHECK: <UIActionSheet: 0x{{.+}}>{{$}}
-print(actionSheet2.description)
-// CHECK-NEXT: 0
-print(actionSheet2.destructiveButtonIndex)
-// CHECK-NEXT: 4
-print(actionSheet2.numberOfButtons)
-
-
-let alertView = UIAlertView(title: "Error", message: "The operation completed successfully.", delegate: nil, cancelButtonTitle: "Abort")
-
-// CHECK: <UIAlertView: 0x{{.+}}>{{$}}
-print(alertView.description)
-// CHECK-NEXT: 0
-print(alertView.cancelButtonIndex)
-// CHECK-NEXT: 1
-print(alertView.numberOfButtons)
-
-
-let alertView2 = UIAlertView(title: "Error", message: "The operation completed successfully.", delegate: nil, cancelButtonTitle: "Abort", otherButtonTitles: "Cry", "Apologize")
-
-// CHECK: <UIAlertView: 0x{{.+}}>{{$}}
-print(alertView2.description)
-// CHECK-NEXT: 0
-print(alertView2.cancelButtonIndex)
-// CHECK-NEXT: 3
-print(alertView2.numberOfButtons)
-
diff --git a/test/Interpreter/SDK/autolinking.swift b/test/Interpreter/SDK/autolinking.swift
index 74391d2669a84..02d2252e8a96c 100644
--- a/test/Interpreter/SDK/autolinking.swift
+++ b/test/Interpreter/SDK/autolinking.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: echo "int global() { return 42; }" | %clang -dynamiclib -o %t/libLinkMe.dylib -x c -
+// RUN: echo "int global() { return 42; }" | %clang -dynamiclib -o %t/libLinkMe.dylib -x c -L %sdk/usr/lib -
 // RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name LinkMe -module-link-name LinkMe %S/../../Inputs/empty.swift
 
 // RUN: %target-jit-run -DIMPORT %s -I %t -L %t 2>&1
@@ -36,7 +36,11 @@ if global() != 42 {
 
 let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
 if dlsym(RTLD_DEFAULT, "global") == nil {
-  print(String(cString: dlerror()))
+  if let err = dlerror() {
+    print(String(cString: err))
+  } else {
+    print("Unknown dlsym error")
+  }
   exit(EXIT_FAILURE)
 }
 #endif
diff --git a/test/Interpreter/SDK/c_pointers.swift b/test/Interpreter/SDK/c_pointers.swift
index 062a6660b3f0e..0c2d79b296fd6 100644
--- a/test/Interpreter/SDK/c_pointers.swift
+++ b/test/Interpreter/SDK/c_pointers.swift
@@ -7,13 +7,14 @@
 // REQUIRES: objc_interop
 
 import Foundation
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
 typealias XXColor = NSColor
-#endif
-#if os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(UIKit)
 import UIKit
 typealias XXColor = UIColor
+#else
+#error("Unsupported platform")
 #endif
 
 
diff --git a/test/Interpreter/SDK/cf_extensions.swift b/test/Interpreter/SDK/cf_extensions.swift
index 9dcc3cb9e918d..91d37d5149796 100644
--- a/test/Interpreter/SDK/cf_extensions.swift
+++ b/test/Interpreter/SDK/cf_extensions.swift
@@ -6,12 +6,12 @@
 import Foundation
 import StdlibUnittest
 
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
-#endif
-
-#if os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(UIKit)
 import UIKit
+#else
+#error("Unsupported platform")
 #endif
 
 extension CGColorSpace {
diff --git a/test/Interpreter/SDK/cf_type_bridging.swift b/test/Interpreter/SDK/cf_type_bridging.swift
index 23dfa86d40419..6b592464ba735 100644
--- a/test/Interpreter/SDK/cf_type_bridging.swift
+++ b/test/Interpreter/SDK/cf_type_bridging.swift
@@ -3,11 +3,12 @@
 
 // REQUIRES: objc_interop
 
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
-#endif
-#if os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(UIKit)
 import UIKit
+#else
+#error("Unsupported platform")
 #endif
 
 let foo: [CGColor] =
diff --git a/test/Interpreter/SDK/interpret_with_options.swift b/test/Interpreter/SDK/interpret_with_options.swift
index c427e0b9b4cc5..22e95023c2a8f 100644
--- a/test/Interpreter/SDK/interpret_with_options.swift
+++ b/test/Interpreter/SDK/interpret_with_options.swift
@@ -5,6 +5,7 @@
 // RUN: cd %S && %swift_driver -sdk %sdk -lInputs/libTestLoad.dylib %s | %FileCheck -check-prefix=WITH-LIB %s
 // REQUIRES: OS=macosx
 // REQUIRES: executable_test
+// REQUIRES: swift_interpreter
 
 import ObjectiveC
 
diff --git a/test/Interpreter/SDK/libc.swift b/test/Interpreter/SDK/libc.swift
index 0515cde35f671..9e91f9833befe 100644
--- a/test/Interpreter/SDK/libc.swift
+++ b/test/Interpreter/SDK/libc.swift
@@ -9,9 +9,9 @@
 // TODO: rdar://problem/33388782
 // REQUIRES: CPU=x86_64
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/Interpreter/availability_host_os.swift b/test/Interpreter/availability_host_os.swift
index 17eeffcb79b5a..3078ae252b5c4 100644
--- a/test/Interpreter/availability_host_os.swift
+++ b/test/Interpreter/availability_host_os.swift
@@ -8,11 +8,12 @@
 
 // REQUIRES: OS=macosx
 // REQUIRES: executable_test
+// REQUIRES: swift_interpreter
 
 print(mavericks()) // CHECK: {{^9$}}
 print(yosemite()) // CHECK-NEXT: {{^10$}}
 
 #if FAIL
-print(todosSantos()) // expected-error {{'todosSantos()' is only available in macOS 10.99 or newer}}
+print(todosSantos()) // expected-error {{'todosSantos()' is only available in macOS 99.99 or newer}}
 // expected-note@-1 {{add 'if #available' version check}}
 #endif
diff --git a/test/Interpreter/dynamicReplacement_property_observer.swift b/test/Interpreter/dynamicReplacement_property_observer.swift
index 0a4900154527a..ae1f435c81bcd 100644
--- a/test/Interpreter/dynamicReplacement_property_observer.swift
+++ b/test/Interpreter/dynamicReplacement_property_observer.swift
@@ -11,9 +11,9 @@
 
 @_private(sourceFile: "dynamic_replacement_property_observer_orig.swift") import TestDidWillSet
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -23,7 +23,7 @@
 #endif
 
 private func target_library_name(_ name: String) -> String {
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   return "lib\(name).dylib"
 #elseif os(Windows)
   return "\(name).dll"
diff --git a/test/Interpreter/dynamic_replacement.swift b/test/Interpreter/dynamic_replacement.swift
index 009ac71c2150a..8518de95e7c80 100644
--- a/test/Interpreter/dynamic_replacement.swift
+++ b/test/Interpreter/dynamic_replacement.swift
@@ -104,10 +104,9 @@
 import Module1
 
 import StdlibUnittest
-
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -175,7 +174,7 @@ func checkExpectedResults(forOriginalLibrary useOrig: Bool) {
 }
 
 private func target_library_name(_ name: String) -> String {
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   return "lib\(name).dylib"
 #elseif os(Windows)
   return "\(name).dll"
diff --git a/test/Interpreter/dynamic_replacement_chaining.swift b/test/Interpreter/dynamic_replacement_chaining.swift
index 8aeda5b0aca13..421ed96996d0d 100644
--- a/test/Interpreter/dynamic_replacement_chaining.swift
+++ b/test/Interpreter/dynamic_replacement_chaining.swift
@@ -25,9 +25,9 @@ import A
 
 import StdlibUnittest
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -39,7 +39,7 @@ import StdlibUnittest
 var DynamicallyReplaceable = TestSuite("DynamicallyReplaceableChaining")
 
 func target_library_name(_ name: String) -> String {
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   return "lib\(name).dylib"
 #elseif os(Windows)
   return "\(name).dll"
diff --git a/test/Interpreter/dynamic_replacement_without_previous_calls.swift b/test/Interpreter/dynamic_replacement_without_previous_calls.swift
index a67a7834f0b71..bc7301e816f60 100644
--- a/test/Interpreter/dynamic_replacement_without_previous_calls.swift
+++ b/test/Interpreter/dynamic_replacement_without_previous_calls.swift
@@ -11,9 +11,9 @@ import Module1
 
 import StdlibUnittest
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -23,7 +23,7 @@ import StdlibUnittest
 #endif
 
 private func target_library_name(_ name: String) -> String {
-#if os(iOS) || os(macOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   return "lib\(name).dylib"
 #elseif os(Windows)
   return "\(name).dll"
diff --git a/test/Interpreter/generic_casts.swift b/test/Interpreter/generic_casts.swift
index 99941a08524d6..73f1837d20ab9 100644
--- a/test/Interpreter/generic_casts.swift
+++ b/test/Interpreter/generic_casts.swift
@@ -1,9 +1,10 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -Onone %s -o %t/a.out
-// RUN: %target-run %t/a.out | %FileCheck --check-prefix CHECK --check-prefix CHECK-ONONE %s
 // RUN: %target-build-swift -O %s -o %t/a.out.optimized
 // RUN: %target-codesign %t/a.out.optimized
-// RUN: %target-run %t/a.out.optimized | %FileCheck %s
+//
+// RUN: %target-run %t/a.out | %FileCheck --check-prefix CHECK %s
+// RUN: %target-run %t/a.out.optimized | %FileCheck --check-prefix CHECK %s
 // REQUIRES: executable_test
 
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
@@ -140,48 +141,56 @@ class PC: P {}
 class PCSub: PC {}
 
 // `is` checks
-func nongenericAnyIsPConforming(type: Any.Type) -> Bool {
+func nongenericAnyIsPType(type: Any.Type) -> Bool {
   // `is P.Type` tests whether the argument conforms to `P`
   // Note:  this can only be true for a concrete type, never a protocol
   return type is P.Type
 }
-func nongenericAnyIsPSubtype(type: Any.Type) -> Bool {
+func nongenericAnyIsPProtocol(type: Any.Type) -> Bool {
+  // `P.Protocol` is the metatype for `P` (the type of `P.self`)
   // `is P.Protocol` tests whether the argument is a subtype of `P`
   // In particular, it is true for `P.self`
   return type is P.Protocol
 }
-func nongenericAnyIsPAndAnyObjectConforming(type: Any.Type) -> Bool {
+func nongenericAnyIsPAndAnyObjectType(type: Any.Type) -> Bool {
   return type is (P & AnyObject).Type
 }
-func nongenericAnyIsPAndPCSubConforming(type: Any.Type) -> Bool {
+func nongenericAnyIsPAndAnyObjectProtocol(type: Any.Type) -> Bool {
+  return type is (P & AnyObject).Protocol
+}
+func nongenericAnyIsPAndPCSubType(type: Any.Type) -> Bool {
   return type is (P & PCSub).Type
 }
 func genericAnyIs<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
   // If we're testing against a runtime that doesn't have the fix this tests,
   // just pretend we got it right.
   if #available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *) {
+    // Remember: If `T` is bound to `P`, then `T.Type` is `P.Protocol`
     return type is T.Type
   } else {
     return expected
   }
 }
 // `as?` checks
-func nongenericAnyAsConditionalPConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsConditionalPType(type: Any.Type) -> Bool {
   return (type as? P.Type) != nil
 }
-func nongenericAnyAsConditionalPSubtype(type: Any.Type) -> Bool {
+func nongenericAnyAsConditionalPProtocol(type: Any.Type) -> Bool {
   return (type as? P.Protocol) != nil
 }
-func nongenericAnyAsConditionalPAndAnyObjectConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsConditionalPAndAnyObjectType(type: Any.Type) -> Bool {
   return (type as? (P & AnyObject).Type) != nil
 }
-func nongenericAnyAsConditionalPAndPCSubConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsConditionalPAndAnyObjectProtocol(type: Any.Type) -> Bool {
+  return (type as? (P & AnyObject).Protocol) != nil
+}
+func nongenericAnyAsConditionalPAndPCSubType(type: Any.Type) -> Bool {
   return (type as? (P & PCSub).Type) != nil
 }
 func genericAnyAsConditional<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
   // If we're testing against a runtime that doesn't have the fix this tests,
   // just pretend we got it right.
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     return (type as? T.Type) != nil
   } else {
     return expected
@@ -190,24 +199,24 @@ func genericAnyAsConditional<T>(type: Any.Type, to: T.Type, expected: Bool) -> B
 // `as!` checks
 func blackhole<T>(_ : T) { }
 
-func nongenericAnyAsUnconditionalPConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsUnconditionalPType(type: Any.Type) -> Bool {
   blackhole(type as! P.Type)
   return true
 }
-func nongenericAnyAsUnconditionalPSubtype(type: Any.Type) -> Bool {
+func nongenericAnyAsUnconditionalPProtocol(type: Any.Type) -> Bool {
   blackhole(type as! P.Protocol)
   return true
 }
-func nongenericAnyAsUnconditionalPAndAnyObjectConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsUnconditionalPAndAnyObjectType(type: Any.Type) -> Bool {
   blackhole(type as! (P & AnyObject).Type)
   return true
 }
-func nongenericAnyAsUnconditionalPAndPCSubConforming(type: Any.Type) -> Bool {
+func nongenericAnyAsUnconditionalPAndPCSubType(type: Any.Type) -> Bool {
   blackhole(type as! (P & PCSub).Type)
   return true
 }
 func genericAnyAsUnconditional<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     blackhole(type as! T.Type)
   }
   return true
@@ -215,135 +224,153 @@ func genericAnyAsUnconditional<T>(type: Any.Type, to: T.Type, expected: Bool) ->
 
 // CHECK-LABEL: casting types to protocols with generics:
 print("casting types to protocols with generics:")
-print(nongenericAnyIsPConforming(type: P.self)) // CHECK: false
-print(nongenericAnyIsPSubtype(type: P.self)) // CHECK: true
-print(genericAnyIs(type: P.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyIsPConforming(type: PS.self)) // CHECK: true
-print(genericAnyIs(type: PS.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyIsPConforming(type: PE.self)) // CHECK: true
-print(genericAnyIs(type: PE.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyIsPConforming(type: PC.self)) // CHECK: true
-print(genericAnyIs(type: PC.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyIsPConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyIs(type: PCSub.self, to: P.self, expected: true)) // CHECK-ONONE: true
+print(#line, nongenericAnyIsPType(type: P.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPProtocol(type: P.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyIs(type: P.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPType(type: PS.self)) // CHECK: [[@LINE]] true
+print(#line, PS() is P) // CHECK: [[@LINE]] true
+// One candidate for a Swift type theory holds that
+// `A is a subtype of B iff A.self is metatype<B>`
+// In that theory, `PS() is P` above would imply that
+// `PS.self is P.Protocol` below must also be true.
+// But that theory is not the one that Swift currently
+// implements.
+print(#line, nongenericAnyIsPProtocol(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PS.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPType(type: PE.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPProtocol(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PE.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPProtocol(type: PC.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PC.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPProtocol(type: PCSub.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PCSub.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
 
 // CHECK-LABEL: conditionally casting types to protocols with generics:
-print("conditionally casting types to protocols with generics:")
-print(nongenericAnyAsConditionalPConforming(type: P.self)) // CHECK: false
-print(nongenericAnyAsConditionalPSubtype(type: P.self)) // CHECK: true
-print(genericAnyAsConditional(type: P.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyAsConditionalPConforming(type: PS.self)) // CHECK: true
-print(genericAnyAsConditional(type: PS.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPConforming(type: PE.self)) // CHECK: true
-print(genericAnyAsConditional(type: PE.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPConforming(type: PC.self)) // CHECK: true
-print(genericAnyAsConditional(type: PC.self, to: P.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyAsConditional(type: PCSub.self, to: P.self, expected: true)) // CHECK-ONONE: true
+print(#line, "conditionally casting types to protocols with generics:")
+print(#line, nongenericAnyAsConditionalPType(type: P.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPProtocol(type: P.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsConditional(type: P.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPType(type: PS.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPProtocol(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PS.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPType(type: PE.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPProtocol(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PE.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPProtocol(type: PC.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PC.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPProtocol(type: PCSub.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PCSub.self, to: P.self, expected: false)) // CHECK: [[@LINE]] false
 
 // CHECK-LABEL: unconditionally casting types to protocols with generics:
-print("unconditionally casting types to protocols with generics:")
-//print(nongenericAnyAsUnconditionalPConforming(type: P.self)) // expected to trap
-print(nongenericAnyAsUnconditionalPSubtype(type: P.self)) // CHECK: true
-print(genericAnyAsUnconditional(type: P.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyAsUnconditionalPConforming(type: PS.self)) // CHECK: true
-print(genericAnyAsUnconditional(type: PS.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyAsUnconditionalPConforming(type: PE.self)) // CHECK: true
-print(genericAnyAsUnconditional(type: PE.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyAsUnconditionalPConforming(type: PC.self)) // CHECK: true
-print(genericAnyAsUnconditional(type: PC.self, to: P.self, expected: true)) // CHECK: true
-print(nongenericAnyAsUnconditionalPConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyAsUnconditional(type: PCSub.self, to: P.self, expected: true)) // CHECK: true
+print(#line, "unconditionally casting types to protocols with generics:")
+//print(#line, nongenericAnyAsUnconditionalPType(type: P.self)) // expected to trap
+print(#line, nongenericAnyAsUnconditionalPProtocol(type: P.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsUnconditional(type: P.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsUnconditionalPType(type: PS.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsUnconditional(type: PS.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsUnconditionalPType(type: PE.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsUnconditional(type: PE.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsUnconditionalPType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsUnconditional(type: PC.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsUnconditionalPType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsUnconditional(type: PCSub.self, to: P.self, expected: true)) // CHECK: [[@LINE]] true
 
 // CHECK-LABEL: casting types to protocol & AnyObject existentials:
-print("casting types to protocol & AnyObject existentials:")
-print(nongenericAnyIsPAndAnyObjectConforming(type: PS.self)) // CHECK: false
-print(genericAnyIs(type: PS.self, to: (P & AnyObject).self, expected: false)) // CHECK: false
-print(nongenericAnyIsPAndAnyObjectConforming(type: PE.self)) // CHECK: false
-print(genericAnyIs(type: PE.self, to: (P & AnyObject).self, expected: false)) // CHECK: false
-print(nongenericAnyIsPAndAnyObjectConforming(type: PC.self)) // CHECK: true
-print(genericAnyIs(type: PC.self, to: (P & AnyObject).self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyIsPAndAnyObjectConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyIs(type: PCSub.self, to: (P & AnyObject).self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPAndAnyObjectConforming(type: PS.self)) // CHECK: false
-print(genericAnyAsConditional(type: PS.self, to: (P & AnyObject).self, expected: false)) // CHECK: false
-print(nongenericAnyAsConditionalPAndAnyObjectConforming(type: PE.self)) // CHECK: false
-print(genericAnyAsConditional(type: PE.self, to: (P & AnyObject).self, expected: false)) // CHECK: false
-print(nongenericAnyAsConditionalPAndAnyObjectConforming(type: PC.self)) // CHECK: true
-print(genericAnyAsConditional(type: PC.self, to: (P & AnyObject).self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPAndAnyObjectConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyAsConditional(type: PCSub.self, to: (P & AnyObject).self, expected: true)) // CHECK-ONONE: true
+print(#line, "casting types to protocol & AnyObject existentials:")
+print(#line, nongenericAnyIsPAndAnyObjectType(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PS.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPAndAnyObjectType(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PE.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPAndAnyObjectType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPAndAnyObjectProtocol(type: PC.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PC.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPAndAnyObjectType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPAndAnyObjectProtocol(type: PCSub.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PCSub.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndAnyObjectType(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PS.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndAnyObjectType(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PE.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndAnyObjectType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyAsConditionalPAndAnyObjectProtocol(type: PC.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PC.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndAnyObjectType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsConditional(type: PCSub.self, to: (P & AnyObject).self, expected: false)) // CHECK: [[@LINE]] false
 
 // CHECK-LABEL: casting types to protocol & class existentials:
-print("casting types to protocol & class existentials:")
-print(nongenericAnyIsPAndPCSubConforming(type: PS.self)) // CHECK: false
-print(genericAnyIs(type: PS.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-print(nongenericAnyIsPAndPCSubConforming(type: PE.self)) // CHECK: false
-print(genericAnyIs(type: PE.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-//print(nongenericAnyIsPAndPCSubConforming(type: PC.self)) // CHECK-SR-11565: false -- FIXME: reenable this when SR-11565 is fixed
-print(genericAnyIs(type: PC.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-print(nongenericAnyIsPAndPCSubConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyIs(type: PCSub.self, to: (P & PCSub).self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyAsConditionalPAndPCSubConforming(type: PS.self)) // CHECK: false
-print(genericAnyAsConditional(type: PS.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-print(nongenericAnyAsConditionalPAndPCSubConforming(type: PE.self)) // CHECK: false
-print(genericAnyAsConditional(type: PE.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-//print(nongenericAnyAsConditionalPAndPCSubConforming(type: PC.self)) // CHECK-SR-11565: false -- FIXME: reenable this when SR-11565 is fixed
-print(genericAnyAsConditional(type: PC.self, to: (P & PCSub).self, expected: false)) // CHECK: false
-print(nongenericAnyAsConditionalPAndPCSubConforming(type: PCSub.self)) // CHECK: true
-print(genericAnyAsConditional(type: PCSub.self, to: (P & PCSub).self, expected: true)) // CHECK-ONONE: true
+print(#line, "casting types to protocol & class existentials:")
+print(#line, nongenericAnyIsPAndPCSubType(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PS.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPAndPCSubType(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PE.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+//print(#line, nongenericAnyIsPAndPCSubType(type: PC.self)) // CHECK-SR-11565: [[@LINE]] false -- FIXME: reenable this when SR-11565 is fixed
+print(#line, genericAnyIs(type: PC.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPAndPCSubType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyIs(type: PCSub.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndPCSubType(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PS.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndPCSubType(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, genericAnyAsConditional(type: PE.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+// print(#line, nongenericAnyAsConditionalPAndPCSubType(type: PC.self)) // CHECK-SR-11565: [[@LINE]] false -- FIXME: reenable this when SR-11565 is fixed
+print(#line, genericAnyAsConditional(type: PC.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyAsConditionalPAndPCSubType(type: PCSub.self)) // CHECK: [[@LINE]] true
+print(#line, genericAnyAsConditional(type: PCSub.self, to: (P & PCSub).self, expected: false)) // CHECK: [[@LINE]] false
 
 
 // CHECK-LABEL: type comparisons:
-print("type comparisons:\n")
-print(allMetasToAllMetas(Int.self, Int.self)) // CHECK: true
-print(allMetasToAllMetas(Int.self, Float.self)) // CHECK: false
-print(allMetasToAllMetas(C.self, C.self)) // CHECK: true
-print(allMetasToAllMetas(D.self, C.self)) // CHECK: true
-print(allMetasToAllMetas(C.self, D.self)) // CHECK: false
-print(C.self is D.Type) // CHECK: false
-print((D.self as C.Type) is D.Type) // CHECK: true
+print(#line, "type comparisons:\n")
+print(#line, allMetasToAllMetas(Int.self, Int.self)) // CHECK: [[@LINE]] true
+print(#line, allMetasToAllMetas(Int.self, Float.self)) // CHECK: [[@LINE]] false
+print(#line, allMetasToAllMetas(C.self, C.self)) // CHECK: [[@LINE]] true
+print(#line, allMetasToAllMetas(D.self, C.self)) // CHECK: [[@LINE]] true
+print(#line, allMetasToAllMetas(C.self, D.self)) // CHECK: [[@LINE]] false
+print(#line, C.self is D.Type) // CHECK: [[@LINE]] false
+print(#line, (D.self as C.Type) is D.Type) // CHECK: [[@LINE]] true
 
 let t: Any.Type = type(of: 1 as Any)
-print(t is Int.Type) // CHECK: true
-print(t is Float.Type) // CHECK: false
-print(t is C.Type) // CHECK: false
+print(#line, t is Int.Type) // CHECK: [[@LINE]] true
+print(#line, t is Float.Type) // CHECK: [[@LINE]] false
+print(#line, t is C.Type) // CHECK: [[@LINE]] false
 
 let u: Any.Type = type(of: (D() as Any))
-print(u is C.Type) // CHECK: true
-print(u is D.Type) // CHECK: true
-print(u is E.Type) // CHECK: false
-print(u is Int.Type) // CHECK: false
+print(#line, u is C.Type) // CHECK: [[@LINE]] true
+print(#line, u is D.Type) // CHECK: [[@LINE]] true
+print(#line, u is E.Type) // CHECK: [[@LINE]] false
+print(#line, u is Int.Type) // CHECK: [[@LINE]] false
 
 // FIXME: Can't spell AnyObject.Protocol
 // CHECK-LABEL: AnyObject casts:
-print("AnyObject casts:")
-print(allToAll(C(), AnyObject.self)) // CHECK: true
+print(#line, "AnyObject casts:")
+print(#line, allToAll(C(), AnyObject.self)) // CHECK: [[@LINE]] true
 
 // On Darwin, the object will be the ObjC-runtime-class object;
 // out of Darwin, this should not succeed.
-print(allToAll(type(of: C()), AnyObject.self)) 
+print(#line, allToAll(type(of: C()), AnyObject.self))
 // CHECK-objc: true
 // CHECK-native: false
 
 // Bridging
 // NSNumber on Darwin, __SwiftValue on Linux.
-print(allToAll(0, AnyObject.self)) // CHECK: true
+print(#line, allToAll(0, AnyObject.self)) // CHECK: [[@LINE]] true
 
 // This will get bridged using __SwiftValue.
 struct NotBridged { var x: Int }
-print(allToAll(NotBridged(x: 0), AnyObject.self)) // CHECK: true
+print(#line, allToAll(NotBridged(x: 0), AnyObject.self)) // CHECK: [[@LINE]] true
 
 #if canImport(Foundation)
 // This requires Foundation (for NSCopying):
-print(allToAll(NotBridged(x: 0), NSCopying.self)) // CHECK-objc: true
+print(#line, allToAll(NotBridged(x: 0), NSCopying.self)) // CHECK-objc: [[@LINE]] true
 #endif
 
 // On Darwin, these casts fail (intentionally) even though __SwiftValue does
 // technically conform to these protocols through NSObject.
 // Off Darwin, it should not conform at all.
-print(allToAll(NotBridged(x: 0), CustomStringConvertible.self)) // CHECK: false
-print(allToAll(NotBridged(x: 0), (AnyObject & CustomStringConvertible).self)) // CHECK: false
+print(#line, allToAll(NotBridged(x: 0), CustomStringConvertible.self)) // CHECK: [[@LINE]] false
+print(#line, allToAll(NotBridged(x: 0), (AnyObject & CustomStringConvertible).self)) // CHECK: [[@LINE]] false
 
 #if canImport(Foundation)
 // This requires Foundation (for NSArray):
@@ -362,5 +389,5 @@ func swiftOptimizesThisFunctionIncorrectly() -> Bool {
 }
 
 let result = swiftOptimizesThisFunctionIncorrectly()
-print("Bridge cast result: \(result)") // CHECK-NEXT-objc: Bridge cast result: true
+print(#line, "Bridge cast result: \(result)") // CHECK-NEXT-objc: Bridge cast result: true
 #endif
diff --git a/test/Interpreter/generic_casts_objc.swift b/test/Interpreter/generic_casts_objc.swift
index f7e9ccd80c01e..e9561d2e2e047 100644
--- a/test/Interpreter/generic_casts_objc.swift
+++ b/test/Interpreter/generic_casts_objc.swift
@@ -16,9 +16,12 @@ enum PE: P {}
 class PC: P, PObjC {}
 class PCSub: PC {}
 
-func nongenericAnyIsPObjC(type: Any.Type) -> Bool {
+func nongenericAnyIsPObjCType(type: Any.Type) -> Bool {
   return type is PObjC.Type
 }
+func nongenericAnyIsPObjCProtocol(type: Any.Type) -> Bool {
+  return type is PObjC.Protocol
+}
 func genericAnyIs<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
   // If we're testing against a runtime that doesn't have the fix this tests,
   // just pretend we got it right.
@@ -29,13 +32,23 @@ func genericAnyIs<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
   }
 }
 
-// CHECK-LABEL: casting types to ObjC protocols with generics:
-print("casting types to ObjC protocols with generics:")
-print(nongenericAnyIsPObjC(type: PS.self)) // CHECK: false
-print(genericAnyIs(type: PS.self, to: PObjC.self, expected: false)) // CHECK: false
-print(nongenericAnyIsPObjC(type: PE.self)) // CHECK: false
-print(genericAnyIs(type: PE.self, to: PObjC.self, expected: false)) // CHECK: false
-print(nongenericAnyIsPObjC(type: PC.self)) // CHECK: true
-print(genericAnyIs(type: PC.self, to: PObjC.self, expected: true)) // CHECK-ONONE: true
-print(nongenericAnyIsPObjC(type: PCSub.self)) // CHECK: true
-print(genericAnyIs(type: PCSub.self, to: PObjC.self, expected: true)) // CHECK-ONONE: true
+// CHECK-LABEL: casting types to ObjC protocol existential metatype:
+print("casting types to ObjC protocol existential metatype:")
+print(#line, nongenericAnyIsPObjCType(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPObjCType(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPObjCType(type: PC.self)) // CHECK: [[@LINE]] true
+print(#line, nongenericAnyIsPObjCType(type: PCSub.self)) // CHECK: [[@LINE]] true
+
+// CHECK-LABEL: casting types to ObjC protocol metatype:
+print("casting types to ObjC protocol metatype:")
+print(#line, nongenericAnyIsPObjCProtocol(type: PS.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPObjCProtocol(type: PE.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPObjCProtocol(type: PC.self)) // CHECK: [[@LINE]] false
+print(#line, nongenericAnyIsPObjCProtocol(type: PCSub.self)) // CHECK: [[@LINE]] false
+
+// CHECK-LABEL: casting types to ObjC protocol metatype via generic:
+print("casting types to ObjC protocol metatype via generic:")
+print(#line, genericAnyIs(type: PS.self, to: PObjC.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PE.self, to: PObjC.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PC.self, to: PObjC.self, expected: false)) // CHECK: [[@LINE]] false
+print(#line, genericAnyIs(type: PCSub.self, to: PObjC.self, expected: false)) // CHECK: [[@LINE]] false
diff --git a/test/Interpreter/interpret_load_framework.swift b/test/Interpreter/interpret_load_framework.swift
index e03a074bdc586..da67fadc034dd 100644
--- a/test/Interpreter/interpret_load_framework.swift
+++ b/test/Interpreter/interpret_load_framework.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: cp -R %S/Inputs/VerySmallObjCFramework.framework %t
-// RUN: %clang -dynamiclib %S/Inputs/VerySmallObjCFramework.m -fmodules -F %t -o %t/VerySmallObjCFramework.framework/VerySmallObjCFramework
+// RUN: %clang -dynamiclib %S/Inputs/VerySmallObjCFramework.m -fmodules -F %t -o %t/VerySmallObjCFramework.framework/VerySmallObjCFramework -L %sdk/usr/lib
 // RUN: %swift_driver -F %t %s | %FileCheck %s
 
 // REQUIRES: objc_interop 
diff --git a/test/Interpreter/objc_class_properties_runtime.swift b/test/Interpreter/objc_class_properties_runtime.swift
index 3cbeee721b554..1d1cf21348c45 100644
--- a/test/Interpreter/objc_class_properties_runtime.swift
+++ b/test/Interpreter/objc_class_properties_runtime.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %clang -arch x86_64 -mmacosx-version-min=10.11 -isysroot %sdk -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
+// RUN: %clang -arch %target-cpu -mmacosx-version-min=10.11 -isysroot %sdk -fobjc-arc %S/Inputs/ObjCClasses/ObjCClasses.m -c -o %t/ObjCClasses.o
 
 // RUN: %swiftc_driver -target $(echo '%target-triple' | sed -E -e 's/macosx10.(9|10).*/macosx10.11/') -sdk %sdk -I %S/Inputs/ObjCClasses/ %t/ObjCClasses.o %s -o %t/a.out
 // RUN: %target-run %t/a.out
diff --git a/test/Migrator/fixit_flatMap.swift b/test/Migrator/fixit_flatMap.swift
index 2277cbe20187c..aec01c03059ee 100644
--- a/test/Migrator/fixit_flatMap.swift
+++ b/test/Migrator/fixit_flatMap.swift
@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t.result -swift-version 4
 // RUN: diff -u %s.expected %t.result
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 func migrate<T, U: Sequence, V: Collection>(lseq: LazySequence<T>, lcol: LazyCollection<T>, seq: U, col: V, test: Bool) {
   _ = lseq.flatMap { test ? nil : $0 }
diff --git a/test/Migrator/fixit_flatMap.swift.expected b/test/Migrator/fixit_flatMap.swift.expected
index eb5e15706e5b7..05aa9df00519c 100644
--- a/test/Migrator/fixit_flatMap.swift.expected
+++ b/test/Migrator/fixit_flatMap.swift.expected
@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend -typecheck -update-code -primary-file %s -emit-migrated-file-path %t.result -swift-version 4
 // RUN: diff -u %s.expected %t.result
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 func migrate<T, U: Sequence, V: Collection>(lseq: LazySequence<T>, lcol: LazyCollection<T>, seq: U, col: V, test: Bool) {
   _ = lseq.compactMap { test ? nil : $0 }
diff --git a/test/Misc/misc_diagnostics.swift b/test/Misc/misc_diagnostics.swift
index b8f2e27b18b32..6bf146ba0ff36 100644
--- a/test/Misc/misc_diagnostics.swift
+++ b/test/Misc/misc_diagnostics.swift
@@ -54,8 +54,9 @@ struct MyArray<Element> {} // expected-note {{'Element' declared as parameter to
 class A {
     var a: MyArray<Int>
     init() {
-        a = MyArray<Int // expected-error {{generic parameter 'Element' could not be inferred}}
-        // expected-note@-1 {{explicitly specify the generic arguments to fix this issue}}
+        a = MyArray<Int // expected-error {{generic parameter 'Element' could not be inferred}} expected-note {{explicitly specify the generic arguments to fix this issue}}
+       // expected-error@-1 {{binary operator '<' cannot be applied to operands of type 'MyArray<_>.Type' and 'Int.Type'}}
+       // expected-error@-2 {{cannot assign value of type 'Bool' to type 'MyArray<Int>'}}
     }
 }
 
@@ -114,11 +115,11 @@ func test17875634() {
   var col = 2
   var coord = (row, col)
 
-  match += (1, 2) // expected-error{{cannot convert value of type '(Int, Int)' to expected argument type 'Array<(Int, Int)>'}}
+  match += (1, 2) // expected-error{{binary operator '+=' cannot be applied to operands of type '[(Int, Int)]' and '(Int, Int)'}}
 
-  match += (row, col) // expected-error{{cannot convert value of type '(Int, Int)' to expected argument type 'Array<(Int, Int)>'}}
+  match += (row, col) // expected-error{{binary operator '+=' cannot be applied to operands of type '[(Int, Int)]' and '(Int, Int)'}}
 
-  match += coord // expected-error{{cannot convert value of type '(Int, Int)' to expected argument type 'Array<(Int, Int)>'}}
+  match += coord // expected-error{{binary operator '+=' cannot be applied to operands of type '[(Int, Int)]' and '(Int, Int)'}}
 
   match.append(row, col) // expected-error {{instance method 'append' expects a single parameter of type '(Int, Int)'}} {{16-16=(}} {{24-24=)}}
 
@@ -142,7 +143,7 @@ func test17875634() {
 func test20770032() {
   if case let 1...10 = (1, 1) { // expected-warning{{'let' pattern has no effect; sub-pattern didn't bind any variables}} {{11-15=}}
     // expected-error@-1 {{expression pattern of type 'ClosedRange<Int>' cannot match values of type '(Int, Int)'}}
-    // expected-error@-2 {{'(Int, Int)' cannot conform to 'Equatable'; only struct/enum/class types can conform to protocols}}
+    // expected-error@-2 {{type '(Int, Int)' cannot conform to 'Equatable'; only concrete types such as structs, enums and classes can conform to protocols}}
     // expected-note@-3 {{required by operator function '~=' where 'T' = '(Int, Int)'}}
   }
 }
diff --git a/test/Misc/tbi.sil b/test/Misc/tbi.sil
index f22555d8c0aad..8a42ebc6a5a36 100644
--- a/test/Misc/tbi.sil
+++ b/test/Misc/tbi.sil
@@ -2,12 +2,12 @@
 // driver is properly generated -enable-aarch64-tbi and also that the frontend
 // respects this option and that we get the proper tbi behavior.
 
-// RUN: %swiftc_driver -parse-sil -Xfrontend -disable-legacy-type-info -target arm64-apple-ios8.0 -target-cpu cyclone \
+// RUN: %swiftc_driver -sdk "" -parse-sil -Xfrontend -disable-legacy-type-info -target arm64-apple-ios8.0 -target-cpu cyclone \
 // RUN:   -O -S %s -parse-as-library -parse-stdlib -module-name Swift \
 // RUN:    | \
 // RUN:   %FileCheck --check-prefix=TBI %s
 
-// RUN: %swiftc_driver -parse-sil -Xfrontend -disable-legacy-type-info -target arm64-apple-ios7.0 -target-cpu cyclone \
+// RUN: %swiftc_driver -sdk "" -parse-sil -Xfrontend -disable-legacy-type-info -target arm64-apple-ios7.0 -target-cpu cyclone \
 // RUN:     -O -S %s -parse-as-library -parse-stdlib -module-name Swift \
 // RUN:      | \
 // RUN:   %FileCheck --check-prefix=NO_TBI %s
diff --git a/test/ModuleInterface/Inputs/make-unreadable.py b/test/ModuleInterface/Inputs/make-unreadable.py
index e8991b0cf2c8e..6a90d3ae511af 100644
--- a/test/ModuleInterface/Inputs/make-unreadable.py
+++ b/test/ModuleInterface/Inputs/make-unreadable.py
@@ -7,7 +7,7 @@
     import ctypes
     AdvAPI32 = ctypes.windll.Advapi32
 
-    from ctypes.wintypes import POINTER
+    from ctypes import POINTER
 
     UNLEN = 256
 
diff --git a/test/ModuleInterface/Inputs/opaque-result-types-client.swift b/test/ModuleInterface/Inputs/opaque-result-types-client.swift
index 88671bd7cc6c6..8258bc3f8bb13 100644
--- a/test/ModuleInterface/Inputs/opaque-result-types-client.swift
+++ b/test/ModuleInterface/Inputs/opaque-result-types-client.swift
@@ -20,7 +20,7 @@ func someTypeIsTheSame() {
   a = foo("") // expected-error{{cannot assign value of type 'some Foo' (result of 'foo') to type 'some Foo' (result of 'foo')}}
 
   var b = foo("")
-  b = foo(0) // expected-error{{cannot assign value of type 'some Foo' (result of 'foo') to type 'some Foo' (result of 'foo')}}
+  b = foo(0) // expected-error{{no 'foo' candidates produce the expected contextual result type 'some Foo'}}
   b = foo("")
 
   var c = foo(MyFoo())
@@ -33,7 +33,7 @@ func someTypeIsTheSame() {
 
   var d = barInt.foo(0)
   d = barInt.foo(0)
-  d = barString.foo(0) // expected-error{{cannot assign}}
+  d = barString.foo(0) // expected-error{{no 'foo' candidates produce the expected contextual result type 'some Foo'}}
   d = getAssocType(barInt)
   d = getAssocType(barString) // expected-error{{cannot assign}}
   
@@ -50,7 +50,7 @@ func someTypeIsTheSame() {
   d3 = getAssocSubscriptType(barString) // expected-error{{cannot assign}}
 
   var e = barString.foo(0)
-  e = barInt.foo(0) // expected-error{{cannot assign}}
+  e = barInt.foo(0) // expected-error{{no 'foo' candidates produce the expected contextual result type 'some Foo'}}
   e = barString.foo(0)
   e = getAssocType(barInt) // expected-error{{cannot assign}}
   e = getAssocType(barString)
diff --git a/test/ModuleInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift b/test/ModuleInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift
index 27aad747e5426..13f132c586477 100644
--- a/test/ModuleInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift
+++ b/test/ModuleInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift
@@ -10,17 +10,17 @@
 // RUN: echo 'import LeafModule' >%t/other.swift
 // RUN: echo 'public func OtherFunc() -> Int { return LeafFunc(); }' >>%t/other.swift
 //
-// Phase 1: build LeafModule into a .swiftinterface file with -target x86_64-macosx-10.9:
+// Phase 1: build LeafModule into a .swiftinterface file with -target %target-cpu-macosx-10.9:
 //
-// RUN: %swift -target x86_64-apple-macosx10.9 -I %t -module-cache-path %t/modulecache -emit-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -typecheck
+// RUN: %swift -target %target-cpu-apple-macosx10.9 -I %t -module-cache-path %t/modulecache -emit-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -typecheck
 //
-// Phase 2: build OtherModule into a .swiftinterface file with -target x86_64-macosx-10.10:
+// Phase 2: build OtherModule into a .swiftinterface file with -target %target-cpu-macosx-10.10:
 //
-// RUN: %swift -target x86_64-apple-macosx10.10 -I %t -module-cache-path %t/modulecache -emit-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -typecheck
+// RUN: %swift -target %target-cpu-apple-macosx10.10 -I %t -module-cache-path %t/modulecache -emit-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -typecheck
 //
-// Phase 3: build TestModule in -target x86_64-apple-macosx10.11 and import both of these:
+// Phase 3: build TestModule in -target %target-cpu-apple-macosx10.11 and import both of these:
 //
-// RUN: %swift -target x86_64-apple-macosx10.11  -I %t -module-cache-path %t/modulecache -module-name TestModule %s -typecheck
+// RUN: %swift -target %target-cpu-apple-macosx10.11  -I %t -module-cache-path %t/modulecache -module-name TestModule %s -typecheck
 //
 // Phase 4: make sure we only compiled LeafModule and OtherModule one time:
 //
diff --git a/test/ModuleInterface/NoWrongSDKWarning.swiftinterface b/test/ModuleInterface/NoWrongSDKWarning.swiftinterface
index 61b7f7fde6708..6918b235f91a4 100644
--- a/test/ModuleInterface/NoWrongSDKWarning.swiftinterface
+++ b/test/ModuleInterface/NoWrongSDKWarning.swiftinterface
@@ -6,6 +6,7 @@
 // RUN: %swift -sdk %sdk -target arm64-apple-ios10 -compile-module-from-interface %s -o %t/NoWrongSDKWarning.swiftmodule 2>&1 | %FileCheck -allow-empty %s
 
 // REQUIRES: OS=macosx
+// REQUIRES: CPU=x86_64
 
 public func empty()
 
diff --git a/test/ModuleInterface/loading-order.swift b/test/ModuleInterface/loading-order.swift
new file mode 100644
index 0000000000000..ae70c5a55fa2e
--- /dev/null
+++ b/test/ModuleInterface/loading-order.swift
@@ -0,0 +1,41 @@
+/// Test the loading order of module interfaces between the SDK and the
+/// prebuilt cache. The order should be:
+///
+/// 1. Local cache (not tested here)
+/// 2. Next to the swiftinterface file
+/// 3. Prebuilt-module cache
+
+/// Create folders for a) our Swift module, b) the module cache, and c) a
+/// fake resource dir with a default prebuilt module cache inside.
+// RUN: %empty-directory(%t/MyModule.swiftmodule)
+// RUN: %empty-directory(%t/ModuleCache)
+// RUN: %empty-directory(%t/ResourceDir/%target-sdk-name/prebuilt-modules/MyModule.swiftmodule)
+
+/// Define two sets of public API.
+// RUN: echo 'public func nextToSwiftinterface() {}' > %t/NextToSwiftinterface.swift
+// RUN: echo 'public func prebuiltModule() {}' > %t/PrebuiltModule.swift
+
+/// Compile this into a module in the SDK.
+// RUN: %target-swift-frontend -emit-module %t/NextToSwiftinterface.swift -o %t/MyModule.swiftmodule/%target-swiftmodule-name -module-name MyModule -parse-stdlib -emit-module-interface-path %t/MyModule.swiftmodule/%target-swiftinterface-name
+
+/// Also put a module with a different API into the default prebuilt cache under the same name.
+// RUN: %target-swift-frontend -emit-module %t/PrebuiltModule.swift -o %t/ResourceDir/%target-sdk-name/prebuilt-modules/MyModule.swiftmodule/%target-swiftmodule-name -module-name MyModule -parse-stdlib
+
+/// Import this module and expect to use the swiftmodule next to the swiftinterface.
+// RUN: %target-swift-frontend -typecheck -resource-dir %t/ResourceDir -I %t %s -parse-stdlib -module-cache-path %t/ModuleCache -sdk %t -D FIRST_NEXT_TO_SWIFTINTERFACE
+
+/// Remove the first swiftmodule and import again to use the prebuilt swiftmodule.
+// RUN: rm %t/MyModule.swiftmodule/%target-swiftmodule-name
+// RUN: %target-swift-frontend -typecheck -resource-dir %t/ResourceDir -I %t %s -parse-stdlib -module-cache-path %t/ModuleCache -sdk %t -D THEN_PREBUILT_MODULE
+
+import MyModule
+
+#if FIRST_NEXT_TO_SWIFTINTERFACE
+
+nextToSwiftinterface()
+
+#elseif THEN_PREBUILT_MODULE
+
+prebuiltModule()
+
+#endif
diff --git a/test/ModuleInterface/skip-override-keyword.swift b/test/ModuleInterface/skip-override-keyword.swift
index fba0d20d5a2bb..f349dac2d11ec 100644
--- a/test/ModuleInterface/skip-override-keyword.swift
+++ b/test/ModuleInterface/skip-override-keyword.swift
@@ -2,13 +2,23 @@
 // RUN: %target-swift-frontend -typecheck -module-name Foo -emit-module-interface-path %t/Foo.swiftinterface %s
 // RUN: %target-swift-frontend -compile-module-from-interface %t/Foo.swiftinterface -o %t/Foo.swiftmodule
 
+// RUN: %target-swift-frontend -typecheck -enable-testing -module-name FooWithTesting -emit-module-interface-path %t/FooWithTesting.swiftinterface %s
+// RUN: %target-swift-frontend -compile-module-from-interface %t/FooWithTesting.swiftinterface -o %t/FooWithTesting.swiftmodule
+
 public class BaseClass {
+  init() { }
   var property: Int { return 1 }
   func doSomething() { }
   subscript(index: Int) -> Int { get { return 0 } set(newValue) {} }
+  @usableFromInline func doSomethingInline() {}
+  @usableFromInline func doSomethingUsableFromInline() {}
 }
+
 public class DerivedClass: BaseClass {
+  public override init() { super.init() }
   public override var property : Int { return 0 }
   public override func doSomething() { }
   public override subscript(index: Int) -> Int { get {return 0} set(newValue) {} }
+  @inlinable public override func doSomethingInline() { super.doSomethingInline() }
+  @usableFromInline override func doSomethingUsableFromInline() { super.doSomethingUsableFromInline() }
 }
diff --git a/test/NameLookup/scope_map_top_level.swift b/test/NameLookup/scope_map_top_level.swift
index e8adaac6e6ca3..1b0b5f01678c3 100644
--- a/test/NameLookup/scope_map_top_level.swift
+++ b/test/NameLookup/scope_map_top_level.swift
@@ -21,7 +21,7 @@ extension Int {
 var i: Int = b.my_identity()
 
 
-// RUN: %target-swift-frontend -dump-scope-maps expanded %s 2> %t.expanded
+// RUN: %target-swift-frontend -dump-scope-maps expanded %/s 2> %t.expanded
 // RUN: %FileCheck -check-prefix CHECK-EXPANDED %s < %t.expanded
 
 
diff --git a/test/PCMacro/elseif.swift b/test/PCMacro/elseif.swift
index 923c2f2d4d1e7..b7511e042da38 100644
--- a/test/PCMacro/elseif.swift
+++ b/test/PCMacro/elseif.swift
@@ -2,7 +2,7 @@
 // RUN: cp %s %t/main.swift
 // RUN: %target-build-swift -whole-module-optimization -module-name PlaygroundSupport -emit-module-path %t/PlaygroundSupport.swiftmodule -parse-as-library -c -o %t/PlaygroundSupport.o %S/Inputs/PCMacroRuntime.swift %S/Inputs/SilentPlaygroundsRuntime.swift
 // RUN: %target-build-swift -Xfrontend -pc-macro -o %t/main -I=%t %t/PlaygroundSupport.o %t/main.swift
-/*// RUN: %target-codesign %t/main*/
+// RUN: %target-codesign %t/main
 // RUN: %target-run %t/main | %FileCheck %s
 // RUN: %target-build-swift -Xfrontend -pc-macro -Xfrontend -playground -Xfrontend -debugger-support -o %t/main2 -I=%t %t/PlaygroundSupport.o %t/main.swift 
 // RUN: %target-run %t/main | %FileCheck %s
diff --git a/test/PCMacro/func_throw_notype.swift b/test/PCMacro/func_throw_notype.swift
index adc030332e0eb..7db14a1e31e42 100644
--- a/test/PCMacro/func_throw_notype.swift
+++ b/test/PCMacro/func_throw_notype.swift
@@ -2,7 +2,7 @@
 // RUN: cp %s %t/main.swift
 // RUN: %target-build-swift -whole-module-optimization -module-name PlaygroundSupport -emit-module-path %t/PlaygroundSupport.swiftmodule -parse-as-library -c -o %t/PlaygroundSupport.o %S/Inputs/PCMacroRuntime.swift %S/Inputs/SilentPlaygroundsRuntime.swift
 // RUN: %target-build-swift -Xfrontend -pc-macro -o %t/main -I=%t %t/PlaygroundSupport.o %t/main.swift
-/*// RUN: %target-codesign %t/main*/
+// RUN: %target-codesign %t/main
 // RUN: %target-run %t/main | %FileCheck %s
 // RUN: %target-build-swift -Xfrontend -pc-macro -Xfrontend -playground -Xfrontend -debugger-support -o %t/main2 -I=%t %t/PlaygroundSupport.o %t/main.swift 
 // RUN: %target-run %t/main | %FileCheck %s
diff --git a/test/PCMacro/getset.swift b/test/PCMacro/getset.swift
index 78880fc5683ea..22019157e2b18 100644
--- a/test/PCMacro/getset.swift
+++ b/test/PCMacro/getset.swift
@@ -2,7 +2,7 @@
 // RUN: cp %s %t/main.swift
 // RUN: %target-build-swift -whole-module-optimization -module-name PlaygroundSupport -emit-module-path %t/PlaygroundSupport.swiftmodule -parse-as-library -c -o %t/PlaygroundSupport.o %S/Inputs/PCMacroRuntime.swift %S/Inputs/SilentPlaygroundsRuntime.swift
 // RUN: %target-build-swift -Xfrontend -pc-macro -o %t/main -I=%t %t/PlaygroundSupport.o %t/main.swift
-/*// RUN: %target-codesign %t/main*/
+// RUN: %target-codesign %t/main
 // RUN: %target-run %t/main | %FileCheck %s
 // RUN: %target-build-swift -Xfrontend -pc-macro -Xfrontend -playground -Xfrontend -debugger-support -o %t/main2 -I=%t %t/PlaygroundSupport.o %t/main.swift 
 // RUN: %target-run %t/main | %FileCheck %s
diff --git a/test/PCMacro/init.swift b/test/PCMacro/init.swift
index f72a581bf489f..21076a85b1ce1 100644
--- a/test/PCMacro/init.swift
+++ b/test/PCMacro/init.swift
@@ -2,7 +2,7 @@
 // RUN: cp %s %t/main.swift
 // RUN: %target-build-swift -whole-module-optimization -module-name PlaygroundSupport -emit-module-path %t/PlaygroundSupport.swiftmodule -parse-as-library -c -o %t/PlaygroundSupport.o %S/Inputs/PCMacroRuntime.swift %S/Inputs/SilentPlaygroundsRuntime.swift
 // RUN: %target-build-swift -Xfrontend -pc-macro -o %t/main -I=%t %t/PlaygroundSupport.o %t/main.swift
-/*// RUN: %target-codesign %t/main*/
+// RUN: %target-codesign %t/main
 // RUN: %target-run %t/main | %FileCheck %s
 // RUN: %target-build-swift -Xfrontend -pc-macro -Xfrontend -playground -Xfrontend -debugger-support -o %t/main2 -I=%t %t/PlaygroundSupport.o %t/main.swift 
 // RUN: %target-run %t/main | %FileCheck %s
diff --git a/test/Parse/confusables.swift b/test/Parse/confusables.swift
index e32d07c56517e..57afcde30dd29 100644
--- a/test/Parse/confusables.swift
+++ b/test/Parse/confusables.swift
@@ -17,7 +17,7 @@ if (true ꝸꝸꝸ false) {} // expected-note {{identifier 'ꝸꝸꝸ' contains
 
 // expected-error @+3 {{invalid character in source file}}
 // expected-error @+2 {{expected ',' separator}}
-// expected-error @+1 {{type '(Int, Int)' cannot conform to 'BinaryInteger'; only struct/enum/class types can conform to protocols}}
+// expected-error @+1 {{type '(Int, Int)' cannot conform to 'BinaryInteger'; only concrete types such as structs, enums and classes can conform to protocols}}
 if (5 ‒ 5) == 0 {} // expected-note {{unicode character '‒' looks similar to '-'; did you mean to use '-'?}} {{7-10=-}}
 // expected-note @-1 {{operator function '=='}}
 
diff --git a/test/Parse/pointer_conversion.swift.gyb b/test/Parse/pointer_conversion.swift.gyb
index d2c8137b7f18e..616285d4fbda6 100644
--- a/test/Parse/pointer_conversion.swift.gyb
+++ b/test/Parse/pointer_conversion.swift.gyb
@@ -164,7 +164,7 @@ func constPointerArguments(_ p: UnsafeMutablePointer<Int>,
   takesConstPointer([0, 1, 2])
   // <rdar://problem/22308330> QoI: CSDiags doesn't handle array -> pointer impl conversions well
   takesConstPointer([0.0, 1.0, 2.0])
-  // expected-error@-1 3 {{annot convert value of type 'Double' to expected element type 'Int'}}
+  // expected-error@-1 3 {{cannot convert value of type 'Double' to expected element type 'Int'}}
 
   // We don't allow these conversions outside of function arguments.
   var x: UnsafePointer<Int> = &i // expected-error {{use of extraneous '&'}}
@@ -307,7 +307,7 @@ struct NotEquatable {}
 func arrayComparison(_ x: [NotEquatable], y: [NotEquatable], p: UnsafeMutablePointer<NotEquatable>) {
   var x = x
   // Don't allow implicit array-to-pointer conversions in operators.
-  let a: Bool = x == y // expected-error{{operator function '==' requires that 'NotEquatable' conform to 'Equatable'}}
+  let a: Bool = x == y // expected-error{{referencing operator function '==' on 'Array' requires that 'NotEquatable' conform to 'Equatable'}}
   let _: Bool = p == &x  // Allowed!
 }
 
diff --git a/test/Parse/recovery.swift b/test/Parse/recovery.swift
index 4613e471ca9da..cac7706052ded 100644
--- a/test/Parse/recovery.swift
+++ b/test/Parse/recovery.swift
@@ -10,12 +10,14 @@ func garbage() -> () {
   var a : Int
   ) this line is invalid, but we will stop at the keyword below... // expected-error{{expected expression}}
   return a + "a" // expected-error{{binary operator '+' cannot be applied to operands of type 'Int' and 'String'}} expected-note {{overloads for '+' exist with these partially matching parameter lists: (Int, Int), (String, String)}}
+  // expected-error@-1 {{no '+' candidates produce the expected contextual result type '()'}}
 }
 
 func moreGarbage() -> () {
   ) this line is invalid, but we will stop at the declaration... // expected-error{{expected expression}}
   func a() -> Int { return 4 }
   return a() + "a" // expected-error{{binary operator '+' cannot be applied to operands of type 'Int' and 'String'}} expected-note {{overloads for '+' exist with these partially matching parameter lists: (Int, Int), (String, String)}}
+  // expected-error@-1 {{no '+' candidates produce the expected contextual result type '()'}}
 }
 
 
diff --git a/test/Parse/source_locs.swift b/test/Parse/source_locs.swift
index 98e96eb76a4bc..390b85c7efe3b 100644
--- a/test/Parse/source_locs.swift
+++ b/test/Parse/source_locs.swift
@@ -5,7 +5,7 @@ func string_interpolation() {
   <#Int#>
 }
 
-// RUN: not %target-swift-frontend -dump-ast %s | %FileCheck %s
-// CHECK: (interpolated_string_literal_expr {{.*}} trailing_quote_loc=SOURCE_DIR{{/|\\}}test{{/|\\}}Parse{{/|\\}}source_locs.swift:4:12 {{.*}}
-// CHECK: (editor_placeholder_expr type='()' {{.*}} trailing_angle_bracket_loc=SOURCE_DIR{{/|\\}}test{{/|\\}}Parse{{/|\\}}source_locs.swift:5:9
+// RUN: not %target-swift-frontend -dump-ast %/s | %FileCheck %s
+// CHECK: (interpolated_string_literal_expr {{.*}} trailing_quote_loc=SOURCE_DIR/test/Parse/source_locs.swift:4:12 {{.*}}
+// CHECK: (editor_placeholder_expr type='()' {{.*}} trailing_angle_bracket_loc=SOURCE_DIR/test/Parse/source_locs.swift:5:9
 
diff --git a/test/Parse/switch.swift b/test/Parse/switch.swift
index 6e0c190288d64..2b42e837965c8 100644
--- a/test/Parse/switch.swift
+++ b/test/Parse/switch.swift
@@ -336,6 +336,7 @@ func f1(x: String, y: Whichever) {
     case Whichever.buzz: // expected-error {{type 'Whichever' has no member 'buzz'}}
         break
     case Whichever.alias: // expected-error {{expression pattern of type 'Whichever' cannot match values of type 'String'}}
+    // expected-note@-1 {{overloads for '~=' exist with these partially matching parameter lists: (Substring, String)}}
         break
     default:
       break
diff --git a/test/PrintAsObjC/accessibility.swift b/test/PrintAsObjC/accessibility.swift
index d484281459db5..586ac95564501 100644
--- a/test/PrintAsObjC/accessibility.swift
+++ b/test/PrintAsObjC/accessibility.swift
@@ -40,13 +40,13 @@
 
 
 #if MAIN
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
 
 @NSApplicationMain
 @objc class AppDelegate : NSApplicationDelegate {}
 
-#elseif os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(UIKit)
 import UIKit
 
 @UIApplicationMain
@@ -54,5 +54,6 @@ import UIKit
 
 #else
 // Uh oh, this test depends on having an app delegate.
+#error("Unsupported platform")
 #endif
 #endif
diff --git a/test/PrintAsObjC/availability_macosx_canonical_versions.swift b/test/PrintAsObjC/availability_macosx_canonical_versions.swift
new file mode 100644
index 0000000000000..fae1907434932
--- /dev/null
+++ b/test/PrintAsObjC/availability_macosx_canonical_versions.swift
@@ -0,0 +1,20 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t %s -disable-objc-attr-requires-foundation-module
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library %t/availability_macosx_canonical_versions.swiftmodule -typecheck -emit-objc-header-path %t/availability.h -import-objc-header %S/../Inputs/empty.h -disable-objc-attr-requires-foundation-module
+// RUN: %FileCheck %s < %t/availability.h
+// RUN: %check-in-clang %t/availability.h
+
+// REQUIRES: objc_interop
+
+// CHECK-LABEL: @interface Availability{{$}}
+// CHECK-NEXT: - (void)alwaysAvailable;
+// CHECK-NEXT: - (void)introducedOn10_16
+// CHECK-DAG: SWIFT_AVAILABILITY(macos,introduced=11.0)
+// CHECK-DAG: SWIFT_AVAILABILITY(ios,introduced=10.16)
+
+@objc class Availability {
+  @objc func alwaysAvailable() {}
+  @available(macOS 10.16, *)
+  @available(iOS, introduced: 10.16)
+  @objc func introducedOn10_16() {}
+}
diff --git a/test/PrintAsObjC/resilient-ancestry.swift b/test/PrintAsObjC/resilient-ancestry.swift
index 2042d294208f2..12bbfcdcc9a74 100644
--- a/test/PrintAsObjC/resilient-ancestry.swift
+++ b/test/PrintAsObjC/resilient-ancestry.swift
@@ -11,6 +11,7 @@
 // RUN: %check-in-clang %t/resilient.h -I %t
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 
 // See also resilient-ancestry.swift, for the stable ABI deployment target test.
 
diff --git a/test/Profiler/coverage_relative_path.swift b/test/Profiler/coverage_relative_path.swift
new file mode 100644
index 0000000000000..2e5683b382abf
--- /dev/null
+++ b/test/Profiler/coverage_relative_path.swift
@@ -0,0 +1,16 @@
+// %s expands to an absolute path, so to test relative paths we need to create a
+// clean directory, put the source there, and cd into it.
+// RUN: rm -rf %t
+// RUN: mkdir -p %t/foo/bar/baz
+// RUN: echo "func coverage() {}" > %t/foo/bar/baz/coverage_relative_path.swift
+// RUN: cd %t/foo/bar
+
+// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir %/t/foo/bar/baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s
+//
+// ABSOLUTE: @__llvm_coverage_mapping = {{.*"\\01.*foo.*bar.*baz.*coverage_relative_path\.swift}}
+
+// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -coverage-prefix-map %/t/foo/bar=. -emit-ir %/t/foo/bar/baz/coverage_relative_path.swift | %FileCheck -check-prefix=RELATIVE %s
+//
+// RELATIVE: @__llvm_coverage_mapping = {{.*"\\01[^/]*}}.{{/|\\}}baz{{.*coverage_relative_path\.swift}}
+
+func coverage() {}
diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift
index fe4a8ab53ccb6..c84158a0d4b57 100644
--- a/test/Prototypes/BigInt.swift
+++ b/test/Prototypes/BigInt.swift
@@ -11,15 +11,18 @@
 //===----------------------------------------------------------------------===//
 
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 -o %t/a.out %s
+// RUN: not --crash %target-build-swift -swift-version 4 -o %t/a.out %s
 // RUN: %target-run %t/a.out
 // REQUIRES: executable_test
 // REQUIRES: CPU=x86_64
 
+// rdar://problem/65015626
+// XFAIL: asserts
+
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/Prototypes/Result_future.swift b/test/Prototypes/Result_future.swift
index b3c931fbfbce5..4911836a5924f 100644
--- a/test/Prototypes/Result_future.swift
+++ b/test/Prototypes/Result_future.swift
@@ -12,7 +12,7 @@
 // RUN: %target-run-simple-swift(-Xfrontend -prespecialize-generic-metadata -target %module-target-future)
 // REQUIRES: executable_test
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
 // UNSUPPORTED: CPU=armv7 && OS=ios
 // UNSUPPORTED: CPU=armv7s && OS=ios
diff --git a/test/Runtime/demangleToMetadata.swift b/test/Runtime/demangleToMetadata.swift
index dd70eb3bd0575..0c11f12fa5e8e 100644
--- a/test/Runtime/demangleToMetadata.swift
+++ b/test/Runtime/demangleToMetadata.swift
@@ -441,7 +441,7 @@ DemangleToMetadataTests.test("Nested types in same-type-constrained extensions")
   // V !: P3 in InnerTEqualsConformsToP1
 }
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   DemangleToMetadataTests.test("Round-trip with _mangledTypeName and _typeByName") {
     func roundTrip<T>(_ type: T.Type) {
       let mangledName: String? = _mangledTypeName(type)
diff --git a/test/Runtime/environment_variables.swift b/test/Runtime/environment_variables.swift
index 329ae76ea5ce1..0c88cb9bb9c6d 100644
--- a/test/Runtime/environment_variables.swift
+++ b/test/Runtime/environment_variables.swift
@@ -5,7 +5,7 @@
 // REQUIRES: executable_test
 // UNSUPPORTED: use_os_stdlib
 
-// RUN: env %env-SWIFT_DEBUG_HELP=YES %env-SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE=42 %env-SWIFT_DEBUG_ENABLE_METADATA_ALLOCATION_ITERATION=YES %env-SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc %env-SWIFT_DETERMINISTIC_HASHING=whatever %env-SWIFT_ENABLE_MANGLED_NAME_VERIFICATION=YES %target-run %t/main 2>&1 | %FileCheck %s --dump-input fail
+// RUN: env %env-SWIFT_DEBUG_HELP=YES %env-SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE=42 %env-SWIFT_DEBUG_ENABLE_METADATA_ALLOCATION_ITERATION=YES %env-SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc %env-SWIFT_DETERMINISTIC_HASHING=whatever %env-SWIFT_ENABLE_MANGLED_NAME_VERIFICATION=YES %env-SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE=YES %target-run %t/main 2>&1 | %FileCheck %s --dump-input fail
 
 // CHECK-DAG: {{Warning: unknown environment variable SWIFT_DEBUG_SOME_UNKNOWN_VARIABLE|Using getenv to read variables. Unknown SWIFT_DEBUG_ variables will not be flagged.}}
 // CHECK-DAG: Warning: cannot parse value SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT=abc, defaulting to 2.
@@ -15,6 +15,7 @@
 // CHECK-DAG: uint8_t SWIFT_DEBUG_IMPLICIT_OBJC_ENTRYPOINT [default: 2] - Print warnings when using implicit @objc entrypoints. Set to desired reporting level, 0-3.
 // CHECK-DAG:    bool SWIFT_DETERMINISTIC_HASHING [default: false] - Disable randomized hash seeding.
 // CHECK-DAG:    bool SWIFT_ENABLE_MANGLED_NAME_VERIFICATION [default: false] - Enable verification that metadata can roundtrip through a mangled name each time metadata is instantiated.
+// CHECK-DAG:    bool SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE [default: false] - Scribble on runtime allocations such as metadata allocations.
 
 print("Hello, world")
 // CHECK: Hello, world
diff --git a/test/Runtime/stable-bit-backward-deployment.swift b/test/Runtime/stable-bit-backward-deployment.swift
index aa0e7b33dea43..09e18a7432c15 100644
--- a/test/Runtime/stable-bit-backward-deployment.swift
+++ b/test/Runtime/stable-bit-backward-deployment.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // -- Deployment target is set to pre-10.14.4 so that we use the "old"
 //    Swift runtime bit in compiler-emitted classes
-// RUN: %target-build-swift -target x86_64-apple-macosx10.9 %s -module-name main -o %t/a.out
+// RUN: %target-build-swift -target %target-cpu-apple-macosx10.9 %s -module-name main -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
 // REQUIRES: executable_test
diff --git a/test/SIL/Parser/basic.sil b/test/SIL/Parser/basic.sil
index b74b3ec0a262d..f23816c7cde69 100644
--- a/test/SIL/Parser/basic.sil
+++ b/test/SIL/Parser/basic.sil
@@ -572,6 +572,15 @@ bb0:
   return %6 : $()
 }
 
+// CHECK-LABEL: @base_addr : $@convention(thin) () -> ()
+sil private @base_addr : $() -> () {
+bb0:
+  // CHECK: base_addr_for_offset $*Int
+  %0 = base_addr_for_offset $*Int
+  %1 = tuple ()
+  return %1 : $()
+}
+
 protocol SomeProtocol {
 }
 class SomeClass : SomeProtocol {
diff --git a/test/SIL/Serialization/deserialize_appkit.sil b/test/SIL/Serialization/deserialize_appkit.sil
deleted file mode 100644
index 59b1fbdfcd822..0000000000000
--- a/test/SIL/Serialization/deserialize_appkit.sil
+++ /dev/null
@@ -1,8 +0,0 @@
-// Make sure that we can deserialize AppKit.
-// RUN: %target-sil-opt %platform-sdk-overlay-dir/AppKit.swiftmodule/%target-swiftmodule-name -module-name AppKit > /dev/null
-// RUN: llvm-bcanalyzer %platform-sdk-overlay-dir/AppKit.swiftmodule/%target-swiftmodule-name | %FileCheck %s
-
-// REQUIRES: objc_interop
-// REQUIRES: OS=macosx
-
-// CHECK-NOT: Unknown
diff --git a/test/SIL/Serialization/globals.sil b/test/SIL/Serialization/globals.sil
index 7ceffc910d283..5dadb7b1d7a4b 100644
--- a/test/SIL/Serialization/globals.sil
+++ b/test/SIL/Serialization/globals.sil
@@ -5,6 +5,7 @@
 sil_stage canonical
 
 import Swift
+import Builtin
 
 // CHECK-NOT: sil_global hidden @hidden_global_unused
 sil_global hidden @hidden_global_unused : $Int
@@ -15,6 +16,17 @@ sil_global @public_global_unused : $Int
 // CHECK: sil_global @public_global_used
 sil_global @public_global_used : $Int
 
+// CHECK:      sil_global [serialized] @initialized_global_object : $Int64 = {
+// CHECK-NEXT:   %0 = integer_literal $Builtin.Int64, 27
+// CHECK-NEXT:   %1 = integer_literal $Builtin.Int64, 28
+// CHECK-NEXT:   %initval = object $GlobalObject (%0 : $Builtin.Int64, [tail_elems] %1 : $Builtin.Int64, %1 : $Builtin.Int64)
+// CHECK-NEXT: }
+sil_global [serialized] @initialized_global_object : $Int64 = {
+  %0 = integer_literal $Builtin.Int64, 27
+  %1 = integer_literal $Builtin.Int64, 28
+  %initval = object $GlobalObject (%0 : $Builtin.Int64, [tail_elems] %1 : $Builtin.Int64, %1 : $Builtin.Int64)
+}
+
 // CHECK: sil_global [serialized] @serialized_global
 sil_global [serialized] @serialized_global : $Int
 
@@ -24,3 +36,19 @@ bb0:
   %2 = tuple ()
   return %2 : $()
 }
+
+// CHECK:      sil_global [serialized] @initialized_global_int : $Int64 = {
+// CHECK-NEXT:   %0 = integer_literal $Builtin.Int64, 27
+// CHECK-NEXT:   %initval = struct $Int64 (%0 : $Builtin.Int64)
+// CHECK-NEXT: }
+sil_global [serialized] @initialized_global_int : $Int64 = {
+  %0 = integer_literal $Builtin.Int64, 27
+  %initval = struct $Int64 (%0 : $Builtin.Int64)
+}
+
+class GlobalObject {
+  @_hasStorage let e: Builtin.Int64
+  
+}
+
+
diff --git a/test/SILGen/Inputs/deterministic-dtor-ordering-other.swift b/test/SILGen/Inputs/deterministic-dtor-ordering-other.swift
new file mode 100644
index 0000000000000..e1627702f0233
--- /dev/null
+++ b/test/SILGen/Inputs/deterministic-dtor-ordering-other.swift
@@ -0,0 +1,3 @@
+public func makeAHorse() -> Horse {
+  return Horse()
+}
diff --git a/test/SILGen/availability_attribute.swift b/test/SILGen/availability_attribute.swift
index c2bb509828e8c..cceb0ca07da9d 100644
--- a/test/SILGen/availability_attribute.swift
+++ b/test/SILGen/availability_attribute.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-emit-silgen %s | %FileCheck %s
-// RUN: %target-swift-emit-silgen %s -target x86_64-apple-macosx10.50 | %FileCheck %s
-// RUN: %target-swift-emit-silgen %s -target x86_64-apple-macosx10.60 | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s -target %target-cpu-apple-macosx10.50 | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s -target %target-cpu-apple-macosx10.60 | %FileCheck %s
 // REQUIRES: OS=macosx
 
 // CHECK-LABEL: sil [available 10.50] [ossa] @$s22availability_attribute17availableFunctionyyF : $@convention(thin) () -> ()
diff --git a/test/SILGen/availability_query.swift b/test/SILGen/availability_query.swift
index 5ae132e316ddb..6cae310c96d7b 100644
--- a/test/SILGen/availability_query.swift
+++ b/test/SILGen/availability_query.swift
@@ -1,5 +1,5 @@
-// RUN: %target-swift-emit-sil %s -target x86_64-apple-macosx10.50 -verify
-// RUN: %target-swift-emit-silgen %s -target x86_64-apple-macosx10.50 | %FileCheck %s
+// RUN: %target-swift-emit-sil %s -target %target-cpu-apple-macosx10.50 -verify
+// RUN: %target-swift-emit-silgen %s -target %target-cpu-apple-macosx10.50 | %FileCheck %s
 
 // REQUIRES: OS=macosx
 
diff --git a/test/SILGen/availability_query_maccatalyst_zippered_canonical_versions.swift b/test/SILGen/availability_query_maccatalyst_zippered_canonical_versions.swift
new file mode 100644
index 0000000000000..0c68ea7c8b30c
--- /dev/null
+++ b/test/SILGen/availability_query_maccatalyst_zippered_canonical_versions.swift
@@ -0,0 +1,22 @@
+// RUN: %target-swift-emit-silgen %s -target x86_64-apple-macosx10.52 -target-variant x86_64-apple-ios50.0-macabi | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s -target x86_64-apple-ios50.0-macabi -target-variant x86_64-apple-macosx10.52 | %FileCheck %s
+
+
+// REQUIRES: maccatalyst_support
+
+// CHECK-LABEL: sil{{.+}}@main{{.*}} {
+
+
+// Test for the runtime non-canonical version hack for canonical macOS versioning.
+// This will eventually change to be the correctly canonicalized version.
+
+// CHECK: [[MACOS_MAJOR:%.*]] = integer_literal $Builtin.Word, 10
+// CHECK: [[MACOS_MINOR:%.*]] = integer_literal $Builtin.Word, 16
+// CHECK: [[MACOS_PATCH:%.*]] = integer_literal $Builtin.Word, 0
+// CHECK: [[IOS_MAJOR:%.*]] = integer_literal $Builtin.Word, 51
+// CHECK: [[IOS_MINOR:%.*]] = integer_literal $Builtin.Word, 1
+// CHECK: [[IOS_PATCH:%.*]] = integer_literal $Builtin.Word, 2
+// CHECK: [[FUNC:%.*]] = function_ref @$ss042_stdlib_isOSVersionAtLeastOrVariantVersiondE0yBi1_Bw_BwBwBwBwBwtF : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+// CHECK: [[QUERY_RESULT:%.*]] = apply [[FUNC]]([[MACOS_MAJOR]], [[MACOS_MINOR]], [[MACOS_PATCH]], [[IOS_MAJOR]], [[IOS_MINOR]], [[IOS_PATCH]]) : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+if #available(OSX 10.16, iOS 51.1.2, *) {
+}
diff --git a/test/SILGen/availability_query_macosx_canonical_versions.swift b/test/SILGen/availability_query_macosx_canonical_versions.swift
new file mode 100644
index 0000000000000..becbe903eb6b1
--- /dev/null
+++ b/test/SILGen/availability_query_macosx_canonical_versions.swift
@@ -0,0 +1,17 @@
+// RUN: %target-swift-emit-sil %s -target %target-cpu-apple-macosx10.50 -verify
+// RUN: %target-swift-emit-silgen %s -target %target-cpu-apple-macosx10.50 | %FileCheck %s
+
+// REQUIRES: OS=macosx
+
+// CHECK-LABEL: sil{{.+}}@main{{.*}} {
+
+// Test for the runtime non-canonical version hack for canonical macOS versioning.
+// This will eventually change to be the correctly canonicalized version.
+
+// CHECK: [[MAJOR:%.*]] = integer_literal $Builtin.Word, 10
+// CHECK: [[MINOR:%.*]] = integer_literal $Builtin.Word, 16
+// CHECK: [[PATCH:%.*]] = integer_literal $Builtin.Word, 0
+// CHECK: [[FUNC:%.*]] = function_ref @$ss26_stdlib_isOSVersionAtLeastyBi1_Bw_BwBwtF : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+// CHECK: [[QUERY_RESULT:%.*]] = apply [[FUNC]]([[MAJOR]], [[MINOR]], [[PATCH]]) : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
+if #available(OSX 10.16, iOS 7.1, *) {
+}
\ No newline at end of file
diff --git a/test/SILGen/class_conforms_with_default_implementation.swift b/test/SILGen/class_conforms_with_default_implementation.swift
new file mode 100644
index 0000000000000..e07ee24889dde
--- /dev/null
+++ b/test/SILGen/class_conforms_with_default_implementation.swift
@@ -0,0 +1,48 @@
+// RUN: %target-swift-emit-silgen %s | %FileCheck %s
+
+protocol P {
+  associatedtype T : Q
+  func foo()
+}
+
+extension P {
+  func foo() {}
+}
+
+protocol Q {}
+
+class C<T : Q> : P {}
+
+protocol PP {
+  associatedtype T : QQ
+  func foo()
+}
+
+extension PP {
+  func foo() {}
+}
+
+class QQ {}
+
+class CC<T : QQ> : PP {}
+
+// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s42class_conforms_with_default_implementation1CCyqd__GAA1PA2aEP3fooyyFTW : $@convention(witness_method: P) <τ_0_0><τ_1_0 where τ_0_0 : C<τ_1_0>, τ_1_0 : Q> (@in_guaranteed τ_0_0) -> () {
+// CHECK: [[WITNESS:%.*]] = function_ref @$s42class_conforms_with_default_implementation1PPAAE3fooyyF : $@convention(method) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
+// CHECK: apply [[WITNESS]]<τ_0_0>(%0) : $@convention(method) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> ()
+// CHECK: return
+
+// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s42class_conforms_with_default_implementation2CCCyqd__GAA2PPA2aEP3fooyyFTW : $@convention(witness_method: PP) <τ_0_0><τ_1_0 where τ_0_0 : CC<τ_1_0>, τ_1_0 : QQ> (@in_guaranteed τ_0_0) -> () {
+// CHECK: [[WITNESS:%.*]] = function_ref @$s42class_conforms_with_default_implementation2PPPAAE3fooyyF : $@convention(method) <τ_0_0 where τ_0_0 : PP> (@in_guaranteed τ_0_0) -> ()
+// CHECK: apply [[WITNESS]]<τ_0_0>(%0) : $@convention(method) <τ_0_0 where τ_0_0 : PP> (@in_guaranteed τ_0_0) -> ()
+// CHECK: return
+
+// CHECK-LABEL: sil_witness_table hidden <T where T : Q> C<T>: P module class_conforms_with_default_implementation {
+// CHECK-NEXT: associated_type_protocol (T: Q): dependent
+// CHECK-NEXT: associated_type T: T
+// CHECK-NEXT: method #P.foo: <Self where Self : P> (Self) -> () -> () : @$s42class_conforms_with_default_implementation1CCyqd__GAA1PA2aEP3fooyyFTW
+// CHECK-NEXT: }
+
+// CHECK-LABEL: sil_witness_table hidden <T where T : QQ> CC<T>: PP module class_conforms_with_default_implementation {
+// CHECK-NEXT: associated_type T: T
+// CHECK-NEXT: method #PP.foo: <Self where Self : PP> (Self) -> () -> () : @$s42class_conforms_with_default_implementation2CCCyqd__GAA2PPA2aEP3fooyyFTW
+// CHECK-NEXT: }
diff --git a/test/SILGen/closure_script_global_escape.swift b/test/SILGen/closure_script_global_escape.swift
index 2ccd1d79693fc..140dacdb76e1b 100644
--- a/test/SILGen/closure_script_global_escape.swift
+++ b/test/SILGen/closure_script_global_escape.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-emit-silgen -module-name foo %s | %FileCheck %s
 // RUN: %target-swift-emit-sil -module-name foo -verify %s
-// RUN: %target-swift-frontend -emit-sil -module-name foo -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -module-name foo -verify %s
 
 // CHECK-LABEL: sil [ossa] @main
 
diff --git a/test/SILGen/closure_self_recursion.swift b/test/SILGen/closure_self_recursion.swift
index 6c0b56d1ff0bf..081d1a9cbf865 100644
--- a/test/SILGen/closure_self_recursion.swift
+++ b/test/SILGen/closure_self_recursion.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-emit-silgen -module-name foo %s | %FileCheck %s
 // RUN: %target-swift-emit-sil -module-name foo -verify %s
-// RUN: %target-swift-frontend -emit-sil -module-name foo -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -module-name foo -verify %s
 
 // CHECK-LABEL: sil [ossa] @main
 
diff --git a/test/SILGen/deterministic-dtor-ordering.swift b/test/SILGen/deterministic-dtor-ordering.swift
new file mode 100644
index 0000000000000..06b7c9275e0eb
--- /dev/null
+++ b/test/SILGen/deterministic-dtor-ordering.swift
@@ -0,0 +1,10 @@
+// RUN: %target-swift-emit-silgen -module-name horse -primary-file %S/Inputs/deterministic-dtor-ordering-other.swift -primary-file %s -module-name horse | %FileCheck %s
+// RUN: %target-swift-emit-silgen -module-name horse %S/Inputs/deterministic-dtor-ordering-other.swift -primary-file %s -module-name horse | %FileCheck %s
+
+public class Horse {}
+
+// CHECK-LABEL: sil hidden [exact_self_class] [ossa] @$s5horse5HorseCACycfC : $@convention(method) (@thick Horse.Type) -> @owned Horse {
+// CHECK-LABEL: sil hidden [ossa] @$s5horse5HorseCACycfc : $@convention(method) (@owned Horse) -> @owned Horse {
+// CHECK-LABEL: sil [ossa] @$s5horse5HorseCfd : $@convention(method) (@guaranteed Horse) -> @owned Builtin.NativeObject {
+// CHECK-LABEL: sil [ossa] @$s5horse5HorseCfD : $@convention(method) (@owned Horse) -> () {
+
diff --git a/test/SILGen/dso_handle.swift b/test/SILGen/dso_handle.swift
index e7fec3557f27d..445c22ae69795 100644
--- a/test/SILGen/dso_handle.swift
+++ b/test/SILGen/dso_handle.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-emit-silgen -Xllvm -sil-full-demangle %s | %FileCheck %s
 
-// CHECK: sil_global [[DSO:@__dso_handle|@__ImageBase]] : $Builtin.RawPointer
+// CHECK: sil_global {{.*}}[[DSO:@__dso_handle|@__ImageBase]] : $Builtin.RawPointer
 
 // CHECK-LABEL: sil [ossa] @main : $@convention(c)
 // CHECK: bb0
diff --git a/test/SILGen/enum_raw_representable_available.swift b/test/SILGen/enum_raw_representable_available.swift
index 080112253913e..404684a261fa7 100644
--- a/test/SILGen/enum_raw_representable_available.swift
+++ b/test/SILGen/enum_raw_representable_available.swift
@@ -1,10 +1,10 @@
-// RUN: %target-typecheck-verify-swift -target x86_64-apple-macosx10.52
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.52
 
-// RUN: %target-swift-emit-silgen -target x86_64-apple-macosx10.52 -emit-sorted-sil -o %t.fragile.sil %s
+// RUN: %target-swift-emit-silgen -target %target-cpu-apple-macosx10.52 -emit-sorted-sil -o %t.fragile.sil %s
 // RUN: %FileCheck %s < %t.fragile.sil
 // RUN: %FileCheck -check-prefix NEGATIVE %s < %t.fragile.sil
 
-// RUN: %target-swift-emit-silgen -target x86_64-apple-macosx10.52 -emit-sorted-sil -enable-library-evolution -o %t.resilient.sil %s
+// RUN: %target-swift-emit-silgen -target %target-cpu-apple-macosx10.52 -emit-sorted-sil -enable-library-evolution -o %t.resilient.sil %s
 // RUN: %FileCheck %s < %t.resilient.sil
 // RUN: %FileCheck -check-prefix NEGATIVE %s < %t.resilient.sil
 
diff --git a/test/SILGen/keypaths.swift b/test/SILGen/keypaths.swift
index 7c1e88cff14a4..42a7605d881b6 100644
--- a/test/SILGen/keypaths.swift
+++ b/test/SILGen/keypaths.swift
@@ -486,9 +486,7 @@ func test_variadics() {
   // CHECK: [[FN_REF:%[0-9]+]] = function_ref @$ss27_allocateUninitializedArrayySayxG_BptBwlF
   // CHECK: [[MAKE_ARR:%[0-9]+]] = apply [[FN_REF]]<Int>([[ARR_COUNT]])
   // CHECK: ([[ARR:%[0-9]+]], %{{[0-9]+}}) = destructure_tuple [[MAKE_ARR]] : $(Array<Int>, Builtin.RawPointer)
-  // CHECK: [[FIN_REF:%[0-9]+]] = function_ref @$ss27_finalizeUninitializedArrayySayxGABnlF
-  // CHECK: [[FIN_ARR:%[0-9]+]] = apply [[FIN_REF]]<Int>([[ARR]])
-  // CHECK: keypath $KeyPath<SubscriptVariadic1, Int>, (root $SubscriptVariadic1; gettable_property $Int,  id @$s8keypaths18SubscriptVariadic1VyS2id_tcig : $@convention(method) (@guaranteed Array<Int>, SubscriptVariadic1) -> Int, getter @$s8keypaths18SubscriptVariadic1VyS2id_tcipACTK : $@convention(thin) (@in_guaranteed SubscriptVariadic1, UnsafeRawPointer) -> @out Int, indices [%$0 : $Array<Int> : $Array<Int>], indices_equals @$sSaySiGTH : $@convention(thin) (UnsafeRawPointer, UnsafeRawPointer) -> Bool, indices_hash @$sSaySiGTh : $@convention(thin) (UnsafeRawPointer) -> Int) ([[FIN_ARR]])
+  // CHECK: keypath $KeyPath<SubscriptVariadic1, Int>, (root $SubscriptVariadic1; gettable_property $Int,  id @$s8keypaths18SubscriptVariadic1VyS2id_tcig : $@convention(method) (@guaranteed Array<Int>, SubscriptVariadic1) -> Int, getter @$s8keypaths18SubscriptVariadic1VyS2id_tcipACTK : $@convention(thin) (@in_guaranteed SubscriptVariadic1, UnsafeRawPointer) -> @out Int, indices [%$0 : $Array<Int> : $Array<Int>], indices_equals @$sSaySiGTH : $@convention(thin) (UnsafeRawPointer, UnsafeRawPointer) -> Bool, indices_hash @$sSaySiGTh : $@convention(thin) (UnsafeRawPointer) -> Int) ([[ARR]])
   _ = \SubscriptVariadic1.[]
   
   _ = \SubscriptVariadic2.["", "1"]
diff --git a/test/SILGen/objc_thunks.swift b/test/SILGen/objc_thunks.swift
index 76a3a48e3e64c..668ca2048fab4 100644
--- a/test/SILGen/objc_thunks.swift
+++ b/test/SILGen/objc_thunks.swift
@@ -454,13 +454,13 @@ class Wotsit<T> : Gizmo {
     return "Hello, world."
   }
 
-  // Ivar destroyer
-  // CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6WotsitCfETo
-
   // CHECK-LABEL: sil hidden [thunk] [ossa] @$s11objc_thunks6WotsitCACyxGSgycfcTo : $@convention(objc_method) <T> (@owned Wotsit<T>) -> @owned Optional<Wotsit<T>>
 
   // CHECK-LABEL: sil hidden [thunk] [ossa] @$s11objc_thunks6WotsitC7bellsOnACyxGSgSi_tcfcTo : $@convention(objc_method) <T> (Int, @owned Wotsit<T>) -> @owned Optional<Wotsit<T>>
 
+  // Ivar destroyer
+  // CHECK-LABEL: sil hidden [ossa] @$s11objc_thunks6WotsitCfETo
+
 }
 
 // CHECK-NOT: sil hidden [thunk] [ossa] @_TToF{{.*}}Wotsit{{.*}}
diff --git a/test/SILGen/polymorphic_inout_aliasing.swift b/test/SILGen/polymorphic_inout_aliasing.swift
index 71bb3e51e9719..e83e9479b8819 100644
--- a/test/SILGen/polymorphic_inout_aliasing.swift
+++ b/test/SILGen/polymorphic_inout_aliasing.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-emit-sil -verify %s
-// RUN: %target-swift-frontend -emit-sil -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -verify %s
 
 struct Block {}
 
diff --git a/test/SILGen/scalar_to_tuple_args.swift b/test/SILGen/scalar_to_tuple_args.swift
index 67888cc061196..004d6cade6d5d 100644
--- a/test/SILGen/scalar_to_tuple_args.swift
+++ b/test/SILGen/scalar_to_tuple_args.swift
@@ -68,8 +68,6 @@ variadicFirst(x)
 // CHECK: [[X:%.*]] = load [trivial] [[READ]]
 // CHECK: [[ALLOC_ARRAY:%.*]] = apply {{.*}} -> (@owned Array<τ_0_0>, Builtin.RawPointer)
 // CHECK: ([[ARRAY:%.*]], [[MEMORY:%.*]]) = destructure_tuple [[ALLOC_ARRAY]]
-// CHECK: [[FIN_FN:%.*]] = function_ref @$ss27_finalizeUninitializedArrayySayxGABnlF
-// CHECK: [[FIN_ARR:%.*]] = apply [[FIN_FN]]<Int>([[ARRAY]])
 // CHECK: [[VARIADIC_SECOND:%.*]] = function_ref @$s20scalar_to_tuple_args14variadicSecondyySi_SidtF
-// CHECK: apply [[VARIADIC_SECOND]]([[X]], [[FIN_ARR]])
+// CHECK: apply [[VARIADIC_SECOND]]([[X]], [[ARRAY]])
 variadicSecond(x)
diff --git a/test/SILOptimizer/Inputs/CXXTypesWithUserProvidedDestructor.h b/test/SILOptimizer/Inputs/CXXTypesWithUserProvidedDestructor.h
new file mode 100644
index 0000000000000..f31f2af64883f
--- /dev/null
+++ b/test/SILOptimizer/Inputs/CXXTypesWithUserProvidedDestructor.h
@@ -0,0 +1,18 @@
+#ifndef TEST_SIL_OPTIMIZER_CXX_WITH_CUSTOM_DESTRUCTOR_H
+#define TEST_SIL_OPTIMIZER_CXX_WITH_CUSTOM_DESTRUCTOR_H
+
+struct HasUserProvidedDestructor {
+  int x;
+  ~HasUserProvidedDestructor() {}
+};
+
+struct Loadable {
+  int x;
+};
+
+struct HasMemberWithUserProvidedDestructor {
+  Loadable y;
+  ~HasMemberWithUserProvidedDestructor() {}
+};
+
+#endif // TEST_SIL_OPTIMIZER_CXX_WITH_CUSTOM_DESTRUCTOR_H
diff --git a/test/SILOptimizer/Inputs/cross-module.swift b/test/SILOptimizer/Inputs/cross-module.swift
index 8c2f1f21fe9c2..2fba5c8c229c0 100644
--- a/test/SILOptimizer/Inputs/cross-module.swift
+++ b/test/SILOptimizer/Inputs/cross-module.swift
@@ -130,6 +130,7 @@ extension Int : PrivateProtocol {
 }
 
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 private func printFooExistential(_ p: PrivateProtocol) {
   print(p.foo())
 }
@@ -266,3 +267,4 @@ public func callUnrelated<T>(_ t: T) -> T {
   return t
 }
 
+public let globalLet = 529387
diff --git a/test/SILOptimizer/Inputs/foo.h b/test/SILOptimizer/Inputs/foo.h
deleted file mode 100644
index 7faf6b5576515..0000000000000
--- a/test/SILOptimizer/Inputs/foo.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef VALIDATION_TEST_SILOPTIMIZER_FOO_H
-#define VALIDATION_TEST_SILOPTIMIZER_FOO_H
-
-struct Foo {
-  int x;
-  ~Foo() {}
-};
-
-struct Loadable {
-  int x;
-};
-
-struct Bar {
-  Loadable y;
-  ~Bar() {}
-};
-
-#endif // VALIDATION_TEST_SILOPTIMIZER_FOO_H
diff --git a/test/SILOptimizer/Inputs/module.modulemap b/test/SILOptimizer/Inputs/module.modulemap
index 6522d75170250..ec95a054a05bb 100644
--- a/test/SILOptimizer/Inputs/module.modulemap
+++ b/test/SILOptimizer/Inputs/module.modulemap
@@ -1,3 +1,3 @@
-module Foo {
-  header "foo.h"
+module CXXTypesWithUserProvidedDestructor {
+  header "CXXTypesWithUserProvidedDestructor.h"
 }
diff --git a/test/SILOptimizer/Inputs/struct_with_fields.swift b/test/SILOptimizer/Inputs/struct_with_fields.swift
new file mode 100644
index 0000000000000..7652d39100139
--- /dev/null
+++ b/test/SILOptimizer/Inputs/struct_with_fields.swift
@@ -0,0 +1,5 @@
+
+public struct TestStruct {
+  public var x: Int
+  public var y: Int
+}
diff --git a/test/SILOptimizer/OSLogCompilerDiagnosticsTest.swift b/test/SILOptimizer/OSLogCompilerDiagnosticsTest.swift
index 9910c5bcc9abe..990d6581e26ea 100644
--- a/test/SILOptimizer/OSLogCompilerDiagnosticsTest.swift
+++ b/test/SILOptimizer/OSLogCompilerDiagnosticsTest.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -swift-version 5 -emit-sil -primary-file %s -o /dev/null -verify
 //
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Tests for the diagnostics produced by the OSLogOptimization pass that
 // performs compile-time analysis and optimization of the new os log APIs.
diff --git a/test/SILOptimizer/OSLogConstantEvaluableTest.swift b/test/SILOptimizer/OSLogConstantEvaluableTest.swift
index 47bff6dcb7a56..87554fac815e8 100644
--- a/test/SILOptimizer/OSLogConstantEvaluableTest.swift
+++ b/test/SILOptimizer/OSLogConstantEvaluableTest.swift
@@ -8,7 +8,7 @@
 //
 // RUN: %FileCheck %s < %t/error-output
 //
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Test that the functions defined in the OSLogPrototype overlay annotated as
 // constant evaluable are so (with the constexpr-limit defined above).
diff --git a/test/SILOptimizer/OSLogFullOptTest.swift b/test/SILOptimizer/OSLogFullOptTest.swift
index dfd43105be461..4dbf39e3e886c 100644
--- a/test/SILOptimizer/OSLogFullOptTest.swift
+++ b/test/SILOptimizer/OSLogFullOptTest.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir -swift-version 5 -O -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 //
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // This tests the optimality of the IR generated for the new os log APIs. This
 // is not testing the output of a specific optimization pass (which has separate
diff --git a/test/SILOptimizer/OSLogMandatoryOptTest.swift b/test/SILOptimizer/OSLogMandatoryOptTest.swift
index a41a1ad7ba34f..2d20e4d303e0f 100644
--- a/test/SILOptimizer/OSLogMandatoryOptTest.swift
+++ b/test/SILOptimizer/OSLogMandatoryOptTest.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -swift-version 5 -emit-sil -primary-file %s -Xllvm -sil-print-after=OSLogOptimization -o /dev/null 2>&1 | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
 //
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Tests for the OSLogOptimization pass that performs compile-time analysis
 // and optimization of the new os log APIs. The tests here check whether specific
diff --git a/test/SILOptimizer/access_enforcement_noescape_error.swift b/test/SILOptimizer/access_enforcement_noescape_error.swift
index a61b8b688d4a3..118f05d508a1c 100644
--- a/test/SILOptimizer/access_enforcement_noescape_error.swift
+++ b/test/SILOptimizer/access_enforcement_noescape_error.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -module-name access_enforcement_noescape -enforce-exclusivity=checked -Onone -emit-sil -swift-version 4 -verify -parse-as-library %s
-// RUN: %target-swift-frontend -module-name access_enforcement_noescape -enforce-exclusivity=checked -Onone -emit-sil -swift-version 4 -verify -parse-as-library -enable-ownership-stripping-after-serialization %s
+// RUN: %target-swift-frontend -module-name access_enforcement_noescape -enforce-exclusivity=checked -Onone -emit-sil -swift-version 4 -verify -parse-as-library %s
 // REQUIRES: asserts
 
 // This is the subset of tests from access_enforcement_noescape.swift
diff --git a/test/SILOptimizer/access_wmo_diagnose.swift b/test/SILOptimizer/access_wmo_diagnose.swift
index 02a2877962f5f..4bdc12138fb5b 100644
--- a/test/SILOptimizer/access_wmo_diagnose.swift
+++ b/test/SILOptimizer/access_wmo_diagnose.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -parse-as-library -emit-sil -enforce-exclusivity=checked -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -parse-as-library -emit-sil -enforce-exclusivity=checked -primary-file %s -o /dev/null -verify
+// RUN: %target-swift-frontend -parse-as-library -emit-sil -enforce-exclusivity=checked -primary-file %s -o /dev/null -verify
 
 // AccessEnforcementWMO assumes that the only way to address a global or static
 // property is via a formal begin_access. If we ever allow keypaths for static
diff --git a/test/SILOptimizer/allocbox_to_stack.sil b/test/SILOptimizer/allocbox_to_stack.sil
index 991a9e848ec89..89cb9c85a2ec3 100644
--- a/test/SILOptimizer/allocbox_to_stack.sil
+++ b/test/SILOptimizer/allocbox_to_stack.sil
@@ -395,7 +395,7 @@ bb0(%0 : $Int):
   return %10 : $()                                // id: %11
 }
 
-// CHECK-LABEL: sil shared @$s6struct8useStack1tySi_tFSiycfU_Tf0s_n
+// CHECK-LABEL: sil private @$s6struct8useStack1tySi_tFSiycfU_Tf0s_n
 // CHECK-LABEL: sil private @$s6struct8useStack1tySi_tFSiycfU_
 // struct.(useStack (t : Swift.Int) -> ()).(closure #1)
 sil private @$s6struct8useStack1tySi_tFSiycfU_ : $@convention(thin) (@owned <τ_0_0> { var τ_0_0 } <Int>) -> Int {
@@ -513,8 +513,8 @@ bb0(%0 : $*T):
   return %9 : $()
 }
 
-// CHECK-LABEL: sil shared @$s21closure_to_specializeTf0ns_n : $@convention(thin) <T where T : P> (@inout_aliasable T) -> @out T
-sil shared @closure_to_specialize : $@convention(thin) <T where T : P> (@owned <τ_0_0> { var τ_0_0 } <T>) -> @out T {
+// CHECK-LABEL: sil private @$s21closure_to_specializeTf0ns_n : $@convention(thin) <T where T : P> (@inout_aliasable T) -> @out T
+sil private @closure_to_specialize : $@convention(thin) <T where T : P> (@owned <τ_0_0> { var τ_0_0 } <T>) -> @out T {
 // CHECK: bb0
 bb0(%0 : $*T, %1 : $<τ_0_0> { var τ_0_0 } <T>):
   %2 = project_box %1 : $<τ_0_0> { var τ_0_0 } <T>, 0
diff --git a/test/SILOptimizer/allocbox_to_stack_ownership.sil b/test/SILOptimizer/allocbox_to_stack_ownership.sil
index b9e0028a21cb4..8c0027c042700 100644
--- a/test/SILOptimizer/allocbox_to_stack_ownership.sil
+++ b/test/SILOptimizer/allocbox_to_stack_ownership.sil
@@ -391,7 +391,7 @@ bb0(%0 : $Int):
   return %10 : $()                                // id: %11
 }
 
-// CHECK-LABEL: sil shared [transparent] [ossa] @$s6struct8useStack1tySi_tFSiycfU_Tf0s_n
+// CHECK-LABEL: sil private [transparent] [ossa] @$s6struct8useStack1tySi_tFSiycfU_Tf0s_n
 // CHECK-LABEL: sil private [transparent] [ossa] @$s6struct8useStack1tySi_tFSiycfU_
 // struct.(useStack (t : Swift.Int) -> ()).(closure #1)
 sil private [transparent] [ossa] @$s6struct8useStack1tySi_tFSiycfU_ : $@convention(thin) (@owned <τ_0_0> { var τ_0_0 } <Int>) -> Int {
diff --git a/test/SILOptimizer/allocboxtostack_localapply.sil b/test/SILOptimizer/allocboxtostack_localapply.sil
new file mode 100644
index 0000000000000..733459137d665
--- /dev/null
+++ b/test/SILOptimizer/allocboxtostack_localapply.sil
@@ -0,0 +1,351 @@
+// RUN: %target-sil-opt %s -allocbox-to-stack -sil-deadfuncelim | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+import SwiftShims
+
+
+sil hidden [noinline] [Onone] @$blackhole : $@convention(thin) <T> (@in_guaranteed T) -> () {
+bb0(%0 : $*T):
+  %2 = tuple ()
+  return %2 : $()
+}
+
+// CHECK-LABEL: sil [noinline] @$testapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testapply'
+sil [noinline] @$testapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = function_ref @$testapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  strong_release %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] @$testapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] @$testapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] @$testtryapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testtryapply'
+sil [noinline] @$testtryapply : $@convention(thin) () -> @error Error {
+bb0:
+  %1 = alloc_box ${ var Int64 }, var, name "x"
+  %2 = project_box %1 : ${ var Int64 }, 0
+  %3 = integer_literal $Builtin.Int64, 0
+  %4 = struct $Int64 (%3 : $Builtin.Int64)
+  store %4 to %2 : $*Int64
+  %6 = function_ref @$testtryapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error
+  try_apply %6(%1) : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error, normal bb1, error bb2
+bb1(%8 : $()):
+  strong_release %1 : ${ var Int64 }
+  %10 = tuple ()
+  return %10 : $()
+bb2(%12 : $Error):
+  strong_release %1 : ${ var Int64 }
+  throw %12 : $Error
+}
+
+sil private [noinline] @$testtryapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error {
+bb0(%0 : ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = begin_access [read] [dynamic] %2 : $*Int64
+  %5 = load %4 : $*Int64
+  end_access %4 : $*Int64
+  %7 = alloc_stack $Int64
+  store %5 to %7 : $*Int64
+  %9 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %10 = apply %9<Int64>(%7) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %7 : $*Int64
+  %12 = tuple ()
+  return %12 : $()
+}
+
+sil private [noinline] @$testtryapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error {
+bb0(%0 : ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = function_ref @$testtryapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error
+  try_apply %4(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error, normal bb1, error bb2
+bb1(%6 : $()):
+  %7 = tuple ()
+  return %7 : $()
+bb2(%9 : $Error):
+  throw %9 : $Error
+}
+
+
+// CHECK-LABEL: sil [noinline] @$testpartialapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testpartialapply'
+sil [noinline] @$testpartialapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = function_ref @$testpartialapplyclosure : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  strong_release %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] @$testpartialapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] @$testpartialapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testpartialapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+sil private @$testpartialapplyclosure : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testpartialapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] @$testtwoboxes :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK1:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK: [[STK2:%.*]] = alloc_stack $Int64, var, name "y"
+// CHECK-LABEL: } // end sil function '$testtwoboxes'
+sil [noinline] @$testtwoboxes : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = alloc_box ${ var Int64 }, var, name "y"
+  %6 = project_box %5 : ${ var Int64 }, 0
+  %7 = integer_literal $Builtin.Int64, 0
+  %8 = struct $Int64 (%7 : $Builtin.Int64)
+  store %8 to %6 : $*Int64
+  %10 = function_ref @$testtwoboxesbas : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %11 = apply %10(%0, %5) : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  strong_release %5 : ${ var Int64 }
+  strong_release %0 : ${ var Int64 }
+  %14 = tuple ()
+  return %14 : $()
+}
+
+sil private [noinline] @$testtwoboxesbar : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }, %1 : ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = project_box %1 : ${ var Int64 }, 0
+  %6 = begin_access [read] [dynamic] %2 : $*Int64
+  %7 = load %6 : $*Int64
+  end_access %6 : $*Int64
+  %9 = alloc_stack $Int64
+  store %7 to %9 : $*Int64
+  %11 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %12 = apply %11<Int64>(%9) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %9 : $*Int64
+  %14 = begin_access [read] [dynamic] %4 : $*Int64
+  %15 = load %14 : $*Int64
+  end_access %14 : $*Int64
+  %17 = alloc_stack $Int64
+  store %15 to %17 : $*Int64
+  %19 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %20 = apply %19<Int64>(%17) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %17 : $*Int64
+  %22 = tuple ()
+  return %22 : $()
+}
+
+sil private [noinline] @$testtwoboxesbas : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }, %1 : ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = project_box %1 : ${ var Int64 }, 0
+  %6 = function_ref @$testtwoboxesbar : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %7 = apply %6(%0, %1) : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %8 = tuple ()
+  return %8 : $()
+}
+
+// CHECK-LABEL: sil [noinline] @$testboxescapes :
+// CHECK: alloc_box ${ var Int64 }, var, name "x"
+// CHECK-LABEL: } // end sil function '$testboxescapes'
+sil [noinline] @$testboxescapes : $@convention(thin) () -> @owned @callee_guaranteed () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = function_ref @$testboxescapesbas : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  strong_release %0 : ${ var Int64 }
+  return %6 : $@callee_guaranteed () -> ()
+}
+
+sil private [noinline] @$testboxescapesbar : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testboxescapesclosure : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  strong_retain %0 : ${ var Int64 }
+  %5 = partial_apply [callee_guaranteed] %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  return %5 : $@callee_guaranteed () -> ()
+}
+
+sil private @$testboxescapesclosure : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = load %1 : $*Int64
+  %4 = tuple ()
+  return %4 : $()
+}
+
+sil private [noinline] @$testboxescapesbas : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testboxescapesbar : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  return %4 : $@callee_guaranteed () -> ()
+}
+
+// CHECK-LABEL: sil [noinline] @$testrecur :
+// CHECK: alloc_box ${ var Int64 }, var, name "x"
+// CHECK-LABEL: } // end sil function '$testrecur'
+sil [noinline] @$testrecur : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = function_ref @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %7 = function_ref @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %8 = apply %7(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  strong_release %0 : ${ var Int64 }
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil private [noinline] @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = function_ref @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %12 = apply %11(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %13 = tuple ()
+  return %13 : $()
+}
+
+sil private [noinline] @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] @$testbeginapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testbeginapply'
+sil [noinline] @$testbeginapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to %1 : $*Int64
+  %5 = function_ref @$testbeginapplybas : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields ()
+  (%addr, %token) = begin_apply %5(%0) : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields ()
+  end_apply %token
+  strong_release %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] @$testbeginapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] @$testbeginapplybas : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields () {
+bb0(%0 : ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testbeginapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  yield %5 : $(), resume bb1, unwind bb2
+bb1:
+  %rv = tuple()
+  return %rv : $()
+bb2:
+  unwind
+}
+
diff --git a/test/SILOptimizer/allocboxtostack_localapply.swift b/test/SILOptimizer/allocboxtostack_localapply.swift
new file mode 100644
index 0000000000000..c9c73539ae6b4
--- /dev/null
+++ b/test/SILOptimizer/allocboxtostack_localapply.swift
@@ -0,0 +1,120 @@
+// RUN: %target-swift-frontend -emit-sil %s -O | %FileCheck %s
+
+
+@_optimize(none)
+@inline(never)
+func blackhole<T>(_ x:T) {
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply9testapplySiyF :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int, var, name "x"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply9testapplySiyF'
+@inline(never)
+public func testapply() -> Int {
+  var x = 0
+  @inline(never)
+  func bar() -> Int {
+    blackhole(x)
+    return x + 1
+  }
+  @inline(never)
+  func bas() -> Int {
+    return bar()
+  }
+  return bas()
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply12testtryapplySiyKF :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int, var, name "x"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply12testtryapplySiyKF'
+@inline(never)
+public func testtryapply() throws -> Int {
+  var x = 0
+  @inline(never)
+  func bar() throws -> Int {
+    blackhole(x)
+    return x + 1
+  }
+  @inline(never)
+  func bas() throws -> Int {
+    return try bar()
+  }
+  let res = try bas()
+  return res
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply16testpartialapplySiyF :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int, var, name "x"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply16testpartialapplySiyF'
+@inline(never)
+public func testpartialapply() -> Int {
+  var x = 0
+  @inline(never)
+  func bar() -> Int {
+    blackhole(x)
+    return x + 1
+  }
+  @inline(never)
+  func bas() -> Int {
+    return bar()
+  }
+  return {bas()}()
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply12testtwoboxesSiyF :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK1:%.*]] = alloc_stack $Int, var, name "x"
+// CHECK: [[STK2:%.*]] = alloc_stack $Int, var, name "y"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply12testtwoboxesSiyF'
+@inline(never)
+public func testtwoboxes() -> Int {
+  var x = 0
+  var y = 0
+  @inline(never)
+  func bar() -> Int {
+    blackhole(x)
+    return x + y 
+  }
+  @inline(never)
+  func bas() -> Int {
+    return bar()
+  }
+  return bas()
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply14testboxescapesyycyF :
+// CHECK: alloc_box ${ var Int }, var, name "x"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply14testboxescapesyycyF'
+@inline(never)
+public func testboxescapes() -> (() -> ()) {
+  var x = 0
+  @inline(never)
+  func bar() -> (() -> ()) {
+    return {x + 1}
+  }
+  @inline(never)
+  func bas() -> (() -> ()) {
+    return bar()
+  }
+  return bas()
+}
+
+// CHECK-LABEL: sil [noinline] @$s26allocboxtostack_localapply9testrecurSiyF :
+// CHECK: alloc_box ${ var Int }, var, name "x"
+// CHECK-LABEL: } // end sil function '$s26allocboxtostack_localapply9testrecurSiyF'
+@inline(never)
+public func testrecur() -> Int {
+  var x = 0
+  @inline(never)
+  func bar() -> Int {
+    return x + bas()
+  }
+  @inline(never)
+  func bas() -> Int {
+    return bar()
+  }
+  return bas() + bar()
+}
diff --git a/test/SILOptimizer/allocboxtostack_localapply_ossa.sil b/test/SILOptimizer/allocboxtostack_localapply_ossa.sil
new file mode 100644
index 0000000000000..6807349240adc
--- /dev/null
+++ b/test/SILOptimizer/allocboxtostack_localapply_ossa.sil
@@ -0,0 +1,351 @@
+// RUN: %target-sil-opt %s -allocbox-to-stack -sil-deadfuncelim | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+import SwiftShims
+
+
+sil hidden [noinline] [ossa] [Onone] @$blackhole : $@convention(thin) <T> (@in_guaranteed T) -> () {
+bb0(%0 : $*T):
+  %2 = tuple ()
+  return %2 : $()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testapply'
+sil [noinline] [ossa] @$testapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = function_ref @$testapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  destroy_value %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] [ossa] @$testapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load [trivial] %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to [trivial] %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] [ossa] @$testapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testtryapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testtryapply'
+sil [noinline] [ossa] @$testtryapply : $@convention(thin) () -> @error Error {
+bb0:
+  %1 = alloc_box ${ var Int64 }, var, name "x"
+  %2 = project_box %1 : ${ var Int64 }, 0
+  %3 = integer_literal $Builtin.Int64, 0
+  %4 = struct $Int64 (%3 : $Builtin.Int64)
+  store %4 to [trivial] %2 : $*Int64
+  %6 = function_ref @$testtryapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error
+  try_apply %6(%1) : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error, normal bb1, error bb2
+bb1(%8 : $()):
+  destroy_value %1 : ${ var Int64 }
+  %10 = tuple ()
+  return %10 : $()
+bb2(%12 : $Error):
+  destroy_value %1 : ${ var Int64 }
+  throw %12 : $Error
+}
+
+sil private [noinline] [ossa] @$testtryapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = begin_access [read] [dynamic] %2 : $*Int64
+  %5 = load [trivial] %4 : $*Int64
+  end_access %4 : $*Int64
+  %7 = alloc_stack $Int64
+  store %5 to [trivial] %7 : $*Int64
+  %9 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %10 = apply %9<Int64>(%7) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %7 : $*Int64
+  %12 = tuple ()
+  return %12 : $()
+}
+
+sil private [noinline] [ossa] @$testtryapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = function_ref @$testtryapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error
+  try_apply %4(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @error Error, normal bb1, error bb2
+bb1(%6 : $()):
+  %7 = tuple ()
+  return %7 : $()
+bb2(%9 : $Error):
+  throw %9 : $Error
+}
+
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testpartialapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testpartialapply'
+sil [noinline] [ossa] @$testpartialapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = function_ref @$testpartialapplyclosure : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  destroy_value %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] [ossa] @$testpartialapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load [trivial] %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to [trivial] %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] [ossa] @$testpartialapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testpartialapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+sil private [ossa] @$testpartialapplyclosure : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testpartialapplybas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testtwoboxes :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK1:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK: [[STK2:%.*]] = alloc_stack $Int64, var, name "y"
+// CHECK-LABEL: } // end sil function '$testtwoboxes'
+sil [noinline] [ossa] @$testtwoboxes : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = alloc_box ${ var Int64 }, var, name "y"
+  %6 = project_box %5 : ${ var Int64 }, 0
+  %7 = integer_literal $Builtin.Int64, 0
+  %8 = struct $Int64 (%7 : $Builtin.Int64)
+  store %8 to [trivial] %6 : $*Int64
+  %10 = function_ref @$testtwoboxesbas : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %11 = apply %10(%0, %5) : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  destroy_value %5 : ${ var Int64 }
+  destroy_value %0 : ${ var Int64 }
+  %14 = tuple ()
+  return %14 : $()
+}
+
+sil private [noinline] [ossa] @$testtwoboxesbar : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }, %1 : @guaranteed ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = project_box %1 : ${ var Int64 }, 0
+  %6 = begin_access [read] [dynamic] %2 : $*Int64
+  %7 = load [trivial] %6 : $*Int64
+  end_access %6 : $*Int64
+  %9 = alloc_stack $Int64
+  store %7 to [trivial] %9 : $*Int64
+  %11 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %12 = apply %11<Int64>(%9) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %9 : $*Int64
+  %14 = begin_access [read] [dynamic] %4 : $*Int64
+  %15 = load [trivial] %14 : $*Int64
+  end_access %14 : $*Int64
+  %17 = alloc_stack $Int64
+  store %15 to [trivial] %17 : $*Int64
+  %19 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %20 = apply %19<Int64>(%17) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %17 : $*Int64
+  %22 = tuple ()
+  return %22 : $()
+}
+
+sil private [noinline] [ossa] @$testtwoboxesbas : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }, %1 : @guaranteed ${ var Int64 }):
+  %2 = project_box %0 : ${ var Int64 }, 0
+  %4 = project_box %1 : ${ var Int64 }, 0
+  %6 = function_ref @$testtwoboxesbar : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %7 = apply %6(%0, %1) : $@convention(thin) (@guaranteed { var Int64 }, @guaranteed { var Int64 }) -> ()
+  %8 = tuple ()
+  return %8 : $()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testboxescapes :
+// CHECK: alloc_box ${ var Int64 }, var, name "x"
+// CHECK-LABEL: } // end sil function '$testboxescapes'
+sil [noinline] [ossa] @$testboxescapes : $@convention(thin) () -> @owned @callee_guaranteed () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = function_ref @$testboxescapesbas : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  destroy_value %0 : ${ var Int64 }
+  return %6 : $@callee_guaranteed () -> ()
+}
+
+sil private [noinline] [ossa] @$testboxescapesbar : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testboxescapesclosure : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %copy = copy_value %0 : ${ var Int64 }
+  %5 = partial_apply [callee_guaranteed] %3(%copy) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  return %5 : $@callee_guaranteed () -> ()
+}
+
+sil private [ossa] @$testboxescapesclosure : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = load [trivial] %1 : $*Int64
+  %4 = tuple ()
+  return %4 : $()
+}
+
+sil private [noinline] [ossa] @$testboxescapesbas : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testboxescapesbar : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> @owned @callee_guaranteed () -> ()
+  return %4 : $@callee_guaranteed () -> ()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testrecur :
+// CHECK: alloc_box ${ var Int64 }, var, name "x"
+// CHECK-LABEL: } // end sil function '$testrecur'
+sil [noinline] [ossa] @$testrecur : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = function_ref @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %6 = apply %5(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %7 = function_ref @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %8 = apply %7(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  destroy_value %0 : ${ var Int64 }
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil private [noinline] [ossa] @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load [trivial] %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to [trivial] %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = function_ref @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %12 = apply %11(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %13 = tuple ()
+  return %13 : $()
+}
+
+sil private [noinline] [ossa] @$testrecurbas : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testrecurbar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// CHECK-LABEL: sil [noinline] [ossa] @$testbeginapply :
+// CHECK-NOT: alloc_box
+// CHECK: [[STK:%.*]] = alloc_stack $Int64, var, name "x"
+// CHECK-LABEL: } // end sil function '$testbeginapply'
+sil [noinline] [ossa] @$testbeginapply : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_box ${ var Int64 }, var, name "x"
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %2 = integer_literal $Builtin.Int64, 0
+  %3 = struct $Int64 (%2 : $Builtin.Int64)
+  store %3 to [trivial] %1 : $*Int64
+  %5 = function_ref @$testbeginapplybas : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields ()
+  (%addr, %token) = begin_apply %5(%0) : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields ()
+  end_apply %token
+  destroy_value %0 : ${ var Int64 }
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil private [noinline] [ossa] @$testbeginapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = begin_access [read] [dynamic] %1 : $*Int64
+  %4 = load [trivial] %3 : $*Int64
+  end_access %3 : $*Int64
+  %6 = alloc_stack $Int64
+  store %4 to [trivial] %6 : $*Int64
+  %8 = function_ref @$blackhole : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  %9 = apply %8<Int64>(%6) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  dealloc_stack %6 : $*Int64
+  %11 = tuple ()
+  return %11 : $()
+}
+
+sil private [noinline] [ossa] @$testbeginapplybas : $@yield_once @convention(thin) (@guaranteed { var Int64 }) -> @yields () {
+bb0(%0 : @guaranteed ${ var Int64 }):
+  %1 = project_box %0 : ${ var Int64 }, 0
+  %3 = function_ref @$testbeginapplybar : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %4 = apply %3(%0) : $@convention(thin) (@guaranteed { var Int64 }) -> ()
+  %5 = tuple ()
+  yield %5 : $(), resume bb1, unwind bb2
+bb1:
+  %rv = tuple()
+  return %rv : $()
+bb2:
+  unwind
+}
+
diff --git a/test/SILOptimizer/array_contentof_opt.swift b/test/SILOptimizer/array_contentof_opt.swift
index 1b1a3d5b9c649..b21b41ba2b2b5 100644
--- a/test/SILOptimizer/array_contentof_opt.swift
+++ b/test/SILOptimizer/array_contentof_opt.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -O -sil-verify-all -emit-sil -Xllvm '-sil-inline-never-functions=$sSa6appendyy' %s | %FileCheck %s
+// RUN: %target-swift-frontend -O -sil-verify-all -emit-sil -Xllvm '-sil-inline-never-functions=$sSa6appendyy' -Xllvm -sil-inline-never-function='$sSa6append10contentsOfyqd__n_t7ElementQyd__RszSTRd__lFSi_SaySiGTg5' %s | %FileCheck %s
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
 
 // This is an end-to-end test of the Array.append(contentsOf:) ->
diff --git a/test/SILOptimizer/basic-aa.sil b/test/SILOptimizer/basic-aa.sil
index bf6c3fca8366e..b24fe632275d2 100644
--- a/test/SILOptimizer/basic-aa.sil
+++ b/test/SILOptimizer/basic-aa.sil
@@ -579,3 +579,97 @@ bb0:
   %2 = tuple()
   return %2 : $()
 }
+
+struct TwoInts {
+  var a: Int
+  var b: Int
+}
+
+struct StructWithOptional {
+  var i: Optional<TwoInts>
+}
+
+// CHECK-LABEL: @init_enum_data_addr
+// CHECK:      PAIR #3.
+// CHECK-NEXT: %0 = argument of bb0 : $*StructWithOptional
+// CHECK-NEXT:   %3 = init_enum_data_addr %2 : $*Optional<TwoInts>, #Optional.some!enumelt
+// CHECK-NEXT: NoAlias
+// CHECK:      PAIR #4.
+// CHECK-NEXT: %0 = argument of bb0 : $*StructWithOptional
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*TwoInts, #TwoInts.a
+// CHECK-NEXT: NoAlias
+// CHECK:      PAIR #5.
+// CHECK-NEXT: %0 = argument of bb0 : $*StructWithOptional
+// CHECK-NEXT:   %5 = struct_element_addr %3 : $*TwoInts, #TwoInts.b
+// CHECK-NEXT: NoAlias
+// CHECK:      PAIR #14.
+// CHECK-NEXT:   %2 = struct_element_addr %1 : $*StructWithOptional, #StructWithOptional.i
+// CHECK-NEXT:   %3 = init_enum_data_addr %2 : $*Optional<TwoInts>, #Optional.some!enumelt
+// CHECK-NEXT: MayAlias
+// CHECK:      PAIR #15.
+// CHECK-NEXT:   %2 = struct_element_addr %1 : $*StructWithOptional, #StructWithOptional.i
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*TwoInts, #TwoInts.a
+// CHECK-NEXT: MayAlias
+// CHECK:      PAIR #16.
+// CHECK-NEXT:   %2 = struct_element_addr %1 : $*StructWithOptional, #StructWithOptional.i
+// CHECK-NEXT:   %5 = struct_element_addr %3 : $*TwoInts, #TwoInts.b
+// CHECK-NEXT: MayAlias
+// CHECK:      PAIR #19.
+// CHECK-NEXT:   %3 = init_enum_data_addr %2 : $*Optional<TwoInts>, #Optional.some!enumelt
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*TwoInts, #TwoInts.a
+// CHECK-NEXT: PartialAlias
+// CHECK:      PAIR #20.
+// CHECK-NEXT:   %3 = init_enum_data_addr %2 : $*Optional<TwoInts>, #Optional.some!enumelt
+// CHECK-NEXT:   %5 = struct_element_addr %3 : $*TwoInts, #TwoInts.b
+// CHECK-NEXT: PartialAlias
+// CHECK:      PAIR #23.
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*TwoInts, #TwoInts.a
+// CHECK-NEXT:   %5 = struct_element_addr %3 : $*TwoInts, #TwoInts.b
+// CHECK-NEXT: NoAlias
+sil @init_enum_data_addr : $@convention(thin) (@in_guaranteed StructWithOptional) -> () {
+bb0(%0 : $*StructWithOptional):
+  %1 = alloc_stack $StructWithOptional
+  %2 = struct_element_addr %1 : $*StructWithOptional, #StructWithOptional.i
+  %3 = init_enum_data_addr %2 : $*Optional<TwoInts>, #Optional.some!enumelt
+  %4 = struct_element_addr %3 : $*TwoInts, #TwoInts.a
+  %5 = struct_element_addr %3 : $*TwoInts, #TwoInts.b
+  dealloc_stack %1 : $*StructWithOptional
+  %6 = tuple ()
+  return %6 : $()
+}
+
+protocol P {}
+
+struct S : P {
+  var i: Int
+}
+
+// CHECK-LABEL: @init_existential_addr
+// CHECK:      PAIR #3.
+// CHECK-NEXT:   %0 = argument of bb0 : $P
+// CHECK-NEXT:   %3 = init_existential_addr %2 : $*P, $S
+// CHECK-NEXT: NoAlias
+// CHECK:      PAIR #12.
+// CHECK-NEXT:   %2 = alloc_stack $P
+// CHECK-NEXT:   %3 = init_existential_addr %2 : $*P, $S
+// CHECK-NEXT: MayAlias
+// CHECK:      PAIR #13.
+// CHECK-NEXT:   %2 = alloc_stack $P
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*S, #S.i
+// CHECK-NEXT: MayAlias
+// CHECK:      PAIR #16.
+// CHECK-NEXT:   %3 = init_existential_addr %2 : $*P, $S
+// CHECK-NEXT:   %4 = struct_element_addr %3 : $*S, #S.i
+// CHECK-NEXT: PartialAlias
+sil @init_existential_addr : $@convention(thin) (P) -> () {
+bb0(%0 : $P):
+  %1 = alloc_stack $S
+  %2 = alloc_stack $P
+  %3 = init_existential_addr %2 : $*P, $S
+  %4 = struct_element_addr %3 : $*S, #S.i
+  dealloc_stack %2 : $*P
+  dealloc_stack %1 : $*S
+  %6 = tuple ()
+  return %6 : $()
+}
+
diff --git a/test/SILOptimizer/bridged_casts_folding.swift b/test/SILOptimizer/bridged_casts_folding.swift
index 850009a40efbb..d168cd16c30b7 100644
--- a/test/SILOptimizer/bridged_casts_folding.swift
+++ b/test/SILOptimizer/bridged_casts_folding.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -O -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s
 
 // REQUIRES: objc_interop
 
diff --git a/test/SILOptimizer/bridged_casts_folding_ownership.sil b/test/SILOptimizer/bridged_casts_folding_ownership.sil
index 5a6ab44eaee7b..b220f7d0775d3 100644
--- a/test/SILOptimizer/bridged_casts_folding_ownership.sil
+++ b/test/SILOptimizer/bridged_casts_folding_ownership.sil
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -module-name bridged_casts_folding -O -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -module-name bridged_casts_folding -O -emit-sil %s | %FileCheck %s
 
 // REQUIRES: objc_interop
 
diff --git a/test/SILOptimizer/cast_folding.swift b/test/SILOptimizer/cast_folding.swift
index ffbb72e5b3a84..1c8d05e9651fb 100644
--- a/test/SILOptimizer/cast_folding.swift
+++ b/test/SILOptimizer/cast_folding.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s
-// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -enable-ownership-stripping-after-serialization -O -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -O -emit-sil %s | %FileCheck %s
 
 // We want to check two things here:
 // - Correctness
diff --git a/test/SILOptimizer/cast_folding_objc.swift b/test/SILOptimizer/cast_folding_objc.swift
index 5732990101fad..d2d7e2f85de01 100644
--- a/test/SILOptimizer/cast_folding_objc.swift
+++ b/test/SILOptimizer/cast_folding_objc.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -emit-sil %s | %FileCheck %s
-// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -enable-ownership-stripping-after-serialization -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -emit-sil %s | %FileCheck %s
 
 // We want to check two things here:
 // - Correctness
diff --git a/test/SILOptimizer/cast_folding_objc_generics.swift b/test/SILOptimizer/cast_folding_objc_generics.swift
index f07c28a2db1fa..855ffb47c0666 100644
--- a/test/SILOptimizer/cast_folding_objc_generics.swift
+++ b/test/SILOptimizer/cast_folding_objc_generics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name cast_folding_objc_generics -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -emit-sil %s | %FileCheck %s
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name cast_folding_objc_generics -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -enable-ownership-stripping-after-serialization -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name cast_folding_objc_generics -O -Xllvm -sil-disable-pass=FunctionSignatureOpts -Xllvm -sil-disable-pass=PerfInliner -emit-sil %s | %FileCheck %s
 
 // REQUIRES: objc_interop
 
diff --git a/test/SILOptimizer/constant_propagation_diagnostics.swift b/test/SILOptimizer/constant_propagation_diagnostics.swift
index de433d7a5a44c..8a9c23faa1fd8 100644
--- a/test/SILOptimizer/constant_propagation_diagnostics.swift
+++ b/test/SILOptimizer/constant_propagation_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -o /dev/null -verify
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -emit-sil -sdk %S/../SILGen/Inputs %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -o /dev/null -verify
 
 // <rdar://problem/18213320> enum with raw values that are too big are not diagnosed
 enum EnumWithTooLargeElements : UInt8 {
diff --git a/test/SILOptimizer/copyforward.sil b/test/SILOptimizer/copyforward.sil
index 0223f35c370f1..e5238fc665aff 100644
--- a/test/SILOptimizer/copyforward.sil
+++ b/test/SILOptimizer/copyforward.sil
@@ -915,3 +915,43 @@ bb1:
   %v = tuple ()
   return %v : $()
 }
+
+// Test an "illegal" reinitialization of a stack location. This
+// happens because lowering .int_fma_FPIEEE32 knows that the type is
+// trivial, so avoids deinitialization. rdar://64671864.
+//
+// Note: we have given up on enforcing known SIL-patterns in
+// CopyForwarding. Instead, we just remove restructions whenever we see
+// unexpected patterns. Eventually, we will replace it with an OSSA
+// pass and enforce all assumptions about SIL patterns in the verifier.
+
+// CHECK-LABEL: sil @testCPF : $@convention(thin) (Float) -> @out Float {
+// CHECK: bb0(%0 : $*Float, %1 : $Float):
+// CHECK:   [[TMP1:%.*]] = alloc_stack $Float
+// CHECK:   store %1 to [[TMP1]] : $*Float
+// CHECK:   [[TMP2:%.*]] = alloc_stack $Float
+// CHECK-NOT: copy_addr
+// CHECK:   [[FMA:%.*]] = builtin "int_fma_FPIEEE32"
+// CHECK:   [[RESULT:%.*]] = struct $Float ([[FMA]] : $Builtin.FPIEEE32)
+// CHECK:   store [[RESULT]] to %0 : $*Float
+// CHECK-NOT: copy_addr
+// CHECK-NOT: destroy_addr
+// CHECK-LABEL: } // end sil function 'testCPF'
+sil @testCPF : $@convention(thin) (Float) -> @out Float {
+bb0(%0 : $*Float, %1 : $Float):
+  %2 = alloc_stack $Float
+  store %1 to %2 : $*Float
+  %4 = alloc_stack $Float
+  copy_addr %2 to [initialization] %4 : $*Float
+  %6 = struct_extract %1 : $Float, #Float._value
+  %7 = builtin "int_fma_FPIEEE32"(%6 : $Builtin.FPIEEE32, %6 : $Builtin.FPIEEE32, %6 : $Builtin.FPIEEE32) : $Builtin.FPIEEE32
+  %8 = struct $Float (%7 : $Builtin.FPIEEE32)
+  store %8 to %4 : $*Float
+  copy_addr %4 to [initialization] %0 : $*Float
+  destroy_addr %4 : $*Float
+  dealloc_stack %4 : $*Float
+  destroy_addr %2 : $*Float
+  dealloc_stack %2 : $*Float
+  %15 = tuple ()
+  return %15 : $()
+}
diff --git a/test/SILOptimizer/cross-module-optimization.swift b/test/SILOptimizer/cross-module-optimization.swift
index 87939e20c07bd..df1689c391719 100644
--- a/test/SILOptimizer/cross-module-optimization.swift
+++ b/test/SILOptimizer/cross-module-optimization.swift
@@ -17,7 +17,9 @@
 
 // Second test: check if CMO really imports the SIL of functions in other modules.
 
-// RUN: %target-build-swift -O -wmo -module-name=Main -I%t %s -Xllvm -sil-disable-pass=FunctionSignatureOpts -emit-sil | %FileCheck %s -check-prefix=CHECK-SIL
+// RUN: %target-build-swift -O -wmo -module-name=Main -I%t %s -Xllvm -sil-disable-pass=FunctionSignatureOpts -emit-sil -o %t/out.sil
+// RUN: %FileCheck %s -check-prefix=CHECK-SIL < %t/out.sil
+// RUN: %FileCheck %s -check-prefix=CHECK-SIL2 < %t/out.sil
 
 import Test
 
@@ -54,13 +56,18 @@ func testClass() {
   print(createClass_gen(0))
 }
 
+// CHECK-SIL2-LABEL: sil hidden [noinline] @$s4Main9testErroryyF
+@inline(never)
 func testError() {
   // CHECK-OUTPUT: PrivateError()
-  // CHECK-SIL-DAG: sil @$s4Test12PrivateError33_{{.*}} : $@convention(method) (@thin PrivateError.Type) -> PrivateError{{$}}
+  // CHECK-SIL2: struct $PrivateError ()
+  // CHECK-SIL2: alloc_existential_box $Error, $PrivateError
   print(returnPrivateError(27))
   // CHECK-OUTPUT: InternalError()
-  // CHECK-SIL-DAG: sil @$s4Test13InternalErrorVACycfC : $@convention(method) (@thin InternalError.Type) -> InternalError{{$}}
+  // CHECK-SIL2: struct $InternalError ()
+  // CHECK-SIL2: alloc_existential_box $Error, $InternalError
   print(returnInternalError(27))
+  // CHECK-SIL2: } // end sil function '$s4Main9testErroryyF'
 }
 
 class DerivedFromOpen<T> : OpenClass<T> { }
@@ -123,6 +130,15 @@ func testMisc() {
   print(classWithPublicProperty(33))
 }
 
+// CHECK-SIL2-LABEL: sil hidden [noinline] @$s4Main10testGlobalyyF
+@inline(never)
+func testGlobal() {
+  // CHECK-OUTPUT: 529387
+  // CHECK-SIL2: integer_literal $Builtin.Int{{[0-9]+}}, 529387
+  print(globalLet)
+  // CHECK-SIL2: } // end sil function '$s4Main10testGlobalyyF'
+}
+
 testNestedTypes()
 testClass()
 testError()
@@ -131,3 +147,5 @@ testSubModule()
 testClosures()
 testKeypath()
 testMisc()
+testGlobal()
+
diff --git a/test/SILOptimizer/definite_init_address_only_let.swift b/test/SILOptimizer/definite_init_address_only_let.swift
index fe8e620ee57fb..d430159e79cc2 100644
--- a/test/SILOptimizer/definite_init_address_only_let.swift
+++ b/test/SILOptimizer/definite_init_address_only_let.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -verify %s
-// RUN: %target-swift-frontend -emit-sil -enable-ownership-stripping-after-serialization -verify %s
+// RUN: %target-swift-frontend -emit-sil -verify %s
 
 func foo<T>(a: Bool, t: T) {
   let x: T
diff --git a/test/SILOptimizer/definite_init_cross_module.swift b/test/SILOptimizer/definite_init_cross_module.swift
index bf074aad07a8a..2201cbf12c436 100644
--- a/test/SILOptimizer/definite_init_cross_module.swift
+++ b/test/SILOptimizer/definite_init_cross_module.swift
@@ -3,8 +3,8 @@
 // RUN: %target-swift-frontend -emit-sil -verify -I %t -swift-version 5 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h
 
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module -emit-module-path=%t/OtherModule.swiftmodule %S/Inputs/definite_init_cross_module/OtherModule.swift -enable-ownership-stripping-after-serialization
-// RUN: %target-swift-frontend -emit-sil -verify -I %t -swift-version 5 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-module -emit-module-path=%t/OtherModule.swiftmodule %S/Inputs/definite_init_cross_module/OtherModule.swift
+// RUN: %target-swift-frontend -emit-sil -verify -I %t -swift-version 5 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h
 
 import OtherModule
 
diff --git a/test/SILOptimizer/definite_init_cross_module_swift4.swift b/test/SILOptimizer/definite_init_cross_module_swift4.swift
index 277e8df8cb616..f5bb629372a82 100644
--- a/test/SILOptimizer/definite_init_cross_module_swift4.swift
+++ b/test/SILOptimizer/definite_init_cross_module_swift4.swift
@@ -3,8 +3,8 @@
 // RUN: %target-swift-frontend -emit-sil -verify -verify-ignore-unknown -I %t -swift-version 4 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h
 
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -emit-module -emit-module-path=%t/OtherModule.swiftmodule %S/Inputs/definite_init_cross_module/OtherModule.swift
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -emit-sil -verify -verify-ignore-unknown -I %t -swift-version 4 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h
+// RUN: %target-swift-frontend -emit-module -emit-module-path=%t/OtherModule.swiftmodule %S/Inputs/definite_init_cross_module/OtherModule.swift
+// RUN: %target-swift-frontend -emit-sil -verify -verify-ignore-unknown -I %t -swift-version 4 %s > /dev/null -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/definite_init_cross_module/BridgingHeader.h
 
 import OtherModule
 
diff --git a/test/SILOptimizer/definite_init_diagnostics.swift b/test/SILOptimizer/definite_init_diagnostics.swift
index 950256fb2310a..1ef70c6a698a1 100644
--- a/test/SILOptimizer/definite_init_diagnostics.swift
+++ b/test/SILOptimizer/definite_init_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -enable-ownership-stripping-after-serialization -primary-file %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 
 import Swift
 
diff --git a/test/SILOptimizer/definite_init_diagnostics_globals.swift b/test/SILOptimizer/definite_init_diagnostics_globals.swift
index e020b2d1cde4a..9b0ae75922613 100644
--- a/test/SILOptimizer/definite_init_diagnostics_globals.swift
+++ b/test/SILOptimizer/definite_init_diagnostics_globals.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -enable-ownership-stripping-after-serialization -emit-sil -primary-file %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 
 import Swift
 
diff --git a/test/SILOptimizer/definite_init_diagnostics_objc.swift b/test/SILOptimizer/definite_init_diagnostics_objc.swift
index b1ecf92999b6e..0a91295ce58ea 100644
--- a/test/SILOptimizer/definite_init_diagnostics_objc.swift
+++ b/test/SILOptimizer/definite_init_diagnostics_objc.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -I %S/../SILGen/Inputs -enable-source-import -parse-stdlib -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -I %S/../SILGen/Inputs -enable-source-import -parse-stdlib -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -sdk %S/../SILGen/Inputs %s -I %S/../SILGen/Inputs -enable-source-import -parse-stdlib -o /dev/null -verify
 // REQUIRES: objc_interop
 
 import Swift
diff --git a/test/SILOptimizer/definite_init_existential_let.swift b/test/SILOptimizer/definite_init_existential_let.swift
index 4d274134ba1dd..e9ddbbf187c00 100644
--- a/test/SILOptimizer/definite_init_existential_let.swift
+++ b/test/SILOptimizer/definite_init_existential_let.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -verify %s
-// RUN: %target-swift-frontend -emit-sil -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -verify %s
 
 // rdar://problem/29716016 - Check that we properly enforce DI on `let`
 // variables and class properties.
diff --git a/test/SILOptimizer/definite_init_extension.swift b/test/SILOptimizer/definite_init_extension.swift
index b3ad064a972c6..99beabb90659e 100644
--- a/test/SILOptimizer/definite_init_extension.swift
+++ b/test/SILOptimizer/definite_init_extension.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -verify %s -o /dev/null
-// RUN: %target-swift-frontend -emit-sil -verify %s -o /dev/null -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -verify %s -o /dev/null
 
 struct S<T> {
   let t: T // expected-note {{'self.t.1' not initialized}}
diff --git a/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift b/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift
index f60fac83331c4..ae5fb4a0b4d5a 100644
--- a/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift
+++ b/test/SILOptimizer/definite_init_failable_initializers_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s
-// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s
 
 // High-level tests that DI rejects certain invalid idioms for early
 // return from initializers.
diff --git a/test/SILOptimizer/definite_init_hang.swift b/test/SILOptimizer/definite_init_hang.swift
index 683a0618da44b..5e6d7006befcb 100644
--- a/test/SILOptimizer/definite_init_hang.swift
+++ b/test/SILOptimizer/definite_init_hang.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil %s -parse-as-library -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil %s -parse-as-library -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil %s -parse-as-library -o /dev/null -verify
 
 var gg: Bool = false
 var rg: Int = 0
diff --git a/test/SILOptimizer/definite_init_lvalue_let_witness_methods.swift b/test/SILOptimizer/definite_init_lvalue_let_witness_methods.swift
index ecc5fe88afac6..b18b73fcd2f2f 100644
--- a/test/SILOptimizer/definite_init_lvalue_let_witness_methods.swift
+++ b/test/SILOptimizer/definite_init_lvalue_let_witness_methods.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s
-// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -disable-objc-attr-requires-foundation-module -verify %s
 
 // High-level tests that DI rejects passing let constants to
 // mutating witness methods
diff --git a/test/SILOptimizer/definite_init_value_types_diagnostics.swift b/test/SILOptimizer/definite_init_value_types_diagnostics.swift
index 3168a8e32e014..f41c031a546bc 100644
--- a/test/SILOptimizer/definite_init_value_types_diagnostics.swift
+++ b/test/SILOptimizer/definite_init_value_types_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil %s -o /dev/null -verify
 
 struct EmptyStruct {}
 
diff --git a/test/SILOptimizer/di_property_wrappers_errors.swift b/test/SILOptimizer/di_property_wrappers_errors.swift
index a3c3d59a7bb0a..d83948c0a78d8 100644
--- a/test/SILOptimizer/di_property_wrappers_errors.swift
+++ b/test/SILOptimizer/di_property_wrappers_errors.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -verify %s
-// RUN: %target-swift-frontend -emit-sil -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -verify %s
 
 @propertyWrapper
 final class ClassWrapper<T> {
diff --git a/test/SILOptimizer/diagnostic_constant_propagation-swift4.swift b/test/SILOptimizer/diagnostic_constant_propagation-swift4.swift
index 87033ad5f3e2b..e732fcf3221e7 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation-swift4.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation-swift4.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
 //
 // These are tests for diagnostics produced by constant propagation pass.
 // These are specific to Swift 4.
diff --git a/test/SILOptimizer/diagnostic_constant_propagation.swift b/test/SILOptimizer/diagnostic_constant_propagation.swift
index 1858dd8426ec3..68d5300ca8a18 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -enable-ownership-stripping-after-serialization -primary-file %s -o /dev/null -verify
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // These are tests for diagnostics produced by constant propagation pass.
 // Due to the change in the implementation of Integer initializers some of the
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_floats.swift b/test/SILOptimizer/diagnostic_constant_propagation_floats.swift
index c2befb634ce70..6fdf2ab561b9e 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation_floats.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation_floats.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // These are tests for diagnostics produced by constant propagation pass
 // on floating-point operations.
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_floats_nonx86.swift b/test/SILOptimizer/diagnostic_constant_propagation_floats_nonx86.swift
index ecc8d4b6417ea..f46c60eb81afe 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation_floats_nonx86.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation_floats_nonx86.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // REQUIRES: !(CPU=i386 || CPU=x86_64)
 //
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_floats_x86.swift b/test/SILOptimizer/diagnostic_constant_propagation_floats_x86.swift
index 29634e0bd2bc8..c32c83d7d982a 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation_floats_x86.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation_floats_x86.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // REQUIRES: CPU=i386 || CPU=x86_64
 // UNSUPPORTED: OS=windows-msvc
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_int_arch32.swift b/test/SILOptimizer/diagnostic_constant_propagation_int_arch32.swift
index aa53d4215cccc..a4ef070074536 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation_int_arch32.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation_int_arch32.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // REQUIRES: PTRSIZE=32
 //
diff --git a/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift b/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift
index 38104f2455167..c77b5fe3c4480 100644
--- a/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift
+++ b/test/SILOptimizer/diagnostic_constant_propagation_int_arch64.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // REQUIRES: PTRSIZE=64
 //
diff --git a/test/SILOptimizer/dont_broaden_cxx_address_only.sil b/test/SILOptimizer/dont_broaden_cxx_address_only.sil
index 369179ae38902..1eae83fbcb09a 100644
--- a/test/SILOptimizer/dont_broaden_cxx_address_only.sil
+++ b/test/SILOptimizer/dont_broaden_cxx_address_only.sil
@@ -5,9 +5,9 @@ sil_stage canonical
 import Builtin
 import Swift
 import SwiftShims
-import Foo
+import CXXTypesWithUserProvidedDestructor
 
-// Make sure we don't try to create a struct here. Foo is not loadable, even
+// Make sure we don't try to create a struct here. HasUserProvidedDestructor is not loadable, even
 // though it's only property is.
 // CHECK-LABEL: @test_foo
 // CHECK: bb0
@@ -16,16 +16,16 @@ import Foo
 // CHECK-NEXT: tuple
 // CHECK-NEXT: return
 // CHECK-LABEL: end sil function 'test_foo'
-sil shared [transparent] [serializable] [ossa] @test_foo : $@convention(method) (Int32, @thin Foo.Type) -> @out Foo {
-bb0(%0 : $*Foo, %1 : $Int32, %2 : $@thin Foo.Type):
-  %3 = struct_element_addr %0 : $*Foo, #Foo.x
+sil shared [transparent] [serializable] [ossa] @test_foo : $@convention(method) (Int32, @thin HasUserProvidedDestructor.Type) -> @out HasUserProvidedDestructor {
+bb0(%0 : $*HasUserProvidedDestructor, %1 : $Int32, %2 : $@thin HasUserProvidedDestructor.Type):
+  %3 = struct_element_addr %0 : $*HasUserProvidedDestructor, #HasUserProvidedDestructor.x
   store %1 to [trivial] %3 : $*Int32
   %5 = tuple ()
   return %5 : $()
 }
 
 // Make sure we create a struct for the first (loadable) type but not the second
-// type (Bar).
+// type (HasMemberWithUserProvidedDestructor).
 // CHECK-LABEL: @test_bar
 // CHECK: bb0
 // CHECK-NEXT: [[E:%.*]] = struct_element_addr
@@ -34,9 +34,9 @@ bb0(%0 : $*Foo, %1 : $Int32, %2 : $@thin Foo.Type):
 // CHECK-NEXT: tuple
 // CHECK-NEXT: return
 // CHECK-LABEL: end sil function 'test_bar'
-sil shared [transparent] [serializable] [ossa] @test_bar : $@convention(method) (Int32, @thin Bar.Type) -> @out Bar {
-bb0(%0 : $*Bar, %1 : $Int32, %2 : $@thin Bar.Type):
-  %3 = struct_element_addr %0 : $*Bar, #Bar.y
+sil shared [transparent] [serializable] [ossa] @test_bar : $@convention(method) (Int32, @thin HasMemberWithUserProvidedDestructor.Type) -> @out HasMemberWithUserProvidedDestructor {
+bb0(%0 : $*HasMemberWithUserProvidedDestructor, %1 : $Int32, %2 : $@thin HasMemberWithUserProvidedDestructor.Type):
+  %3 = struct_element_addr %0 : $*HasMemberWithUserProvidedDestructor, #HasMemberWithUserProvidedDestructor.y
   %3a = struct_element_addr %3 : $*Loadable, #Loadable.x
   store %1 to [trivial] %3a : $*Int32
   %5 = tuple ()
diff --git a/test/SILOptimizer/exclusivity_static_diagnostics.swift b/test/SILOptimizer/exclusivity_static_diagnostics.swift
index cee457e92d0cf..8a770e4897dab 100644
--- a/test/SILOptimizer/exclusivity_static_diagnostics.swift
+++ b/test/SILOptimizer/exclusivity_static_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
 
 import Swift
 
diff --git a/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift b/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift
index a2403ab2d67c9..42c572b32e3be 100644
--- a/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift
+++ b/test/SILOptimizer/exclusivity_static_diagnostics_objc.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/optional_closure_bridging.h -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/optional_closure_bridging.h -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -import-objc-header %S/Inputs/optional_closure_bridging.h -enforce-exclusivity=checked -swift-version 4 -emit-sil -primary-file %s -o /dev/null -verify
 // REQUIRES: objc_interop
 
 import Foundation
diff --git a/test/SILOptimizer/generalized_accessors.swift b/test/SILOptimizer/generalized_accessors.swift
index a0faa6159d7a8..99051682d8686 100644
--- a/test/SILOptimizer/generalized_accessors.swift
+++ b/test/SILOptimizer/generalized_accessors.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 //
 // Tests for yield-once diagnostics emitted for generalized accessors.
 
diff --git a/test/SILOptimizer/infinite_recursion.swift b/test/SILOptimizer/infinite_recursion.swift
index 00c1bd94b0178..3a0e03858967d 100644
--- a/test/SILOptimizer/infinite_recursion.swift
+++ b/test/SILOptimizer/infinite_recursion.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
-// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil -primary-file %s -o /dev/null -verify
 
 func a() {  // expected-warning {{all paths through this function will call itself}}
   a()
diff --git a/test/SILOptimizer/invalid_escaping_captures.swift b/test/SILOptimizer/invalid_escaping_captures.swift
index 5bad5c21152fb..2872c997e64b3 100644
--- a/test/SILOptimizer/invalid_escaping_captures.swift
+++ b/test/SILOptimizer/invalid_escaping_captures.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil %s -verify
-// RUN: %target-swift-frontend -emit-sil %s -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil %s -verify
 
 func takesEscaping(_: @escaping () -> ()) {}
 
diff --git a/test/SILOptimizer/keypath_offset.swift b/test/SILOptimizer/keypath_offset.swift
new file mode 100644
index 0000000000000..bb0ffca7249f1
--- /dev/null
+++ b/test/SILOptimizer/keypath_offset.swift
@@ -0,0 +1,197 @@
+// RUN: %empty-directory(%t) 
+// RUN: %target-build-swift %S/Inputs/struct_with_fields.swift -parse-as-library -wmo -enable-library-evolution -module-name=Test -emit-module -emit-module-path=%t/Test.swiftmodule -c -o %t/test.o
+
+// RUN: %target-build-swift -O %s -module-name=test -Xfrontend -sil-verify-all -I%t -emit-sil | %FileCheck %s
+
+// RUN: %target-build-swift -Onone %s -I%t %t/test.o -o %t/Onone.out
+// RUN: %target-build-swift -O %s -I%t %t/test.o -o %t/O.out
+// RUN: %target-run %t/Onone.out > %t/Onone.txt
+// RUN: %target-run %t/O.out > %t/O.txt
+// RUN: diff  %t/Onone.txt %t/O.txt
+
+// REQUIRES: executable_test,swift_stdlib_no_asserts,optimized_stdlib
+
+import Test
+
+final class C<T> {
+  var x: Int
+  var z: T
+  let immutable: String
+  private(set) var secretlyMutable: String
+
+  init(x: Int, z: T) {
+    self.x = x
+    self.z = z
+    self.immutable = "somestring"
+    self.secretlyMutable = immutable
+  }
+}
+
+struct Point {
+  var x: Double
+  var y: Double
+}
+
+struct S<T> {
+  var x: Int
+  var y: Int?
+  var z: T
+  var p: Point
+  var op: Point?
+  var c: C<T>
+}
+
+struct NonOffsetableProperties {
+  // observers
+  var x: Int { didSet {} }
+  // reabstracted
+  var y: () -> ()
+  // computed
+  var z: Int { return 0 }
+}
+
+struct TupleProperties {
+  // unlabeled
+  var a: (Int, String)
+  // labeled
+  let b: (x: String, y: Int)
+  // reference writable
+  let c: (m: C<Int>, n: C<String>)
+}
+
+typealias Tuple<T, U> = (S<T>, C<U>)
+
+func getIdentityKeyPathOfType<T>(_: T.Type) -> KeyPath<T, T> {
+  return \.self
+}
+
+
+@inline(never)
+func printOffset(_ o: Int?) {
+  print(o as Any)
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A13StructOffsetsyyF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A13StructOffsetsyyF'
+@inline(never)
+func testStructOffsets() {
+  let SLayout = MemoryLayout<S<Int>>.self
+  printOffset(SLayout.offset(of: \S<Int>.x))
+  printOffset(SLayout.offset(of: \S<Int>.y))
+  printOffset(SLayout.offset(of: \S<Int>.z))
+  printOffset(SLayout.offset(of: \S<Int>.p))
+  printOffset(SLayout.offset(of: \S<Int>.p.x))
+  printOffset(SLayout.offset(of: \S<Int>.p.y))
+  printOffset(SLayout.offset(of: \S<Int>.c))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A20GenericStructOffsetsyyxmlF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A20GenericStructOffsetsyyxmlF'
+@inline(never)
+@_semantics("optimize.sil.specialize.generic.never")
+func testGenericStructOffsets<T>(_ t: T.Type) {
+  let SLayout = MemoryLayout<S<T>>.self
+  printOffset(SLayout.offset(of: \S<T>.x))
+  printOffset(SLayout.offset(of: \S<T>.y))
+  printOffset(SLayout.offset(of: \S<T>.z))
+  printOffset(SLayout.offset(of: \S<T>.p))
+  printOffset(SLayout.offset(of: \S<T>.p.x))
+  printOffset(SLayout.offset(of: \S<T>.p.y))
+  printOffset(SLayout.offset(of: \S<T>.c))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A10NonOffsetsyyF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A10NonOffsetsyyF'
+@inline(never)
+func testNonOffsets() {
+  let NOPLayout = MemoryLayout<NonOffsetableProperties>.self
+  printOffset(NOPLayout.offset(of: \NonOffsetableProperties.x))
+  printOffset(NOPLayout.offset(of: \NonOffsetableProperties.y))
+  printOffset(NOPLayout.offset(of: \NonOffsetableProperties.z))
+  printOffset(MemoryLayout<C<Int>>.offset(of: \C<Int>.x))
+  let SLayout = MemoryLayout<S<Int>>.self
+  printOffset(SLayout.offset(of: \S<Int>.c.x))
+  printOffset(SLayout.offset(of: \S<Int>.op!.x))
+  printOffset(SLayout.offset(of: \S<Int>.op?.x))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A11SelfOffsetsyyF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A11SelfOffsetsyyF'
+@inline(never)
+func testSelfOffsets() {
+  let SLayout = MemoryLayout<S<Int>>.self
+  printOffset(SLayout.offset(of: \.self))
+  printOffset(SLayout.offset(of: getIdentityKeyPathOfType(S<Int>.self)))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A12TupleOffsetsyyF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A12TupleOffsetsyyF'
+@inline(never)
+func testTupleOffsets() {
+  let TPLayout = MemoryLayout<TupleProperties>.self
+  printOffset(TPLayout.offset(of: \TupleProperties.self))
+  printOffset(TPLayout.offset(of: \TupleProperties.a))
+  printOffset(TPLayout.offset(of: \TupleProperties.a.0))
+  printOffset(TPLayout.offset(of: \TupleProperties.a.1))
+  printOffset(TPLayout.offset(of: \TupleProperties.b))
+  printOffset(TPLayout.offset(of: \TupleProperties.b.x))
+  printOffset(TPLayout.offset(of: \TupleProperties.b.y))
+  printOffset(TPLayout.offset(of: \TupleProperties.c))
+  printOffset(TPLayout.offset(of: \TupleProperties.c.m))
+  printOffset(TPLayout.offset(of: \TupleProperties.c.n))
+
+  let TLayout = MemoryLayout<Tuple<Int, Int>>.self
+  printOffset(TLayout.offset(of: \Tuple<Int, Int>.self))
+  printOffset(TLayout.offset(of: \Tuple<Int, Int>.0))
+  printOffset(TLayout.offset(of: \Tuple<Int, Int>.0.x))
+  printOffset(TLayout.offset(of: \Tuple<Int, Int>.1))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A19GenericTupleOffsetsyyxmlF
+// CHECK-NOT:     _storedInlineOffset
+// CHECK-NOT:     class_method
+// CHECK:       } // end sil function '$s4test0A19GenericTupleOffsetsyyxmlF'
+@inline(never)
+@_semantics("optimize.sil.specialize.generic.never")
+func testGenericTupleOffsets<T>(_ t: T.Type) {
+  let TLayout = MemoryLayout<Tuple<T, T>>.self
+  printOffset(TLayout.offset(of: \Tuple<T, T>.self))
+  printOffset(TLayout.offset(of: \Tuple<T, T>.0))
+  printOffset(TLayout.offset(of: \Tuple<T, T>.0.x))
+  printOffset(TLayout.offset(of: \Tuple<T, T>.1))
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A16ResilientOffsetsyyF
+// CHECK:         class_method {{.*}}_storedInlineOffset
+// CHECK:       } // end sil function '$s4test0A16ResilientOffsetsyyF'
+@inline(never)
+func testResilientOffsets() {
+  let TLayout = MemoryLayout<TestStruct>.self
+  printOffset(TLayout.offset(of: \TestStruct.x))
+}
+
+print("### testStructOffsets")
+testStructOffsets()
+print("### testGenericStructOffsets")
+testGenericStructOffsets(Int.self)
+print("### testNonOffsets")
+testNonOffsets()
+print("### testSelfOffsets")
+testSelfOffsets()
+print("### testTupleOffsets")
+testTupleOffsets()
+print("### testGenericTupleOffsets")
+testGenericTupleOffsets(Int.self)
+print("### testResilientOffsets")
+testResilientOffsets()
+
diff --git a/test/SILOptimizer/mandatory_inlining.swift b/test/SILOptimizer/mandatory_inlining.swift
index 7867ce7baee4f..fa28c1584349c 100644
--- a/test/SILOptimizer/mandatory_inlining.swift
+++ b/test/SILOptimizer/mandatory_inlining.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -sil-verify-all -primary-file %s -emit-sil -o - -verify | %FileCheck %s
-// RUN: %target-swift-frontend -sil-verify-all -primary-file %s -emit-sil -o - -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -sil-verify-all -primary-file %s -emit-sil -o - -verify
 
 // These tests are deliberately shallow, because I do not want to depend on the
 // specifics of SIL generation, which might change for reasons unrelated to this
diff --git a/test/SILOptimizer/mandatory_inlining_circular.swift b/test/SILOptimizer/mandatory_inlining_circular.swift
index 4fac3a593e96b..623e7ef396992 100644
--- a/test/SILOptimizer/mandatory_inlining_circular.swift
+++ b/test/SILOptimizer/mandatory_inlining_circular.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -sil-verify-all -emit-sil %s -o /dev/null -verify
-// RUN: %target-swift-frontend -sil-verify-all -emit-sil %s -o /dev/null -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -sil-verify-all -emit-sil %s -o /dev/null -verify
 
 @_transparent func waldo(_ x: Double) -> Double {
   return fred(x); // expected-error {{inlining 'transparent' functions forms circular loop}} expected-note 1 {{while inlining here}}
diff --git a/test/SILOptimizer/mem-behavior-all.sil b/test/SILOptimizer/mem-behavior-all.sil
index 11e4ab6199467..fb101d2b3224d 100644
--- a/test/SILOptimizer/mem-behavior-all.sil
+++ b/test/SILOptimizer/mem-behavior-all.sil
@@ -113,6 +113,21 @@ bb0(%0 : $*Builtin.Int32):
   return %val : $Builtin.Int32
 }
 
+// CHECK-LABEL: @testLoadTake
+// CHECK:      PAIR #0.
+// CHECK-NEXT:   %2 = load [take] %0 : $*C
+// CHECK-NEXT:   %0 = argument of bb0 : $*C
+// CHECK-NEXT:   r=1,w=1,se=1
+// CHECK:      PAIR #1.
+// CHECK-NEXT:   %2 = load [take] %0 : $*C
+// CHECK-NEXT:   %1 = argument of bb0 : $*C
+// CHECK-NEXT:   r=0,w=0,se=0
+sil [ossa] @testLoadTake : $@convention(thin) (@in C, @in_guaranteed C) -> @owned C {
+bb0(%0 : $*C, %1 : $*C):
+  %2 = load [take] %0 : $*C
+  return %2 : $C
+}
+
 // ===-----------------------------------------------------------------------===
 // Test the effect of a [deinit] access on a global 'let'
 //
@@ -168,3 +183,64 @@ bb0(%0 : $*Int64Wrapper):
   %8 = tuple ()
   return %8 : $()
 }
+
+// CHECK-LABEL: @test_copy_addr_initialize
+// CHECK:      PAIR #0.
+// CHECK-NEXT:   copy_addr %1 to [initialization] %0 : $*C
+// CHECK-NEXT:   %0 = argument of bb0 : $*C
+// CHECK-NEXT:   r=0,w=1,se=1
+// CHECK:      PAIR #1.
+// CHECK-NEXT:    copy_addr %1 to [initialization] %0 : $*C
+// CHECK-NEXT:    %1 = argument of bb0 : $*C
+// CHECK-NEXT:    r=1,w=0,se=0
+// CHECK:      PAIR #2.
+// CHECK-NEXT:   copy_addr %1 to [initialization] %0 : $*C
+// CHECK-NEXT:   %2 = argument of bb0 : $*C
+// CHECK-NEXT:   r=0,w=0,se=0
+sil @test_copy_addr_initialize : $@convention(thin) (@inout C, @inout C) -> @out C {
+bb0(%0 : $*C, %1 : $*C, %2: $*C):
+  copy_addr %1 to [initialization] %0 : $*C
+  %6 = tuple ()
+  return %6 : $()
+}
+
+// CHECK-LABEL: @test_copy_addr_assign
+// CHECK:      PAIR #0.
+// CHECK-NEXT:   copy_addr %1 to %0 : $*C
+// CHECK-NEXT:   %0 = argument of bb0 : $*C
+// CHECK-NEXT:   r=1,w=1,se=1
+// CHECK:      PAIR #1.
+// CHECK-NEXT:    copy_addr %1 to %0 : $*C
+// CHECK-NEXT:    %1 = argument of bb0 : $*C
+// CHECK-NEXT:    r=1,w=1,se=1
+// CHECK:      PAIR #2.
+// CHECK-NEXT:   copy_addr %1 to %0 : $*C
+// CHECK-NEXT:   %2 = argument of bb0 : $*C
+// CHECK-NEXT:   r=1,w=1,se=1
+sil @test_copy_addr_assign : $@convention(thin) (@inout C, @inout C, @inout C) -> () {
+bb0(%0 : $*C, %1 : $*C, %2: $*C):
+  copy_addr %1 to %0 : $*C
+  %6 = tuple ()
+  return %6 : $()
+}
+
+// CHECK-LABEL: @test_copy_addr_take
+// CHECK:      PAIR #0.
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] %0 : $*C
+// CHECK-NEXT:   %0 = argument of bb0 : $*C
+// CHECK-NEXT:   r=0,w=1,se=1
+// CHECK:      PAIR #1.
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] %0 : $*C
+// CHECK-NEXT:   %1 = argument of bb0 : $*C
+// CHECK-NEXT:   r=1,w=1,se=1
+// CHECK:      PAIR #2.
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] %0 : $*C
+// CHECK-NEXT:   %2 = argument of bb0 : $*C
+// CHECK-NEXT:   r=0,w=0,se=0
+sil @test_copy_addr_take : $@convention(thin) (@in C, @inout C) -> @out C {
+bb0(%0 : $*C, %1 : $*C, %2: $*C):
+  copy_addr [take] %1 to [initialization] %0 : $*C
+  %6 = tuple ()
+  return %6 : $()
+}
+
diff --git a/test/SILOptimizer/noescape_param_exclusivity.swift b/test/SILOptimizer/noescape_param_exclusivity.swift
index ad7833937f279..73db82bb7fb56 100644
--- a/test/SILOptimizer/noescape_param_exclusivity.swift
+++ b/test/SILOptimizer/noescape_param_exclusivity.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -emit-sil %s -verify
-// RUN: %target-swift-frontend -emit-sil %s -verify -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -emit-sil %s -verify
 
 func test0(a: (() -> ()) -> (), b: () -> ()) {
   a(b) // expected-error {{passing a non-escaping function parameter 'b' to a call to a non-escaping function parameter can allow re-entrant modification of a variable}}
diff --git a/test/SILOptimizer/polymorphic_builtins_diagnostics.swift b/test/SILOptimizer/polymorphic_builtins_diagnostics.swift
index 5abb380279bb2..6d31f8c6b8e54 100644
--- a/test/SILOptimizer/polymorphic_builtins_diagnostics.swift
+++ b/test/SILOptimizer/polymorphic_builtins_diagnostics.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -parse-stdlib -emit-sil -verify %s
-// RUN: %target-swift-frontend -parse-stdlib -emit-sil -verify %s -enable-ownership-stripping-after-serialization
+// RUN: %target-swift-frontend -parse-stdlib -emit-sil -verify %s
 
 import Swift
 
diff --git a/test/SILOptimizer/pound_assert.swift b/test/SILOptimizer/pound_assert.swift
index acccdaf0e32b5..d593786a3afa0 100644
--- a/test/SILOptimizer/pound_assert.swift
+++ b/test/SILOptimizer/pound_assert.swift
@@ -1,5 +1,5 @@
 // RUN: %target-swift-frontend -enable-experimental-static-assert -emit-sil %s -verify
-// RUN: %target-swift-frontend -enable-experimental-static-assert -enable-ownership-stripping-after-serialization -emit-sil %s -verify
+// RUN: %target-swift-frontend -enable-experimental-static-assert -emit-sil %s -verify
 // REQUIRES: asserts
 
 //===----------------------------------------------------------------------===//
diff --git a/test/SILOptimizer/pound_assert_test_recursive.swift b/test/SILOptimizer/pound_assert_test_recursive.swift
index e62ef5fceefc0..ba200237e7235 100644
--- a/test/SILOptimizer/pound_assert_test_recursive.swift
+++ b/test/SILOptimizer/pound_assert_test_recursive.swift
@@ -1,5 +1,5 @@
 // RUN: not %target-swift-frontend -enable-experimental-static-assert -emit-sil %s 2>&1 | %FileCheck %s
-// RUN: not %target-swift-frontend -enable-experimental-static-assert -enable-ownership-stripping-after-serialization -emit-sil %s 2>&1 | %FileCheck %s
+// RUN: not %target-swift-frontend -enable-experimental-static-assert -emit-sil %s 2>&1 | %FileCheck %s
 
 // This is a special FileCheck test for testing that we properly catch that we
 // are recursing here. The reason why this is separate from the other
diff --git a/test/SILOptimizer/return_ownership.swift b/test/SILOptimizer/return_ownership.swift
index 89477d544ef44..a3d9135c7dae3 100644
--- a/test/SILOptimizer/return_ownership.swift
+++ b/test/SILOptimizer/return_ownership.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend %s -enable-ownership-stripping-after-serialization -emit-sil -verify
+// RUN: %target-swift-frontend %s -emit-sil -verify
 
 class TuringMachine {
   func halt() -> Never {
diff --git a/test/SILOptimizer/sil_combine.sil b/test/SILOptimizer/sil_combine.sil
index cfb4377c29346..3cd288f74e822 100644
--- a/test/SILOptimizer/sil_combine.sil
+++ b/test/SILOptimizer/sil_combine.sil
@@ -3739,3 +3739,80 @@ bb0(%0 : $@thick SpecialEnum.Type):
   %4 = struct $Bool (%3 : $Builtin.Int1)
   return %4 : $Bool
 }
+
+struct IntTuple {
+  @_hasStorage var t: (Int64, Int64)
+}
+
+sil_global [let] @initialized_let_global : $Int64 = {
+  %0 = integer_literal $Builtin.Int64, 27
+  %initval = struct $Int64 (%0 : $Builtin.Int64)
+}
+
+sil_global @initialized_var_global : $Int64 = {
+  %0 = integer_literal $Builtin.Int64, 27
+  %initval = struct $Int64 (%0 : $Builtin.Int64)
+}
+
+sil_global [let] @initialized_tuple_global : $IntTuple = {
+  %0 = integer_literal $Builtin.Int64, 27
+  %1 = integer_literal $Builtin.Int64, 28
+  %2 = struct $Int64 (%0 : $Builtin.Int64)
+  %3 = struct $Int64 (%1 : $Builtin.Int64)
+  %4 = tuple (%2 : $Int64, %3 : $Int64)
+  %initval = struct $IntTuple (%4 : $(Int64, Int64))
+}
+
+// CHECK-LABEL: sil @load_from_global_let
+// CHECK:         [[I:%.*]] = integer_literal $Builtin.Int64, 27
+// CHECK:         [[R:%.*]] = struct $Int64 ([[I]] : $Builtin.Int64)
+// CHECK:         return [[R]]
+// CHECK:       } // end sil function 'load_from_global_let'
+sil @load_from_global_let : $@convention(thin) () -> Int64 {
+bb0:
+  %0 = global_addr @initialized_let_global : $*Int64
+  %1 = load %0 : $*Int64
+  return %1 : $Int64
+}
+
+// CHECK-LABEL: sil @load_from_global_with_projections
+// CHECK:         [[I:%.*]] = integer_literal $Builtin.Int64, 28
+// CHECK:         return [[I]]
+// CHECK:       } // end sil function 'load_from_global_with_projections'
+sil @load_from_global_with_projections : $@convention(thin) () -> Builtin.Int64 {
+bb0:
+  %0 = global_addr @initialized_tuple_global : $*IntTuple
+  %1 = struct_element_addr %0 : $*IntTuple, #IntTuple.t
+  %2 = tuple_element_addr %1 : $*(Int64, Int64), 1
+  %3 = struct_element_addr %2 : $*Int64, #Int64._value
+  %4 = load %3 : $*Builtin.Int64
+  return %4 : $Builtin.Int64
+}
+
+// CHECK-LABEL: sil @load_from_global_without_projections
+// CHECK-DAG:     [[I1:%.*]] = integer_literal $Builtin.Int64, 27
+// CHECK-DAG:     [[I2:%.*]] = integer_literal $Builtin.Int64, 28
+// CHECK-DAG:     [[S1:%.*]] = struct $Int64 ([[I1]] : $Builtin.Int64)
+// CHECK-DAG:     [[S2:%.*]] = struct $Int64 ([[I2]] : $Builtin.Int64)
+// CHECK-DAG:     [[T:%.*]] = tuple ([[S1]] : $Int64, [[S2]] : $Int64)
+// CHECK-DAG:     [[IT:%.*]] = struct $IntTuple ([[T]] : $(Int64, Int64))
+// CHECK:         return [[IT]]
+// CHECK:       } // end sil function 'load_from_global_without_projections'
+sil @load_from_global_without_projections : $@convention(thin) () -> IntTuple {
+bb0:
+  %0 = global_addr @initialized_tuple_global : $*IntTuple
+  %1 = load %0 : $*IntTuple
+  return %1 : $IntTuple
+}
+
+// CHECK-LABEL: sil @load_from_global_var
+// CHECK:         global_addr
+// CHECK-NEXT:    load
+// CHECK-NEXT:    return
+// CHECK:       } // end sil function 'load_from_global_var'
+sil @load_from_global_var : $@convention(thin) () -> Int64 {
+bb0:
+  %0 = global_addr @initialized_var_global : $*Int64
+  %1 = load %0 : $*Int64
+  return %1 : $Int64
+}
diff --git a/test/SILOptimizer/specialize_anyobject.swift b/test/SILOptimizer/specialize_anyobject.swift
index 31426157e5608..b5c0654720980 100644
--- a/test/SILOptimizer/specialize_anyobject.swift
+++ b/test/SILOptimizer/specialize_anyobject.swift
@@ -1,4 +1,3 @@
-
 // RUN: %target-swift-frontend -module-name specialize_anyobject -O -sil-inline-threshold 0 -emit-sil -primary-file %s | %FileCheck %s
 
 // rdar://problem/20338028
diff --git a/test/SILOptimizer/specialize_default_witness_ossa.sil b/test/SILOptimizer/specialize_default_witness_ossa.sil
new file mode 100644
index 0000000000000..beacfa832a0d8
--- /dev/null
+++ b/test/SILOptimizer/specialize_default_witness_ossa.sil
@@ -0,0 +1,53 @@
+// RUN: %target-sil-opt -enable-sil-verify-all -sil-generic-specializer-enable-ownership -generic-specializer %s | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+
+public protocol ResilientProtocol {
+  func defaultA()
+  func defaultB()
+}
+
+struct ConformingStruct : ResilientProtocol {
+  func defaultA()
+  func defaultB()
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultA4main16ConformingStructV_Tg5
+// CHECK:       bb0(%0 : $ConformingStruct):
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultB4main16ConformingStructV_Tg5
+// CHECK:    [[RESULT:%.*]] = apply [[FN]]
+// CHECK:    return [[RESULT]]
+
+sil [ossa] @defaultA : $@convention(witness_method: ResilientProtocol) <Self where Self : ResilientProtocol> (@in_guaranteed Self) -> () {
+bb0(%0 : $*Self):
+  %fn = function_ref @defaultB : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  %result = apply %fn<Self>(%0) : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  return %result : $()
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultB4main16ConformingStructV_Tg5
+// CHECK:       bb0(%0 : $ConformingStruct):
+// CHECK:    [[RESULT:%.*]] = tuple ()
+// CHECK:    return [[RESULT]]
+
+sil [ossa] @defaultB : $@convention(witness_method: ResilientProtocol) <Self where Self : ResilientProtocol> (@in_guaranteed Self) -> () {
+bb0(%0 : $*Self):
+  %result = tuple ()
+  return %result : $()
+}
+
+// CHECK-LABEL: sil hidden [ossa] @test_specialize_default_witness_method
+// CHECK:       bb0(%0 : $*ConformingStruct):
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultA4main16ConformingStructV_Tg5
+// CHECK:    [[RESULT:%.*]] = apply [[FN]]
+// CHECK:    return [[RESULT]]
+
+sil hidden [ossa] @test_specialize_default_witness_method : $@convention(thin) (@in_guaranteed ConformingStruct) -> () {
+bb0(%0 : $*ConformingStruct):
+  %fn = function_ref @defaultA : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  %result = apply %fn<ConformingStruct>(%0) : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  return %result : $()
+}
diff --git a/test/SILOptimizer/specialize_default_witness_resilience_ossa.sil b/test/SILOptimizer/specialize_default_witness_resilience_ossa.sil
new file mode 100644
index 0000000000000..2de2e23b74d55
--- /dev/null
+++ b/test/SILOptimizer/specialize_default_witness_resilience_ossa.sil
@@ -0,0 +1,101 @@
+// RUN: %target-sil-opt -enable-library-evolution -enable-sil-verify-all -generic-specializer -sil-generic-specializer-enable-ownership %s | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+
+public protocol ResilientProtocol {
+  func defaultA()
+  func defaultB()
+}
+
+public struct ConformingStruct : ResilientProtocol {
+  public func defaultA()
+  public func defaultB()
+}
+
+class Klass {}
+
+// Used to make sure we also handle non-trivial structs correctly.
+public struct ConformingNonTrivialStruct : ResilientProtocol {
+  var k: Klass
+
+  public func defaultA()
+  public func defaultB()
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultA4main16ConformingStructV_Tg5
+// CHECK:       bb0(%0 : $ConformingStruct):
+// CHECK-NEXT:    [[TMP:%.*]] = alloc_stack $ConformingStruct
+// CHECK-NEXT:    store %0 to [trivial] [[TMP]] : $*ConformingStruct
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultB4main16ConformingStructV_Tg5
+// CHECK-NEXT:    [[LOAD:%.*]] = load [trivial] [[TMP]] : $*ConformingStruct
+// CHECK-NEXT:    [[RESULT:%.*]] = apply [[FN]]([[LOAD]])
+// CHECK-NEXT:    dealloc_stack [[TMP]] : $*ConformingStruct
+// CHECK } // end sil function 's8defaultA4main16ConformingStructV_Tg5'
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultA4main26ConformingNonTrivialStructV_Tg5
+// CHECK:       bb0(%0 : @guaranteed $ConformingNonTrivialStruct):
+// CHECK-NEXT:    [[TMP:%.*]] = alloc_stack $ConformingNonTrivialStruct
+// CHECK-NEXT:    store_borrow %0 to [[TMP]] : $*ConformingNonTrivialStruct
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultB4main26ConformingNonTrivialStructV_Tg5
+// CHECK-NEXT:    [[LOAD:%.*]] = load_borrow [[TMP]] : $*ConformingNonTrivialStruct
+// CHECK-NEXT:    [[RESULT:%.*]] = apply [[FN]]([[LOAD]])
+// CHECK:         dealloc_stack [[TMP]] : $*ConformingNonTrivialStruct
+// CHECK } // end sil function 's8defaultA4main16ConformingNonTrivialStructV_Tg5'
+
+sil [ossa] @defaultA : $@convention(witness_method: ResilientProtocol) <Self where Self : ResilientProtocol> (@in_guaranteed Self) -> () {
+bb0(%0 : $*Self):
+  %fn = function_ref @defaultB : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  %result = apply %fn<Self>(%0) : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  return %result : $()
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultB4main16ConformingStructV_Tg5 :
+// CHECK:       bb0(%0 : $ConformingStruct):
+// CHECK-NEXT:    [[TMP:%.*]] = alloc_stack $ConformingStruct
+// CHECK-NEXT:    store %0 to [trivial] [[TMP]] : $*ConformingStruct
+// CHECK:    dealloc_stack [[TMP]] : $*ConformingStruct
+// CHECK: } // end sil function '$s8defaultB4main16ConformingStructV_Tg5'
+
+// CHECK-LABEL: sil shared [ossa] @$s8defaultB4main26ConformingNonTrivialStructV_Tg5 :
+// CHECK:       bb0(%0 : @guaranteed $ConformingNonTrivialStruct):
+// CHECK-NEXT:    [[TMP:%.*]] = alloc_stack $ConformingNonTrivialStruct
+// CHECK-NEXT:    store_borrow %0 to [[TMP]] : $*ConformingNonTrivialStruct
+// CHECK:    dealloc_stack [[TMP]] : $*ConformingNonTrivialStruct
+// CHECK: } // end sil function '$s8defaultB4main26ConformingNonTrivialStructV_Tg5'
+
+sil [ossa] @defaultB : $@convention(witness_method: ResilientProtocol) <Self where Self : ResilientProtocol> (@in_guaranteed Self) -> () {
+bb0(%0 : $*Self):
+  %result = tuple ()
+  return %result : $()
+}
+
+// CHECK-LABEL: sil hidden [ossa] @test_specialize_default_witness_method
+// CHECK:       bb0(%0 : $*ConformingStruct):
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultA4main16ConformingStructV_Tg5
+// CHECK-NEXT:    [[VALUE:%.*]] = load [trivial] %0 : $*ConformingStruct
+// CHECK-NEXT:    [[RESULT:%.*]] = apply [[FN]]([[VALUE]])
+// CHECK-NEXT:    return [[RESULT]]
+
+sil hidden [ossa] @test_specialize_default_witness_method : $@convention(thin) (@in_guaranteed ConformingStruct) -> () {
+bb0(%0 : $*ConformingStruct):
+  %fn = function_ref @defaultA : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  %result = apply %fn<ConformingStruct>(%0) : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  return %result : $()
+}
+
+// CHECK-LABEL: sil hidden [ossa] @test_specialize_default_witness_method_nontrivial
+// CHECK:       bb0(%0 : $*ConformingNonTrivialStruct):
+// CHECK:         [[FN:%.*]] = function_ref @$s8defaultA4main26ConformingNonTrivialStructV_Tg5
+// CHECK-NEXT:    [[VALUE:%.*]] = load_borrow %0 : $*ConformingNonTrivialStruct
+// CHECK-NEXT:    [[RESULT:%.*]] = apply [[FN]]([[VALUE]])
+// CHECK: } // end sil function 'test_specialize_default_witness_method_nontrivial'
+
+sil hidden [ossa] @test_specialize_default_witness_method_nontrivial : $@convention(thin) (@in_guaranteed ConformingNonTrivialStruct) -> () {
+bb0(%0 : $*ConformingNonTrivialStruct):
+  %fn = function_ref @defaultA : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  %result = apply %fn<ConformingNonTrivialStruct>(%0) : $@convention(witness_method: ResilientProtocol) <T where T : ResilientProtocol> (@in_guaranteed T) -> ()
+  return %result : $()
+}
diff --git a/test/SILOptimizer/specialize_inherited_ossa.sil b/test/SILOptimizer/specialize_inherited_ossa.sil
new file mode 100644
index 0000000000000..feafbd1446590
--- /dev/null
+++ b/test/SILOptimizer/specialize_inherited_ossa.sil
@@ -0,0 +1,71 @@
+// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer -module-name inherit -sil-generic-specializer-enable-ownership %s | %FileCheck %s
+
+import Builtin
+import Swift
+
+class MMFont {
+}
+
+class Klass {}
+
+struct MMStorage<Key : Hashable, Value> {
+  var k: Klass = Klass()
+}
+
+func ==(lhs: MMObject, rhs: MMObject) -> Bool
+
+class MMObject : Hashable {
+  func hash(into hasher: inout Hasher)
+}
+
+class MMString : MMObject {
+}
+
+// CHECK-LABEL: @caller : $@convention(thin) (Int, Int, @owned MMString) -> @owned MMStorage<MMString, Optional<MMFont>> {
+sil [ossa] @caller : $@convention(thin) (Int, Int, @owned MMString) -> @owned MMStorage<MMString, Optional<MMFont>> {
+bb0(%0 : $Int, %1 : $Int, %2 : @owned $MMString):
+  %3 = metatype $@thin MMStorage<MMString, Optional<MMFont>>.Type
+  %13 = function_ref @ext_fn1 : $@convention(thin) (Int, @thin MMStorage<MMString, Optional<MMFont>>.Type) -> @owned MMStorage<MMString, Optional<MMFont>>
+  %14 = apply %13(%0, %3) : $@convention(thin) (Int, @thin MMStorage<MMString, Optional<MMFont>>.Type) -> @owned MMStorage<MMString, Optional<MMFont>>
+  %15 = copy_value %14 : $MMStorage<MMString, Optional<MMFont>>
+
+  // CHECK: [[STACK:%[0-9]+]] = alloc_stack $MMString
+  %37 = alloc_stack $MMString
+  store %2 to [init] %37 : $*MMString
+  // CHECK: [[ID:%[0-9]+]] = function_ref @$s6callee7inherit8MMStringC_AB6MMFontCSgTg5 : $@convention(method) (@owned MMString, Int, @owned MMStorage<MMString, Optional<MMFont>>) -> Bool
+  %34 = function_ref @callee : $@convention(method) <τ_0_0, τ_0_1 where τ_0_0 : Hashable> (@in τ_0_0, Int, @owned MMStorage<τ_0_0, τ_0_1>) -> Bool
+  // CHECK: [[LOAD:%[0-9]+]] = load [take] [[STACK]]
+  // CHECK: apply [[ID]]([[LOAD]], %1, %{{[0-9]+}}) : $@convention(method) (@owned MMString, Int, @owned MMStorage<MMString, Optional<MMFont>>) -> Bool
+  %45 = apply %34<MMString, MMFont?>(%37, %1, %14) : $@convention(method) <τ_0_0, τ_0_1 where τ_0_0 : Hashable> (@in τ_0_0, Int, @owned MMStorage<τ_0_0, τ_0_1>) -> Bool
+  dealloc_stack %37 : $*MMString
+
+  return %15 : $MMStorage<MMString, Optional<MMFont>>
+}
+
+// CHECK-LABEL: @$s6callee7inherit8MMStringC_AB6MMFontCSgTg5 : $@convention(method) (@owned MMString, Int, @owned MMStorage<MMString, Optional<MMFont>>) -> Bool {
+// CHECK: [[META:%[0-9]+]] = metatype $@thick MMString.Type
+// CHECK: [[ID3:%[0-9]+]] = witness_method $MMString, #Equatable."==" :
+// CHECK: [[STACK2:%[0-9]+]] = alloc_stack $MMString
+// CHECK: [[STACK3:%[0-9]+]] = alloc_stack $MMString
+// CHECK: apply [[ID3]]<MMString>([[STACK2]], [[STACK3]], [[META]]) : $@convention(witness_method: Equatable) <τ_0_0 where τ_0_0 : Equatable> (@in τ_0_0, @in τ_0_0, @thick τ_0_0.Type) -> Bool
+
+// CHECK-LABEL: @callee : $@convention(method) <Key, Value where Key : Hashable> (@in Key, Int, @owned MMStorage<Key, Value>) -> Bool {
+sil [noinline] [ossa] @callee : $@convention(method) <Key, Value where Key : Hashable> (@in Key, Int, @owned MMStorage<Key, Value>) -> Bool {
+bb0(%0 : $*Key, %1 : $Int, %2 : @owned $MMStorage<Key, Value>):
+  %25 = metatype $@thick Key.Type
+  // CHECK: [[ID2:%[0-9]+]] = witness_method $Key, #Equatable."==" :
+  %26 = witness_method $Key, #Equatable."==" : $@convention(witness_method: Equatable) <τ_0_0 where τ_0_0 : Equatable> (@in τ_0_0, @in τ_0_0, @thick τ_0_0.Type) -> Bool
+  %27 = alloc_stack $Key
+  %33 = alloc_stack $Key
+  copy_addr %0 to [initialization] %27 : $*Key
+  copy_addr %0 to [initialization] %33 : $*Key
+  // CHECK: apply [[ID2]]<Key>
+  %35 = apply %26<Key>(%27, %33, %25) : $@convention(witness_method: Equatable) <τ_0_0 where τ_0_0 : Equatable> (@in τ_0_0, @in τ_0_0, @thick τ_0_0.Type) -> Bool
+  dealloc_stack %33 : $*Key
+  dealloc_stack %27 : $*Key
+  destroy_value %2 : $MMStorage<Key, Value>
+  destroy_addr %0 : $*Key
+  return %35 : $Bool
+}
+
+sil @ext_fn1 : $@convention(thin) (Int, @thin MMStorage<MMString, Optional<MMFont>>.Type) -> @owned MMStorage<MMString, Optional<MMFont>>
diff --git a/test/SILOptimizer/specialize_opaque_ossa.sil b/test/SILOptimizer/specialize_opaque_ossa.sil
new file mode 100644
index 0000000000000..b7eab611c04cd
--- /dev/null
+++ b/test/SILOptimizer/specialize_opaque_ossa.sil
@@ -0,0 +1,45 @@
+// RUN: %target-sil-opt -enable-sil-opaque-values -enable-sil-verify-all -generic-specializer -sil-generic-specializer-enable-ownership %s | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+
+// Test that foo is specialized on Builtin.Int64 and the copy_values and destroy_values are dropped.
+//
+// CHECK-LABEL: sil shared [ossa] @$s3fooBi64__Tg5 : $@convention(thin) (Builtin.Int64, Builtin.Int64) -> () {
+// CHECK: bb0(%0 : $Builtin.Int64, %1 : $Builtin.Int64):
+// CHECK:   [[F:%.*]] = function_ref @$s3fooBi64__Tg5 : $@convention(thin) (Builtin.Int64, Builtin.Int64) -> ()
+// CHECK:   %{{.*}} = apply [[F]](%0, %1) : $@convention(thin) (Builtin.Int64, Builtin.Int64) -> ()
+// CHECK-NOT: copy_value
+// CHECK-NOT: destroy_value
+// CHECK:   return %{{.*}} : $()
+// CHECK: } // end sil function '$s3fooBi64__Tg5'
+
+// Test that foo when specialized on Builtin.NativeObject, keeps copy_value/etc.
+// CHECK-LABEL: sil shared [ossa] @$s3fooBo_Tg5 : $@convention(thin) (@owned Builtin.NativeObject, @owned Builtin.NativeObject) -> () {
+// CHECK: copy_value
+// CHECK: apply
+// CHECK: destroy_value
+// CHECK: } // end sil function '$s3fooBo_Tg5'
+
+sil hidden [ossa] @foo : $@convention(thin) <T> (@in T, @in T) -> () {
+bb0(%0 : @owned $T, %1 : @owned $T):
+  %f = function_ref @foo : $@convention(thin) <τ_0_0> (@in τ_0_0, @in τ_0_0) -> ()
+  %cp0 = copy_value %0 : $T
+  %cp1 = copy_value %1 : $T
+  %call = apply %f<T>(%cp0, %cp1) : $@convention(thin) <τ_0_0> (@in τ_0_0, @in τ_0_0) -> ()
+  destroy_value %1 : $T
+  destroy_value %0 : $T
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil [ossa] @testSpecialize : $@convention(thin) (Builtin.Int64, @owned Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.Int64, %1 : @owned $Builtin.NativeObject):
+  %f = function_ref @foo : $@convention(thin) <T> (@in T, @in T) -> ()
+  %call = apply %f<Builtin.Int64>(%0, %0) : $@convention(thin) <τ_0_0> (@in τ_0_0, @in τ_0_0) -> ()
+  %1a = copy_value %1 : $Builtin.NativeObject
+  %call2 = apply %f<Builtin.NativeObject>(%1, %1a) : $@convention(thin) <τ_0_0> (@in τ_0_0, @in τ_0_0) -> ()
+  %999 = tuple ()
+  return %999 : $()
+}
diff --git a/test/SILOptimizer/specialize_opaque_result_types_ossa.sil b/test/SILOptimizer/specialize_opaque_result_types_ossa.sil
new file mode 100644
index 0000000000000..1ead1ab5274b6
--- /dev/null
+++ b/test/SILOptimizer/specialize_opaque_result_types_ossa.sil
@@ -0,0 +1,74 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -disable-availability-checking %S/Inputs/opaque_result_types.swift -module-name External -emit-module -emit-module-path %t/External.swiftmodule
+// RUN: %target-sil-opt -I %t -enable-sil-verify-all %s -generic-specializer -sil-generic-specializer-enable-ownership | %FileCheck %s
+
+// REQUIRES: CPU=x86_64
+
+import Builtin
+import Swift
+import SwiftShims
+import External
+
+sil_stage canonical
+
+sil @project : $@convention(thin) (@in Test) -> @out IndexingIterator<Test>
+
+sil shared [ossa] @test : $@convention(thin) (@owned Test) -> () {
+bb0(%0 : @owned $Test):
+  %3 = alloc_stack $Test
+  store %0 to [init] %3 : $*Test
+  %5 = alloc_stack $IndexingIterator<Test>
+  %6 = function_ref @project : $@convention(thin) (@in Test) -> @out IndexingIterator<Test>
+  %7 = apply %6(%5, %3) : $@convention(thin) (@in Test) -> @out IndexingIterator<Test>
+  %44 = alloc_stack $Optional<Int64>
+  // function_ref protocol witness for IteratorProtocol.next() in conformance IndexingIterator<A>
+  %45 = function_ref @next : $@convention(witness_method: IteratorProtocol) <τ_0_0 where τ_0_0 : Collection> (@inout IndexingIterator<τ_0_0>) -> @out Optional<τ_0_0.Element>
+  %46 = apply %45<Test>(%44, %5) : $@convention(witness_method: IteratorProtocol) <τ_0_0 where τ_0_0 : Collection> (@inout IndexingIterator<τ_0_0>) -> @out Optional<τ_0_0.Element>
+  destroy_addr %44: $*Optional<Int64>
+  dealloc_stack %44 : $*Optional<Int64>
+  destroy_addr %5: $*IndexingIterator<Test>
+  dealloc_stack %5 : $*IndexingIterator<Test>
+  dealloc_stack %3 : $*Test
+  %41 = tuple ()
+  return %41 : $()
+}
+// CHECK-LABEL: sil shared [ossa] @$s4next8External4TestV_Tg5 : $@convention(witness_method: IteratorProtocol) (@inout IndexingIterator<Test>) -> Optional<Int64>
+// CHECK: bb0(%0 : $*IndexingIterator<Test>):
+// CHECK: alloc_stack $Optional<Int64>
+// CHECK:  ([[RES:%.*]], %{{.*}}) = begin_apply {{.*}}<Test>({{.*}}) : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
+// CHECK:  [[DEST:%.*]] = init_enum_data_addr %1 : $*Optional<Int64>, #Optional.some!enumelt
+// CHECK:  copy_addr [[RES]] to [initialization] {{.*}} : $*Int64
+// CHECK: } // end sil function '$s4next8External4TestV_Tg5'
+sil [ossa] @next : $@convention(witness_method: IteratorProtocol) <τ_0_0 where τ_0_0 : Collection> (@inout IndexingIterator<τ_0_0>) -> @out Optional<τ_0_0.Element> {
+bb0(%0 : $*Optional<τ_0_0.Element>, %1 : $*IndexingIterator<τ_0_0>):
+  %2 = metatype $@thick τ_0_0.Index.Type
+  %3 = struct_element_addr %1 : $*IndexingIterator<τ_0_0>, #IndexingIterator._position
+  %4 = alloc_stack $τ_0_0.Index
+  copy_addr %3 to [initialization] %4 : $*τ_0_0.Index
+  %6 = struct_element_addr %1 : $*IndexingIterator<τ_0_0>, #IndexingIterator._elements
+  %20 = alloc_stack $τ_0_0
+  copy_addr %6 to [initialization] %20 : $*τ_0_0
+  %22 = alloc_stack $τ_0_0.Index
+  copy_addr %3 to [initialization] %22 : $*τ_0_0.Index
+  %24 = alloc_stack $τ_0_0
+  copy_addr [take] %20 to [initialization] %24 : $*τ_0_0
+  %26 = witness_method $τ_0_0, #Collection.subscript!read : <Self where Self : Collection> (Self) -> (Self.Index) -> () : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
+
+  // The specialized begin apply %26<Test> has a result type of t_0_0.Element
+  // which works out to be an opaque result type whose underlying type is Int64.
+  // Make sure that the specialized code handles this correctly.
+  (%27, %28) = begin_apply %26<τ_0_0>(%22, %24) : $@yield_once @convention(witness_method: Collection) <τ_0_0 where τ_0_0 : Collection> (@in_guaranteed τ_0_0.Index, @in_guaranteed τ_0_0) -> @yields @in_guaranteed τ_0_0.Element
+
+  %29 = init_enum_data_addr %0 : $*Optional<τ_0_0.Element>, #Optional.some!enumelt
+  copy_addr %27 to [initialization] %29 : $*τ_0_0.Element
+  end_apply %28
+  destroy_addr %22 : $*τ_0_0.Index
+  destroy_addr %24 : $*τ_0_0
+  dealloc_stack %24 : $*τ_0_0
+  dealloc_stack %22 : $*τ_0_0.Index
+  dealloc_stack %20 : $*τ_0_0
+  destroy_addr %4 : $*τ_0_0.Index
+  dealloc_stack %4 : $*τ_0_0.Index
+  %41 = tuple ()
+  return %41 : $()
+}
diff --git a/test/SILOptimizer/specialize_ossa.sil b/test/SILOptimizer/specialize_ossa.sil
index b76d6621600fa..45714dcc4f9f5 100644
--- a/test/SILOptimizer/specialize_ossa.sil
+++ b/test/SILOptimizer/specialize_ossa.sil
@@ -1,10 +1,12 @@
-// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer %/s | %FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all -sil-partial-specialization -generic-specializer -sil-generic-specializer-enable-ownership  %s | %FileCheck %s
 
 sil_stage canonical
 
 import Builtin
 import Swift
 
+class Klass {}
+
 sil [ossa] [transparent] @ossaTransparentCallee : $@convention(thin) <T> (@in T) -> () {
 bb0(%0 : $*T):
   destroy_addr %0 : $*T
@@ -12,9 +14,12 @@ bb0(%0 : $*T):
   return %9999 : $()
 }
 
+// We specialize this case today and just respect the already set ownership in
+// each function. This makes sense since ossa can be specialized.
+//
 // CHECK-LABEL: sil @caller : $@convention(thin) (@owned Builtin.NativeObject) -> () {
-// CHECK: [[FUNC:%.*]] = function_ref @ossaTransparentCallee : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
-// CHECK: apply [[FUNC]]<Builtin.NativeObject>(
+// CHECK: [[FUNC:%.*]] = function_ref @$s21ossaTransparentCalleeBo_Tg5 : $@convention(thin) (@owned Builtin.NativeObject) -> ()
+// CHECK: apply [[FUNC]](
 // CHECK: } // end sil function 'caller'
 sil @caller : $@convention(thin) (@owned Builtin.NativeObject) -> () {
 bb0(%0 : $Builtin.NativeObject):
@@ -26,3 +31,1222 @@ bb0(%0 : $Builtin.NativeObject):
   %9999 = tuple()
   return %9999 : $()
 }
+
+// CHECK-LABEL: sil [ossa] @exp1 : $@convention(thin) () -> () {
+// CHECK-NOT: apply
+// Call of specialized initializer: <Int32>
+// CHECK: [[CTOR:%[0-9]+]] = function_ref @$s8XXX_inits5Int32V_Tg5
+// CHECK: apply [[CTOR]]
+// CHECK: [[ACCEPTS_INT:%[0-9]+]] = function_ref @acceptsInt
+// Call of specialized XXX_foo: <Int32>
+// CHECK: [[FOO:%[0-9]+]] = function_ref @$s7XXX_foos5Int32V_Tg5
+// CHECK: apply [[FOO]]
+// CHECK: apply [[ACCEPTS_INT]]
+// CHECK: return
+// CHECK: } // end sil function 'exp1'
+
+// CHECK: sil [ossa] @exp2 : $@convention(thin) () -> () {
+// CHECK: } // end sil function 'exp2'
+
+struct XXX<T> {
+  init(t: T)
+  mutating func foo(t: T) -> Int32
+  var m_t: T
+}
+
+// specialize.XXX.init <A>(specialize.XXX<A>.Type)(t : A) -> specialize.XXX<A>
+sil [ossa] [noinline] @XXX_init : $@convention(thin) <T> (@in T, @thin XXX<T>.Type) -> @out XXX<T> {
+bb0(%0 : $*XXX<T>, %1 : $*T, %2 : $@thin XXX<T>.Type):
+  %3 = alloc_stack $XXX<T>, var, name "sf"           // users: %7, %11, %13
+  debug_value_addr %1 : $*T, let, name "t" // id: %4
+  %5 = alloc_stack $T                             // users: %6, %8, %9
+  copy_addr %1 to [initialization] %5 : $*T     // id: %6
+  %7 = struct_element_addr %3 : $*XXX<T>, #XXX.m_t // user: %8
+  copy_addr [take] %5 to [initialization] %7 : $*T // id: %8
+  dealloc_stack %5 : $*T         // id: %9
+  destroy_addr %1 : $*T                           // id: %10
+  copy_addr [take] %3 to [initialization] %0 : $*XXX<T> // id: %11
+  %12 = tuple ()                                  // user: %14
+  dealloc_stack %3 : $*XXX<T>    // id: %13
+  return %12 : $()                                // id: %14
+}
+
+// specialize.XXX.foo <A>(@inout specialize.XXX<A>)(t : A) -> Swift.Int32
+sil [ossa] [noinline] @XXX_foo : $@convention(method) <T> (@in T, @inout XXX<T>) -> Int32 {
+bb0(%0 : $*T, %1 : $*XXX<T>):
+  debug_value_addr %0 : $*T, let, name "t" // id: %2
+  %3 = alloc_stack $T                             // users: %4, %6, %7
+  copy_addr %0 to [initialization] %3 : $*T     // id: %4
+  %5 = struct_element_addr %1 : $*XXX<T>, #XXX.m_t // user: %6
+  copy_addr [take] %3 to %5 : $*T               // id: %6
+  dealloc_stack %3 : $*T         // id: %7
+  %8 = integer_literal $Builtin.Int32, 4          // user: %9
+  %9 = struct $Int32 (%8 : $Builtin.Int32)        // user: %11
+  destroy_addr %0 : $*T                           // id: %10
+  return %9 : $Int32                              // id: %11
+}
+
+sil [ossa] [noinline] @XXX_init_guaranteed : $@convention(thin) <T> (@in_guaranteed T, @thin XXX<T>.Type) -> @out XXX<T> {
+bb0(%0 : $*XXX<T>, %1 : $*T, %2 : $@thin XXX<T>.Type):
+  %3 = alloc_stack $XXX<T>, var, name "sf"           // users: %7, %11, %13
+  debug_value_addr %1 : $*T, let, name "t" // id: %4
+  %5 = alloc_stack $T                             // users: %6, %8, %9
+  copy_addr %1 to [initialization] %5 : $*T     // id: %6
+  %7 = struct_element_addr %3 : $*XXX<T>, #XXX.m_t // user: %8
+  copy_addr [take] %5 to [initialization] %7 : $*T // id: %8
+  dealloc_stack %5 : $*T         // id: %9
+  copy_addr [take] %3 to [initialization] %0 : $*XXX<T> // id: %11
+  %12 = tuple ()                                  // user: %14
+  dealloc_stack %3 : $*XXX<T>    // id: %13
+  return %12 : $()                                // id: %14
+}
+
+// specialize.XXX.foo <A>(@inout specialize.XXX<A>)(t : A) -> Swift.Int32
+sil [ossa] [noinline] @XXX_foo_guaranteed : $@convention(method) <T> (@in_guaranteed T, @inout XXX<T>) -> Int32 {
+bb0(%0 : $*T, %1 : $*XXX<T>):
+  debug_value_addr %0 : $*T, let, name "t" // id: %2
+  %3 = alloc_stack $T                             // users: %4, %6, %7
+  copy_addr %0 to [initialization] %3 : $*T     // id: %4
+  %5 = struct_element_addr %1 : $*XXX<T>, #XXX.m_t // user: %6
+  copy_addr [take] %3 to %5 : $*T               // id: %6
+  dealloc_stack %3 : $*T         // id: %7
+  %8 = integer_literal $Builtin.Int32, 4          // user: %9
+  %9 = struct $Int32 (%8 : $Builtin.Int32)        // user: %11
+  return %9 : $Int32                              // id: %11
+}
+
+// Swift.Int32._convertFromBuiltinIntegerLiteral (Swift.Int32.Type)(Builtin.IntLiteral) -> Swift.Int32
+sil public_external [ossa] [transparent] @$sSi33_convertFromBuiltinIntegerLiteralySiBI_cSimF : $@convention(thin) (Builtin.IntLiteral, @thin Int32.Type) -> Int32 {
+bb0(%0 : $Builtin.IntLiteral, %1 : $@thin Int32.Type):
+  %3 = builtin "s_to_s_checked_trunc_IntLiteral_Int32"(%0 : $Builtin.IntLiteral) : $(Builtin.Int32, Builtin.Int1)
+  %4 = tuple_extract %3 : $(Builtin.Int32, Builtin.Int1), 0 // user: %5
+  %5 = struct $Int32 (%4 : $Builtin.Int32)           // user: %6
+  return %5 : $Int32                                // id: %6
+}
+
+// specialize.acceptsInt (Swift.Int32) -> ()
+sil [noinline] [ossa] @acceptsInt : $@convention(thin) (Int32) -> () {
+bb0(%0 : $Int32):
+  debug_value %0 : $Int32, let, name "x" // id: %1
+  %2 = tuple ()                                   // user: %3
+  return %2 : $()                                 // id: %3
+}
+
+// specialize.exp1 () -> ()
+sil [ossa] @exp1 : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_stack $XXX<Int32>, var, name "II"           // users: %7, %15, %19
+  // function_ref specialize.XXX.init <A>(specialize.XXX<A>.Type)(t : A) -> specialize.XXX<A>
+  %1 = function_ref @XXX_init : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0> // user: %7
+  %2 = metatype $@thin XXX<Int32>.Type              // user: %7
+  %3 = alloc_stack $Int32                           // users: %6, %7, %8
+  %4 = integer_literal $Builtin.Int32, 5            // user: %5
+  %5 = struct $Int32 (%4 : $Builtin.Int32)          // user: %6
+  store %5 to [trivial] %3 : $*Int32                        // id: %6
+  %7 = apply %1<Int32>(%0, %3, %2) : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0>
+  dealloc_stack %3 : $*Int32       // id: %8
+  // function_ref specialize.acceptsInt (Swift.Int32) -> ()
+  %9 = function_ref @acceptsInt : $@convention(thin) (Int32) -> () // user: %16
+  // function_ref specialize.XXX.foo <A>(@inout specialize.XXX<A>)(t : A) -> Swift.Int32
+  %10 = function_ref @XXX_foo : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %15
+  %11 = alloc_stack $Int32                          // users: %14, %15, %17
+  %12 = integer_literal $Builtin.Int32, 4           // user: %13
+  %13 = struct $Int32 (%12 : $Builtin.Int32)        // user: %14
+  store %13 to [trivial] %11 : $*Int32                      // id: %14
+  %15 = apply %10<Int32>(%11, %0) : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %16
+  %16 = apply %9(%15) : $@convention(thin) (Int32) -> ()
+  dealloc_stack %11 : $*Int32      // id: %17
+  %18 = tuple ()                                    // user: %20
+  dealloc_stack %0 : $*XXX<Int32>  // id: %19
+  return %18 : $()                                  // id: %20
+}
+
+// specialize.exp2 () -> ()
+sil [ossa] @exp2 : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_stack $XXX<UInt8>, var, name "I8"        // users: %7, %15, %19
+  // function_ref specialize.XXX.init <A>(specialize.XXX<A>.Type)(t : A) -> specialize.XXX<A>
+  %1 = function_ref @XXX_init : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0> // user: %7
+  %2 = metatype $@thin XXX<UInt8>.Type            // user: %7
+  %3 = alloc_stack $UInt8                         // users: %6, %7, %8
+  %4 = integer_literal $Builtin.Int8, 5           // user: %5
+  %5 = struct $UInt8 (%4 : $Builtin.Int8)         // user: %6
+  store %5 to [trivial] %3 : $*UInt8                      // id: %6
+  %7 = apply %1<UInt8>(%0, %3, %2) : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0>
+  dealloc_stack %3 : $*UInt8     // id: %8
+  // function_ref specialize.acceptsInt (Swift.Int32) -> ()
+  %9 = function_ref @acceptsInt : $@convention(thin) (Int32) -> () // user: %16
+  // function_ref specialize.XXX.foo <A>(@inout specialize.XXX<A>)(t : A) -> Swift.Int32
+  %10 = function_ref @XXX_foo : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %15
+  %11 = alloc_stack $UInt8                        // users: %14, %15, %17
+  %12 = integer_literal $Builtin.Int8, 4          // user: %13
+  %13 = struct $UInt8 (%12 : $Builtin.Int8)       // user: %14
+  store %13 to [trivial] %11 : $*UInt8                    // id: %14
+  %15 = apply %10<UInt8>(%11, %0) : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %16
+  %16 = apply %9(%15) : $@convention(thin) (Int32) -> ()
+  dealloc_stack %11 : $*UInt8    // id: %17
+  %18 = tuple ()                                  // user: %20
+  dealloc_stack %0 : $*XXX<UInt8> // id: %19
+  return %18 : $()                                // id: %20
+}
+
+sil [ossa] @exp2_nativeObject : $@convention(thin) (@guaranteed Builtin.NativeObject) -> () {
+bb0(%arg : @guaranteed $Builtin.NativeObject):
+  %0 = alloc_stack $XXX<Builtin.NativeObject>
+  // function_ref specialize.XXX.init <A>(specialize.XXX<A>.Type)(t : A) -> specialize.XXX<A>
+  %1 = function_ref @XXX_init : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0> // user: %7
+  %2 = metatype $@thin XXX<Builtin.NativeObject>.Type            // user: %7
+  %3 = alloc_stack $Builtin.NativeObject                         // users: %6, %7, %8
+  %arg1 = copy_value %arg : $Builtin.NativeObject
+  store %arg1 to [init] %3 : $*Builtin.NativeObject                      // id: %6
+  %7 = apply %1<Builtin.NativeObject>(%0, %3, %2) : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0>
+  dealloc_stack %3 : $*Builtin.NativeObject     // id: %8
+
+  %1g = function_ref @XXX_init_guaranteed : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0>
+  %3g = alloc_stack $Builtin.NativeObject                         // users: %6, %7, %8
+  %3g_out = alloc_stack $XXX<Builtin.NativeObject>                         // users: %6, %7, %8
+  %arg1g = copy_value %arg : $Builtin.NativeObject
+  store %arg1g to [init] %3g : $*Builtin.NativeObject                      // id: %6
+  %7g = apply %1<Builtin.NativeObject>(%3g_out, %3g, %2) : $@convention(thin) <τ_0_0> (@in τ_0_0, @thin XXX<τ_0_0>.Type) -> @out XXX<τ_0_0>
+  destroy_addr %3g_out : $*XXX<Builtin.NativeObject>
+  dealloc_stack %3g_out : $*XXX<Builtin.NativeObject>
+  dealloc_stack %3g : $*Builtin.NativeObject     // id: %8
+
+  // function_ref specialize.acceptsInt (Swift.Int32) -> ()
+  %9 = function_ref @acceptsInt : $@convention(thin) (Int32) -> () // user: %16
+  // function_ref specialize.XXX.foo <A>(@inout specialize.XXX<A>)(t : A) -> Swift.Int32
+  %10 = function_ref @XXX_foo : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %15
+  %11 = alloc_stack $Builtin.NativeObject                        // users: %14, %15, %17
+  %arg2 = copy_value %arg : $Builtin.NativeObject
+  store %arg2 to [init] %11 : $*Builtin.NativeObject
+  %15 = apply %10<Builtin.NativeObject>(%11, %0) : $@convention(method) <τ_0_0> (@in τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %16
+  %16 = apply %9(%15) : $@convention(thin) (Int32) -> ()
+  dealloc_stack %11 : $*Builtin.NativeObject    // id: %17
+
+  %10g = function_ref @XXX_foo_guaranteed : $@convention(method) <τ_0_0> (@in_guaranteed τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %15
+  %11g = alloc_stack $Builtin.NativeObject                        // users: %14, %15, %17
+  %arg2g = copy_value %arg : $Builtin.NativeObject
+  store %arg2g to [init] %11g : $*Builtin.NativeObject
+  %15g = apply %10g<Builtin.NativeObject>(%11g, %0) : $@convention(method) <τ_0_0> (@in_guaranteed τ_0_0, @inout XXX<τ_0_0>) -> Int32 // user: %16
+  apply %9(%15g) : $@convention(thin) (Int32) -> ()
+  destroy_addr %11g : $*Builtin.NativeObject
+  dealloc_stack %11g : $*Builtin.NativeObject    // id: %17
+  destroy_addr %0 : $*XXX<Builtin.NativeObject>
+  dealloc_stack %0 : $*XXX<Builtin.NativeObject> // id: %19
+  %18 = tuple ()                                  // user: %20
+  return %18 : $()                                // id: %20
+}
+
+// specialize.useClosure <A>(fun : () -> A) -> A
+sil [ossa] @useClosure : $@convention(thin) <T> (@owned @callee_owned () -> @out T) -> @out T {
+bb0(%0 : $*T, %1 : @owned $@callee_owned () -> @out T):
+  debug_value %1 : $@callee_owned () -> @out T, let, name "fun" // id: %2
+  %2 = copy_value %1 : $@callee_owned () -> @out T // id: %3
+  %4 = apply %2(%0) : $@callee_owned () -> @out T
+  destroy_value %1 : $@callee_owned () -> @out T // id: %5
+  %6 = tuple ()                                   // user: %7
+  return %6 : $()                                 // id: %7
+}
+
+// specialize.getGenericClosure <A>(t : A) -> () -> A
+sil [ossa] @getGenericClosure : $@convention(thin) <T> (@in T) -> @owned @callee_owned () -> @out T {
+bb0(%0 : $*T):
+  debug_value_addr %0 : $*T, let, name "t" // id: %1
+  // function_ref specialize.(getGenericClosure <A>(t : A) -> () -> A).(tmp #1) (())A
+  %2 = function_ref @getGenericClosure_closure : $@convention(thin) <τ_0_0> (@owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> @out τ_0_0 // user: %5
+  %3 = alloc_box $<τ_0_0> { var τ_0_0 } <T>
+  %3b = begin_borrow %3 : $<τ_0_0> { var τ_0_0 } <T>
+  %3a = project_box %3b : $<τ_0_0> { var τ_0_0 } <T>, 0
+  copy_addr %0 to [initialization] %3a : $*T     // id: %4
+  end_borrow %3b : $<τ_0_0> { var τ_0_0 } <T>
+  %5 = partial_apply %2<T>(%3) : $@convention(thin) <τ_0_0> (@owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> @out τ_0_0 // user: %7
+  destroy_addr %0 : $*T                           // id: %6
+  return %5 : $@callee_owned () -> @out T       // id: %7
+}
+
+// specialize.(getGenericClosure <A>(t : A) -> () -> A).(tmp #1) (())
+sil shared [ossa] @getGenericClosure_closure : $@convention(thin) <T> (@owned <τ_0_0> { var τ_0_0 } <T>) -> @out T {
+bb0(%0 : $*T, %1 : @owned $<τ_0_0> { var τ_0_0 } <T>):
+  %1a = begin_borrow %1 : $<τ_0_0> { var τ_0_0 } <T>
+  %2 = project_box %1a : $<τ_0_0> { var τ_0_0 } <T>, 0
+  copy_addr %2 to [initialization] %0 : $*T       // id: %3
+  end_borrow %1a : $<τ_0_0> { var τ_0_0 } <T>
+  destroy_value %1 : $<τ_0_0> { var τ_0_0 } <T>       // id: %4
+  %5 = tuple ()                                   // user: %6
+  return %5 : $()                                 // id: %6
+}
+
+// specialize.specializePartialApplies () -> Swift.UInt8
+sil [ossa] @specializePartialApplies : $@convention(thin) () -> UInt8 {
+bb0:
+  %0 = alloc_stack $UInt8, var, name "i"               // users: %3, %18
+  %1 = integer_literal $Builtin.Int8, 5           // user: %2
+  %2 = struct $UInt8 (%1 : $Builtin.Int8)         // users: %3, %7
+  store %2 to [trivial] %0 : $*UInt8                      // id: %3
+  // function_ref specialize.useClosure <A>(fun : () -> A) -> A
+  %4 = function_ref @useClosure : $@convention(thin) <τ_0_0> (@owned @callee_owned () -> @out τ_0_0) -> @out τ_0_0 // user: %14
+  // function_ref specialize.getGenericClosure <A>(t : A) -> () -> A
+  %5 = function_ref @getGenericClosure : $@convention(thin) <τ_0_0> (@in τ_0_0) -> @owned @callee_owned () -> @out τ_0_0 // user: %8
+  %6 = alloc_stack $UInt8                         // users: %7, %8, %17
+  store %2 to [trivial] %6 : $*UInt8                      // id: %7
+  %8 = apply %5<UInt8>(%6) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> @owned @callee_owned () -> @out τ_0_0 // user: %10
+  // function_ref reabstraction thunk helper from @callee_owned () -> (@out Swift.UInt8) to @callee_owned () -> (@unowned Swift.UInt8)
+  %9 = function_ref @$ss5UInt8VIxr_ABIxd_TR : $@convention(thin) (@owned @callee_owned () -> @out UInt8) -> UInt8 // user: %10
+  %10 = partial_apply %9(%8) : $@convention(thin) (@owned @callee_owned () -> @out UInt8) -> UInt8 // user: %12
+  // function_ref reabstraction thunk helper from @callee_owned () -> (@unowned Swift.UInt8) to @callee_owned () -> (@out Swift.UInt8)
+  %11 = function_ref @$ss5UInt8VIxd_ABIxr_TR : $@convention(thin) (@owned @callee_owned () -> UInt8) -> @out UInt8 // user: %12
+  %12 = partial_apply %11(%10) : $@convention(thin) (@owned @callee_owned () -> UInt8) -> @out UInt8 // user: %14
+  %13 = alloc_stack $UInt8                        // users: %14, %15, %16
+  %14 = apply %4<UInt8>(%13, %12) : $@convention(thin) <τ_0_0> (@owned @callee_owned () -> @out τ_0_0) -> @out τ_0_0
+  %15 = load [trivial] %13 : $*UInt8                      // user: %19
+  dealloc_stack %13 : $*UInt8    // id: %16
+  dealloc_stack %6 : $*UInt8     // id: %17
+  dealloc_stack %0 : $*UInt8     // id: %18
+  return %15 : $UInt8                             // id: %19
+}
+
+// reabstraction thunk helper from @callee_owned () -> (@out Swift.UInt8) to @callee_owned () -> (@unowned Swift.UInt8)
+sil shared [ossa] [transparent] @$ss5UInt8VIxr_ABIxd_TR : $@convention(thin) (@owned @callee_owned () -> @out UInt8) -> UInt8 {
+bb0(%0 : @owned $@callee_owned () -> @out UInt8):
+  %1 = alloc_stack $UInt8                         // users: %2, %3, %4
+  %2 = apply %0(%1) : $@callee_owned () -> @out UInt8
+  %3 = load [trivial] %1 : $*UInt8                        // user: %5
+  dealloc_stack %1 : $*UInt8     // id: %4
+  return %3 : $UInt8                              // id: %5
+}
+
+// reabstraction thunk helper from @callee_owned () -> (@unowned Swift.UInt8) to @callee_owned () -> (@out Swift.UInt8)
+sil shared [ossa] [transparent] @$ss5UInt8VIxd_ABIxr_TR : $@convention(thin) (@owned @callee_owned () -> UInt8) -> @out UInt8 {
+bb0(%0 : $*UInt8, %1 : @owned $@callee_owned () -> UInt8):
+  %2 = apply %1() : $@callee_owned () -> UInt8    // user: %3
+  store %2 to [trivial] %0 : $*UInt8                        // id: %3
+  %4 = tuple ()                                   // user: %5
+  return %4 : $()                                 // id: %5
+}
+
+
+class Base {
+}
+sil_vtable Base {
+}
+
+sil [ossa] @generic_upcast : $@convention(thin) <T where T : Base> (@owned T) -> @owned Base {
+bb0(%0 : @owned $T):
+  %2 = upcast %0 : $T to $Base
+  return %2 : $Base
+}
+
+sil [ossa] @specialize_generic_upcast : $@convention(thin)(@owned Base) -> @owned Base {
+bb0(%0 : @owned $Base):
+  %1 = function_ref @generic_upcast : $@convention(thin)<T where T : Base> (@owned T) -> @owned Base
+  %2 = apply %1<Base>(%0) : $@convention(thin)<T where T : Base> (@owned T) -> @owned Base
+  return %2 : $Base
+}
+
+// CHECK-LABEL: sil shared [ossa] @{{.*}}generic_upcast{{.*}}Tg5 : $@convention(thin) (@owned Base) -> @owned Base {
+// CHECK: bb0(%0 : @owned $Base):
+// CHECK:  return %0 : $Base
+
+// Check generic specialization of partial_apply
+
+protocol P { func get() -> Int32 }
+
+struct C : P { func get() -> Int32 }
+
+// test4.C.get (test4.C)() -> Swift.Int32
+sil hidden [ossa] @C_get : $@convention(method) (C) -> Int32 {
+bb0(%0 : $C):
+  debug_value %0 : $C, let, name "self" // id: %1
+  %2 = integer_literal $Builtin.Int32, 1          // user: %3
+  %3 = struct $Int32 (%2 : $Builtin.Int32)        // user: %4
+  return %3 : $Int32                              // id: %4
+}
+
+// test4.C.init (test4.C.Type)() -> test4.C
+sil hidden [ossa][noinline] @C_init : $@convention(thin) (@thin C.Type) -> C {
+bb0(%0 : $@thin C.Type):
+  %1 = alloc_stack $C, var, name "sf"                // user: %3
+  %2 = struct $C ()                               // user: %4
+  dealloc_stack %1 : $*C         // id: %3
+  return %2 : $C                                  // id: %4
+}
+
+// protocol witness for test4.P.get <A : test4.P>(test4.P.Self)() -> Swift.Int32 in conformance test4.C : test4.P in test4
+sil hidden [ossa] [transparent] [thunk] @test4_P_get_witness_C : $@convention(witness_method: P) (@in_guaranteed C) -> Int32 {
+bb0(%0 : $*C):
+  %1 = load [trivial] %0 : $*C                              // user: %3
+  // function_ref test4.C.get (test4.C)() -> Swift.Int32
+  %2 = function_ref @C_get : $@convention(method) (C) -> Int32 // user: %3
+  %3 = apply %2(%1) : $@convention(method) (C) -> Int32 // user: %4
+  return %3 : $Int32                              // id: %4
+}
+
+// test4.boo <A : test4.P, B>(A) -> (Swift.Int32, B) -> Swift.Int32
+sil hidden [ossa] [noinline] @boo : $@convention(thin) <U, T where U : P> (@in U) -> @owned @callee_owned (Int32, @in T) -> Int32 {
+bb0(%0 : $*U):
+  debug_value_addr %0 : $*U, let, name "y" // id: %1
+  // function_ref test4.(boo <A : test4.P, B>(A) -> (Swift.Int32, B) -> Swift.Int32).(closure #1)
+  %2 = function_ref @boo_closure : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P> (Int32, @in τ_0_1, @owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> Int32 // user: %5
+  %3 = alloc_box $<τ_0_0> { var τ_0_0 } <U>                               // users: %4, %5, %5
+  %3a = project_box %3 : $<τ_0_0> { var τ_0_0 } <U>, 0
+  copy_addr %0 to [initialization] %3a : $*U     // id: %4
+  %5 = partial_apply %2<U, T>(%3) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P> (Int32, @in τ_0_1, @owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> Int32 // user: %7
+  destroy_addr %0 : $*U                           // id: %6
+  return %5 : $@callee_owned (Int32, @in T) -> Int32 // id: %7
+}
+
+// test4.(boo <A : test4.P, B>(A) -> (Swift.Int32, B) -> Swift.Int32).(closure #1)
+sil shared [ossa] [noinline] @boo_closure : $@convention(thin) <U, T where U : P> (Int32, @in T, @owned <τ_0_0> { var τ_0_0 } <U>) -> Int32 {
+bb0(%0 : $Int32, %1 : $*T, %2 : @owned $<τ_0_0> { var τ_0_0 } <U>):
+  %3 = project_box %2 : $<τ_0_0> { var τ_0_0 } <U>, 0
+  debug_value %0 : $Int32, let, name "x" // id: %4
+  debug_value_addr %1 : $*T, let, name "z" // id: %5
+  %6 = witness_method $U, #P.get : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int32 // user: %7
+  %7 = apply %6<U>(%3) : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int32 // user: %8
+  %8 = struct_extract %7 : $Int32, #Int32._value   // user: %11
+  %9 = struct_extract %0 : $Int32, #Int32._value   // user: %11
+  %10 = integer_literal $Builtin.Int1, -1         // user: %11
+  %11 = builtin "sadd_with_overflow_Int32"(%8 : $Builtin.Int32, %9 : $Builtin.Int32, %10 : $Builtin.Int1) : $(Builtin.Int32, Builtin.Int1) // users: %12, %13
+  %12 = tuple_extract %11 : $(Builtin.Int32, Builtin.Int1), 0 // user: %15
+  %13 = tuple_extract %11 : $(Builtin.Int32, Builtin.Int1), 1 // user: %14
+  cond_fail %13 : $Builtin.Int1                   // id: %14
+  %15 = struct $Int32 (%12 : $Builtin.Int32)      // user: %18
+  destroy_value %2 : $<τ_0_0> { var τ_0_0 } <U>       // id: %16
+  destroy_addr %1 : $*T                           // id: %17
+  return %15 : $Int32                             // id: %18
+}
+
+// static Swift.+ infix (Swift.Int32, Swift.Int32) -> Swift.Int32
+sil public_external [ossa] [transparent] [serialized] @$ss1poiys5Int32VAC_ACtFZ : $@convention(thin) (Int32, Int32) -> Int32 {
+bb0(%0 : $Int32, %1 : $Int32):
+  %2 = struct_extract %0 : $Int32, #Int32._value   // user: %5
+  %3 = struct_extract %1 : $Int32, #Int32._value   // user: %5
+  %4 = integer_literal $Builtin.Int1, -1          // user: %5
+  %5 = builtin "sadd_with_overflow_Int32"(%2 : $Builtin.Int32, %3 : $Builtin.Int32, %4 : $Builtin.Int1) : $(Builtin.Int32, Builtin.Int1) // users: %6, %7
+  %6 = tuple_extract %5 : $(Builtin.Int32, Builtin.Int1), 0 // user: %9
+  %7 = tuple_extract %5 : $(Builtin.Int32, Builtin.Int1), 1 // user: %8
+  cond_fail %7 : $Builtin.Int1                    // id: %8
+  %9 = struct $Int32 (%6 : $Builtin.Int32)        // user: %10
+  return %9 : $Int32                              // id: %10
+}
+
+// test4.foo <A : test4.P, B : test4.P>(A, B) -> (Swift.Int32, Swift.Float) -> Swift.Int32
+sil hidden [ossa] [noinline] @foo : $@convention(thin) <T, U where T : P, U : P> (@in T, @in U) -> @owned @callee_owned (Int32, Float) -> Int32 {
+bb0(%0 : $*T, %1 : $*U):
+  debug_value_addr %0 : $*T, let, name "x" // id: %2
+  debug_value_addr %1 : $*U, let, name "y" // id: %3
+  // function_ref test4.boo <A : test4.P, B>(A) -> (Swift.Int32, B) -> Swift.Int32
+  %4 = function_ref @boo : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P> (@in τ_0_0) -> @owned @callee_owned (Int32, @in τ_0_1) -> Int32 // user: %7
+  %5 = alloc_stack $U                             // users: %6, %7, %10
+  copy_addr %1 to [initialization] %5 : $*U     // id: %6
+  %7 = apply %4<U, Float>(%5) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P> (@in τ_0_0) -> @owned @callee_owned (Int32, @in τ_0_1) -> Int32 // user: %9
+  // function_ref reabstraction thunk helper <T_0_0, T_0_1 where T_0_0: test4.P, T_0_1: test4.P> from @callee_owned (@unowned Swift.Int32, @in Swift.Float) -> (@unowned Swift.Int32) to @callee_owned (@unowned Swift.Int32, @unowned Swift.Float) -> (@unowned Swift.Int32)
+  %8 = function_ref @_TTRG1_RPq_P5test41P_Pq0_PS0___XFo_dVs5Int32iSf_dS1__XFo_dS1_dSf_dS1__ : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P, τ_0_1 : P> (Int32, Float, @owned @callee_owned (Int32, @in Float) -> Int32) -> Int32 // user: %9
+  %9 = partial_apply %8<T, U>(%7) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P, τ_0_1 : P> (Int32, Float, @owned @callee_owned (Int32, @in Float) -> Int32) -> Int32 // user: %13
+  dealloc_stack %5 : $*U         // id: %10
+  destroy_addr %1 : $*U                           // id: %11
+  destroy_addr %0 : $*T                           // id: %12
+  return %9 : $@callee_owned (Int32, Float) -> Int32 // id: %13
+}
+
+// reabstraction thunk helper <T_0_0, T_0_1 where T_0_0: test4.P, T_0_1: test4.P> from @callee_owned (@unowned Swift.Int32, @in Swift.Float) -> (@unowned Swift.Int32) to @callee_owned (@unowned Swift.Int32, @unowned Swift.Float) -> (@unowned Swift.Int32)
+sil shared [ossa] [transparent] [thunk] @_TTRG1_RPq_P5test41P_Pq0_PS0___XFo_dVs5Int32iSf_dS1__XFo_dS1_dSf_dS1__ : $@convention(thin) <T, U where T : P, U : P> (Int32, Float, @owned @callee_owned (Int32, @in Float) -> Int32) -> Int32 {
+bb0(%0 : $Int32, %1 : $Float, %2 : @owned $@callee_owned (Int32, @in Float) -> Int32):
+  %3 = alloc_stack $Float                         // users: %4, %5, %6
+  store %1 to [trivial] %3 : $*Float                      // id: %4
+  %5 = apply %2(%0, %3) : $@callee_owned (Int32, @in Float) -> Int32 // user: %7
+  dealloc_stack %3 : $*Float     // id: %6
+  return %5 : $Int32                              // id: %7
+}
+
+// test4.gen1 <A : test4.P>(A) -> (Swift.Int32) -> Swift.Int32
+sil hidden [ossa] [noinline] @gen1 : $@convention(thin) <T where T : P> (@in T) -> @owned @callee_owned (Int32) -> Int32 {
+bb0(%0 : $*T):
+  debug_value_addr %0 : $*T, let, name "x" // id: %1
+  // function_ref test4.(gen1 <A : test4.P>(A) -> (Swift.Int32) -> Swift.Int32).(closure #1)
+  %2 = function_ref @gen1_closure : $@convention(thin) <τ_0_0 where τ_0_0 : P> (Int32, @owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> Int32 // user: %5
+  %3 = alloc_box $<τ_0_0> { var τ_0_0 } <T>                               // users: %4, %5, %5
+  %3a = project_box %3 : $<τ_0_0> { var τ_0_0 } <T>, 0
+  copy_addr %0 to [initialization] %3a : $*T     // id: %4
+  %5 = partial_apply %2<T>(%3) : $@convention(thin) <τ_0_0 where τ_0_0 : P> (Int32, @owned <τ_0_0> { var τ_0_0 } <τ_0_0>) -> Int32 // user: %7
+  destroy_addr %0 : $*T                           // id: %6
+  return %5 : $@callee_owned (Int32) -> Int32     // id: %7
+}
+
+// test4.(gen1 <A : test4.P>(A) -> (Swift.Int32) -> Swift.Int32).(closure #1)
+sil shared [ossa] [noinline] @gen1_closure : $@convention(thin) <T where T : P> (Int32, @owned <τ_0_0> { var τ_0_0 } <T>) -> Int32 {
+bb0(%0 : $Int32, %1 : @owned $<τ_0_0> { var τ_0_0 } <T>):
+  %2 = project_box %1 : $<τ_0_0> { var τ_0_0 } <T>, 0
+  debug_value %0 : $Int32 , let, name "$0"              // id: %3
+  %4 = witness_method $T, #P.get : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int32 // user: %5
+  %5 = apply %4<T>(%2) : $@convention(witness_method: P) <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int32 // user: %6
+  %6 = struct_extract %5 : $Int32, #Int32._value   // user: %9
+  %7 = struct_extract %0 : $Int32, #Int32._value   // user: %9
+  %8 = integer_literal $Builtin.Int1, -1          // user: %9
+  %9 = builtin "sadd_with_overflow_Int32"(%6 : $Builtin.Int32, %7 : $Builtin.Int32, %8 : $Builtin.Int1) : $(Builtin.Int32, Builtin.Int1) // users: %10, %11
+  %10 = tuple_extract %9 : $(Builtin.Int32, Builtin.Int1), 0 // user: %13
+  %11 = tuple_extract %9 : $(Builtin.Int32, Builtin.Int1), 1 // user: %12
+  cond_fail %11 : $Builtin.Int1                   // id: %12
+  %13 = struct $Int32 (%10 : $Builtin.Int32)      // user: %15
+  destroy_value %1 : $<τ_0_0> { var τ_0_0 } <T>       // id: %14
+  return %13 : $Int32                             // id: %15
+}
+
+// check that there is a generic specialization of boo
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s3booxs5Int32VSfACIexyid_4main1PRzSfRs_r0_lIetio_Tp5AD1CV_Tg5 : $@convention(thin) (C) -> @owned @callee_owned (Int32, @in Float) -> Int32
+// CHECK: [[CLOSURE_SPECIALIZATION:%[0-9]+]] = function_ref @$s11boo_closures5Int32VSfxz_x_lXXAC4main1PRzSfRs_r0_lIetyyxd_TP5AD1CV_TG5
+// CHECK: partial_apply [[CLOSURE_SPECIALIZATION:%[0-9]+]]
+// CHECK: return
+
+// Check that there is a generic specialization of a closure from boo
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s11boo_closures5Int32VSfxz_x_lXXAC4main1PRzSfRs_r0_lIetyyxd_Tp5AD1CV_Tg5
+// CHECK: return
+
+// Check that there is a generic specialization of foo
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s3foo4main1CV_ADTg5 : $@convention(thin) (C, C) -> @owned @callee_owned (Int32, Float) -> Int32
+// CHECK: function_ref @$s3booxs5Int32VSfACIexyid_4main1PRzSfRs_r0_lIetio_Tp5AD1CV_Tg5
+// check that it invokes a generic specialization of the reabstraction thunk helper which invokes a specialization boo
+// CHECK: [[THUNK_SPECIALIZATION:%[0-9]+]] = function_ref @$s053_TTRG1_RPq_P5test41P_Pq0_PS0___XFo_dVs5Int32iSf_dS1__f2_dj2_di2_dJ2__4main1CV_ADTg5
+// CHECK-NOT: apply
+// CHECK: partial_apply [[THUNK_SPECIALIZATION]]
+// CHECK-NOT: apply
+// CHECK: return
+
+
+// Check that there is a generic specialization of gen1
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s4gen14main1CV_Tg5 : $@convention(thin) (C) -> @owned @callee_owned (Int32) -> Int32
+// check that it invokes a generic specialization of the closure by mean of partial_apply
+// CHECK: [[CLOSURE_SPECIALIZATION:%[0-9]+]] = function_ref @$s12gen1_closure4main1CV_Tg5
+// CHECK-NOT: apply
+// CHECK: partial_apply [[CLOSURE_SPECIALIZATION]]
+// CHECK-NOT: apply
+// CHECK: return
+
+// Check that there is a generic specialization of a closure from gen1
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s12gen1_closure4main1CV_Tg5 : $@convention(thin) (Int32, @owned <τ_0_0> { var τ_0_0 } <C>) -> Int32
+// CHECK: return
+
+
+
+// test4.bar () -> Swift.Int32
+// CHECK-LABEL: sil hidden [ossa] @bar
+// check that it does not invoke a generic specialization of foo
+// CHECK-NOT:  function_ref @foo
+// check that it invokes a generic specialization of foo
+// CHECK: function_ref @$s3foo4main1CV_ADTg5
+sil hidden [ossa] @bar : $@convention(thin) () -> Int32 {
+bb0:
+  %0 = alloc_stack $@callee_owned (Int32, Float) -> Int32, var, name "f" // users: %11, %22
+  // function_ref test4.C.init (test4.C.Type)() -> test4.C
+  %1 = function_ref @C_init : $@convention(thin) (@thin C.Type) -> C // user: %3
+  %2 = metatype $@thin C.Type                     // user: %3
+  %3 = apply %1(%2) : $@convention(thin) (@thin C.Type) -> C  // users: %4, %7, %9
+  debug_value %3 : $C, let, name "c" // id: %4
+  // function_ref test4.foo <A : test4.P, B : test4.P>(A, B) -> (Swift.Int32, Swift.Float) -> Swift.Int32
+  %5 = function_ref @foo : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P, τ_0_1 : P> (@in τ_0_0, @in τ_0_1) -> @owned @callee_owned (Int32, Float) -> Int32 // user: %10
+  %6 = alloc_stack $C                             // users: %7, %10, %13
+  store %3 to [trivial] %6 : $*C                          // id: %7
+  %8 = alloc_stack $C                             // users: %9, %10, %12
+  store %3 to [trivial] %8 : $*C                          // id: %9
+  %10 = apply %5<C, C>(%6, %8) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_0 : P, τ_0_1 : P> (@in τ_0_0, @in τ_0_1) -> @owned @callee_owned (Int32, Float) -> Int32 // users: %11, %14, %20, %21
+  store %10 to [init] %0 : $*@callee_owned (Int32, Float) -> Int32 // id: %11
+  dealloc_stack %8 : $*C         // id: %12
+  dealloc_stack %6 : $*C         // id: %13
+  %11 = load [take] %0 : $*@callee_owned (Int32, Float) -> Int32 // id: %14
+  %15 = integer_literal $Builtin.Int32, 3         // user: %16
+  %16 = struct $Int32 (%15 : $Builtin.Int32)      // user: %20
+  %17 = float_literal $Builtin.FPIEEE80, 0x4000C8F5C28F5C28F5C3 // 3.1400000000000000001 // user: %18
+  %18 = builtin "fptrunc_FPIEEE80_FPIEEE32"(%17 : $Builtin.FPIEEE80) : $Builtin.FPIEEE32 // user: %19
+  %19 = struct $Float (%18 : $Builtin.FPIEEE32)   // user: %20
+  %20 = apply %11(%16, %19) : $@callee_owned (Int32, Float) -> Int32 // user: %23
+  dealloc_stack %0 : $*@callee_owned (Int32, Float) -> Int32 // id: %22
+  return %20 : $Int32                             // id: %23
+}
+
+// test4.testBar () -> Swift.Int32
+sil [ossa] @testBar : $@convention(thin) () -> Int32 {
+bb0:
+  // function_ref test4.bar () -> Swift.Int32
+  %0 = function_ref @bar : $@convention(thin) () -> Int32 // user: %1
+  %1 = apply %0() : $@convention(thin) () -> Int32            // user: %2
+  return %1 : $Int32                              // id: %2
+}
+
+// CHECK-LABEL: sil [ossa] @testGen1
+// Call of C_init
+// CHECK: function_ref @C_init
+// CHECK: apply
+// Reference to the generic specialization of gen1
+// CHECK-NOT: function_ref @gen1
+// CHECK: function_ref @$s4gen14main1CV_Tg5 : $@convention(thin) (C) -> @owned @callee_owned (Int32) -> Int32
+sil [ossa] @testGen1 : $@convention(thin) () -> Int32 {
+bb0:
+  %0 = alloc_stack $@callee_owned (Int32) -> Int32, var, name "f" // users: %9, %16
+  // function_ref test4.C.init (test4.C.Type)() -> test4.C
+  %1 = function_ref @C_init : $@convention(thin) (@thin C.Type) -> C // user: %3
+  %2 = metatype $@thin C.Type                     // user: %3
+  %3 = apply %1(%2) : $@convention(thin) (@thin C.Type) -> C  // users: %4, %7
+  debug_value %3 : $C, let, name "c" // id: %4
+  // function_ref test4.gen1 <A : test4.P>(A) -> (Swift.Int32) -> Swift.Int32
+  %5 = function_ref @gen1 : $@convention(thin) <τ_0_0 where τ_0_0 : P> (@in τ_0_0) -> @owned @callee_owned (Int32) -> Int32 // user: %8
+  %6 = alloc_stack $C                             // users: %7, %8, %10
+  store %3 to [trivial] %6 : $*C                          // id: %7
+  %8 = apply %5<C>(%6) : $@convention(thin) <τ_0_0 where τ_0_0 : P> (@in τ_0_0) -> @owned @callee_owned (Int32) -> Int32 // users: %9, %11, %14, %15
+  store %8 to [init] %0 : $*@callee_owned (Int32) -> Int32 // id: %9
+  dealloc_stack %6 : $*C         // id: %10
+  %8a = load [take] %0 : $*@callee_owned (Int32) -> Int32 // id: %11
+  %12 = integer_literal $Builtin.Int32, 3         // user: %13
+  %13 = struct $Int32 (%12 : $Builtin.Int32)      // user: %14
+  %14 = apply %8a(%13) : $@callee_owned (Int32) -> Int32 // user: %17
+  dealloc_stack %0 : $*@callee_owned (Int32) -> Int32 // id: %16
+  return %14 : $Int32                             // id: %17
+}
+
+// test_bind<A> (Builtin.RawPointer, A.Type) -> ()
+// Check that this is specialized as T=Int.
+// CHECK-LABEL: sil shared [ossa] @$s9test_bindSi_Tg5 : $@convention(thin) (Builtin.RawPointer, @thick Int.Type) -> ()
+// CHECK: bind_memory %0 : $Builtin.RawPointer, {{%.*}} : $Builtin.Word to $*Int
+// CHECK: return
+sil hidden [ossa] @test_bind : $@convention(thin) <T> (Builtin.RawPointer, @thick T.Type) -> () {
+bb0(%0 : $Builtin.RawPointer, %1 : $@thick T.Type):
+  %4 = integer_literal $Builtin.Word, 1
+  %5 = metatype $@thick T.Type
+  bind_memory %0 : $Builtin.RawPointer, %4 : $Builtin.Word to $*T
+  %7 = tuple ()
+  %8 = tuple ()
+  return %8 : $()
+}
+
+// Invoke test_bind with T=Int.
+sil [ossa] @call_bind : $@convention(thin) (Builtin.RawPointer) -> () {
+bb0(%0 : $Builtin.RawPointer):
+  // function_ref test_bind<A> (Builtin.RawPointer, A.Type) -> ()
+  %2 = function_ref @test_bind : $@convention(thin) <τ_0_0> (Builtin.RawPointer, @thick τ_0_0.Type) -> ()
+  %3 = metatype $@thick Int.Type
+  %4 = apply %2<Int>(%0, %3) : $@convention(thin) <τ_0_0> (Builtin.RawPointer, @thick τ_0_0.Type) -> ()
+  %5 = tuple ()
+  return %5 : $()
+}
+
+// invokeGenericClosure<A>(todo:)
+sil [ossa] [noinline] @invokeGenericClosure : $@convention(thin) <R> (@owned @callee_owned () -> (@out R, @error Error)) -> (@out R, @error Error) {
+bb0(%0 : $*R, %1 : @owned $@callee_owned () -> (@out R, @error Error)):
+  debug_value %1 : $@callee_owned () -> (@out R, @error Error), let, name "todo", argno 1 // id: %2
+  debug_value undef : $Error, var, name "$error", argno 2 // id: %3
+  %1a = copy_value  %1 : $@callee_owned () -> (@out R, @error Error) // id: %4
+  try_apply %1a(%0) : $@callee_owned () -> (@out R, @error Error), normal bb1, error bb2 // id: %5
+
+bb1(%6 : $()):                                    // Preds: bb0
+  destroy_value %1 : $@callee_owned () -> (@out R, @error Error) // id: %7
+  %8 = tuple ()                                   // user: %9
+  return %8 : $()                                 // id: %9
+
+// %10                                            // user: %12
+bb2(%10 : @owned $Error):                                // Preds: bb0
+  destroy_value %1 : $@callee_owned () -> (@out R, @error Error) // id: %11
+  throw %10 : $Error                              // id: %12
+} // end sil function 'invokeGenericClosure'
+
+sil public_external @error : $@convention(thin) () -> Never
+
+// action()
+sil @action : $@convention(thin) () -> Never
+
+// thunk for @callee_owned () -> (@unowned Never, @error @owned Error)
+sil @action_thunk : $@convention(thin) (@owned @callee_owned () -> (Never, @error Error)) -> (@out Never, @error Error)
+
+// Check that in a case where a generic specialization is a non-return function,
+// the return value is not stored after the call and an unreachable instruction
+// is inserted as a terminator of a basic block.
+//
+// CHECK-LABEL: sil [ossa] @testGenericClosureSpecialization
+// Call of the generic specialization of invokeGenericClosure<Never>
+// CHECK: function_ref @$s20invokeGenericClosures5NeverO_Tg5 : $@convention(thin) (@owned @callee_owned () -> (@out Never, @error Error)) -> (Never, @error Error)
+// CHECK: apply [nothrow]
+// CHECK: unreachable
+// CHECK: end sil function 'testGenericClosureSpecialization'
+sil [ossa] @testGenericClosureSpecialization : $@convention(thin) () -> @error Error {
+bb0:
+  // function_ref invokeGenericClosure<A>(todo:)
+  %1 = function_ref @invokeGenericClosure : $@convention(thin) <τ_0_0> (@owned @callee_owned () -> (@out τ_0_0, @error Error)) -> (@out τ_0_0, @error Error)
+  %2 = alloc_stack $Never
+  // function_ref action()
+  %3 = function_ref @action : $@convention(thin) () -> Never
+  %4 = thin_to_thick_function %3 : $@convention(thin) () -> Never to $@callee_owned () -> Never
+  %5 = convert_function %4 : $@callee_owned () -> Never to $@callee_owned () -> (Never, @error Error)
+  // function_ref thunk for @callee_owned () -> (@unowned Never, @error @owned Error)
+  %6 = function_ref @action_thunk : $@convention(thin) (@owned @callee_owned () -> (Never, @error Error)) -> (@out Never, @error Error)
+  %7 = partial_apply %6(%5) : $@convention(thin) (@owned @callee_owned () -> (Never, @error Error)) -> (@out Never, @error Error)
+  %8 = apply [nothrow] %1<Never>(%2, %7) : $@convention(thin) <τ_0_0> (@owned @callee_owned () -> (@out τ_0_0, @error Error)) -> (@out τ_0_0, @error Error)
+  unreachable
+} // end sil function 'testGenericClosureSpecialization'
+
+// Test a specialization of a self-recursive generic closure.
+
+// CHECK-LABEL: sil shared [ossa] @$s27selfReferringGenericClosurexBi64_Bi64_Bi64_Rs_r0_lIetnyy_Tp5 : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_1 == Builtin.Int64> (@in_guaranteed τ_0_0, Builtin.Int64, Builtin.Int64) -> () {
+// CHECK: [[SPECIALIZED_FN:%[0-9]+]] = function_ref @$s27selfReferringGenericClosurexBi64_Bi64_Bi64_Rs_r0_lIetnyy_Tp5
+// CHECK: partial_apply [[SPECIALIZED_FN]]{{.*}}({{.*}}) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_1 == Builtin.Int64> (@in_guaranteed τ_0_0, Builtin.Int64, Builtin.Int64) -> ()
+
+// CHECK-LABEL: sil [ossa] @selfReferringGenericClosure : $@convention(thin) <R, S> (@in_guaranteed R, @in_guaranteed S, Builtin.Int64) -> ()
+// Refer to the specialized version of the function
+// CHECK: [[SPECIALIZED_FN:%[0-9]+]] = function_ref @$s27selfReferringGenericClosurexBi64_Bi64_Bi64_Rs_r0_lIetnyy_Tp5
+// CHECK: partial_apply [[SPECIALIZED_FN]]<R, Builtin.Int64>({{.*}}) : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_1 == Builtin.Int64> (@in_guaranteed τ_0_0, Builtin.Int64, Builtin.Int64) -> ()
+sil [ossa] @selfReferringGenericClosure : $@convention(thin) <R, S> (@in_guaranteed R, @in_guaranteed S, Builtin.Int64) -> () {
+bb0(%0 : $*R, %1 : $*S, %2 : $Builtin.Int64):
+  %4 = integer_literal $Builtin.Int64, 100
+  %5 = builtin "cmp_eq_Int64"(%2 : $Builtin.Int64, %4 : $Builtin.Int64) : $Builtin.Int1
+  cond_br %5, bb2, bb1
+
+bb1:
+  %val_storage = alloc_stack $Builtin.Int64
+  %val = integer_literal $Builtin.Int64, 4
+  store %val to [trivial] %val_storage : $*Builtin.Int64
+  %fn = function_ref @selfReferringGenericClosure : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, Builtin.Int64) -> () 
+  %7 = partial_apply %fn<R, Builtin.Int64>(%0, %val_storage, %4) : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, Builtin.Int64) -> ()
+  dealloc_stack %val_storage : $*Builtin.Int64
+  destroy_value %7 : $@callee_owned () -> ()
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil [ossa] @selfReferringGenericClosure_nontrivial_guaranteed : $@convention(thin) <R, S> (@in_guaranteed R, @in_guaranteed S, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $*R, %1 : $*S, %2 : @guaranteed $Builtin.NativeObject):
+  cond_br undef, bb2, bb1
+
+bb1:
+  %val_storage = alloc_stack $Builtin.NativeObject
+  %val = copy_value %2 : $Builtin.NativeObject
+  %val2 = copy_value %2 : $Builtin.NativeObject
+  store %val to [init] %val_storage : $*Builtin.NativeObject
+  %fn = function_ref @selfReferringGenericClosure_nontrivial_guaranteed : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, @guaranteed Builtin.NativeObject) -> () 
+  %7 = partial_apply %fn<R, Builtin.NativeObject>(%0, %val_storage, %val2) : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, @guaranteed Builtin.NativeObject) -> ()
+  dealloc_stack %val_storage : $*Builtin.NativeObject
+  destroy_value %7 : $@callee_owned () -> ()
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil [ossa] @selfReferringGenericClosure_nontrivial_guaranteed_applied : $@convention(thin) <R, S> (@in_guaranteed R, @in_guaranteed S, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $*R, %1 : $*S, %2 : @guaranteed $Builtin.NativeObject):
+  cond_br undef, bb2, bb1
+
+bb1:
+  %val_storage = alloc_stack $Builtin.NativeObject
+  %val = copy_value %2 : $Builtin.NativeObject
+  %val2 = copy_value %2 : $Builtin.NativeObject
+  store %val to [init] %val_storage : $*Builtin.NativeObject
+  %fn = function_ref @selfReferringGenericClosure_nontrivial_guaranteed_applied : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, @guaranteed Builtin.NativeObject) -> () 
+  %7 = partial_apply %fn<R, Builtin.NativeObject>(%0, %val_storage, %val2) : $@convention(thin) <U, V> (@in_guaranteed U, @in_guaranteed V, @guaranteed Builtin.NativeObject) -> ()
+  apply %7() :$@callee_owned () -> ()
+  dealloc_stack %val_storage : $*Builtin.NativeObject
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %8 = tuple ()
+  return %8 : $()
+}
+
+//----
+
+// CHECK-LABEL: sil [ossa] @selfReferringGenericClosure_nontrivial_owned : $@convention(thin) <R, S> (@in R, @in S, @owned Builtin.NativeObject) -> () {
+// CHECK:  [[FUNC:%.*]] = function_ref @$s44selfReferringGenericClosure_nontrivial_ownedxBoBoBoRs_r0_lIetixx_Tp5 : $@convention(thin) <τ_0_0, τ_0_1 where τ_0_1 == Builtin.NativeObject> (@in τ_0_0, @owned Builtin.NativeObject, @owned Builtin.NativeObject) -> ()
+// CHECK:  [[PAI:%.*]] = partial_apply [[FUNC]]<
+// CHECK:  destroy_value [[PAI]]
+// CHECK: } // end sil function 'selfReferringGenericClosure_nontrivial_owned'
+sil [ossa] @selfReferringGenericClosure_nontrivial_owned : $@convention(thin) <R, S> (@in R, @in S, @owned Builtin.NativeObject) -> () {
+bb0(%0 : $*R, %1 : $*S, %2 : @owned $Builtin.NativeObject):
+  cond_br undef, bb2, bb1
+
+bb1:
+  %val_storage = alloc_stack $Builtin.NativeObject
+  %val = copy_value %2 : $Builtin.NativeObject
+  store %val to [init] %val_storage : $*Builtin.NativeObject
+  %fn = function_ref @selfReferringGenericClosure_nontrivial_owned : $@convention(thin) <U, V> (@in U, @in V, @owned Builtin.NativeObject) -> () 
+  %7 = partial_apply %fn<R, Builtin.NativeObject>(%0, %val_storage, %2) : $@convention(thin) <U, V> (@in U, @in V, @owned Builtin.NativeObject) -> ()
+  dealloc_stack %val_storage : $*Builtin.NativeObject
+  destroy_value %7 : $@callee_owned () -> ()
+  br bb3
+
+bb2:
+  destroy_value %2 : $Builtin.NativeObject
+  destroy_addr %0 : $*R
+  br bb3
+
+bb3:
+  destroy_addr %1 : $*S
+  %8 = tuple ()
+  return %8 : $()
+}
+
+sil [ossa] @selfReferringGenericClosure_nontrivial_owned_applied : $@convention(thin) <R, S> (@in R, @in S, @owned Builtin.NativeObject) -> () {
+bb0(%0 : $*R, %1 : $*S, %2 : @owned $Builtin.NativeObject):
+  cond_br undef, bb2, bb1
+
+bb1:
+  %val_storage = alloc_stack $Builtin.NativeObject
+  %val = copy_value %2 : $Builtin.NativeObject
+  store %val to [init] %val_storage : $*Builtin.NativeObject
+  %fn = function_ref @selfReferringGenericClosure_nontrivial_owned_applied : $@convention(thin) <U, V> (@in U, @in V, @owned Builtin.NativeObject) -> () 
+  %7 = partial_apply %fn<R, Builtin.NativeObject>(%0, %val_storage, %2) : $@convention(thin) <U, V> (@in U, @in V, @owned Builtin.NativeObject) -> ()
+  apply %7() :$@callee_owned () -> ()
+  dealloc_stack %val_storage : $*Builtin.NativeObject
+  br bb3
+
+bb2:
+  destroy_value %2 : $Builtin.NativeObject
+  destroy_addr %0 : $*R
+  br bb3
+
+bb3:
+  destroy_addr %1 : $*S
+  %8 = tuple ()
+  return %8 : $()
+}
+
+struct YYY<T> {
+}
+
+enum MyOptional<T> {
+  case none
+  case some(T)
+}
+
+// Check that a specialization of a self-recursive function is produced
+// and it is not crashing the compiler.
+// CHECK-LABEL: sil shared [ossa] @$s25testSelfRecursiveFunction4main10MyOptionalOyAB3YYYVyypGG_Tg5 : $@convention(thin) (MyOptional<YYY<Any>>) -> ()
+sil [ossa] @testSelfRecursiveFunction : $@convention(thin) <T> (@in T) -> () {
+bb0(%0 : $*T):
+  %2 = function_ref @testSelfRecursiveFunction : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
+  %3 = alloc_stack $MyOptional<YYY<Any>>
+  inject_enum_addr %3 : $*MyOptional<YYY<Any>>, #MyOptional.none!enumelt
+  %5 = tuple ()
+  %6 = load [trivial] %3 : $*MyOptional<YYY<Any>>
+  %7 = alloc_stack $MyOptional<YYY<Any>>
+  store %6 to [trivial] %7 : $*MyOptional<YYY<Any>>
+  %9 = apply %2<MyOptional<YYY<Any>>>(%7) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
+  dealloc_stack %7 : $*MyOptional<YYY<Any>>
+  dealloc_stack %3 : $*MyOptional<YYY<Any>>
+  destroy_addr %0 : $*T
+  %13 = tuple ()
+  return %13 : $()
+} // end sil function 'testSelfRecursiveFunction'
+
+sil [ossa] @id : $@convention(thin) <T> (@in T) -> @out T {
+bb0(%0 : $*T, %1 :$*T):
+  copy_addr [take] %1 to [initialization] %0 : $*T
+  %t = tuple ()
+  return %t : $()
+}
+
+// This should not assert.
+// CHECK-LABEL: sil shared [ossa] @$s26specialize_no_return_applys5NeverO_Tg5
+// CHECK:      apply
+// CHECK-NEXT: unreachable
+
+sil [ossa] @specialize_no_return_apply: $@convention(thin) <T> (@thick T.Type) -> () {
+bb0(%0 : $@thick T.Type):
+  %in = alloc_stack $T
+  copy_addr [take] undef to [initialization] %in : $*T
+  %out = alloc_stack $T
+  %f = function_ref @id : $@convention(thin) <T> (@in T) -> @out T
+  %r = apply %f<T>(%out, %in) : $@convention(thin) <T> (@in T) -> @out T
+  destroy_addr %out : $*T
+  dealloc_stack %out : $*T
+  dealloc_stack %in : $*T
+  %t = tuple ()
+  return %t : $()
+}
+
+sil [ossa] @test_specialize_noreturn_apply : $@convention(thin) () -> () {
+bb0:
+  %f = function_ref @specialize_no_return_apply : $@convention(thin) <T> (@thick T.Type) -> ()
+  %m = metatype $@thick Never.Type
+  %r = apply %f<Never>(%m) : $@convention(thin) <T> (@thick T.Type) -> ()
+  %t = tuple ()
+  return %t : $()
+}
+
+////////////////////
+// TryApply Tests //
+////////////////////
+
+sil @getError : $@convention(thin) () -> @owned Error
+
+sil [ossa] @generic_try_apply_callee2 : $@convention(thin) <T> (@in_guaranteed T) -> @error Error {
+bb0(%0 : $*T):
+  cond_br undef, bb1, bb2
+
+bb1:
+  %f = function_ref @getError : $@convention(thin) () -> @owned Error
+  %e = apply %f() : $@convention(thin) () -> @owned Error
+  throw %e : $Error
+
+bb2:
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @generic_try_apply_callee : $@convention(thin) <T> (@in_guaranteed T) -> @error Error {
+bb0(%0 : $*T):
+  %f = function_ref @generic_try_apply_callee2 : $@convention(thin) <T> (@in_guaranteed T) -> @error Error
+  try_apply %f<T>(%0) : $@convention(thin) <T> (@in_guaranteed T) -> @error Error, normal bb1, error bb2
+
+bb1(%result : $()):
+  %9999 = tuple()  
+  return %9999 : $()
+
+bb2(%e : @owned $Error):
+  throw %e : $Error
+}
+
+sil [ossa] @generic_try_apply_callee2_out_param : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error) {
+bb0(%0 : $*T, %1 : $*T):
+  cond_br undef, bb1, bb2
+
+bb1:
+  %f = function_ref @getError : $@convention(thin) () -> @owned Error
+  %e = apply %f() : $@convention(thin) () -> @owned Error
+  throw %e : $Error
+
+bb2:
+  copy_addr %1 to [initialization] %0 : $*T
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+
+sil [ossa] @generic_try_apply_callee_out_param : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error) {
+bb0(%0 : $*T, %1 : $*T):
+  %f = function_ref @generic_try_apply_callee2_out_param : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error)
+  try_apply %f<T>(%0, %1) : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error), normal bb1, error bb2
+
+bb1(%result : $()):
+  %9999 = tuple()  
+  return %9999 : $()
+
+bb2(%e : @owned $Error):
+  throw %e : $Error
+}
+
+// Just make sure we pass the verifiers.
+//
+// CHECK-LABEL: sil [ossa] @test_try_apply : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+// CHECK: try_apply {{%.*}}({{%.*}}) : $@convention(thin) (Builtin.Int32) -> @error Error, normal bb1, error bb2
+// CHECK: try_apply {{%.*}}({{%.*}}) : $@convention(thin) (@guaranteed Builtin.NativeObject) -> @error Error, normal bb4, error bb5
+// CHECK: } // end sil function 'test_try_apply'
+sil [ossa] @test_try_apply : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.Int32, %1 : @guaranteed $Builtin.NativeObject):
+  %f = function_ref @generic_try_apply_callee : $@convention(thin) <T> (@in_guaranteed T) -> @error Error
+
+  %0a = alloc_stack $Builtin.Int32
+  store %0 to [trivial] %0a : $*Builtin.Int32
+  try_apply %f<Builtin.Int32>(%0a) : $@convention(thin) <T> (@in_guaranteed T) -> @error Error, normal bb1, error bb2
+
+bb1(%result : $()):
+  br bb3
+
+bb2(%e : @owned $Error):
+  destroy_value %e : $Error
+  br bb3
+
+bb3:
+  dealloc_stack %0a : $*Builtin.Int32
+
+  %0b = alloc_stack $Builtin.NativeObject
+  store_borrow %1 to %0b : $*Builtin.NativeObject
+  try_apply %f<Builtin.NativeObject>(%0b) : $@convention(thin) <T> (@in_guaranteed T) -> @error Error, normal bb4, error bb5
+
+bb4(%result2 : $()):
+  br bb6
+
+bb5(%e2 : @owned $Error):
+  destroy_value %e2 : $Error
+  br bb6
+
+bb6:
+  dealloc_stack %0b : $*Builtin.NativeObject
+
+  %0c = alloc_stack $Builtin.NativeObject
+  store_borrow %1 to %0c : $*Builtin.NativeObject
+  %outParam = alloc_stack $Builtin.NativeObject
+  %f2 = function_ref @generic_try_apply_callee_out_param : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error)
+  try_apply %f2<Builtin.NativeObject>(%outParam, %0c) : $@convention(thin) <T> (@in_guaranteed T) -> (@out T, @error Error), normal bb7, error bb8
+
+bb7(%result3 : $()):
+  destroy_addr %outParam : $*Builtin.NativeObject
+  br bb9  
+
+bb8(%error4 : @owned $Error):
+  destroy_value %error4 : $Error
+  br bb9
+
+bb9:
+  dealloc_stack %outParam : $*Builtin.NativeObject
+  dealloc_stack %0c : $*Builtin.NativeObject
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// Test cases where we throw instead of catch.
+sil [ossa] @test_try_apply_throw_error : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> @error Error {
+bb0(%0 : $Builtin.Int32, %1 : @guaranteed $Builtin.NativeObject):
+  %f = function_ref @generic_try_apply_callee : $@convention(thin) <T> (@in_guaranteed T) -> @error Error
+
+  %0a = alloc_stack $Builtin.Int32
+  store %0 to [trivial] %0a : $*Builtin.Int32
+  try_apply %f<Builtin.Int32>(%0a) : $@convention(thin) <T> (@in_guaranteed T) -> @error Error, normal bb1, error bb2
+
+bb1(%result : $()):
+  br bb3
+
+bb2(%e : @owned $Error):
+  dealloc_stack %0a : $*Builtin.Int32
+  br bbError(%e : $Error)
+
+bb3:
+  dealloc_stack %0a : $*Builtin.Int32
+  %0b = alloc_stack $Builtin.NativeObject
+  store_borrow %1 to %0b : $*Builtin.NativeObject
+  try_apply %f<Builtin.NativeObject>(%0b) : $@convention(thin) <T> (@in_guaranteed T) -> @error Error, normal bb4, error bb5
+
+bb4(%result2 : $()):
+  br bb6
+
+bb5(%e2 : @owned $Error):
+  dealloc_stack %0b : $*Builtin.NativeObject
+  br bbError(%e2 : $Error)
+
+bbError(%eOut : @owned $Error):
+  throw %eOut : $Error
+
+bb6:
+  dealloc_stack %0b : $*Builtin.NativeObject
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @generic_try_apply_callee_loadable_2 : $@convention(thin) <T : AnyObject> (@inout T, @guaranteed T) -> @error Error {
+bb0(%0 : $*T, %1 : @guaranteed $T
+):
+  cond_br undef, bb1, bb2
+
+bb1:
+  %f = function_ref @getError : $@convention(thin) () -> @owned Error
+  %e = apply %f() : $@convention(thin) () -> @owned Error
+  throw %e : $Error
+
+bb2:
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @generic_try_apply_callee_loadable_1 : $@convention(thin) <T : AnyObject> (@inout T, @in_guaranteed T) -> @error Error {
+bb0(%0 : $*T, %1 : $*T):
+  %f = function_ref @generic_try_apply_callee_loadable_2 : $@convention(thin) <T : AnyObject> (@inout T, @guaranteed T) -> @error Error
+  %1b = load_borrow %1 : $*T
+  try_apply %f<T>(%0, %1b) : $@convention(thin) <T : AnyObject> (@inout T, @guaranteed T) -> @error Error, normal bb1, error bb2
+
+bb1(%result : $()):
+  end_borrow %1b : $T
+  %9999 = tuple()
+  return %9999 : $()
+
+bb2(%e : @owned $Error):
+  end_borrow %1b : $T
+  throw %e : $Error
+}
+
+sil [ossa] @test_try_apply_loadable : $@convention(thin) (@inout Klass, @guaranteed Klass) -> () {
+bb0(%0 : $*Klass, %1 : @guaranteed $Klass):
+  %f = function_ref @generic_try_apply_callee_loadable_1 : $@convention(thin) <T : AnyObject> (@inout T, @in_guaranteed T) -> @error Error
+  %1b = alloc_stack $Klass
+  store_borrow %1 to %1b : $*Klass
+  try_apply %f<Klass>(%0, %1b) : $@convention(thin) <T : AnyObject> (@inout T, @in_guaranteed T) -> @error Error, normal bb4, error bb5
+
+bb4(%result2 : $()):
+  br bb6
+
+bb5(%e2 : @owned $Error):
+  destroy_value %e2 : $Error
+  br bb6
+
+bb6:
+  dealloc_stack %1b : $*Klass
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @loadable_partial_apply_user : $@convention(thin) (@guaranteed @callee_guaranteed (@inout Klass) -> @error Error) -> () {
+bb0(%0 : @guaranteed $@callee_guaranteed (@inout Klass) -> @error Error):
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+sil [ossa] @test_try_apply_loadable_partial_apply : $@convention(thin) (@inout Klass, @guaranteed Klass) -> () {
+bb0(%0 : $*Klass, %1 : @guaranteed $Klass):
+  %f = function_ref @generic_try_apply_callee_loadable_1 : $@convention(thin) <T : AnyObject> (@inout T, @in_guaranteed T) -> @error Error
+  %1b = alloc_stack $Klass
+  %1a = copy_value %1 : $Klass
+  store %1a to [init] %1b : $*Klass
+  %f2 = partial_apply [callee_guaranteed] %f<Klass>(%1b) : $@convention(thin) <T : AnyObject> (@inout T, @in_guaranteed T) -> @error Error
+  %f3 = function_ref @loadable_partial_apply_user : $@convention(thin) (@guaranteed @callee_guaranteed (@inout Klass) -> @error Error) -> ()
+  apply %f3(%f2) : $@convention(thin) (@guaranteed @callee_guaranteed (@inout Klass) -> @error Error) -> ()
+  destroy_value %f2 : $@callee_guaranteed (@inout Klass) -> @error Error
+  dealloc_stack %1b : $*Klass
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+//////////////////////
+// BeginApply Tests //
+//////////////////////
+
+sil [ossa] @generic_begin_apply_callee_inguaranteed : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in_guaranteed T {
+bb0(%0 : $*T):
+  %1 = alloc_stack $*T
+  copy_addr %0 to [initialization] %1 : $*T
+  yield %1 : $*T, resume bb1, unwind bb2
+
+bb1:
+  destroy_addr %1 : $*T
+  dealloc_stack %1 : $*T
+  %9999 = tuple()
+  return %9999 : $()
+
+bb2:
+  destroy_addr %1 : $*T
+  dealloc_stack %1 : $*T
+  unwind
+}
+
+sil [ossa] @generic_begin_apply_callee_in : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in T {
+bb0(%0 : $*T):
+  %1 = alloc_stack $*T
+  copy_addr %0 to [initialization] %1 : $*T
+  yield %1 : $*T, resume bb1, unwind bb2
+
+bb1:
+  dealloc_stack %1 : $*T
+  %9999 = tuple()
+  return %9999 : $()
+
+bb2:
+  dealloc_stack %1 : $*T
+  unwind
+}
+
+sil [ossa] @generic_begin_apply_callee_inout : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @inout T {
+bb0(%0 : $*T):
+  %1 = alloc_stack $*T
+  copy_addr %0 to [initialization] %1 : $*T
+  yield %1 : $*T, resume bb1, unwind bb2
+
+bb1:
+  destroy_addr %1 : $*T
+  dealloc_stack %1 : $*T
+  %9999 = tuple()
+  return %9999 : $()
+
+bb2:
+  destroy_addr %1 : $*T
+  dealloc_stack %1 : $*T
+  unwind
+}
+
+// Just make sure we pass the verifiers.
+//
+// CHECK-LABEL: sil [ossa] @test_begin_apply_inguaranteed : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (Builtin.Int32) -> @yields @in_guaranteed Builtin.Int32
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (@guaranteed Builtin.NativeObject) -> @yields @in_guaranteed Builtin.NativeObject
+// CHECK: } // end sil function 'test_begin_apply_inguaranteed'
+sil [ossa] @test_begin_apply_inguaranteed : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.Int32, %1 : @guaranteed $Builtin.NativeObject):
+  %f = function_ref @generic_begin_apply_callee_inguaranteed : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in_guaranteed T
+
+  %0a = alloc_stack $Builtin.Int32
+  store %0 to [trivial] %0a : $*Builtin.Int32
+  (%0r, %0token) = begin_apply %f<Builtin.Int32>(%0a) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in_guaranteed T
+  end_apply %0token
+  dealloc_stack %0a : $*Builtin.Int32
+
+  %1b = alloc_stack $Builtin.NativeObject
+  %1c = copy_value %1 : $Builtin.NativeObject
+  store %1c to [init] %1b : $*Builtin.NativeObject
+  (%1result, %1token) = begin_apply %f<Builtin.NativeObject>(%1b) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in_guaranteed T
+
+  end_apply %1token
+  destroy_addr %1b : $*Builtin.NativeObject
+  dealloc_stack %1b : $*Builtin.NativeObject
+
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// CHECK-LABEL: sil [ossa] @test_begin_apply_in : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (Builtin.Int32) -> @yields @in Builtin.Int32
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (@guaranteed Builtin.NativeObject) -> @yields @in Builtin.NativeObject
+// CHECK: } // end sil function 'test_begin_apply_in'
+sil [ossa] @test_begin_apply_in : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.Int32, %1 : @guaranteed $Builtin.NativeObject):
+  %f = function_ref @generic_begin_apply_callee_in : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in T
+
+  %0a = alloc_stack $Builtin.Int32
+  store %0 to [trivial] %0a : $*Builtin.Int32
+  (%0r, %0token) = begin_apply %f<Builtin.Int32>(%0a) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in T
+  end_apply %0token
+  dealloc_stack %0a : $*Builtin.Int32
+
+  %1b = alloc_stack $Builtin.NativeObject
+  %1c = copy_value %1 : $Builtin.NativeObject
+  store %1c to [init] %1b : $*Builtin.NativeObject
+  (%1result, %1token) = begin_apply %f<Builtin.NativeObject>(%1b) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @in T
+
+  end_apply %1token
+  destroy_addr %1b : $*Builtin.NativeObject
+  dealloc_stack %1b : $*Builtin.NativeObject
+
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// CHECK-LABEL: sil [ossa] @test_begin_apply_inout : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (Builtin.Int32) -> @yields @inout Builtin.Int32
+// CHECK: begin_apply {{%.*}}({{%.*}}) : $@yield_once @convention(thin) (@guaranteed Builtin.NativeObject) -> @yields @inout Builtin.NativeObject
+// CHECK: } // end sil function 'test_begin_apply_inout'
+sil [ossa] @test_begin_apply_inout : $@convention(thin) (Builtin.Int32, @guaranteed Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.Int32, %1 : @guaranteed $Builtin.NativeObject):
+  %f = function_ref @generic_begin_apply_callee_inout : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @inout T
+
+  %0a = alloc_stack $Builtin.Int32
+  store %0 to [trivial] %0a : $*Builtin.Int32
+  (%0r, %0token) = begin_apply %f<Builtin.Int32>(%0a) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @inout T
+  end_apply %0token
+  dealloc_stack %0a : $*Builtin.Int32
+
+  %1b = alloc_stack $Builtin.NativeObject
+  %1c = copy_value %1 : $Builtin.NativeObject
+  store %1c to [init] %1b : $*Builtin.NativeObject
+  (%1result, %1token) = begin_apply %f<Builtin.NativeObject>(%1b) : $@yield_once @convention(thin) <T> (@in_guaranteed T) -> @yields @inout T
+
+  end_apply %1token
+  destroy_addr %1b : $*Builtin.NativeObject
+  dealloc_stack %1b : $*Builtin.NativeObject
+
+  %9999 = tuple()
+  return %9999 : $()
+}
diff --git a/test/SILOptimizer/specialize_reabstraction_ossa.sil b/test/SILOptimizer/specialize_reabstraction_ossa.sil
new file mode 100644
index 0000000000000..916bc1797e5e0
--- /dev/null
+++ b/test/SILOptimizer/specialize_reabstraction_ossa.sil
@@ -0,0 +1,132 @@
+// RUN: %target-sil-opt -enable-sil-verify-all -generic-specializer -sil-generic-specializer-enable-ownership %s | %FileCheck %s
+
+sil_stage canonical
+
+import Builtin
+import Swift
+
+public protocol RefProto {
+  associatedtype T
+  var me: Ref<Self.T> { get }
+}
+
+public final class Ref<T> : RefProto {
+  public final var me: Ref<T> { get }
+  deinit
+  init()
+}
+
+extension RefProto {
+  public func merge<U>(other: Ref<U>) -> Ref<(Self.T, U)>
+}
+
+public protocol ValProto {
+  associatedtype T
+  var me: Val<Self.T> { get }
+}
+
+extension ValProto {
+  public func merge<U>(other: Val<U>) -> Val<(Self.T, U)>
+}
+
+public struct Val<T> : ValProto {
+  public var me: Val<T> { get }
+  init()
+}
+
+sil @coerce : $@convention(thin) <T, U, V> (@owned @callee_owned (@owned Ref<T>) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<V>) -> @owned @callee_owned (Val<U>) -> Val<V>
+
+sil [ossa] @merge : $@convention(method) <Self where Self : RefProto><U> (@owned Ref<U>, @in_guaranteed Self) -> @owned Ref<(Self.T, U)> {
+bb0(%0 : @owned $Ref<U>, %1 : $*Self):
+  %2 = alloc_ref $Ref<(Self.T, U)>
+  destroy_value %0 : $Ref<U>
+  return %2 : $Ref<(Self.T, U)>
+}
+
+sil [ossa] @merge_curried : $@convention(thin) <Self where Self : RefProto><U> (@in Self) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)> {
+bb0(%0 : $*Self):
+  %1 = function_ref @merge : $@convention(method) <τ_0_0 where τ_0_0 : RefProto><τ_1_0> (@owned Ref<τ_1_0>, @in_guaranteed τ_0_0) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  %2 = partial_apply %1<Self, U>(%0) : $@convention(method) <τ_0_0 where τ_0_0 : RefProto><τ_1_0> (@owned Ref<τ_1_0>, @in_guaranteed τ_0_0) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  return %2 : $@callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)>
+}
+
+sil [ossa] [reabstraction_thunk] @reabstract : $@convention(thin) <Self where Self : ValProto><U> (@owned Ref<Self.T>, @owned @callee_owned (@in Ref<Self.T>) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)>) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)> {
+bb0(%0 : @owned $Ref<Self.T>, %1 : @owned $@callee_owned (@in Ref<Self.T>) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)>):
+  %2 = alloc_stack $Ref<Self.T>
+  store %0 to [init] %2 : $*Ref<Self.T>
+  %4 = apply %1(%2) : $@callee_owned (@in Ref<Self.T>) -> @owned @callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)>
+  dealloc_stack %2 : $*Ref<Self.T>
+  return %4 : $@callee_owned (@owned Ref<U>) -> @owned Ref<(Self.T, U)>
+}
+
+// CHECK-LABEL: sil [ossa] @test
+sil [ossa] @test : $@convention(thin) (Val<Bool>, Val<Int>) -> Val<(Bool, Int)> {
+// CHECK: bb0
+bb0(%0 : $Val<Bool>, %1 : $Val<Int>):
+  // CHECK: [[COERCE:%.*]] = function_ref @coerce
+  %2 = function_ref @coerce : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2> (@owned @callee_owned (@owned Ref<τ_0_0>) -> @owned @callee_owned (@owned Ref<τ_0_1>) -> @owned Ref<τ_0_2>) -> @owned @callee_owned (Val<τ_0_1>) -> Val<τ_0_2>
+  // CHECK: [[MERGE:%.*]] = function_ref @$s13merge_curried4main3RefCySbG_SiTg5
+  %3 = function_ref @merge_curried : $@convention(thin) <τ_0_0 where τ_0_0 : RefProto><τ_1_0> (@in τ_0_0) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  // CHECK: [[PARTIAL:%.*]] = partial_apply [[MERGE]]()
+  %4 = partial_apply %3<Ref<Bool>, Int>() : $@convention(thin) <τ_0_0 where τ_0_0 : RefProto><τ_1_0> (@in τ_0_0) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  // CHECK-NOT: function_ref @reabstract
+  %5 = function_ref @reabstract : $@convention(thin) <τ_0_0 where τ_0_0 : ValProto><τ_1_0> (@owned Ref<τ_0_0.T>, @owned @callee_owned (@in Ref<τ_0_0.T>) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  // CHECK-NOT: partial_apply
+  %6 = partial_apply %5<Val<Bool>, Int>(%4) : $@convention(thin) <τ_0_0 where τ_0_0 : ValProto><τ_1_0> (@owned Ref<τ_0_0.T>, @owned @callee_owned (@in Ref<τ_0_0.T>) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>) -> @owned @callee_owned (@owned Ref<τ_1_0>) -> @owned Ref<(τ_0_0.T, τ_1_0)>
+  // CHECK: apply [[COERCE]]<Bool, Int, (Bool, Int)>([[PARTIAL]])
+  %7 = apply %2<Bool, Int, (Bool, Int)>(%6) : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2> (@owned @callee_owned (@owned Ref<τ_0_0>) -> @owned @callee_owned (@owned Ref<τ_0_1>) -> @owned Ref<τ_0_2>) -> @owned @callee_owned (Val<τ_0_1>) -> Val<τ_0_2>
+  %8 = apply %7(%1) : $@callee_owned (Val<Int>) -> Val<(Bool, Int)>
+  return %8 : $Val<(Bool, Int)>
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s9coroutineSb_Tg5 : $@yield_once @convention(thin) (Bool) -> @yields @inout Bool {
+// CHECK:       bb0(%0 : $Bool):
+// CHECK-NEXT:    [[TEMP:%.*]] = alloc_stack $Bool
+// CHECK-NEXT:    store %0 to [trivial] [[TEMP]] : $*Bool
+// CHECK-NEXT:    yield [[TEMP]] : $*Bool, resume bb1, unwind bb2
+// CHECK:       bb1:
+// CHECK-NEXT:    destroy_addr [[TEMP]] : $*Bool
+// CHECK-NEXT:    [[RV:%.*]] = tuple ()
+// CHECK-NEXT:    dealloc_stack [[TEMP]] : $*Bool
+// CHECK-NEXT:    return [[RV]] : $()
+// CHECK:       bb2:
+// CHECK-NEXT:    destroy_addr [[TEMP]] : $*Bool
+// CHECK-NEXT:    dealloc_stack [[TEMP]] : $*Bool
+// CHECK-NEXT:    unwind
+// CHECK-NEXT:  }
+sil [ossa] @coroutine : $@yield_once @convention(thin) <T> (@in T) -> @yields @inout T {
+bb0(%0 : $*T):
+  yield %0 : $*T, resume bb1, unwind bb2
+bb1:
+  destroy_addr %0 : $*T
+  %rv = tuple ()
+  return %rv : $()
+bb2:
+  destroy_addr %0 : $*T
+  unwind
+}
+
+// CHECK-LABEL: @test_coroutine : $@convention(thin) (Bool) -> () {
+// CHECK:       bb0(%0 : $Bool):
+// CHECK-NEXT:    [[TEMP:%.*]] = alloc_stack $Bool
+// CHECK-NEXT:    store %0 to [trivial] [[TEMP]] : $*Bool
+// CHECK-NEXT:    // function_ref
+// CHECK-NEXT:    [[CORO:%.*]] = function_ref @$s9coroutineSb_Tg5 : $@yield_once @convention(thin) (Bool) -> @yields @inout Bool
+// CHECK-NEXT:    [[LOAD:%.*]] = load [trivial] [[TEMP]] : $*Bool
+// CHECK-NEXT:    ([[ADDR:%.*]], [[TOKEN:%.*]]) = begin_apply [[CORO]]([[LOAD]])
+// CHECK-NEXT:    end_apply [[TOKEN]]
+// CHECK-NEXT:    dealloc_stack [[TEMP]] : $*Bool
+// CHECK-NEXT:    [[RV:%.*]] = tuple ()
+// CHECK-NEXT:    return [[RV]] : $()
+// CHECK-NEXT:  }
+sil [ossa] @test_coroutine : $@convention(thin) (Bool) -> () {
+bb0(%0 : $Bool):
+  %coro = function_ref @coroutine : $@yield_once @convention(thin) <T> (@in T) -> @yields @inout T
+  %temp = alloc_stack $Bool
+  store %0 to [trivial] %temp : $*Bool
+  (%addr, %token) = begin_apply %coro<Bool>(%temp) : $@yield_once @convention(thin) <T> (@in T) -> @yields @inout T
+  end_apply %token
+  dealloc_stack %temp : $*Bool
+  %rv = tuple ()
+  return %rv : $()
+}
diff --git a/test/SILOptimizer/specialize_recursive_generics_ossa.sil b/test/SILOptimizer/specialize_recursive_generics_ossa.sil
new file mode 100644
index 0000000000000..5bb75added371
--- /dev/null
+++ b/test/SILOptimizer/specialize_recursive_generics_ossa.sil
@@ -0,0 +1,150 @@
+// RUN: %target-sil-opt -enable-sil-verify-all %s -generic-specializer -cse -sil-generic-specializer-enable-ownership | %FileCheck %s
+
+// Check that SIL cloner can correctly handle specialization of recursive
+// functions with generic arguments.
+
+sil_stage canonical
+
+import Builtin
+import Swift
+
+// Check that this recursive function is specialized only for Int32.
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s62_TF29specialize_recursive_generics18recursive_genericsU__FQ_T_s5Int32V_Tg5
+// CHECK: function_ref @$s62_TF29specialize_recursive_generics18recursive_genericsU__FQ_T_s5Int32V_Tg5
+// CHECK: return
+sil [noinline] [ossa] @_TF29specialize_recursive_generics18recursive_genericsU__FQ_T_ : $@convention(thin) <T> (@in T) -> () {
+bb0(%0 : $*T):
+  debug_value_addr %0 : $*T, let, name "t" // id: %1
+  // function_ref specialize_recursive_generics.recursive_generics <A>(A) -> ()
+  %2 = function_ref @_TF29specialize_recursive_generics18recursive_genericsU__FQ_T_ : $@convention(thin) <τ_0_0> (@in τ_0_0) -> () // user: %5
+  %3 = alloc_stack $T                             // users: %4, %5, %6
+  copy_addr %0 to [initialization] %3 : $*T     // id: %4
+  %5 = apply %2<T>(%3) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
+  dealloc_stack %3 : $*T         // id: %6
+  destroy_addr %0 : $*T                           // id: %7
+  %8 = tuple ()                                   // user: %9
+  return %8 : $()                                 // id: %9
+}
+
+// Check that this recursive function is specialized twice: for (Int, Double) and for (Double, Int).
+
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s97_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_Sd_s5Int32VTg5
+// CHECK: function_ref @$s97_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_s5Int32V_SdTg5
+// CHECK: return
+
+// CHECK-LABEL: sil shared [noinline] [ossa] @$s97_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_s5Int32V_SdTg5
+// CHECK: function_ref @$s97_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_Sd_s5Int32VTg5
+// CHECK: return
+
+
+sil [noinline] [ossa] @_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_ : $@convention(thin) <T, U> (@in T, @in U) -> () {
+bb0(%0 : $*T, %1 : $*U):
+  debug_value_addr %0 : $*T, let, name "t" // id: %2
+  debug_value_addr %1 : $*U, let, name "u" // id: %3
+  // function_ref specialize_recursive_generics.recursive_generics_with_different_substitutions <A, B>(A, B) -> ()
+  %4 = function_ref @_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_ : $@convention(thin) <τ_0_0, τ_0_1> (@in τ_0_0, @in τ_0_1) -> () // user: %9
+  %5 = alloc_stack $U                             // users: %6, %9, %11
+  copy_addr %1 to [initialization] %5 : $*U     // id: %6
+  %7 = alloc_stack $T                             // users: %8, %9, %10
+  copy_addr %0 to [initialization] %7 : $*T     // id: %8
+  %9 = apply %4<U, T>(%5, %7) : $@convention(thin) <τ_0_0, τ_0_1> (@in τ_0_0, @in τ_0_1) -> ()
+  dealloc_stack %7 : $*T         // id: %10
+  dealloc_stack %5 : $*U         // id: %11
+  destroy_addr %1 : $*U                           // id: %12
+  destroy_addr %0 : $*T                           // id: %13
+  %14 = tuple ()                                  // user: %15
+  return %14 : $()                                // id: %15
+}
+
+sil [ossa] @$s29specialize_recursive_generics05test_b1_C0yyF : $@convention(thin) () -> () {
+bb0:
+  // function_ref specialize_recursive_generics.recursive_generics <A>(A) -> ()
+  %0 = function_ref @_TF29specialize_recursive_generics18recursive_genericsU__FQ_T_ : $@convention(thin) <τ_0_0> (@in τ_0_0) -> () // user: %5
+  %1 = integer_literal $Builtin.Int32, 3          // user: %2
+  %2 = struct $Int32 (%1 : $Builtin.Int32)        // user: %4
+  %3 = alloc_stack $Int32                         // users: %4, %5, %6
+  store %2 to [trivial] %3 : $*Int32                      // id: %4
+  %5 = apply %0<Int32>(%3) : $@convention(thin) <τ_0_0> (@in τ_0_0) -> ()
+  dealloc_stack %3 : $*Int32     // id: %6
+  %7 = tuple ()                                   // user: %8
+  return %7 : $()                                 // id: %8
+}
+
+sil [ossa] @$s29specialize_recursive_generics05test_b1_C29_with_different_substitutionsyyF : $@convention(thin) () -> () {
+bb0:
+  // function_ref specialize_recursive_generics.recursive_generics_with_different_substitutions <A, B>(A, B) -> ()
+  %0 = function_ref @_TF29specialize_recursive_generics47recursive_generics_with_different_substitutionsU___FTQ_Q0__T_ : $@convention(thin) <τ_0_0, τ_0_1> (@in τ_0_0, @in τ_0_1) -> () // user: %10
+  %1 = float_literal $Builtin.FPIEEE80, 0x3FFF999999999999999A // 1.20000000000000000004 // user: %2
+  %2 = builtin "fptrunc_FPIEEE80_FPIEEE64"(%1 : $Builtin.FPIEEE80) : $Builtin.FPIEEE64 // user: %3
+  %3 = struct $Double (%2 : $Builtin.FPIEEE64)    // user: %5
+  %4 = alloc_stack $Double                        // users: %5, %10, %12
+  store %3 to [trivial] %4 : $*Double                     // id: %5
+  %6 = integer_literal $Builtin.Int32, 1          // user: %7
+  %7 = struct $Int32 (%6 : $Builtin.Int32)        // user: %9
+  %8 = alloc_stack $Int32                         // users: %9, %10, %11
+  store %7 to [trivial] %8 : $*Int32                      // id: %9
+  %10 = apply %0<Double, Int32>(%4, %8) : $@convention(thin) <τ_0_0, τ_0_1> (@in τ_0_0, @in τ_0_1) -> ()
+  dealloc_stack %8 : $*Int32     // id: %11
+  dealloc_stack %4 : $*Double    // id: %12
+  %13 = tuple ()                                  // user: %14
+  return %13 : $()                                // id: %14
+}
+
+
+public class C : P {}
+
+public protocol P {}
+
+sil hidden [ossa] [noinline] @helper : $@convention(thin) <T> (@in T, @in P) -> @owned Optional<C> {
+bb0(%0 : $*T, %1 : $*P):
+  %4 = alloc_stack $P
+  copy_addr %1 to [initialization] %4 : $*P
+  %6 = alloc_stack $C
+  checked_cast_addr_br take_always P in %4 : $*P to C in %6 : $*C, bb1, bb2
+bb1:
+  %8 = load [take] %6 : $*C
+  %9 = enum $Optional<C>, #Optional.some!enumelt, %8 : $C
+  dealloc_stack %6 : $*C
+  br bb3(%9 : $Optional<C>)
+
+bb2:
+  %12 = enum $Optional<C>, #Optional.none!enumelt
+  dealloc_stack %6 : $*C
+  br bb3(%12 : $Optional<C>)
+
+bb3(%15 : @owned $Optional<C>):
+  dealloc_stack %4 : $*P
+  destroy_addr %1 : $*P
+  destroy_addr %0 : $*T
+  return %15 : $Optional<C>
+}
+
+// CHECK-LABEL: sil shared [ossa] @$s6lookup4main1CC_Tg5
+sil [ossa] @lookup : $@convention(method) <Self where Self : P> (@owned C, @in_guaranteed Self) -> @owned Optional<C> {
+bb0(%0 : @owned $C, %1 : $*Self):
+  // CHECK: [[HELPER:%.*]] = function_ref @$s6helpers5Int32V_Tg5
+  %4 = function_ref @helper : $@convention(thin) <τ_0_0> (@in τ_0_0, @in P) -> @owned Optional<C>
+  %5 = integer_literal $Builtin.Int32, 1
+  %6 = struct $Int32 (%5 : $Builtin.Int32)
+  %7 = alloc_stack $Int32
+  store %6 to [trivial] %7 : $*Int32
+  %9 = alloc_stack $P
+  %10 = init_existential_addr %9 : $*P, $Self
+  copy_addr %1 to [initialization] %10 : $*Self
+  // CHECK: apply [[HELPER]]
+  // CHECK-NOT: apply [[HELPER]]
+  %12 = apply %4<Int32>(%7, %9) : $@convention(thin) <τ_0_0> (@in τ_0_0, @in P) -> @owned Optional<C>
+  destroy_value %12 : $Optional<C>
+  dealloc_stack %9 : $*P
+  dealloc_stack %7 : $*Int32
+  // CHECK: [[LOOKUP:%.*]] = function_ref @$s6lookup4main1CC_Tg5
+  %16 = function_ref @lookup : $@convention(method) <τ_0_0 where τ_0_0 : P> (@owned C, @in_guaranteed τ_0_0) -> @owned Optional<C>
+  %17 = alloc_stack $C
+  %0c = copy_value %0 : $C
+  store %0c to [init] %17 : $*C
+  // CHECK: apply [[LOOKUP]]
+  %20 = apply %16<C>(%0, %17) : $@convention(method) <τ_0_0 where τ_0_0 : P> (@owned C, @in_guaranteed τ_0_0) -> @owned Optional<C>
+  destroy_addr %17 : $*C
+  dealloc_stack %17 : $*C
+  return %20 : $Optional<C>
+}
diff --git a/test/SILOptimizer/temp_rvalue_opt.sil b/test/SILOptimizer/temp_rvalue_opt.sil
index 153527ed7be9f..5ca28bac003f9 100644
--- a/test/SILOptimizer/temp_rvalue_opt.sil
+++ b/test/SILOptimizer/temp_rvalue_opt.sil
@@ -16,6 +16,11 @@ struct GS<Base> {
 
 class Klass {}
 
+struct Str {
+  var kl: Klass
+  var _value: Builtin.Int64
+}
+
 sil @unknown : $@convention(thin) () -> ()
 
 sil @inguaranteed_user_without_result : $@convention(thin) (@in_guaranteed Klass) -> () {
@@ -33,6 +38,8 @@ bb0(%0 : $*Klass, %1 : $*Klass):
 
 sil @throwing_function : $@convention(thin) (@in_guaranteed Klass) -> ((), @error Error)
 
+sil [ossa] @takeStr : $@convention(thin) (@owned Str) -> ()
+
 ///////////
 // Tests //
 ///////////
@@ -124,6 +131,26 @@ bb0(%0 : $*B, %1 : $*GS<B>):
   return %9999 : $()
 }
 
+// Check that we don't cause a memory lifetime failure with load [take]
+
+// CHECK-LABEL: sil [ossa] @take_from_source
+// CHECK: alloc_stack
+// CHECK: copy_addr
+// CHECK: load
+// CHECK: load
+// CHECK: } // end sil function 'take_from_source'
+sil [ossa] @take_from_source : $@convention(thin) (@in Str) -> @owned Str {
+bb0(%0 : $*Str):
+  %1 = alloc_stack $Str
+  copy_addr %0 to [initialization] %1 : $*Str
+  %3 = load [take] %0 : $*Str
+  %4 = load [copy] %1 : $*Str
+  %f = function_ref @takeStr : $@convention(thin) (@owned Str) -> ()
+  %a = apply %f(%4) : $@convention(thin) (@owned Str) -> ()
+  destroy_addr %1 : $*Str
+  dealloc_stack %1 : $*Str
+  return %3 : $Str
+}
 // CHECK-LABEL: sil @load_in_wrong_block
 // CHECK:      bb0(%0 : $*GS<B>):
 // CHECK-NEXT:   alloc_stack
diff --git a/test/SILOptimizer/templvalueopt.sil b/test/SILOptimizer/templvalueopt.sil
new file mode 100644
index 0000000000000..81f57e2d4da75
--- /dev/null
+++ b/test/SILOptimizer/templvalueopt.sil
@@ -0,0 +1,251 @@
+// RUN: %target-sil-opt -enable-sil-verify-all %s -temp-lvalue-opt | %FileCheck %s
+
+import Swift
+import Builtin
+
+// CHECK-LABEL: sil @test_enum_with_initialize
+// CHECK:      bb0(%0 : $*Optional<Any>, %1 : $*Any):
+// CHECK-NEXT:   [[E:%[0-9]+]] = init_enum_data_addr %0
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] [[E]]
+// CHECK-NEXT:   inject_enum_addr %0 : $*Optional<Any>, #Optional.some!enumelt
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'test_enum_with_initialize'
+sil @test_enum_with_initialize : $@convention(thin) (@in Any) -> @out Optional<Any> {
+bb0(%0 : $*Optional<Any>, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %2 to [initialization] %0 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %6 = tuple ()
+  return %6 : $()
+}
+
+// CHECK-LABEL: sil @test_enum_without_initialize
+// CHECK:      bb0(%0 : $*Optional<Any>, %1 : $*Any):
+// CHECK-NEXT:   destroy_addr %0
+// CHECK-NEXT:   [[E:%[0-9]+]] = init_enum_data_addr %0
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] [[E]]
+// CHECK-NEXT:   inject_enum_addr %0 : $*Optional<Any>, #Optional.some!enumelt
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'test_enum_without_initialize'
+sil @test_enum_without_initialize : $@convention(thin) (@in Any) -> @out Optional<Any> {
+bb0(%0 : $*Optional<Any>, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %2 to %0 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %6 = tuple ()
+  return %6 : $()
+}
+
+protocol Proto {}
+
+struct ConformingStruct : Proto {
+  @_hasStorage let a: Any
+}
+
+// CHECK-LABEL: sil @test_existential
+// CHECK:      bb0(%0 : $*Proto, %1 : $*ConformingStruct):
+// CHECK-NEXT:   [[E:%[0-9]+]] = init_existential_addr %0
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] [[E]]
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'test_existential'
+sil @test_existential : $@convention(thin) (@in ConformingStruct) -> @out Proto {
+bb0(%0 : $*Proto, %1 : $*ConformingStruct):
+  %2 = alloc_stack $Proto
+  %3 = init_existential_addr %2 : $*Proto, $ConformingStruct
+  copy_addr [take] %1 to [initialization] %3 : $*ConformingStruct
+  copy_addr [take] %2 to [initialization] %0 : $*Proto
+  dealloc_stack %2 : $*Proto
+  %6 = tuple ()
+  return %6 : $()
+}
+
+enum Either<Left, Right> {
+  case left(Left), right(Right)
+}
+
+public struct TestStruct {
+  @_hasStorage var e: Either<AddressOnlyPayload, Int>
+}
+
+struct AddressOnlyPayload {
+  @_hasStorage let a: Any
+  @_hasStorage let i: Int
+}
+
+// There should only be a single copy_addr after optimization.
+//
+// CHECK-LABEL: sil @test_initialize_struct
+// CHECK:      bb0(%0 : $*TestStruct, %1 : $*Any, %2 : $Int):
+// CHECK-NEXT:   [[E:%[0-9]+]] = struct_element_addr %0
+// CHECK-NEXT:   [[LEFT:%[0-9]+]] = init_enum_data_addr [[E]]
+// CHECK-NEXT:   [[A:%[0-9]+]] = struct_element_addr [[LEFT]]
+// CHECK-NEXT:   copy_addr %1 to [initialization] [[A]]
+// CHECK-NEXT:   [[I:%[0-9]+]] = struct_element_addr [[LEFT]]
+// CHECK-NEXT:   store %2 to [[I]]
+// CHECK-NEXT:   inject_enum_addr [[E]]
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'test_initialize_struct'
+sil @test_initialize_struct : $@convention(method) (@in Any, Int) -> @out TestStruct {
+bb0(%0 : $*TestStruct, %1 : $*Any, %2 : $Int):
+  %3 = alloc_stack $TestStruct
+  %4 = alloc_stack $Either<AddressOnlyPayload, Int>
+  %5 = alloc_stack $AddressOnlyPayload
+  %6 = struct_element_addr %5 : $*AddressOnlyPayload, #AddressOnlyPayload.a
+  copy_addr %1 to [initialization] %6 : $*Any
+  %8 = struct_element_addr %5 : $*AddressOnlyPayload, #AddressOnlyPayload.i
+  store %2 to %8 : $*Int
+  %10 = init_enum_data_addr %4 : $*Either<AddressOnlyPayload, Int>, #Either.left!enumelt
+  copy_addr [take] %5 to [initialization] %10 : $*AddressOnlyPayload
+  inject_enum_addr %4 : $*Either<AddressOnlyPayload, Int>, #Either.left!enumelt
+  dealloc_stack %5 : $*AddressOnlyPayload
+  %14 = struct_element_addr %3 : $*TestStruct, #TestStruct.e
+  copy_addr [take] %4 to [initialization] %14 : $*Either<AddressOnlyPayload, Int>
+  dealloc_stack %4 : $*Either<AddressOnlyPayload, Int>
+  copy_addr %3 to [initialization] %0 : $*TestStruct
+  destroy_addr %3 : $*TestStruct
+  dealloc_stack %3 : $*TestStruct
+  %20 = tuple ()
+  return %20 : $()
+}
+
+// CHECK-LABEL: sil @bail_on_write_to_dest
+// CHECK:   alloc_stack
+// CHECK:   copy_addr
+// CHECK:   copy_addr
+// CHECK: } // end sil function 'bail_on_write_to_dest'
+sil @bail_on_write_to_dest : $@convention(thin) (@inout Optional<Any>, @in Any) -> () {
+bb0(%0 : $*Optional<Any>, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  destroy_addr %0 : $*Optional<Any>
+  copy_addr [take] %2 to [initialization] %0 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %6 = tuple ()
+  return %6 : $()
+}
+
+// CHECK-LABEL: sil @write_to_dest_ok_if_before_liferange
+// CHECK:      bb0(%0 : $*Optional<Any>, %1 : $*Any):
+// CHECK-NEXT:   destroy_addr
+// CHECK-NEXT:   init_enum_data_addr
+// CHECK-NEXT:   copy_addr
+// CHECK-NEXT:   inject_enum_addr
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'write_to_dest_ok_if_before_liferange'
+sil @write_to_dest_ok_if_before_liferange : $@convention(thin) (@inout Optional<Any>, @in Any) -> () {
+bb0(%0 : $*Optional<Any>, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  destroy_addr %0 : $*Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %2 to [initialization] %0 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %6 = tuple ()
+  return %6 : $()
+}
+
+enum Enum {
+  case A(Optional<Any>), B
+}
+
+struct StructWithEnum : Proto {
+  @_hasStorage let e: Enum
+}
+
+// CHECK-LABEL: sil @move_projections
+// CHECK:      bb0(%0 : $*Proto, %1 : $*Any):
+// CHECK-NEXT:   [[S:%[0-9]+]] = init_existential_addr %0 : $*Proto, $StructWithEnum
+// CHECK-NEXT:   [[E:%[0-9]+]] = struct_element_addr [[S]] : $*StructWithEnum, #StructWithEnum.e
+// CHECK-NEXT:   [[ENUMA:%[0-9]+]] = init_enum_data_addr [[E]] : $*Enum, #Enum.A!enumelt
+// CHECK-NEXT:   [[OPTIONAL:%[0-9]+]] = init_enum_data_addr [[ENUMA]] : $*Optional<Any>, #Optional.some!enumelt
+// CHECK-NEXT:   copy_addr [take] %1 to [initialization] [[OPTIONAL]] : $*Any
+// CHECK-NEXT:   inject_enum_addr [[ENUMA]] : $*Optional<Any>, #Optional.some!enumelt
+// CHECK-NEXT:   inject_enum_addr [[E]] : $*Enum, #Enum.A!enumelt
+// CHECK-NOT:    copy_addr
+// CHECK: } // end sil function 'move_projections'
+sil @move_projections : $@convention(thin) (@in Any) -> @out Proto {
+bb0(%0 : $*Proto, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  %4 = init_existential_addr %0 : $*Proto, $StructWithEnum
+  %5 = struct_element_addr %4 : $*StructWithEnum, #StructWithEnum.e
+  %6 = init_enum_data_addr %5 : $*Enum, #Enum.A!enumelt
+  copy_addr [take] %2 to [initialization] %6 : $*Optional<Any>
+  inject_enum_addr %5 : $*Enum, #Enum.A!enumelt
+  dealloc_stack %2 : $*Optional<Any>
+  %10 = tuple ()
+  return %10 : $()
+}
+
+// CHECK-LABEL: sil @cant_move_projections
+// CHECK:   alloc_stack
+// CHECK:   copy_addr
+// CHECK:   load
+// CHECK:   copy_addr
+// CHECK: } // end sil function 'cant_move_projections'
+sil @cant_move_projections : $@convention(thin) (@in Any, @in_guaranteed Builtin.RawPointer) -> () {
+bb0(%0 : $*Any, %1 : $*Builtin.RawPointer):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %0 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  %4 = load %1 : $*Builtin.RawPointer
+  %5 = pointer_to_address %4 : $Builtin.RawPointer to $*Optional<Any>
+  copy_addr [take] %2 to [initialization] %5 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil @init_optional : $@convention(thin) () -> @out Optional<Any>
+
+// CHECK-LABEL: sil @instructions_after_copy_addr
+// CHECK:   alloc_stack
+// CHECK:   copy_addr
+// CHECK:   copy_addr
+// CHECK:   apply
+// CHECK: } // end sil function 'instructions_after_copy_addr'
+sil @instructions_after_copy_addr : $@convention(thin) (@in Any) -> @out Optional<Any> {
+bb0(%0 : $*Optional<Any>, %1 : $*Any):
+  %2 = alloc_stack $Optional<Any>
+  %3 = init_enum_data_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %1 to [initialization] %3 : $*Any
+  inject_enum_addr %2 : $*Optional<Any>, #Optional.some!enumelt
+  copy_addr [take] %2 to [initialization] %0 : $*Optional<Any>
+  %4 = function_ref @init_optional : $@convention(thin) () -> @out Optional<Any>
+  %5 = apply %4(%2) : $@convention(thin) () -> @out Optional<Any>
+  destroy_addr %2 : $*Optional<Any>
+  dealloc_stack %2 : $*Optional<Any>
+  %6 = tuple ()
+  return %6 : $()
+}
+
+// CHECK-LABEL: sil @dont_optimize_swap
+// CHECK:   alloc_stack
+// CHECK:   copy_addr
+// CHECK:   copy_addr
+// CHECK:   copy_addr
+// CHECK:   dealloc_stack
+// CHECK: } // end sil function 'dont_optimize_swap'
+sil @dont_optimize_swap : $@convention(thin) <T> (@inout T, @inout T) -> () {
+bb0(%0 : $*T, %1 : $*T):
+  %2 = alloc_stack $T
+  copy_addr [take] %0 to [initialization] %2 : $*T
+  copy_addr [take] %1 to [initialization] %0 : $*T
+  copy_addr [take] %2 to [initialization] %1 : $*T
+  dealloc_stack %2 : $*T
+  %78 = tuple ()
+  return %78 : $()
+}
+
diff --git a/test/SILOptimizer/templvalueopt.swift b/test/SILOptimizer/templvalueopt.swift
new file mode 100644
index 0000000000000..05ab18c00bfc5
--- /dev/null
+++ b/test/SILOptimizer/templvalueopt.swift
@@ -0,0 +1,61 @@
+// RUN: %target-swift-frontend -module-name=test -O -emit-sil  %s | %FileCheck %s
+
+// RUN: %empty-directory(%t) 
+// RUN: %target-build-swift -O -module-name=test %s -o %t/a.out
+// RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT
+
+// REQUIRES: executable_test
+// REQUIRES: CPU=arm64 || CPU=x86_64
+
+// Check that the compiler creates optimal code for address-only enum initializations.
+
+public enum Either<Left, Right> {
+  case left(Left), right(Right)
+}
+
+internal struct AddressOnlyPayload {
+  let a: Any
+  let i: Int
+}
+
+public struct TestStruct {
+  internal var e: Either<AddressOnlyPayload, Int>
+
+  // CHECK-LABEL: sil [noinline] @$s4test10TestStructVyACyp_SitcfC
+  // CHECK: [[E:%[0-9]+]] = struct_element_addr %0 : $*TestStruct, #TestStruct.e
+  // CHECK: [[LEFT:%[0-9]+]] = init_enum_data_addr [[E]] : $*Either<AddressOnlyPayload, Int>, #Either.left!enumelt
+  // CHECK: [[A:%[0-9]+]] = struct_element_addr [[LEFT]] : $*AddressOnlyPayload, #AddressOnlyPayload.a
+  // CHECK: copy_addr [take] %1 to [initialization] [[A]] : $*Any
+  // CHECK: [[I:%[0-9]+]] = struct_element_addr [[LEFT]] : $*AddressOnlyPayload, #AddressOnlyPayload.i
+  // CHECK: store %2 to [[I]] : $*Int
+  // CHECK: inject_enum_addr [[E]] : $*Either<AddressOnlyPayload, Int>, #Either.left!enumelt
+  // CHECK: } // end sil function '$s4test10TestStructVyACyp_SitcfC'
+  @inline(never)
+  public init(_ a: Any, _ i: Int) {
+    e = Either.left(AddressOnlyPayload(a: a, i: i))
+  }
+}
+
+// CHECK-LABEL: sil [noinline] @$s4test13createAnyLeftyAA6EitherOyypSgSiGypF
+// CHECK:  [[E:%[0-9]+]] = init_enum_data_addr %0 : $*Either<Optional<Any>, Int>, #Either.left!enumelt
+// CHECK:  [[SOME:%[0-9]+]] = init_enum_data_addr [[E]] : $*Optional<Any>, #Optional.some!enumelt
+// CHECK:  copy_addr %1 to [initialization] [[SOME]] : $*Any
+// CHECK:  inject_enum_addr [[E]] : $*Optional<Any>, #Optional.some!enumelt
+// CHECK:  inject_enum_addr %0 : $*Either<Optional<Any>, Int>, #Either.left!enumelt
+// CHECK: } // end sil function '$s4test13createAnyLeftyAA6EitherOyypSgSiGypF'
+@inline(never)
+public func createAnyLeft(_ a: Any) -> Either<Any?, Int> {
+  return Either.left(a)
+}
+
+
+// CHECK-OUTPUT: TestStruct(e: test.Either<test.AddressOnlyPayload, Swift.Int>.left(test.AddressOnlyPayload(a: 27, i: 1)))
+// CHECK-OUTPUT: TestStruct(e: test.Either<test.AddressOnlyPayload, Swift.Int>.left(test.AddressOnlyPayload(a: "A non-trivial value", i: 1)))
+print(TestStruct(27, 1))
+print(TestStruct("A non-trivial value", 1))
+
+// CHECK-OUTPUT: left(Optional(27))
+// CHECK-OUTPUT: left(Optional("A non-trivial value"))
+print(createAnyLeft(27))
+print(createAnyLeft("A non-trivial value"))
+
diff --git a/test/SILOptimizer/testflag_disable_pass_only.swift b/test/SILOptimizer/testflag_disable_pass_only.swift
new file mode 100644
index 0000000000000..dc295cb11728f
--- /dev/null
+++ b/test/SILOptimizer/testflag_disable_pass_only.swift
@@ -0,0 +1,25 @@
+// RUN: %target-swift-frontend -emit-sil %s -Xllvm -sil-disable-pass=AllocBoxToStack -Xllvm -sil-disable-pass-only-function='$s26testflag_disable_pass_only4foo1yyF' | %FileCheck %s
+
+// CHECK-LABEL: sil hidden [noinline] @$s26testflag_disable_pass_only4foo1yyF :
+// CHECK: alloc_box 
+// CHECK-LABEL: } // end sil function '$s26testflag_disable_pass_only4foo1yyF'
+@inline(never)
+func foo1() {
+  var a = 100
+  @inline(never)
+  func bar() {
+    print(a)
+  }
+}
+
+// CHECK-LABEL: sil hidden [noinline] @$s26testflag_disable_pass_only4foo2yyF :
+// CHECK-NOT: alloc_box 
+// CHECK-LABEL: } // end sil function '$s26testflag_disable_pass_only4foo2yyF'
+@inline(never)
+func foo2() {
+  var a = 100
+  @inline(never)
+  func bar() {
+    print(a)
+  }
+}
diff --git a/test/SPI/local_spi_decls.swift b/test/SPI/local_spi_decls.swift
index 31f1c60dbd058..943a005f15678 100644
--- a/test/SPI/local_spi_decls.swift
+++ b/test/SPI/local_spi_decls.swift
@@ -10,7 +10,7 @@
 @_spi() public func emptyParensSPI() {} // expected-error {{expected an SPI identifier as subject of the '@_spi' attribute}}
 @_spi(set) public func keywordSPI() {} // expected-error {{expected an SPI identifier as subject of the '@_spi' attribute}}
 
-@_spi(S) public class SPIClass {} // expected-note 2 {{type declared here}}
+@_spi(S) public class SPIClass {} // expected-note 3 {{type declared here}}
   // expected-note @-1 2 {{class 'SPIClass' is not '@usableFromInline' or public}}
 class InternalClass {} // expected-note 2 {{type declared here}}
 private class PrivateClass {} // expected-note 2 {{type declared here}}
@@ -18,9 +18,9 @@ private class PrivateClass {} // expected-note 2 {{type declared here}}
 @_spi(S) public protocol SPIProtocol {} // expected-note {{type declared here}}
 
 @_spi(S) public func useOfSPITypeOk(_ p0: SPIProtocol, p1: SPIClass) -> SPIClass { fatalError() } // OK
-public func useOfSPITypeInvalid() -> SPIClass { fatalError() } // expected-error {{function cannot be declared public because its result uses an '@_spi' type}}
-@_spi(S) public func spiUseOfInternalType() -> InternalClass { fatalError() } // expected-error{{function cannot be declared '@_spi' because its result uses an internal type}}
-@_spi(S) public func spiUseOfPrivateType(_ a: PrivateClass)  { fatalError() } // expected-error{{function cannot be declared '@_spi' because its parameter uses a private type}}
+public func useOfSPITypeInvalid() -> SPIClass { fatalError() } // expected-error {{cannot use class 'SPIClass' here; it is SPI}}
+@_spi(S) public func spiUseOfInternalType() -> InternalClass { fatalError() } // expected-error{{function cannot be declared public because its result uses an internal type}}
+@_spi(S) public func spiUseOfPrivateType(_ a: PrivateClass)  { fatalError() } // expected-error{{function cannot be declared public because its parameter uses a private type}}
 
 @inlinable
 func inlinable() -> SPIClass { // expected-error {{class 'SPIClass' is '@_spi' and cannot be referenced from an '@inlinable' function}}
@@ -41,12 +41,17 @@ private protocol PrivateProtocol {} // expected-note {{type declared here}}
 
 @_spi(S) public class BadSubclass : InternalClass {} // expected-error{{class cannot be declared public because its superclass is internal}}
 @_spi(S) public class OkSPISubclass : SPIClass {} // OK
-public class BadPublicClass : SPIClass {} // expected-error {{class cannot be declared public because its superclass is '@_spi'}}
+public class BadPublicClass : SPIClass {} // expected-error {{cannot use class 'SPIClass' here; it is SPI}}
 @_spi(S) public class BadSPIClass : PrivateClass {} // expected-error {{class cannot be declared public because its superclass is private}}
 
 @_spi(s) public func genFunc<T: PrivateProtocol>(_ t: T) {} // expected-error {{global function cannot be declared public because its generic parameter uses a private type}}
-public func genFuncBad<T: SPIProtocol>(_ t: T) {} // expected-error {{global function cannot be declared public because its generic parameter uses an '@_spi' type}}
+public func genFuncBad<T: SPIProtocol>(_ t: T) {} // expected-error {{cannot use protocol 'SPIProtocol' here; it is SPI}}
 @_spi(S) public func genFuncSPI<T: SPIProtocol>(_ t: T) {} // OK
 
 @_spi(S) private func privateCantBeSPI() {} // expected-error{{private global function cannot be declared '@_spi' because only public and open declarations can be '@_spi'}} {{1-10=}}
 @_spi(S) func internalCantBeSPI() {} // expected-error{{internal global function cannot be declared '@_spi' because only public and open declarations can be '@_spi'}} {{1-10=}}
+
+public struct PublicStructWithProperties {
+  public var a: SPIClass // expected-error {{cannot use class 'SPIClass' here; it is SPI}}
+  public var b = SPIClass() // expected-error {{cannot use class 'SPIClass' here; it is SPI}}
+}
diff --git a/test/SPI/spi_client.swift b/test/SPI/spi_client.swift
index 25351c12a496b..bee3144cb7a4f 100644
--- a/test/SPI/spi_client.swift
+++ b/test/SPI/spi_client.swift
@@ -50,9 +50,7 @@ print(ps.spiVar)
 otherApiFunc() // expected-error {{cannot find 'otherApiFunc' in scope}}
 
 public func publicUseOfSPI(param: SPIClass) -> SPIClass {} // expected-error 2{{cannot use class 'SPIClass' here; it is an SPI imported from 'SPIHelper'}}
-// expected-error@-1 {{function cannot be declared public because its parameter uses an '@_spi' type}}
 public func publicUseOfSPI2() -> [SPIClass] {} // expected-error {{cannot use class 'SPIClass' here; it is an SPI imported from 'SPIHelper'}}
-// expected-error@-1 {{function cannot be declared public because its result uses an '@_spi' type}}
 
 @inlinable
 func inlinable() -> SPIClass { // expected-error {{class 'SPIClass' is '@_spi' and cannot be referenced from an '@inlinable' function}}
diff --git a/test/Sanitizers/tsan.swift b/test/Sanitizers/tsan.swift
index e7f72ed918237..3fbc8dd5defe1 100644
--- a/test/Sanitizers/tsan.swift
+++ b/test/Sanitizers/tsan.swift
@@ -10,9 +10,9 @@
 // don't support TSan.
 // UNSUPPORTED: remote_run
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/ScanDependencies/Inputs/ModuleDependencyGraph.swift b/test/ScanDependencies/Inputs/ModuleDependencyGraph.swift
index bfcb553fabb03..1a9daa5c98863 100644
--- a/test/ScanDependencies/Inputs/ModuleDependencyGraph.swift
+++ b/test/ScanDependencies/Inputs/ModuleDependencyGraph.swift
@@ -63,12 +63,20 @@ struct SwiftModuleDetails: Codable {
   /// The module interface from which this module was built, if any.
   var moduleInterfacePath: String?
 
+  /// The compiled Swift module to use.
+  var compiledModulePath: String?
+
   /// The bridging header, if any.
   var bridgingHeader: BridgingHeader?
 
   /// The Swift command line arguments that need to be passed through
   /// to the -compile-module-from-interface action to build this module.
   var commandLine: [String]?
+
+  /// To build a PCM to be used by this Swift module, we need to append these
+  /// arguments to the generic PCM build arguments reported from the dependency
+  /// graph.
+  var extraPcmArgs: [String]?
 }
 
 /// Details specific to Clang modules.
diff --git a/test/ScanDependencies/compiled_swift_modules.swift b/test/ScanDependencies/compiled_swift_modules.swift
new file mode 100644
index 0000000000000..fe592a1633b14
--- /dev/null
+++ b/test/ScanDependencies/compiled_swift_modules.swift
@@ -0,0 +1,37 @@
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t/Foo.swiftmodule)
+// RUN: %empty-directory(%t/ResourceDir/%target-sdk-name/prebuilt-modules/Foo.swiftmodule)
+// RUN: echo "public func foo() {}" > %t/Foo.swift
+
+import Foo
+
+// HAS_COMPILED:        "compiledModulePath": "{{.*}}Foo.swiftmodule{{.*}}.swiftmodule"
+// HAS_NO_COMPILED-NOT: "compiledModulePath": "{{.*}}Foo.swiftmodule{{.*}}.swiftmodule"
+
+// Step 1: build swift interface and swift module side by side
+// RUN: %target-swift-frontend -emit-module %t/Foo.swift -emit-module-path %t/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -emit-module-interface-path %t/Foo.swiftmodule/%target-swiftinterface-name
+
+// Step 2: scan dependency should give us the binary module adjacent to the interface file.
+// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
+// RUN: %FileCheck %s -check-prefix=HAS_COMPILED < %t/deps.json
+
+// Step 3: remove the adjacent module.
+// RUN: rm %t/Foo.swiftmodule/%target-swiftmodule-name
+
+// Step 4: scan dependency should give us the interface file.
+// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
+// RUN: %FileCheck %s -check-prefix=HAS_NO_COMPILED < %t/deps.json
+
+// Step 4: build prebuilt module cache using the interface.
+// RUN: %target-swift-frontend -compile-module-from-interface -o %t/ResourceDir/%target-sdk-name/prebuilt-modules/Foo.swiftmodule/%target-swiftmodule-name -module-name Foo -disable-interface-lock %t/Foo.swiftmodule/%target-swiftinterface-name
+
+// Step 5: scan dependency now should give us the prebuilt module cache
+// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d -sdk %t -prebuilt-module-cache-path %t/ResourceDir/%target-sdk-name/prebuilt-modules
+// RUN: %FileCheck %s -check-prefix=HAS_COMPILED < %t/deps.json
+
+// Step 6: update the interface file from where the prebuilt module cache was built.
+// RUN: touch %t/Foo.swiftmodule/%target-swiftinterface-name
+
+// Step 4: scan dependency should give us the interface file.
+// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -I %t -emit-dependencies -emit-dependencies-path %t/deps.d
+// RUN: %FileCheck %s -check-prefix=HAS_NO_COMPILED < %t/deps.json
diff --git a/test/ScanDependencies/explicit-module-map.swift b/test/ScanDependencies/explicit-module-map.swift
new file mode 100644
index 0000000000000..78f5e91a80141
--- /dev/null
+++ b/test/ScanDependencies/explicit-module-map.swift
@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: mkdir -p %t/clang-module-cache
+// RUN: mkdir -p %t/inputs
+// RUN: echo "/// Some cool comments" > %t/foo.swift
+// RUN: echo "public func foo() {}" >> %t/foo.swift
+// RUN: %target-swift-frontend -emit-module -emit-module-path %t/inputs/Foo.swiftmodule -emit-module-doc-path %t/inputs/Foo.swiftdoc -emit-module-source-info -emit-module-source-info-path %t/inputs/Foo.swiftsourceinfo -module-cache-path %t.module-cache %t/foo.swift -module-name Foo
+
+// RUN: echo "[{" > %/t/inputs/map.json
+// RUN: echo "\"moduleName\": \"Foo\"," >> %/t/inputs/map.json
+// RUN: echo "\"modulePath\": \"%/t/inputs/Foo.swiftmodule\"," >> %/t/inputs/map.json
+// RUN: echo "\"docPath\": \"%/t/inputs/Foo.swiftdoc\"," >> %/t/inputs/map.json
+// RUN: echo "\"sourceInfoPath\": \"%/t/inputs/Foo.swiftsourceinfo\"" >> %/t/inputs/map.json
+// RUN: echo "}]" >> %/t/inputs/map.json
+
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -enable-swiftsourceinfo -source-filename %s -explicit-swift-module-map-file %t/inputs/map.json | %FileCheck %s
+
+// CHECK: foo.swift:2:13: Func/foo RawComment=[/// Some cool comments
diff --git a/test/ScanDependencies/module_deps.swift b/test/ScanDependencies/module_deps.swift
index 1f8d498a90c6d..374bd5b083a13 100644
--- a/test/ScanDependencies/module_deps.swift
+++ b/test/ScanDependencies/module_deps.swift
@@ -17,29 +17,6 @@
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main %t/deps.json
 
-// RUN: mkdir -p %t/BuildModules
-// RUN: cp %S/Inputs/BuildModulesFromGraph.swift %t/BuildModules/main.swift
-// RUN: %target-build-swift %S/Inputs/ModuleDependencyGraph.swift %t/BuildModules/main.swift -o %t/ModuleBuilder
-// RUN: %target-codesign %t/ModuleBuilder
-
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path SwiftShims.pcm -o %t/clang-module-cache/SwiftShims.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/SwiftShims.pcm
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path A.pcm -o %t/clang-module-cache/A.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/A.pcm
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path B.pcm -o %t/clang-module-cache/B.pcm -Xcc -Xclang -Xcc -fmodule-map-file=%S/Inputs/CHeaders/module.modulemap -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/A.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/B.pcm
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path C.pcm -o %t/clang-module-cache/C.pcm -Xcc -Xclang -Xcc -fmodule-map-file=%S/Inputs/CHeaders/module.modulemap -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/B.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/C.pcm
-
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path A.swiftmodule -o %t/clang-module-cache/A.swiftmodule -Xcc -Xclang -Xcc -fmodule-map-file=%S/Inputs/CHeaders/module.modulemap -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/A.pcm -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/SwiftShims.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/A.swiftmodule
-
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path E.swiftmodule -o %t/clang-module-cache/E.swiftmodule -Xcc -Xclang -Xcc -fmodule-map-file=%S/Inputs/CHeaders/module.modulemap -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/SwiftShims.pcm | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/E.swiftmodule
-
-// RUN: %target-run %t/ModuleBuilder %t/deps.json %swift-path SubE.swiftmodule -o %t/clang-module-cache/SubE.swiftmodule -Xcc -Xclang -Xcc -fmodule-map-file=%S/Inputs/CHeaders/module.modulemap -Xcc -Xclang -Xcc -fmodule-file=%t/clang-module-cache/SwiftShims.pcm -swift-module-file %t/clang-module-cache/E.swiftmodule | %S/Inputs/CommandRunner.py
-// RUN: ls %t/clang-module-cache/SubE.swiftmodule
-
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
@@ -83,6 +60,13 @@ import SubE
 // CHECK-NEXT: {
 // CHECK-NEXT:   "swift": "_cross_import_E"
 // CHECK-NEXT: }
+// CHECK-NEXT: ],
+
+// CHECK:      "extraPcmArgs": [
+// CHECK-NEXT:    "-Xcc",
+// CHECK-NEXT:    "-target",
+// CHECK-NEXT:    "-Xcc",
+// CHECK:         "-fapinotes-swift-version=4"
 
 // CHECK: "bridgingHeader":
 // CHECK-NEXT: "path":
@@ -151,7 +135,11 @@ import SubE
 // CHECK: "G"
 // CHECK: "-swift-version"
 // CHECK: "5"
-// CHECK: ]
+// CHECK: ],
+// CHECK" "extraPcmArgs": [
+// CHECK"   "-target",
+// CHECK"   "-fapinotes-swift-version=5"
+// CHECK" ]
 
 /// --------Swift module Swift
 // CHECK-LABEL: "modulePath": "Swift.swiftmodule",
@@ -191,7 +179,6 @@ import SubE
 // CHECK-MAKE-DEPS: module_deps.swift
 // CHECK-MAKE-DEPS-SAME: A.swiftinterface
 // CHECK-MAKE-DEPS-SAME: G.swiftinterface
-// CHECK-MAKE-DEPS-SAME: Swift.swiftmodule
 // CHECK-MAKE-DEPS-SAME: B.h
 // CHECK-MAKE-DEPS-SAME: F.h
 // CHECK-MAKE-DEPS-SAME: Bridging.h
diff --git a/test/Sema/Inputs/availability_multi_other.swift b/test/Sema/Inputs/availability_multi_other.swift
index 193cd27acac1b..ccd1c58e88f25 100644
--- a/test/Sema/Inputs/availability_multi_other.swift
+++ b/test/Sema/Inputs/availability_multi_other.swift
@@ -3,88 +3,88 @@
 // validate declarations when resolving declaration signatures.
 // This file relies on the minimum deployment target for OS X being 10.9.
 
-@available(OSX, introduced: 10.52)
-private class PrivateIntroduced10_52 { }
+@available(OSX, introduced: 99.52)
+private class PrivateIntroduced99_52 { }
 
 class OtherIntroduced10_9 { }
 
-@available(OSX, introduced: 10.51)
-class OtherIntroduced10_51 {
-  func uses10_52() {
+@available(OSX, introduced: 99.51)
+class OtherIntroduced99_51 {
+  func uses99_52() {
     // If this were the primary file then the below would emit an error, because
-    // PrivateIntroduced10_53 is not available on 10.52. But since we only
+    // PrivateIntroduced99_53 is not available on 99.52. But since we only
     // run the first pass of the type checker on these declarations,
     // the body is not checked.
-    _ = PrivateIntroduced10_52()
+    _ = PrivateIntroduced99_52()
   }
 
-  // This method uses a 10_52 only type in its signature, so validating
+  // This method uses a 99_52 only type in its signature, so validating
   // the declaration should produce an availability error
-  func returns10_52() -> OtherIntroduced10_52 { // expected-error {{'OtherIntroduced10_52' is only available in macOS 10.52 or newer}}
+  func returns99_52() -> OtherIntroduced99_52 { // expected-error {{'OtherIntroduced99_52' is only available in macOS 99.52 or newer}}
       // expected-note@-1 {{add @available attribute to enclosing instance method}}
 
     // Body is not type checked (by design) so no error is expected for unavailable type used in return.
-    return OtherIntroduced10_52()
+    return OtherIntroduced99_52()
   }
 
-  @available(OSX, introduced: 10.52)
-  func returns10_52Introduced10_52() -> OtherIntroduced10_52 {
-    return OtherIntroduced10_52()
+  @available(OSX, introduced: 99.52)
+  func returns99_52Introduced99_52() -> OtherIntroduced99_52 {
+    return OtherIntroduced99_52()
   }
 
-  func takes10_52(o: OtherIntroduced10_52) { 
+  func takes99_52(o: OtherIntroduced99_52) { 
   }
 
-  @available(OSX, introduced: 10.52)
-  func takes10_52Introduced10_52(o: OtherIntroduced10_52) {
+  @available(OSX, introduced: 99.52)
+  func takes99_52Introduced99_52(o: OtherIntroduced99_52) {
   }
 
-  var propOf10_52: OtherIntroduced10_52 = 
+  var propOf99_52: OtherIntroduced99_52 = 
 
 
-      OtherIntroduced10_52() // We don't expect an error here because the initializer is not type checked (by design).
+      OtherIntroduced99_52() // We don't expect an error here because the initializer is not type checked (by design).
 
-  @available(OSX, introduced: 10.52)
-  var propOf10_52Introduced10_52: OtherIntroduced10_52 = OtherIntroduced10_52()
+  @available(OSX, introduced: 99.52)
+  var propOf99_52Introduced99_52: OtherIntroduced99_52 = OtherIntroduced99_52()
 
-  @available(OSX, introduced: 10.52)
-  class NestedIntroduced10_52 : OtherIntroduced10_52 {
-    override func returns10_52() -> OtherIntroduced10_52 {
+  @available(OSX, introduced: 99.52)
+  class NestedIntroduced99_52 : OtherIntroduced99_52 {
+    override func returns99_52() -> OtherIntroduced99_52 {
     }
 
-    @available(OSX, introduced: 10.53)
-    func returns10_53() -> OtherIntroduced10_53 {
+    @available(OSX, introduced: 99.53)
+    func returns99_53() -> OtherIntroduced99_53 {
     }
   }
 }
 
-@available(OSX, introduced: 10.51)
-class SubOtherIntroduced10_51 : OtherIntroduced10_51 {
+@available(OSX, introduced: 99.51)
+class SubOtherIntroduced99_51 : OtherIntroduced99_51 {
 }
 
-@available(OSX, introduced: 10.52)
-class OtherIntroduced10_52 : OtherIntroduced10_51 {
+@available(OSX, introduced: 99.52)
+class OtherIntroduced99_52 : OtherIntroduced99_51 {
 }
 
-extension OtherIntroduced10_51 {
+extension OtherIntroduced99_51 {
 }
 
 extension OtherIntroduced10_9 {
-  @available(OSX, introduced: 10.51)
-  func extensionMethodOnOtherIntroduced10_9AvailableOn10_51(_ p: OtherIntroduced10_51) { }
+  @available(OSX, introduced: 99.51)
+  func extensionMethodOnOtherIntroduced10_9AvailableOn99_51(_ p: OtherIntroduced99_51) { }
 }
 
-@available(OSX, introduced: 10.51)
-extension OtherIntroduced10_51 {
-  func extensionMethodOnOtherIntroduced10_51() { }
+@available(OSX, introduced: 99.51)
+extension OtherIntroduced99_51 {
+  func extensionMethodOnOtherIntroduced99_51() { }
 
-  @available(OSX, introduced: 10.52)
-  func extensionMethodOnOtherIntroduced10_51AvailableOn10_52() { }
+  @available(OSX, introduced: 99.52)
+  func extensionMethodOnOtherIntroduced99_51AvailableOn99_52() { }
 }
 
-@available(OSX, introduced: 10.53)
-class OtherIntroduced10_53 {
+@available(OSX, introduced: 99.53)
+class OtherIntroduced99_53 {
 }
 
-var globalFromOtherOn10_52 : OtherIntroduced10_52? = nil // expected-error {{'OtherIntroduced10_52' is only available in macOS 10.52 or newer}}
+var globalFromOtherOn99_52 : OtherIntroduced99_52? = nil // expected-error {{'OtherIntroduced99_52' is only available in macOS 99.52 or newer}}
     // expected-note@-1 {{add @available attribute to enclosing var}}
diff --git a/test/Sema/availability_versions.swift b/test/Sema/availability_versions.swift
index f757798b86b5a..e3adcb811d4cc 100644
--- a/test/Sema/availability_versions.swift
+++ b/test/Sema/availability_versions.swift
@@ -1,8 +1,8 @@
-// RUN: %target-typecheck-verify-swift -target x86_64-apple-macosx10.50 -disable-objc-attr-requires-foundation-module
-// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -typecheck %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module
+// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -typecheck %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
 
 // Make sure we do not emit availability errors or warnings when -disable-availability-checking is passed
-// RUN: not %target-swift-frontend -target x86_64-apple-macosx10.50 -typecheck -disable-objc-attr-requires-foundation-module -disable-availability-checking %s 2>&1 | %FileCheck %s '--implicit-check-not=error:' '--implicit-check-not=warning:'
+// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -typecheck -disable-objc-attr-requires-foundation-module -disable-availability-checking %s 2>&1 | %FileCheck %s '--implicit-check-not=error:' '--implicit-check-not=warning:'
 
 // REQUIRES: OS=macosx
 
diff --git a/test/Sema/availability_versions_canonical_macos.swift b/test/Sema/availability_versions_canonical_macos.swift
new file mode 100644
index 0000000000000..fb18d412aa22f
--- /dev/null
+++ b/test/Sema/availability_versions_canonical_macos.swift
@@ -0,0 +1,14 @@
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -disable-objc-attr-requires-foundation-module
+
+// REQUIRES: OS=macosx
+
+func markUsed<T>(_ t: T) {}
+
+@available(OSX 10.16, *)
+func introducedOn10_16() { }
+
+func useUnderPoundAvailable() {
+  if #available(OSX 10.16, *) {
+    introducedOn10_16() // no-error
+  }
+}
diff --git a/test/Sema/availability_versions_multi.swift b/test/Sema/availability_versions_multi.swift
index d471eaa5014d9..89e61cbb7528b 100644
--- a/test/Sema/availability_versions_multi.swift
+++ b/test/Sema/availability_versions_multi.swift
@@ -8,54 +8,54 @@ callToEnsureNotInScriptMode() // expected-error {{expressions are not allowed at
 @available(OSX, introduced: 10.9)
 var globalAvailableOn10_9: Int = 9
 
-@available(OSX, introduced: 10.51)
-var globalAvailableOn10_51: Int = 10
+@available(OSX, introduced: 99.51)
+var globalAvailableOn99_51: Int = 10
 
-@available(OSX, introduced: 10.52)
-var globalAvailableOn10_52: Int = 11
+@available(OSX, introduced: 99.52)
+var globalAvailableOn99_52: Int = 11
 
 // Top level should reflect the minimum deployment target.
 let ignored1: Int = globalAvailableOn10_9
 
-let ignored2: Int = globalAvailableOn10_51 // expected-error {{'globalAvailableOn10_51' is only available in macOS 10.51 or newer}}
+let ignored2: Int = globalAvailableOn99_51 // expected-error {{'globalAvailableOn99_51' is only available in macOS 99.51 or newer}}
     // expected-note@-1 {{add @available attribute to enclosing let}}
 
-let ignored3: Int = globalAvailableOn10_52 // expected-error {{'globalAvailableOn10_52' is only available in macOS 10.52 or newer}}
+let ignored3: Int = globalAvailableOn99_52 // expected-error {{'globalAvailableOn99_52' is only available in macOS 99.52 or newer}}
     // expected-note@-1 {{add @available attribute to enclosing let}}
 
-@available(OSX, introduced: 10.51)
-func useFromOtherOn10_51() {
-  // This will trigger validation of OtherIntroduced10_51 in
+@available(OSX, introduced: 99.51)
+func useFromOtherOn99_51() {
+  // This will trigger validation of OtherIntroduced99_51 in
   // in availability_multi_other.swift
-  let o10_51 = OtherIntroduced10_51()
-  o10_51.extensionMethodOnOtherIntroduced10_51()
+  let o99_51 = OtherIntroduced99_51()
+  o99_51.extensionMethodOnOtherIntroduced99_51()
 
   let o10_9 = OtherIntroduced10_9()
-  o10_9.extensionMethodOnOtherIntroduced10_9AvailableOn10_51(o10_51)
-  _ = o10_51.returns10_52Introduced10_52() // expected-error {{'returns10_52Introduced10_52()' is only available in macOS 10.52 or newer}}
+  o10_9.extensionMethodOnOtherIntroduced10_9AvailableOn99_51(o99_51)
+  _ = o99_51.returns99_52Introduced99_52() // expected-error {{'returns99_52Introduced99_52()' is only available in macOS 99.52 or newer}}
       // expected-note@-1 {{add 'if #available' version check}}
 
-  _ = OtherIntroduced10_52()
-      // expected-error@-1 {{'OtherIntroduced10_52' is only available in macOS 10.52 or newer}}
+  _ = OtherIntroduced99_52()
+      // expected-error@-1 {{'OtherIntroduced99_52' is only available in macOS 99.52 or newer}}
       // expected-note@-2 {{add 'if #available' version check}}
 
-  o10_51.extensionMethodOnOtherIntroduced10_51AvailableOn10_52() // expected-error {{'extensionMethodOnOtherIntroduced10_51AvailableOn10_52()' is only available in macOS 10.52 or newer}}
+  o99_51.extensionMethodOnOtherIntroduced99_51AvailableOn99_52() // expected-error {{'extensionMethodOnOtherIntroduced99_51AvailableOn99_52()' is only available in macOS 99.52 or newer}}
       // expected-note@-1 {{add 'if #available' version check}}
 
-  _ = OtherIntroduced10_51.NestedIntroduced10_52()
-      // expected-error@-1 {{'NestedIntroduced10_52' is only available in macOS 10.52 or newer}}
+  _ = OtherIntroduced99_51.NestedIntroduced99_52()
+      // expected-error@-1 {{'NestedIntroduced99_52' is only available in macOS 99.52 or newer}}
       // expected-note@-2 {{add 'if #available' version check}}
 }
 
-@available(OSX, introduced: 10.52)
-func useFromOtherOn10_52() {
-  _ = OtherIntroduced10_52()
+@available(OSX, introduced: 99.52)
+func useFromOtherOn99_52() {
+  _ = OtherIntroduced99_52()
 
-  let n10_52 = OtherIntroduced10_51.NestedIntroduced10_52()
-  _ = n10_52.returns10_52()
-  _ = n10_52.returns10_53() // expected-error {{'returns10_53()' is only available in macOS 10.53 or newer}}
+  let n99_52 = OtherIntroduced99_51.NestedIntroduced99_52()
+  _ = n99_52.returns99_52()
+  _ = n99_52.returns99_53() // expected-error {{'returns99_53()' is only available in macOS 99.53 or newer}}
       // expected-note@-1 {{add 'if #available' version check}}
 
   // This will trigger validation of the global in availability_in_multi_other.swift
-  _ = globalFromOtherOn10_52
+  _ = globalFromOtherOn99_52
 }
diff --git a/test/Sema/deprecation_osx.swift b/test/Sema/deprecation_osx.swift
index d25f8ab7c5e5b..84a48bd81325e 100644
--- a/test/Sema/deprecation_osx.swift
+++ b/test/Sema/deprecation_osx.swift
@@ -1,5 +1,5 @@
-// RUN: %swift -typecheck -parse-as-library -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s -verify
-// RUN: %swift -typecheck -parse-as-library -target x86_64-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
+// RUN: %swift -typecheck -parse-as-library -target %target-cpu-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s -verify
+// RUN: %swift -typecheck -parse-as-library -target %target-cpu-apple-macosx10.51 %clang-importer-sdk -I %S/Inputs/custom-modules %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
 //
 // This test requires a target of OS X 10.51 or later to test deprecation
 // diagnostics because (1) we only emit deprecation warnings if a symbol is
diff --git a/test/Sema/diag_ambiguous_overloads.swift b/test/Sema/diag_ambiguous_overloads.swift
index 10712fc3531c3..f76457697e6d5 100644
--- a/test/Sema/diag_ambiguous_overloads.swift
+++ b/test/Sema/diag_ambiguous_overloads.swift
@@ -126,3 +126,37 @@ func getCounts(_ scheduler: sr5154_Scheduler, _ handler: @escaping ([Count]) ->
   })
 }
 
+// SR-12689
+func SR12689(_ u: UnsafeBufferPointer<UInt16>) {}
+
+let array : [UInt16] = [1, 2]
+
+array.withUnsafeBufferPointer {
+  SR12689(UnsafeRawPointer($0).bindMemory(to: UInt16.self, capacity: 1)) // expected-error {{cannot convert value of type 'UnsafePointer<UInt16>' to expected argument type 'UnsafeBufferPointer<UInt16>'}}
+  // expected-error@-1 {{no exact matches in call to initializer}}
+  // expected-note@-2 {{candidate expects value of type 'UnsafeRawPointer' for parameter #1}}
+  // expected-note@-3 {{candidate expects value of type 'UnsafeMutableRawPointer' for parameter #1}}
+  // expected-note@-4 {{candidate expects value of type 'OpaquePointer' for parameter #1}}
+  // expected-note@-5 {{candidate expects value of type 'Builtin.RawPointer' for parameter #1}}
+
+  UnsafeRawPointer($0) as UnsafeBufferPointer<UInt16> // expected-error {{cannot convert value of type 'UnsafeRawPointer' to type 'UnsafeBufferPointer<UInt16>' in coercion}}
+  // expected-error@-1 {{no exact matches in call to initializer}}
+  // expected-note@-2 {{found candidate with type '(UnsafeRawPointer) -> UnsafeRawPointer'}}
+  // expected-note@-3 {{found candidate with type '(Builtin.RawPointer) -> UnsafeRawPointer'}}
+  // expected-note@-4 {{found candidate with type '(OpaquePointer) -> UnsafeRawPointer'}}
+  // expected-note@-5 {{found candidate with type '(UnsafeMutableRawPointer) -> UnsafeRawPointer'}}
+}
+
+func SR12689_1(_ u: Int) -> String { "" } // expected-note {{found this candidate}} expected-note {{candidate expects value of type 'Int' for parameter #1}}
+func SR12689_1(_ u: String) -> Double { 0 } // expected-note {{found this candidate}} expected-note {{candidate expects value of type 'String' for parameter #1}}
+func SR12689_2(_ u: Int) {}
+
+SR12689_2(SR12689_1(1 as Double)) // expected-error {{no exact matches in call to global function 'SR12689_1'}}
+SR12689_1(1 as Double) as Int // expected-error {{no exact matches in call to global function 'SR12689_1'}}
+
+// Ambiguos OverloadRefExpr
+func SR12689_O(_ p: Int) {} // expected-note {{found candidate with type '(Int) -> ()'}}
+func SR12689_O(_ p: Double) {} // expected-note {{found candidate with type '(Double) -> ()'}}
+func SR12689_3(_ param: (String)-> Void) {}
+
+SR12689_3(SR12689_O) // expected-error {{no 'SR12689_O' candidates produce the expected type '(String) -> Void' for parameter #0}}
diff --git a/test/Sema/diag_constantness_check_os_log.swift b/test/Sema/diag_constantness_check_os_log.swift
index 59703a27f6248..f0b4b6916c139 100644
--- a/test/Sema/diag_constantness_check_os_log.swift
+++ b/test/Sema/diag_constantness_check_os_log.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -swift-version 5
 
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Tests the constantness Sema diagnostics for the OSLogTestHelper module,
 // which acts as a stub for the os overlay.
diff --git a/test/Sema/enum_raw_representable.swift b/test/Sema/enum_raw_representable.swift
index 39e89779ddf0d..b856e3dbf387f 100644
--- a/test/Sema/enum_raw_representable.swift
+++ b/test/Sema/enum_raw_representable.swift
@@ -46,7 +46,8 @@ var doubles: [Double] = serialize([Bar.a, .b, .c])
 var foos: [Foo] = deserialize([1, 2, 3])
 var bars: [Bar] = deserialize([1.2, 3.4, 5.6])
 
-// Infer RawValue from witnesses.
+// We reject enums where the raw type stated in the inheritance clause does not
+// match the types of the witnesses.
 enum Color : Int {
   case red
   case blue
@@ -56,11 +57,13 @@ enum Color : Int {
   }
 
   var rawValue: Double {
+  // expected-error@-1 {{invalid redeclaration of synthesized implementation for protocol requirement 'rawValue'}}
     return 1.0
   }
 }
 
 var colorRaw: Color.RawValue = 7.5
+// expected-error@-1 {{cannot convert value of type 'Double' to specified type 'Color.RawValue' (aka 'Int')}}
 
 // Mismatched case types
 
@@ -135,19 +138,23 @@ rdar32431165_2(E_32431165.bar)
 rdar32431165_2(42, E_32431165.bar)
 // expected-error@-1 {{cannot convert value of type 'E_32431165' to expected argument type 'String'}} {{34-34=.rawValue}}
 
-E_32431165.bar == "bar"
-// expected-error@-1 {{cannot convert value of type 'E_32431165' to expected argument type 'String}} {{15-15=.rawValue}}
+// TODO: In following two examples it's possible to fix a problem by either using `.rawValue` on first argument
+// or constructing raw representable type from second, both ways are valid.
+do {
+  E_32431165.bar == "bar"
+  // expected-error@-1 {{binary operator '==' cannot be applied to operands of type 'E_32431165' and 'String'}} expected-note@-1 {{partially matching parameter lists: (String, String)}}
 
-"bar" == E_32431165.bar
-// expected-error@-1 {{cannot convert value of type 'E_32431165' to expected argument type 'String}} {{24-24=.rawValue}}
+  "bar" == E_32431165.bar
+  // expected-error@-1 {{binary operator '==' cannot be applied to operands of type 'String' and 'E_32431165'}} expected-note@-1 {{partially matching parameter lists: (String, String)}}
+}
 
-func rdar32431165_overloaded() -> Int { 42 }     // expected-note {{found candidate with type 'Int'}}
+func rdar32431165_overloaded() -> Int { 42 }     // expected-note {{'rdar32431165_overloaded()' produces 'Int', not the expected contextual result type 'E_32431165'}}
 func rdar32431165_overloaded() -> String { "A" } // expected-note {{'rdar32431165_overloaded()' produces 'String', not the expected contextual result type 'E_32431165'}}
 
 func test_candidate_diagnostic() {
   func test_argument(_: E_32431165) {}
 
-  let _: E_32431165 = rdar32431165_overloaded() // expected-error {{no exact matches in call to global function 'rdar32431165_overloaded'}}
+  let _: E_32431165 = rdar32431165_overloaded() // expected-error {{no 'rdar32431165_overloaded' candidates produce the expected contextual result type 'E_32431165'}}
   test_argument(rdar32431165_overloaded()) // expected-error {{cannot convert value of type 'String' to expected argument type 'E_32431165'}} {{17-17=E_32431165(rawValue: }} {{42-42=) ?? <#default value#>}}
 }
 
@@ -197,7 +204,8 @@ func sr8150_mutable(obj: SR8150Box) {
     sr8150_helper1(opt)
     // expected-error@-1 {{cannot convert value of type 'Bar?' to expected argument type 'Double'}} {{23-23=?.rawValue ?? <#default value#>}}
     sr8150_helper1(opt ?? Bar.a)
-    // expected-error@-1 {{cannot convert value of type 'Bar' to expected argument type 'Double'}} {{20-20=(}} {{32-32=).rawValue}}
+    // expected-error@-1 {{no exact matches in call to global function 'sr8150_helper1'}}
+    // expected-note@-2  {{candidate expects value of type 'Bar' for parameter #0}} {{20-20=(}} {{32-32=).rawValue}}
     let _: Double? = opt
     // expected-error@-1 {{cannot convert value of type 'Bar?' to specified type 'Double?'}} {{25-25=?.rawValue}}
   }
diff --git a/test/Sema/enum_raw_representable_circularity.swift b/test/Sema/enum_raw_representable_circularity.swift
new file mode 100644
index 0000000000000..9fb76a0714d44
--- /dev/null
+++ b/test/Sema/enum_raw_representable_circularity.swift
@@ -0,0 +1,13 @@
+// RUN: %target-typecheck-verify-swift
+
+// This used to fail with "reference to invalid associated type 'RawValue' of type 'E'"
+_ = E(rawValue: 123)
+
+enum E : Int {
+  case a = 123
+
+  init?(rawValue: RawValue) {
+    self = .a
+  }
+}
+
diff --git a/test/Sema/exhaustive_switch.swift b/test/Sema/exhaustive_switch.swift
index a3933f3cfe4f6..3d74dee71cc22 100644
--- a/test/Sema/exhaustive_switch.swift
+++ b/test/Sema/exhaustive_switch.swift
@@ -1082,7 +1082,7 @@ enum UnavailableCaseOSSpecific {
   case a
   case b
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   @available(macOS, unavailable)
   @available(iOS, unavailable)
   @available(tvOS, unavailable)
diff --git a/test/Sema/object_literals_ios.swift b/test/Sema/object_literals_ios.swift
index b4ef8d54b7983..b067b8cf41a5e 100644
--- a/test/Sema/object_literals_ios.swift
+++ b/test/Sema/object_literals_ios.swift
@@ -8,10 +8,13 @@ struct S: _ExpressibleByColorLiteral {
 let y: S = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)
 let y2 = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1) // expected-error{{could not infer type of color literal}}
 // expected-note@-1{{import UIKit to use 'UIColor' as the default color literal type}}
-let y3 = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1) // expected-error{{incorrect argument labels in call (have 'red:bleen:grue:alpha:', expected 'red:green:blue:alpha:')}}
+let y3 = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1)
 // expected-error@-1 {{could not infer type of color literal}}
 // expected-note@-2 {{import UIKit to use 'UIColor' as the default color literal type}}
 
+let _: S = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1)
+// expected-error@-1{{incorrect argument labels in call (have 'red:bleen:grue:alpha:', expected 'red:green:blue:alpha:')}} {{34-39=green}} {{44-48=blue}}
+
 struct I: _ExpressibleByImageLiteral {
   init(imageLiteralResourceName: String) {}
 }
diff --git a/test/Sema/object_literals_osx.swift b/test/Sema/object_literals_osx.swift
index 2fb5e2fc0b503..0590f2e3348f1 100644
--- a/test/Sema/object_literals_osx.swift
+++ b/test/Sema/object_literals_osx.swift
@@ -8,10 +8,13 @@ struct S: _ExpressibleByColorLiteral {
 let y: S = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)
 let y2 = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1) // expected-error{{could not infer type of color literal}}
 // expected-note@-1{{import AppKit to use 'NSColor' as the default color literal type}}
-let y3 = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1) // expected-error{{incorrect argument labels in call (have 'red:bleen:grue:alpha:', expected 'red:green:blue:alpha:')}}
+let y3 = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1)
 // expected-error@-1{{could not infer type of color literal}}
 // expected-note@-2{{import AppKit to use 'NSColor' as the default color literal type}}
 
+let _: S = #colorLiteral(red: 1, bleen: 0, grue: 0, alpha: 1)
+// expected-error@-1 {{incorrect argument labels in call (have 'red:bleen:grue:alpha:', expected 'red:green:blue:alpha:')}} {{34-39=green}} {{44-48=blue}}
+
 struct I: _ExpressibleByImageLiteral {
   init(imageLiteralResourceName: String) {}
 }
@@ -21,7 +24,7 @@ let z2 = #imageLiteral(resourceName: "hello.png") // expected-error{{could not i
 // expected-note@-1{{import AppKit to use 'NSImage' as the default image literal type}}
 
 struct Path: _ExpressibleByFileReferenceLiteral {
-  init(fileReferenceLiteralResourceName: String) {}
+  init(fileReferenceLiteralResourceName: String) {} // expected-note {{'init(fileReferenceLiteralResourceName:)' declared here}}
 }
 
 let p1: Path = #fileLiteral(resourceName: "what.txt")
@@ -32,6 +35,18 @@ let text = #fileLiteral(resourceName: "TextFile.txt").relativeString! // expecte
 // expected-note@-1{{import Foundation to use 'URL' as the default file reference literal type}}
 
 // rdar://problem/49861813
-#fileLiteral() // expected-error{{missing argument for parameter 'resourceName' in call}}
+#fileLiteral()
 // expected-error@-1{{could not infer type of file reference literal}}
 // expected-note@-2{{import Foundation to use 'URL' as the default file reference literal type}}
+
+let _: Path = #fileLiteral() // expected-error {{missing argument for parameter 'resourceName' in call}}
+
+// rdar://problem/62927467
+func test_literal_arguments_are_loaded() {
+  var resource = "foo.txt" // expected-warning {{variable 'resource' was never mutated; consider changing to 'let' constant}}
+  let _: Path = #fileLiteral(resourceName: resource) // Ok
+
+  func test(red: inout Float, green: inout Float) -> S {
+    return #colorLiteral(red: red, green: green, blue: 1, alpha: 1) // Ok
+  }
+}
diff --git a/test/Sema/struct_equatable_hashable.swift b/test/Sema/struct_equatable_hashable.swift
index f61b3865c1382..be162f1abd1a2 100644
--- a/test/Sema/struct_equatable_hashable.swift
+++ b/test/Sema/struct_equatable_hashable.swift
@@ -114,7 +114,8 @@ struct StructWithoutExplicitConformance {
 }
 
 func structWithoutExplicitConformance() {
-  if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { } // expected-error{{binary operator '==' cannot be applied to two 'StructWithoutExplicitConformance' operands}}
+  // This diagnostic is about `Equatable` because it's considered the best possible solution among other ones for operator `==`.
+  if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { } // expected-error{{referencing operator function '==' on 'Equatable' requires that 'StructWithoutExplicitConformance' conform to 'Equatable'}}
 }
 
 // Structs with non-hashable/equatable stored properties don't derive conformance.
diff --git a/test/Serialization/Inputs/binary_sub.py b/test/Serialization/Inputs/binary_sub.py
index f3f84eb1c5ff4..096aeb75dcafd 100755
--- a/test/Serialization/Inputs/binary_sub.py
+++ b/test/Serialization/Inputs/binary_sub.py
@@ -5,5 +5,9 @@
 (_, old, new) = sys.argv
 assert(len(old) == len(new))
 
-data = sys.stdin.read()
-sys.stdout.write(data.replace(old, new))
+if sys.version_info[0] < 3:
+    data = sys.stdin.read()
+    sys.stdout.write(data.replace(old, new))
+else:
+    data = sys.stdin.buffer.read()
+    sys.stdout.buffer.write(data.replace(old.encode('utf-8'), new.encode('utf-8')))
diff --git a/test/Serialization/Inputs/def_basic.sil b/test/Serialization/Inputs/def_basic.sil
index d9aeaa7ee4b0d..9e8b718768dfb 100644
--- a/test/Serialization/Inputs/def_basic.sil
+++ b/test/Serialization/Inputs/def_basic.sil
@@ -498,6 +498,15 @@ bb0:
   return %6 : $()
 }
 
+// CHECK-LABEL: @base_addr : $@convention(thin) () -> ()
+sil [transparent] [serialized] @base_addr : $@convention(thin) () -> () {
+bb0:
+  // CHECK: base_addr_for_offset $*Int
+  %0 = base_addr_for_offset $*Int
+  %1 = tuple ()
+  return %1 : $()
+}
+
 class GlobalObject { }
 
 sil_global @static_global_object : $GlobalObject = {
@@ -1491,7 +1500,8 @@ bb0:
   %57 = function_ref @$s7literal8literalsyyF : $@convention(thin) () -> ()
   %59 = function_ref @$s5index5gep641p1iBpBp_Bi64_tF : $@convention(thin) (Builtin.RawPointer, Builtin.Word) -> Builtin.RawPointer
   %60 = function_ref @global_code : $@convention(thin) () -> ()
-  %61 = function_ref @global_object : $@convention(thin) () -> GlobalObject
+  %61 = function_ref @base_addr : $@convention(thin) () -> ()
+  %62 = function_ref @global_object : $@convention(thin) () -> GlobalObject
   %63 = function_ref @test_class_metatype : $@convention(thin) (SomeClass, SomeSubclass) -> (@thick SomeClass.Type, @thick SomeClass.Type)
   %67 = function_ref @test_existential_metatype : $@convention(thin) (@in SomeProtocol) -> @thick SomeProtocol.Type
   %69 = function_ref @test_unreachable : $@convention(thin) () -> ()
diff --git a/test/Serialization/builtin.swift b/test/Serialization/builtin.swift
index 3dc709ca2cef3..cce143203088b 100644
--- a/test/Serialization/builtin.swift
+++ b/test/Serialization/builtin.swift
@@ -11,4 +11,4 @@ var a : TheBuiltinInt64
 
 // Check that it really is Builtin.Int64.
 var wrapped = Int64(a) // okay
-var badWrapped = Int32(a) // expected-error{{initializer 'init(_:)' requires that 'TheBuiltinInt64' conform to 'BinaryInteger'}}
+var badWrapped = Int32(a) // expected-error{{no exact matches in call to initializer}}
diff --git a/test/Serialization/target-too-new.swift b/test/Serialization/target-too-new.swift
index d2cd2633941f2..62c0916a9a0ab 100644
--- a/test/Serialization/target-too-new.swift
+++ b/test/Serialization/target-too-new.swift
@@ -1,16 +1,16 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.50 -emit-module -parse-stdlib %S/../Inputs/empty.swift -o %t
-// RUN: not %target-swift-frontend -I %t -target x86_64-apple-macosx10.9 -typecheck %s 2>&1 | %FileCheck %s
-// RUN: not %target-swift-frontend -I %t -target x86_64-apple-darwin13 -typecheck %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.50 -emit-module -parse-stdlib %S/../Inputs/empty.swift -o %t
+// RUN: not %target-swift-frontend -I %t -target %target-cpu-apple-macosx10.9 -typecheck %s 2>&1 | %FileCheck %s
+// RUN: not %target-swift-frontend -I %t -target %target-cpu-apple-darwin13 -typecheck %s 2>&1 | %FileCheck %s
 // RUN: %target-swift-frontend -I %t -typecheck %s -disable-target-os-checking
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.50 -I %t -typecheck %s
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.50.1 -I %t -typecheck %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.50 -I %t -typecheck %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.50.1 -I %t -typecheck %s
 
 // Allow any version when built with resilience. (Really we should encode a
 // "minimum supported OS", but we don't have that information today.)
-// RUN: %target-swift-frontend -target x86_64-apple-macosx10.50 -emit-module -parse-stdlib %S/../Inputs/empty.swift -enable-library-evolution -o %t
-// RUN: %target-swift-frontend -I %t -target x86_64-apple-macosx10.9 -typecheck %s
-// RUN: %target-swift-frontend -I %t -target x86_64-apple-darwin13 -typecheck %s
+// RUN: %target-swift-frontend -target %target-cpu-apple-macosx10.50 -emit-module -parse-stdlib %S/../Inputs/empty.swift -enable-library-evolution -o %t
+// RUN: %target-swift-frontend -I %t -target %target-cpu-apple-macosx10.9 -typecheck %s
+// RUN: %target-swift-frontend -I %t -target %target-cpu-apple-darwin13 -typecheck %s
 
 
 // REQUIRES: OS=macosx
diff --git a/test/SourceKit/ConformingMethods/basic.swift b/test/SourceKit/ConformingMethods/basic.swift
index 539664f08b035..35701bdefb7dc 100644
--- a/test/SourceKit/ConformingMethods/basic.swift
+++ b/test/SourceKit/ConformingMethods/basic.swift
@@ -26,5 +26,12 @@ func testing(obj: C) {
   let _ = obj.
 }
 
-// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' -- -module-name MyModule %s > %t.response
+// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 -repeat-request=2 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' -- -module-name MyModule %s > %t.response
 // RUN: %diff -u %s.response %t.response
+// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 -repeat-request=2 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD',reuseastcontext=0 -- -module-name MyModule %s | %FileCheck %s --check-prefix=DISABLED
+
+// DISABLED-NOT: key.reuseastcontext
+// DISABLED: key.members: [
+// DISABLED-NOT: key.reuseastcontext
+// DISABLED: key.members: [
+// DISABLED-NOT: key.reuseastcontext
diff --git a/test/SourceKit/ConformingMethods/basic.swift.response b/test/SourceKit/ConformingMethods/basic.swift.response
index c21b7146cac75..1ed7aba0a8b18 100644
--- a/test/SourceKit/ConformingMethods/basic.swift.response
+++ b/test/SourceKit/ConformingMethods/basic.swift.response
@@ -18,3 +18,24 @@
     }
   ]
 }
+{
+  key.typename: "C",
+  key.typeusr: "$s8MyModule1CCD",
+  key.members: [
+    {
+      key.name: "methodForTarget1()",
+      key.sourcetext: "methodForTarget1()",
+      key.description: "methodForTarget1()",
+      key.typename: "ConcreteTarget1",
+      key.typeusr: "$s8MyModule15ConcreteTarget1VD"
+    },
+    {
+      key.name: "methodForTarget2()",
+      key.sourcetext: "methodForTarget2()",
+      key.description: "methodForTarget2()",
+      key.typename: "ConcreteTarget2",
+      key.typeusr: "$s8MyModule15ConcreteTarget2VD"
+    }
+  ],
+  key.reusingastcontext: 1
+}
diff --git a/test/SourceKit/CursorInfo/cursor_info_synthesized_refs.swift b/test/SourceKit/CursorInfo/cursor_info_synthesized_refs.swift
new file mode 100644
index 0000000000000..bc13d438183d3
--- /dev/null
+++ b/test/SourceKit/CursorInfo/cursor_info_synthesized_refs.swift
@@ -0,0 +1,18 @@
+struct Foo {
+    let x: Int
+    let y: String
+    func perform(_ action: (Int, Int) -> ()) {}
+}
+
+func test() {
+    let x = Foo.init(x: 2, y: "hello")
+    x.perform {
+        print($0 + $1)
+    }
+}
+
+// RUN: %sourcekitd-test -req=cursor -pos=8:17 %s -- %s | %FileCheck -check-prefix=CHECK1 %s
+// CHECK1: <Declaration>init(x: <Type usr="s:Si">Int</Type>, y: <Type usr="s:SS">String</Type>)</Declaration>
+
+// RUN: %sourcekitd-test -req=cursor -pos=10:15 %s -- %s | %FileCheck -check-prefix=CHECK2 %s
+// CHECK2: <Declaration>let $0: <Type usr="s:Si">Int</Type></Declaration>
diff --git a/test/SourceKit/CursorInfo/cursor_invalid.swift b/test/SourceKit/CursorInfo/cursor_invalid.swift
index 07161a4efa2ec..c1db5ff7b577f 100644
--- a/test/SourceKit/CursorInfo/cursor_invalid.swift
+++ b/test/SourceKit/CursorInfo/cursor_invalid.swift
@@ -24,8 +24,12 @@ func resyncParser2() {}
 
 Swift(label: 3)
 
-enum Outer {
-  case Inner(IDontExist)
+enum Outer1 {
+  case Inner1(IDontExist)
+}
+
+enum Outer2 {
+  case Inner2(x: Undefined)
 }
 
 // RUN: %sourcekitd-test -req=cursor -pos=4:13 %s -- %s | %FileCheck -check-prefix=CHECK1 %s
@@ -68,6 +72,10 @@ enum Outer {
 
 // RUN: %sourcekitd-test -req=cursor -pos=25:7 %s -- %s | %FileCheck -check-prefix=DIAG %s
 
-// RUN: %sourcekitd-test -req=cursor -pos=28:8 %s -- %s | %FileCheck -check-prefix=INVALID_ENUM %s
-// INVALID_ENUM: source.lang.swift.decl.enumelement (28:8-28:13)
-// INVALID_ENUM: Inner(_:)
+// RUN: %sourcekitd-test -req=cursor -pos=28:8 %s -- %s | %FileCheck -check-prefix=INVALID_ENUM1 %s
+// INVALID_ENUM1: source.lang.swift.decl.enumelement (28:8-28:14)
+// INVALID_ENUM1: Inner1(_:)
+
+// RUN: %sourcekitd-test -req=cursor -pos=32:8 %s -- %s | %FileCheck -check-prefix=INVALID_ENUM2 %s
+// INVALID_ENUM2: source.lang.swift.decl.enumelement (32:8-32:14)
+// INVALID_ENUM2: Inner2(x:)
diff --git a/test/SourceKit/InterfaceGen/gen_clang_module.swift b/test/SourceKit/InterfaceGen/gen_clang_module.swift
index 7c92eb4fe74ad..d97fc0b498eed 100644
--- a/test/SourceKit/InterfaceGen/gen_clang_module.swift
+++ b/test/SourceKit/InterfaceGen/gen_clang_module.swift
@@ -69,7 +69,7 @@ var x: FooClassBase
 // RUN:         -target %target-triple %clang-importer-sdk-nosource -I %t | %FileCheck -check-prefix=CHECK-IFACE %s
 
 // CHECK-IFACE: DOC: (/<interface-gen>)
-// CHECK-IFACE: ARGS: [-target x86_64-{{.*}} -sdk {{.*}} -F {{.*}}/libIDE-mock-sdk -I {{.*}}.overlays {{.*}} -module-cache-path {{.*}} ]
+// CHECK-IFACE: ARGS: [-target {{.*}}-{{.*}} -sdk {{.*}} -F {{.*}}/libIDE-mock-sdk -I {{.*}}.overlays {{.*}} -module-cache-path {{.*}} ]
 
 // RUN: %sourcekitd-test -req=interface-gen-open -module Foo -- -I %t.overlays -F %S/../Inputs/libIDE-mock-sdk \
 // RUN:         -target %target-triple %clang-importer-sdk-nosource -I %t \
diff --git a/test/SourceKit/Misc/mixed_completion_sequence.swift b/test/SourceKit/Misc/mixed_completion_sequence.swift
new file mode 100644
index 0000000000000..ef7a5991280f5
--- /dev/null
+++ b/test/SourceKit/Misc/mixed_completion_sequence.swift
@@ -0,0 +1,41 @@
+protocol Target1 {}
+protocol Target2 {}
+protocol Target3 {}
+
+struct ConcreteTarget1 : Target1 {}
+struct ConcreteTarget2 : Target2 {}
+struct ConcreteTarget3 : Target3 {}
+
+protocol P {
+  associatedtype Assoc
+  func protocolMethod(asc: Assoc) -> Self
+}
+extension P {
+  func protocolMethod(asc: Assoc) -> Self { return self }
+}
+enum MyEnum {
+    case foo, bar
+}
+
+class C : P {
+  typealias Assoc = String
+  static func staticMethod() -> Self {}
+  func instanceMethod(x: MyEnum) -> C {}
+  func methodForTarget1() -> ConcreteTarget1 {}
+  func methodForTarget2() -> ConcreteTarget2 {}
+}
+
+func testing(obj: C) {
+  let _ = obj.
+}
+func testing(obj: C) {
+  let _ = obj.instanceMethod(x: )
+}
+
+
+// RUN: %sourcekitd-test \
+// RUN:   -req=complete -pos=29:14 %s -- %s -module-name MyModule == \
+// RUN:   -req=conformingmethods -pos=29:14 -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' %s -- %s -module-name MyModule == \
+// RUN:   -req=typecontextinfo -pos=32:33 %s -- %s -module-name MyModule == \
+// RUN:   -req=complete -pos=29:14 %s -- %s -module-name MyModule > %t.response
+// RUN: %diff -u %s.response %t.response
diff --git a/test/SourceKit/Misc/mixed_completion_sequence.swift.response b/test/SourceKit/Misc/mixed_completion_sequence.swift.response
new file mode 100644
index 0000000000000..daecf7b99587b
--- /dev/null
+++ b/test/SourceKit/Misc/mixed_completion_sequence.swift.response
@@ -0,0 +1,215 @@
+{
+  key.results: [
+    {
+      key.kind: source.lang.swift.decl.function.operator.infix,
+      key.name: "!==",
+      key.sourcetext: " !== <#T##AnyObject?#>",
+      key.description: "!==",
+      key.typename: "Bool",
+      key.context: source.codecompletion.context.othermodule,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.is_system: 1,
+      key.modulename: "Swift"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.operator.infix,
+      key.name: "===",
+      key.sourcetext: " === <#T##AnyObject?#>",
+      key.description: "===",
+      key.typename: "Bool",
+      key.context: source.codecompletion.context.othermodule,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.is_system: 1,
+      key.modulename: "Swift"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "instanceMethod(x:)",
+      key.sourcetext: ".instanceMethod(x: <#T##MyEnum#>)",
+      key.description: "instanceMethod(x: MyEnum)",
+      key.typename: "C",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC14instanceMethod1xAcA0A4EnumO_tF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "methodForTarget1()",
+      key.sourcetext: ".methodForTarget1()",
+      key.description: "methodForTarget1()",
+      key.typename: "ConcreteTarget1",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC16methodForTarget1AA08ConcreteE0VyF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "methodForTarget2()",
+      key.sourcetext: ".methodForTarget2()",
+      key.description: "methodForTarget2()",
+      key.typename: "ConcreteTarget2",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC16methodForTarget2AA08ConcreteE0VyF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "protocolMethod(asc:)",
+      key.sourcetext: ".protocolMethod(asc: <#T##String#>)",
+      key.description: "protocolMethod(asc: String)",
+      key.typename: "C",
+      key.context: source.codecompletion.context.superclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1PPAAE14protocolMethod3ascx5AssocQz_tF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.keyword,
+      key.name: "self",
+      key.sourcetext: ".self",
+      key.description: "self",
+      key.typename: "C",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0
+    }
+  ]
+}
+{
+  key.typename: "C",
+  key.typeusr: "$s8MyModule1CCD",
+  key.members: [
+    {
+      key.name: "methodForTarget1()",
+      key.sourcetext: "methodForTarget1()",
+      key.description: "methodForTarget1()",
+      key.typename: "ConcreteTarget1",
+      key.typeusr: "$s8MyModule15ConcreteTarget1VD"
+    },
+    {
+      key.name: "methodForTarget2()",
+      key.sourcetext: "methodForTarget2()",
+      key.description: "methodForTarget2()",
+      key.typename: "ConcreteTarget2",
+      key.typeusr: "$s8MyModule15ConcreteTarget2VD"
+    }
+  ],
+  key.reusingastcontext: 1
+}
+{
+  key.results: [
+    {
+      key.typename: "MyEnum",
+      key.typeusr: "$s8MyModule0A4EnumOD",
+      key.implicitmembers: [
+        {
+          key.name: "foo",
+          key.sourcetext: "foo",
+          key.description: "foo"
+        },
+        {
+          key.name: "bar",
+          key.sourcetext: "bar",
+          key.description: "bar"
+        }
+      ]
+    }
+  ],
+  key.reusingastcontext: 1
+}
+{
+  key.results: [
+    {
+      key.kind: source.lang.swift.decl.function.operator.infix,
+      key.name: "!==",
+      key.sourcetext: " !== <#T##AnyObject?#>",
+      key.description: "!==",
+      key.typename: "Bool",
+      key.context: source.codecompletion.context.othermodule,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.is_system: 1,
+      key.modulename: "Swift"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.operator.infix,
+      key.name: "===",
+      key.sourcetext: " === <#T##AnyObject?#>",
+      key.description: "===",
+      key.typename: "Bool",
+      key.context: source.codecompletion.context.othermodule,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.is_system: 1,
+      key.modulename: "Swift"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "instanceMethod(x:)",
+      key.sourcetext: ".instanceMethod(x: <#T##MyEnum#>)",
+      key.description: "instanceMethod(x: MyEnum)",
+      key.typename: "C",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC14instanceMethod1xAcA0A4EnumO_tF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "methodForTarget1()",
+      key.sourcetext: ".methodForTarget1()",
+      key.description: "methodForTarget1()",
+      key.typename: "ConcreteTarget1",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC16methodForTarget1AA08ConcreteE0VyF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "methodForTarget2()",
+      key.sourcetext: ".methodForTarget2()",
+      key.description: "methodForTarget2()",
+      key.typename: "ConcreteTarget2",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1CC16methodForTarget2AA08ConcreteE0VyF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.decl.function.method.instance,
+      key.name: "protocolMethod(asc:)",
+      key.sourcetext: ".protocolMethod(asc: <#T##String#>)",
+      key.description: "protocolMethod(asc: String)",
+      key.typename: "C",
+      key.context: source.codecompletion.context.superclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0,
+      key.associated_usrs: "s:8MyModule1PPAAE14protocolMethod3ascx5AssocQz_tF",
+      key.modulename: "MyModule"
+    },
+    {
+      key.kind: source.lang.swift.keyword,
+      key.name: "self",
+      key.sourcetext: ".self",
+      key.description: "self",
+      key.typename: "C",
+      key.context: source.codecompletion.context.thisclass,
+      key.typerelation: source.codecompletion.typerelation.unknown,
+      key.num_bytes_to_erase: 0
+    }
+  ],
+  key.reusingastcontext: 1
+}
diff --git a/test/SourceKit/Misc/resource-dir-handling.swift b/test/SourceKit/Misc/resource-dir-handling.swift
index a4a1f66d5b87e..74d70cb82398d 100644
--- a/test/SourceKit/Misc/resource-dir-handling.swift
+++ b/test/SourceKit/Misc/resource-dir-handling.swift
@@ -5,8 +5,8 @@ var p: CoolInt
 // RUN: %empty-directory(%t)
 // RUN: %empty-directory(%t/custom-resource-dir/macosx/Swift.swiftmodule)
 
-// RUN: %target-swift-frontend -emit-module -module-name Swift -parse-stdlib -target x86_64-apple-macosx10.12 %S/Inputs/custom-resource-stdlib.swift -o %t/custom-resource-dir/macosx/Swift.swiftmodule/%target-swiftmodule-name
-// RUN: %sourcekitd-test -req=cursor -pos=3:8 %s -- -resource-dir %t/custom-resource-dir -target x86_64-apple-macosx10.12 %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-module -module-name Swift -parse-stdlib -target %target-cpu-apple-macosx10.12 %S/Inputs/custom-resource-stdlib.swift -o %t/custom-resource-dir/macosx/Swift.swiftmodule/%target-swiftmodule-name
+// RUN: %sourcekitd-test -req=cursor -pos=3:8 %s -- -resource-dir %t/custom-resource-dir -target %target-cpu-apple-macosx10.12 %s | %FileCheck %s
 
 // CHECK: source.lang.swift.ref.struct
 // CHECK-NEXT: CoolInt
diff --git a/test/SourceKit/Sema/sema_annotations_saved.swift b/test/SourceKit/Sema/sema_annotations_saved.swift
new file mode 100644
index 0000000000000..ac2269488d0aa
--- /dev/null
+++ b/test/SourceKit/Sema/sema_annotations_saved.swift
@@ -0,0 +1,10 @@
+func foo() {}
+foo()
+
+// RUN: %sourcekitd-test -req=open %s -- %s \
+// RUN:    == -req=edit -offset=0 -replace="" -length=0 %s \
+// RUN:    == -req=edit -offset=0 -replace="" -length=0 %s \
+// RUN:    == -req=edit -pos=3:1 -replace="foo()" -length=0 %s \
+// RUN:    == -req=edit -offset=0 -replace="" -length=0 %s \
+// RUN:    == -req=edit -offset=0 -replace="" -length=0 %s > %t.response
+// RUN: %diff -u %s.response %t.response
diff --git a/test/SourceKit/Sema/sema_annotations_saved.swift.response b/test/SourceKit/Sema/sema_annotations_saved.swift.response
new file mode 100644
index 0000000000000..300f041a04396
--- /dev/null
+++ b/test/SourceKit/Sema/sema_annotations_saved.swift.response
@@ -0,0 +1,66 @@
+{
+  key.annotations: [
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 14,
+      key.length: 3
+    }
+  ],
+  key.diagnostic_stage: source.diagnostic.stage.swift.sema,
+  key.syntaxmap: [
+  ],
+  key.substructure: [
+  ]
+}
+{
+  key.annotations: [
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 14,
+      key.length: 3
+    }
+  ],
+  key.diagnostic_stage: source.diagnostic.stage.swift.sema,
+  key.syntaxmap: [
+  ],
+  key.substructure: [
+  ]
+}
+{
+  key.annotations: [
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 14,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 20,
+      key.length: 3
+    }
+  ],
+  key.diagnostic_stage: source.diagnostic.stage.swift.sema,
+  key.syntaxmap: [
+  ],
+  key.substructure: [
+  ]
+}
+{
+  key.annotations: [
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 14,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.ref.function.free,
+      key.offset: 20,
+      key.length: 3
+    }
+  ],
+  key.diagnostic_stage: source.diagnostic.stage.swift.sema,
+  key.syntaxmap: [
+  ],
+  key.substructure: [
+  ]
+}
diff --git a/test/SourceKit/TypeContextInfo/typecontext_basic.swift b/test/SourceKit/TypeContextInfo/typecontext_basic.swift
index 79b262e788d04..def196cd861c4 100644
--- a/test/SourceKit/TypeContextInfo/typecontext_basic.swift
+++ b/test/SourceKit/TypeContextInfo/typecontext_basic.swift
@@ -25,5 +25,12 @@ func test(obj: C) {
   let _ = obj.foo(x: 
 }
 
-// RUN: %sourcekitd-test -req=typecontextinfo -pos=25:22 %s -- %s > %t.response
+// RUN: %sourcekitd-test -req=typecontextinfo -repeat-request=2 -pos=25:22 %s -- %s > %t.response
 // RUN: %diff -u %s.response %t.response
+// RUN: %sourcekitd-test -req=typecontextinfo -repeat-request=2 -pos=25:22 %s -req-opts=reuseastcontext=0 -- %s | %FileCheck %s --check-prefix=DISABLED
+
+// DISABLED-NOT: key.reuseastcontext
+// DISABLED: key.results: [
+// DISABLED-NOT: key.reuseastcontext
+// DISABLED: key.results: [
+// DISABLED-NOT: key.reuseastcontext
diff --git a/test/SourceKit/TypeContextInfo/typecontext_basic.swift.response b/test/SourceKit/TypeContextInfo/typecontext_basic.swift.response
index 83d5f4587e478..1f6373eb5ce08 100644
--- a/test/SourceKit/TypeContextInfo/typecontext_basic.swift.response
+++ b/test/SourceKit/TypeContextInfo/typecontext_basic.swift.response
@@ -58,3 +58,64 @@
     }
   ]
 }
+{
+  key.results: [
+    {
+      key.typename: "Direction",
+      key.typeusr: "$s17typecontext_basic9DirectionOD",
+      key.implicitmembers: [
+        {
+          key.name: "east",
+          key.sourcetext: "east",
+          key.description: "east"
+        },
+        {
+          key.name: "west",
+          key.sourcetext: "west",
+          key.description: "west"
+        },
+        {
+          key.name: "vector(x:y:)",
+          key.sourcetext: "vector(x: <#T##Int#>, y: <#T##Int#>)",
+          key.description: "vector(x: Int, y: Int)"
+        },
+        {
+          key.name: "distance(_:)",
+          key.sourcetext: "distance(<#T##Int#>)",
+          key.description: "distance(Int)"
+        }
+      ]
+    },
+    {
+      key.typename: "Target",
+      key.typeusr: "$s17typecontext_basic6TargetVD",
+      key.implicitmembers: [
+        {
+          key.name: "me",
+          key.sourcetext: "me",
+          key.description: "me",
+          key.doc.brief: "Mine."
+        },
+        {
+          key.name: "you",
+          key.sourcetext: "you",
+          key.description: "you",
+          key.doc.brief: "Yours."
+        },
+        {
+          key.name: "them",
+          key.sourcetext: "them",
+          key.description: "them",
+          key.doc.brief: "Theirs."
+        },
+        {
+          key.name: "all",
+          key.sourcetext: "all",
+          key.description: "all",
+          key.doc.brief: "One for all."
+        }
+      ]
+    }
+  ],
+  key.reusingastcontext: 1
+}
diff --git a/test/SourceKit/lit.local.cfg b/test/SourceKit/lit.local.cfg
index ba3fc04d95887..53333531a587f 100644
--- a/test/SourceKit/lit.local.cfg
+++ b/test/SourceKit/lit.local.cfg
@@ -1,4 +1,5 @@
 import os
+import pipes
 
 
 if 'sourcekit' not in config.available_features:
@@ -17,6 +18,6 @@ else:
     config.substitutions.append( ('%sourcekitd-test', '%s -module-cache-path %r' % (config.sourcekitd_test, config.clang_module_cache_path)) )
     config.substitutions.append( ('%complete-test', '%s -module-cache-path=%r' % (config.complete_test, config.clang_module_cache_path)) )
     config.substitutions.append( ('%swiftlib_dir', config.swiftlib_dir) )
-    config.substitutions.append( ('%sed_clean', '%s %s' % (sys.executable, sk_path_sanitize) ) )
+    config.substitutions.append( ('%sed_clean', '%s %s' % (pipes.quote(sys.executable), sk_path_sanitize) ) )
 
 config.substitutions.append( ('%diff', 'diff --strip-trailing-cr') )
diff --git a/test/SymbolGraph/Symbols/Mixins/Availability/Inherited/UnconditionallyUnavailable.swift b/test/SymbolGraph/Symbols/Mixins/Availability/Inherited/UnconditionallyUnavailable.swift
new file mode 100644
index 0000000000000..716b947fb5461
--- /dev/null
+++ b/test/SymbolGraph/Symbols/Mixins/Availability/Inherited/UnconditionallyUnavailable.swift
@@ -0,0 +1,19 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %s -module-name UnavailableFilled -emit-module -emit-module-path %t/
+// RUN: %target-swift-symbolgraph-extract -module-name UnavailableFilled -I %t -pretty-print -output-dir %t
+// RUN: %FileCheck %s --input-file %t/UnavailableFilled.symbols.json
+
+// REQUIRES: OS=macosx
+
+@available(iOS, unavailable)
+public struct S {
+  public func foo() {}
+}
+
+// CHECK-LABEL: "precise": "s:17UnavailableFilled1SV3fooyyF",
+// CHECK: "availability": [
+// CHECK-NEXT:   {
+// CHECK-NEXT:     "domain": "iOS",
+// CHECK-NEXT:     "isUnconditionallyUnavailable": true
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
diff --git a/test/SymbolGraph/Symbols/Mixins/Availability/UnconditionallyUnavailable.swift b/test/SymbolGraph/Symbols/Mixins/Availability/UnconditionallyUnavailable.swift
new file mode 100644
index 0000000000000..a5201af2b649d
--- /dev/null
+++ b/test/SymbolGraph/Symbols/Mixins/Availability/UnconditionallyUnavailable.swift
@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %s -module-name UnconditionallyUnavailable -emit-module -emit-module-path %t/
+// RUN: %target-swift-symbolgraph-extract -module-name UnconditionallyUnavailable -I %t -pretty-print -output-dir %t
+// RUN: %FileCheck %s --input-file %t/UnconditionallyUnavailable.symbols.json
+
+// REQUIRES: OS=macosx
+
+@available(iOS, unavailable)
+public struct UnconditionallyUnavailable {}
+
+// CHECK: "availability": [
+// CHECK-NEXT:   {
+// CHECK-NEXT:     "domain": "iOS",
+// CHECK-NEXT:     "isUnconditionallyUnavailable": true
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
diff --git a/test/SymbolGraph/Symbols/Mixins/Extension.swift b/test/SymbolGraph/Symbols/Mixins/Extension/GetFromExtension.swift
similarity index 63%
rename from test/SymbolGraph/Symbols/Mixins/Extension.swift
rename to test/SymbolGraph/Symbols/Mixins/Extension/GetFromExtension.swift
index 1a558def02134..599f4a10275d4 100644
--- a/test/SymbolGraph/Symbols/Mixins/Extension.swift
+++ b/test/SymbolGraph/Symbols/Mixins/Extension/GetFromExtension.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -module-name Extension -emit-module-path %t/Extension.swiftmodule
-// RUN: %target-swift-symbolgraph-extract -module-name Extension -I %t -pretty-print -output-dir %t
-// RUN: %FileCheck %s --input-file %t/Extension.symbols.json
+// RUN: %target-build-swift %s -module-name GetFromExtension -emit-module-path %t/GetFromExtension.swiftmodule
+// RUN: %target-swift-symbolgraph-extract -module-name GetFromExtension -I %t -pretty-print -output-dir %t
+// RUN: %FileCheck %s --input-file %t/GetFromExtension.symbols.json
 
 public struct Outer<T> {
   public var x: T
diff --git a/test/SymbolGraph/Symbols/Mixins/Extension/IgnoreInherited.swift b/test/SymbolGraph/Symbols/Mixins/Extension/IgnoreInherited.swift
new file mode 100644
index 0000000000000..5687a79f5d092
--- /dev/null
+++ b/test/SymbolGraph/Symbols/Mixins/Extension/IgnoreInherited.swift
@@ -0,0 +1,32 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %s -module-name IgnoreInherited -emit-module-path %t/IgnoreInherited.swiftmodule
+// RUN: %target-swift-symbolgraph-extract -module-name IgnoreInherited -I %t -pretty-print -output-dir %t
+// RUN: %FileCheck %s --input-file %t/IgnoreInherited.symbols.json
+
+public protocol P {
+  associatedtype T
+  static func foo() -> T
+}
+
+public struct S<T> {}
+
+extension S: P where T: Sequence, T.Element == Int {
+  public static func foo() -> AnySequence<Int> {
+    return AnySequence([0])
+  }
+}
+
+// CHECK-LABEL: "precise": "s:15IgnoreInherited1SVAASTRzSi7ElementRtzlE3foos11AnySequenceVySiGyFZ"
+// CHECK: swiftExtension
+// CHECK: "constraints": [
+// CHECK-NEXT:   {
+// CHECK-NEXT:     "kind": "conformance",
+// CHECK-NEXT:     "lhs": "T",
+// CHECK-NEXT:     "rhs": "Sequence"
+// CHECK-NEXT:   },
+// CHECK-NEXT:   {
+// CHECK-NEXT:     "kind": "sameType",
+// CHECK-NEXT:     "lhs": "T.Element",
+// CHECK-NEXT:     "rhs": "Int"
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]
diff --git a/test/TBD/app-extension.swift b/test/TBD/app-extension.swift
index 9fe43bb68ac99..8bdf74b852d51 100644
--- a/test/TBD/app-extension.swift
+++ b/test/TBD/app-extension.swift
@@ -9,7 +9,7 @@
 // EXTENSIONSAFE-NOT: not_app_extension_safe
 // NOTEXTENSIONSAFE: not_app_extension_safe
 
-// RUN: %target-swift-frontend -target-variant x86_64-apple-ios13.0-macabi -typecheck %s -application-extension -emit-tbd -emit-tbd-path %t/target-variant.tbd
+// RUN: %target-swift-frontend -target-variant %target-cpu-apple-ios13.0-macabi -typecheck %s -application-extension -emit-tbd -emit-tbd-path %t/target-variant.tbd
 // RUN: %FileCheck %s --check-prefix MACABI < %t/target-variant.tbd
 
 // MACABI: targets: [ {{.*}}macos{{.*}}maccatalyst{{.*}} ]
diff --git a/test/TBD/move_to_extension.swift b/test/TBD/move_to_extension.swift
new file mode 100644
index 0000000000000..bcd9a36bbf037
--- /dev/null
+++ b/test/TBD/move_to_extension.swift
@@ -0,0 +1,61 @@
+// REQUIRES: OS=macosx
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend -typecheck %s -emit-tbd -emit-tbd-path %t/before_move.tbd -D BEFORE_MOVE -module-name Foo -enable-library-evolution -emit-sil -o %t/before_move.sil
+// RUN: %FileCheck %s < %t/before_move.tbd
+// RUN: %FileCheck %s --check-prefix=CHECK-SIL < %t/before_move.sil
+
+// RUN: %target-swift-frontend %s -emit-module -emit-module-path %t/FooCore.swiftmodule -D AFTER_MOVE_FOO_CORE -module-name FooCore -enable-library-evolution
+// RUN: %target-swift-frontend -typecheck %s -emit-tbd -emit-tbd-path %t/after_move.tbd -D AFTER_MOVE_FOO -module-name Foo -I %t -enable-library-evolution -emit-sil -o %t/after_move.sil
+// RUN: %FileCheck %s < %t/after_move.tbd
+// RUN: %FileCheck %s --check-prefix=CHECK-SIL < %t/after_move.sil
+
+// CHECK: '_$s3Foo4DateC14getCurrentYearSiyFZ'
+// CHECK: '_$s3Foo9DateValueV4yearACSi_tcfC'
+// CHECK: '_$s3Foo9DateValueV4yearSivg'
+
+// CHECK-SIL: sil [available 10.7] @$s3Foo4DateC14getCurrentYearSiyFZ : $@convention(method) (@thick Date.Type) -> Int
+// CHECK-SIL: sil [available 10.7] @$s3Foo9DateValueV4yearACSi_tcfC : $@convention(method) (Int, @thin DateValue.Type) -> @out DateValue
+// CHECK-SIL: sil [available 10.7] @$s3Foo9DateValueV4yearSivg : $@convention(method) (@in_guaranteed DateValue) -> Int
+
+#if BEFORE_MOVE
+
+@available(OSX 10.7, *)
+public class Date {
+  public static func getCurrentYear() -> Int { return 2020 }
+}
+
+@available(OSX 10.7, *)
+public struct DateValue {
+  public init(year: Int) {}
+  public var year: Int { return 2020 }
+}
+
+#endif
+
+#if AFTER_MOVE_FOO_CORE
+
+@available(OSX 10.7, *)
+@_originallyDefinedIn(module: "Foo", OSX 10.9)
+public class Date {}
+
+@available(OSX 10.7, *)
+@_originallyDefinedIn(module: "Foo", OSX 10.9)
+public struct DateValue {}
+
+#endif
+
+#if AFTER_MOVE_FOO
+
+@_exported import FooCore
+
+public extension Date {
+  public static func getCurrentYear() -> Int { return 2020 }
+}
+
+public extension DateValue {
+  public init(year: Int) { self.init(year: 2020) }
+  public var year: Int { return 2020 }
+}
+
+#endif
diff --git a/test/api-digester/Inputs/mock-sdk-baseline.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface b/test/api-digester/Inputs/mock-sdk-baseline.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface
new file mode 100644
index 0000000000000..04fba0eeed4da
--- /dev/null
+++ b/test/api-digester/Inputs/mock-sdk-baseline.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-tools-version: Apple Swift version 5.1 (swiftlang-1100.0.38 clang-1100.0.20.14)
+// swift-module-flags: -target arm64-apple-macos10.14 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SwiftFoo
+import Swift
+public class RemovedClass {
+  @objc deinit
+}
diff --git a/test/api-digester/Inputs/mock-sdk.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface b/test/api-digester/Inputs/mock-sdk.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface
new file mode 100644
index 0000000000000..606b8bd222422
--- /dev/null
+++ b/test/api-digester/Inputs/mock-sdk.sdk/System/Library/Frameworks/SwiftFoo.framework/Modules/SwiftFoo.swiftmodule/arm64-apple-macos.swiftinterface
@@ -0,0 +1,7 @@
+// swift-interface-format-version: 1.0
+// swift-tools-version: Apple Swift version 5.1 (swiftlang-1100.0.38 clang-1100.0.20.14)
+// swift-module-flags: -target arm64-apple-macos10.14 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SwiftFoo
+import Swift
+public class AddedClass {
+  @objc deinit
+}
diff --git a/test/api-digester/Outputs/Cake-abi.txt b/test/api-digester/Outputs/Cake-abi.txt
index 2eb33a4d2771f..321612c33efa1 100644
--- a/test/api-digester/Outputs/Cake-abi.txt
+++ b/test/api-digester/Outputs/Cake-abi.txt
@@ -26,9 +26,7 @@ cake: InfixOperator ..*.. has been changed to a PrefixOperator
 cake: Protocol ProtocolToEnum has been changed to a Enum
 
 /* Renamed Decls */
-cake: Class SwiftObjcClass has ObjC name change from OldObjCClass to NewObjCClass
 cake: Func S1.foo5(x:y:) has been renamed to Func foo5(x:y:z:)
-cake: Func SwiftObjcClass.foo(a:b:c:) has ObjC name change from OldObjCFool:OldObjCA:OldObjCB: to NewObjCFool:NewObjCA:NewObjCB:
 cake: Struct Somestruct2 has been renamed to Struct NSSomestruct2
 
 /* Type Changes */
@@ -54,7 +52,6 @@ cake: Accessor GlobalLetChangedToVar.Set() is a new API without @available attri
 cake: Accessor fixedLayoutStruct2.BecomeFixedBinaryOrder.Modify() is a new API without @available attribute
 cake: Accessor fixedLayoutStruct2.BecomeFixedBinaryOrder.Set() is a new API without @available attribute
 cake: Class C0 is a new API without @available attribute
-cake: Class C5 is now without @objc
 cake: Class C8 is a new API without @available attribute
 cake: Constructor C1.init(_:) is a new API without @available attribute
 cake: Constructor ClassWithMissingDesignatedInits.init() is a new API without @available attribute
@@ -62,7 +59,6 @@ cake: Constructor SubclassWithMissingDesignatedInits.init() is a new API without
 cake: Enum IceKind is now without @frozen
 cake: EnumElement FrozenKind.AddedCase is a new API without @available attribute
 cake: Func C1.foo1() is now not static
-cake: Func C5.dy_foo() is now with dynamic
 cake: Func FinalFuncContainer.NewFinalFunc() is now with final
 cake: Func FinalFuncContainer.NoLongerFinalFunc() is now without final
 cake: Func Float.floatHigher() is a new API without @available attribute
@@ -94,8 +90,6 @@ cake: Var fixedLayoutStruct2.NoLongerWithFixedBinaryOrder is no longer a stored
 /* Protocol Conformance Change */
 cake: Class C7 has added a conformance to an existing protocol P1
 cake: Class SuperClassChange has added a conformance to an existing protocol P1
-cake: Func ObjCProtocol.addOptional() is now an optional requirement
-cake: Func ObjCProtocol.removeOptional() is no longer an optional requirement
 cake: Protocol P3 has added inherited protocol P4
 cake: Protocol P3 has removed inherited protocol P2
 cake: Struct fixedLayoutStruct has added a conformance to an existing protocol P2
@@ -110,7 +104,6 @@ cake: Func RequiementChanges.addedFunc() has been added as a protocol requiremen
 cake: Var RequiementChanges.addedVar has been added as a protocol requirement
 
 /* Class Inheritance Change */
-cake: Class C4 has changed its super class from APINotesTest.OldType to APINotesTest.NewType
 cake: Class SubGenericClass has changed its super class from cake.GenericClass<cake.P1> to cake.GenericClass<cake.P2>
 cake: Class SuperClassRemoval has removed its super class cake.C3
 cake: Class SuperClassRemoval no longer inherits convenience inits from its superclass
diff --git a/test/api-digester/Outputs/stability-stdlib-source-arm64.swift.expected b/test/api-digester/Outputs/stability-stdlib-source-arm64.swift.expected
new file mode 100644
index 0000000000000..902afdfd72c19
--- /dev/null
+++ b/test/api-digester/Outputs/stability-stdlib-source-arm64.swift.expected
@@ -0,0 +1,27 @@
+Constructor BinaryFloatingPoint.init(_:) has been removed
+Constructor Double.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Double.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Float.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Float.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int16.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int16.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int32.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int32.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int64.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int64.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int8.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor Int8.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt16.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt16.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt32.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt32.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt64.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt64.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt8.init(_:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Constructor UInt8.init(exactly:) has parameter 0 type change from Swift.Float80 to Swift.Float16
+Struct Float80 has been removed
+TypeAlias CLongDouble has underlying type change from Swift.Float80 to Swift.Double
diff --git a/test/api-digester/Outputs/stability-stdlib-source.swift.expected b/test/api-digester/Outputs/stability-stdlib-source-x86_64.swift.expected
similarity index 100%
rename from test/api-digester/Outputs/stability-stdlib-source.swift.expected
rename to test/api-digester/Outputs/stability-stdlib-source-x86_64.swift.expected
diff --git a/test/api-digester/compare-dump-abi.swift b/test/api-digester/compare-dump-abi.swift
index 53914a0051ee1..cb4b0ad835a5a 100644
--- a/test/api-digester/compare-dump-abi.swift
+++ b/test/api-digester/compare-dump-abi.swift
@@ -18,8 +18,5 @@
 // RUN: not %api-digester -diagnose-sdk -print-module -baseline-dir %t.baseline -module cake -I %t.mod2 -I %S/Inputs/APINotesLeft -module-cache-path %t.module-cache %clang-importer-sdk-nosource -abi -o %t.result -compiler-style-diags 2> %t.abi.compiler.diags
 // RUN: %FileCheck %s < %t.abi.compiler.diags
 
-// CHECK: cake_current/cake.swift:31:14: error: cake: Class C4 has changed its super class from APINotesTest.OldType to APINotesTest.NewType
-// CHECK: cake_current/cake.swift:33:14: error: cake: Class C5 is now without @objc
-// CHECK: cake_current/cake.swift:35:23: error: cake: Func C5.dy_foo() is now with dynamic
 // CHECK: cake_current/cake.swift:39:15: error: cake: Struct C6 is now with @frozen
 // CHECK: cake_current/cake.swift:41:13: error: cake: Enum IceKind is now without @frozen
diff --git a/test/api-digester/stability-stdlib-source.swift b/test/api-digester/stability-stdlib-source.swift
index 32934342910d4..f0e383a5cc2c2 100644
--- a/test/api-digester/stability-stdlib-source.swift
+++ b/test/api-digester/stability-stdlib-source.swift
@@ -2,6 +2,6 @@
 // RUN: %empty-directory(%t.tmp)
 // mkdir %t.tmp/module-cache && mkdir %t.tmp/dummy.sdk
 // RUN: %api-digester -diagnose-sdk -module Swift -o %t.tmp/changes.txt -module-cache-path %t.tmp/module-cache -sdk %t.tmp/dummy.sdk -avoid-location
-// RUN: %clang -E -P -x c %S/Outputs/stability-stdlib-source.swift.expected -o - | sed '/^\s*$/d' | sort > %t.tmp/stability-stdlib-source.swift.expected
+// RUN: %clang -E -P -x c %S/Outputs/stability-stdlib-source-%target-cpu.swift.expected -o - | sed '/^\s*$/d' | sort > %t.tmp/stability-stdlib-source.swift.expected
 // RUN: %clang -E -P -x c %t.tmp/changes.txt -o - | sed '/^\s*$/d' | sort > %t.tmp/changes.txt.tmp
 // RUN: diff -u %t.tmp/stability-stdlib-source.swift.expected %t.tmp/changes.txt.tmp
diff --git a/test/attr/attr_availability_canonical_macos_version.swift b/test/attr/attr_availability_canonical_macos_version.swift
new file mode 100644
index 0000000000000..10cf92286e255
--- /dev/null
+++ b/test/attr/attr_availability_canonical_macos_version.swift
@@ -0,0 +1,41 @@
+// RUN: %swift -typecheck -verify -parse-stdlib -module-name Swift -target x86_64-apple-macosx11.0 %s
+
+
+@available(OSX, introduced: 10.5, deprecated: 10.8, obsoleted: 11.0,
+              message: "you don't want to do that anyway")
+func obsoletedIn11() { }
+// expected-note @-1{{'obsoletedIn11()' was obsoleted in macOS 11.0}}
+
+obsoletedIn11() // expected-error{{'obsoletedIn11()' is unavailable in macOS: you don't want to do that anyway}}
+
+
+@available(OSX, introduced: 10.5, deprecated: 10.8, obsoleted: 10.16,
+              message: "you don't want to do that anyway")
+func obsoletedIn10_16() { }
+// expected-note @-1{{'obsoletedIn10_16()' was obsoleted in macOS 11.0}}
+
+obsoletedIn10_16() // expected-error{{'obsoletedIn10_16()' is unavailable in macOS: you don't want to do that anyway}}
+
+
+@available(OSX, deprecated: 10.16)
+func deprecatedIn10_16() { }
+
+@available(OSX, deprecated: 10.18)
+func deprecatedIn10_18() { }
+
+@available(OSX, deprecated: 11.0)
+func deprecatedIn11_0() { }
+
+@available(OSX, deprecated: 13.0)
+func deprecatedIn13_0() { }
+
+@available(OSXApplicationExtension, deprecated: 10.16)
+func deprecatedIn10_16AppExtension() { }
+
+func useDeprecated() {
+  deprecatedIn10_16() // expected-warning {{deprecatedIn10_16()' was deprecated in macOS 11.0}}
+  deprecatedIn10_18() // expected-warning {{'deprecatedIn10_18()' was deprecated in macOS 10.18}}
+  deprecatedIn11_0() // expected-warning {{'deprecatedIn11_0()' was deprecated in macOS 11.0}}
+
+  deprecatedIn13_0()  // no-warning
+}
diff --git a/test/attr/attr_availability_canonical_macos_version_introduction.swift b/test/attr/attr_availability_canonical_macos_version_introduction.swift
new file mode 100644
index 0000000000000..69409ec882144
--- /dev/null
+++ b/test/attr/attr_availability_canonical_macos_version_introduction.swift
@@ -0,0 +1,61 @@
+// RUN: %swift -typecheck -verify -parse-stdlib -module-name Swift -target x86_64-apple-macosx10.15 %s
+
+@available(OSX, introduced: 10.16)
+func longFormIntroducedIn10_16() { }
+
+@available(OSX, introduced: 10.18)
+func longFormIntroducedIn10_18() { }
+
+@available(OSX, introduced: 11.0)
+func longFormIntroducedIn11_0() { }
+
+@available(OSX, introduced: 13.0)
+func longFormIntroducedIn13_0() { }
+
+// expected-note@+1 *{{add @available attribute to enclosing global function}}
+func useLongFromIntroduced() {
+  longFormIntroducedIn10_16()
+  // expected-error@-1{{'longFormIntroducedIn10_16()' is only available in macOS 11.0 or newer}}
+  // expected-note@-2{{add 'if #available' version check}}
+
+  longFormIntroducedIn10_18()
+  // expected-error@-1{{'longFormIntroducedIn10_18()' is only available in macOS 10.18 or newer}}
+  // expected-note@-2{{add 'if #available' version check}}
+
+  longFormIntroducedIn11_0()
+  // expected-error@-1{{'longFormIntroducedIn11_0()' is only available in macOS 11.0 or newer}}
+  // expected-note@-2{{add 'if #available' version check}}
+
+  longFormIntroducedIn13_0()
+    // expected-error@-1{{'longFormIntroducedIn13_0()' is only available in macOS 13.0 or newer}}
+    // expected-note@-2{{add 'if #available' version check}}
+}
+
+@available(OSX 10.16, *)
+func shortFormIntroducedIn10_16() { }
+
+@available(OSX 10.18, *)
+func shortFormIntroducedIn10_18() { }
+
+@available(OSX 11.0, *)
+func shortFormIntroducedIn11_0() { }
+
+@available(OSX 13.0, *)
+func shortFormIntroducedIn13_0() { }
+
+// expected-note@+1 *{{add @available attribute to enclosing global function}}
+func useShortIntroduced() {
+  shortFormIntroducedIn10_16()
+    // expected-error@-1{{'shortFormIntroducedIn10_16()' is only available in macOS 11.0 or newer}}
+    // expected-note@-2{{add 'if #available' version check}}
+  shortFormIntroducedIn10_18()
+    // expected-error@-1{{'shortFormIntroducedIn10_18()' is only available in macOS 10.18 or newer}}
+    // expected-note@-2{{add 'if #available' version check}}
+  shortFormIntroducedIn11_0()
+    // expected-error@-1{{'shortFormIntroducedIn11_0()' is only available in macOS 11.0 or newer}}
+    // expected-note@-2{{add 'if #available' version check}}
+
+  shortFormIntroducedIn13_0()
+    // expected-error@-1{{'shortFormIntroducedIn13_0()' is only available in macOS 13.0 or newer}}
+    // expected-note@-2{{add 'if #available' version check}}
+}
diff --git a/test/attr/attr_availability_canonical_macos_version_introduction_appext.swift b/test/attr/attr_availability_canonical_macos_version_introduction_appext.swift
new file mode 100644
index 0000000000000..fa4ff5ad960f0
--- /dev/null
+++ b/test/attr/attr_availability_canonical_macos_version_introduction_appext.swift
@@ -0,0 +1,9 @@
+// RUN: %swift -typecheck -verify -parse-stdlib -module-name Swift -target x86_64-apple-macosx10.15 %s -application-extension
+
+@available(OSXApplicationExtension 11, *)
+func introducedInAppExtension11_0() { }
+
+@available(OSXApplicationExtension 10.16, *)
+func useAppExtension() {
+  introducedInAppExtension11_0() // no-warning
+}
diff --git a/test/attr/attr_dynamic_member_lookup.swift b/test/attr/attr_dynamic_member_lookup.swift
index 06c810448855d..f13c6913c7a4b 100644
--- a/test/attr/attr_dynamic_member_lookup.swift
+++ b/test/attr/attr_dynamic_member_lookup.swift
@@ -600,9 +600,7 @@ func keypath_with_subscripts(_ arr: SubscriptLens<[Int]>,
 
 func keypath_with_incorrect_return_type(_ arr: Lens<Array<Int>>) {
   for idx in 0..<arr.count {
-    // expected-error@-1 {{protocol 'Sequence' requires that 'Lens<Int>' conform to 'Strideable'}}
-    // expected-error@-2 {{cannot convert value of type 'Int' to expected argument type 'Lens<Int>'}}
-    // expected-error@-3 {{referencing operator function '..<' on 'Comparable' requires that 'Lens<Int>' conform to 'Comparable'}}
+    // expected-error@-1 {{cannot convert value of type 'Int' to expected argument type 'Lens<Int>'}}
     let _ = arr[idx]
   }
 }
diff --git a/test/attr/require_explicit_availability.swift b/test/attr/require_explicit_availability.swift
index 1aa42917988a3..b6103ef8c4b5e 100644
--- a/test/attr/require_explicit_availability.swift
+++ b/test/attr/require_explicit_availability.swift
@@ -1,4 +1,5 @@
 // Test the -require-explicit-availability flag
+// REQUIRES: OS=macosx
 
 // RUN: %swiftc_driver -typecheck -parse-stdlib -target x86_64-apple-macosx10.10 -Xfrontend -verify -require-explicit-availability -require-explicit-availability-target "macOS 10.10"  %s
 // RUN: %swiftc_driver -typecheck -parse-stdlib -target x86_64-apple-macosx10.10 -warnings-as-errors %s
diff --git a/test/decl/protocol/conforms/error_self_conformance.swift b/test/decl/protocol/conforms/error_self_conformance.swift
index a5ceb7947a8c3..b451839b0e5ec 100644
--- a/test/decl/protocol/conforms/error_self_conformance.swift
+++ b/test/decl/protocol/conforms/error_self_conformance.swift
@@ -11,15 +11,15 @@ func testSimple(error: Error) {
 
 protocol ErrorRefinement : Error {}
 func testErrorRefinment(error: ErrorRefinement) {
-  wantsError(error) // expected-error {{value of protocol type 'ErrorRefinement' cannot conform to 'Error'; only struct/enum/class types can conform to protocols}}
+  wantsError(error) // expected-error {{protocol 'ErrorRefinement' as a type cannot conform to 'Error'; only concrete types such as structs, enums and classes can conform to protocols}}
 }
 
 protocol OtherProtocol {}
 func testErrorComposition(error: Error & OtherProtocol) {
-  wantsError(error) // expected-error {{value of protocol type 'Error & OtherProtocol' cannot conform to 'Error'; only struct/enum/class types can conform to protocols}}
+  wantsError(error) // expected-error {{protocol 'Error & OtherProtocol' as a type cannot conform to 'Error'; only concrete types such as structs, enums and classes can conform to protocols}}
 }
 
 class C {}
 func testErrorCompositionWithClass(error: Error & C) {
-  wantsError(error) // expected-error {{value of protocol type 'C & Error' cannot conform to 'Error'; only struct/enum/class types can conform to protocols}}
+  wantsError(error) // expected-error {{protocol 'C & Error' as a type cannot conform to 'Error'; only concrete types such as structs, enums and classes can conform to protocols}}
 }
diff --git a/test/decl/protocol/conforms/fixit_stub_editor.swift b/test/decl/protocol/conforms/fixit_stub_editor.swift
index 30c1aeb2aa1b5..787af46dfba29 100644
--- a/test/decl/protocol/conforms/fixit_stub_editor.swift
+++ b/test/decl/protocol/conforms/fixit_stub_editor.swift
@@ -3,18 +3,31 @@
 
 // RUN: %target-swift-frontend -typecheck %s -I %t -verify -diagnostics-editor-mode
 
+protocol P0_A { associatedtype T }
+protocol P0_B { associatedtype T }
+
+class C0: P0_A, P0_B {} // expected-error{{type 'C0' does not conform to protocol 'P0_A'}} expected-error{{type 'C0' does not conform to protocol 'P0_B'}} expected-note{{do you want to add protocol stubs?}}{{23-23=\n    typealias T = <#type#>\n}}
+
 protocol P1 {
   @available(*, deprecated)
   func foo1()
   func foo2()
+  func foo3(arg: Int, arg2: String)
+  func foo4<T: P1>(_: T)
 }
 
 protocol P2 {
   func bar1()
   func bar2()
+
+  func foo2()
+  func foo3(arg: Int, arg2: String)
+  func foo3(arg: Int, arg2: Int)
+  func foo4<T: P1>(_: T)
+  func foo4<T: P2>(_: T)
 }
 
-class C1 : P1, P2 {} // expected-error{{type 'C1' does not conform to protocol 'P1'}} expected-error{{type 'C1' does not conform to protocol 'P2'}} expected-note{{do you want to add protocol stubs?}}{{20-20=\n    func foo1() {\n        <#code#>\n    \}\n\n    func foo2() {\n        <#code#>\n    \}\n\n    func bar1() {\n        <#code#>\n    \}\n\n    func bar2() {\n        <#code#>\n    \}\n}}
+class C1 : P1, P2 {} // expected-error{{type 'C1' does not conform to protocol 'P1'}} expected-error{{type 'C1' does not conform to protocol 'P2'}} expected-note{{do you want to add protocol stubs?}}{{20-20=\n    func foo1() {\n        <#code#>\n    \}\n\n    func foo2() {\n        <#code#>\n    \}\n\n    func foo3(arg: Int, arg2: String) {\n        <#code#>\n    \}\n\n    func foo4<T>(_: T) where T : P1 {\n        <#code#>\n    \}\n\n    func bar1() {\n        <#code#>\n    \}\n\n    func bar2() {\n        <#code#>\n    \}\n\n    func foo3(arg: Int, arg2: Int) {\n        <#code#>\n    \}\n}}
 
 protocol P3 {
   associatedtype T1
@@ -23,6 +36,7 @@ protocol P3 {
 }
 
 protocol P4 : P3 {
+  associatedtype T1
   associatedtype T4 = T1
   associatedtype T5 = T2
   associatedtype T6 = T3
@@ -30,6 +44,21 @@ protocol P4 : P3 {
 
 class C2 : P4 {} // expected-error{{type 'C2' does not conform to protocol 'P4'}} expected-error{{type 'C2' does not conform to protocol 'P3'}} expected-note{{do you want to add protocol stubs?}}{{16-16=\n    typealias T1 = <#type#>\n\n    typealias T2 = <#type#>\n\n    typealias T3 = <#type#>\n}}
 
+protocol P5 {
+  func foo1()
+  func foo2(arg: Int, arg2: String)
+  func foo3<T: P3>(_: T)
+}
+
+protocol P6: P5 {
+  func foo1()
+  func foo2(arg: Int, arg2: String)
+  func foo2(arg: Int, arg2: Int)
+  func foo3<T: P3>(_: T)
+  func foo3<T: P4>(_: T)
+}
+
+class C3 : P6 {} // expected-error{{type 'C3' does not conform to protocol 'P5'}} expected-error{{type 'C3' does not conform to protocol 'P6'}} expected-note{{do you want to add protocol stubs?}}{{16-16=\n    func foo1() {\n        <#code#>\n    \}\n\n    func foo2(arg: Int, arg2: String) {\n        <#code#>\n    \}\n\n    func foo2(arg: Int, arg2: Int) {\n        <#code#>\n    \}\n\n    func foo3<T>(_: T) where T : P3 {\n        <#code#>\n    \}\n}}
 
 // =============================================================================
 // Test how we print stubs for mutating and non-mutating requirements.
diff --git a/test/decl/protocol/conforms/nscoding_availability_osx.swift b/test/decl/protocol/conforms/nscoding_availability_osx.swift
index 90fced355f7cc..31fb24e90eb6c 100644
--- a/test/decl/protocol/conforms/nscoding_availability_osx.swift
+++ b/test/decl/protocol/conforms/nscoding_availability_osx.swift
@@ -1,6 +1,6 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -target x86_64-apple-macosx10.50 -verify
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -target %target-cpu-apple-macosx10.50 -verify
 
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -target x86_64-apple-macosx10.50 -dump-ast > %t.ast
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -target %target-cpu-apple-macosx10.50 -dump-ast > %t.ast
 // RUN: %FileCheck %s < %t.ast
 
 // REQUIRES: objc_interop
diff --git a/test/decl/protocol/req/associated_type_default.swift b/test/decl/protocol/req/associated_type_default.swift
index 0d8e685e50857..cd3e1ababf0d1 100644
--- a/test/decl/protocol/req/associated_type_default.swift
+++ b/test/decl/protocol/req/associated_type_default.swift
@@ -34,3 +34,9 @@ protocol P4 {
 }
 
 struct X4 : P4 {} // expected-error{{type 'X4' does not conform to protocol 'P4'}}
+
+// rdar://62355224 - circularity check for default type was over-eager
+protocol Seq {
+  associatedtype SubSeq: Seq
+  associatedtype Index = SubSeq.Index
+}
\ No newline at end of file
diff --git a/test/decl/subscript/subscripting.swift b/test/decl/subscript/subscripting.swift
index 170b8fc9baea3..667f8e511ca42 100644
--- a/test/decl/subscript/subscripting.swift
+++ b/test/decl/subscript/subscripting.swift
@@ -349,9 +349,9 @@ func testUnresolvedMemberSubscriptFixit(_ s0: GenSubscriptFixitTest) {
 
 struct SubscriptTest1 {
   subscript(keyword:String) -> Bool { return true }
-  // expected-note@-1 5 {{found this candidate}} expected-note@-1 {{found candidate with type 'Bool'}}
+  // expected-note@-1 5 {{found this candidate}} expected-note@-1 {{'subscript(_:)' produces 'Bool', not the expected contextual result type 'Int'}}
   subscript(keyword:String) -> String? {return nil }
-  // expected-note@-1 5 {{found this candidate}} expected-note@-1 {{found candidate with type 'String?'}}
+  // expected-note@-1 5 {{found this candidate}} expected-note@-1 {{'subscript(_:)' produces 'String?', not the expected contextual result type 'Int'}}
 
   subscript(arg: SubClass) -> Bool { return true } // expected-note {{declared here}}
   // expected-note@-1 2 {{found this candidate}}
@@ -397,14 +397,12 @@ func testSubscript1(_ s1 : SubscriptTest1) {
 
 struct SubscriptTest2 {
   subscript(a : String, b : Int) -> Int { return 0 } // expected-note {{candidate expects value of type 'Int' for parameter #2}}
-  // expected-note@-1 {{declared here}}
-  // expected-note@-2 {{candidate has partially matching parameter list (String, Int)}}
-    subscript(a : String, b : String) -> Int { return 0 } // expected-note {{candidate expects value of type 'String' for parameter #2}}
-  // expected-note@-1 {{candidate has partially matching parameter list (String, String)}}
+  // expected-note@-1 2 {{declared here}}
+  subscript(a : String, b : String) -> Int { return 0 } // expected-note {{candidate expects value of type 'String' for parameter #2}}
 }
 
 func testSubscript1(_ s2 : SubscriptTest2) {
-  _ = s2["foo"] // expected-error {{no exact matches in call to subscript}}
+  _ = s2["foo"] // expected-error {{missing argument for parameter #2 in call}}
 
   let a = s2["foo", 1.0] // expected-error {{no exact matches in call to subscript}}
 
diff --git a/test/decl/var/function_builders_availability.swift b/test/decl/var/function_builders_availability.swift
new file mode 100644
index 0000000000000..aa22b171f2144
--- /dev/null
+++ b/test/decl/var/function_builders_availability.swift
@@ -0,0 +1,86 @@
+// RUN: %swift -typecheck -verify -target %target-cpu-apple-macosx10.15 %s
+// REQUIRES: OS=macosx
+
+enum Either<T,U> {
+  case first(T)
+  case second(U)
+}
+
+struct Do<T> {
+  var value: T
+}
+
+@_functionBuilder
+struct TupleBuilder {
+  static func buildBlock<T1>(_ t1: T1) -> (T1) {
+    return (t1)
+  }
+
+  static func buildBlock<T1, T2>(_ t1: T1, _ t2: T2) -> (T1, T2) {
+    return (t1, t2)
+  }
+  
+  static func buildBlock<T1, T2, T3>(_ t1: T1, _ t2: T2, _ t3: T3)
+      -> (T1, T2, T3) {
+    return (t1, t2, t3)
+  }
+
+  static func buildBlock<T1, T2, T3, T4>(_ t1: T1, _ t2: T2, _ t3: T3, _ t4: T4)
+      -> (T1, T2, T3, T4) {
+    return (t1, t2, t3, t4)
+  }
+
+  static func buildBlock<T1, T2, T3, T4, T5>(
+    _ t1: T1, _ t2: T2, _ t3: T3, _ t4: T4, _ t5: T5
+  ) -> (T1, T2, T3, T4, T5) {
+    return (t1, t2, t3, t4, t5)
+  }
+
+  static func buildDo<T1>(_ t1: T1) -> Do<(T1)> {
+    .init(value: t1)
+  }
+
+  static func buildDo<T1, T2>(_ t1: T1, _ t2: T2) -> Do<(T1, T2)> {
+    .init(value: (t1, t2))
+  }
+  
+  static func buildDo<T1, T2, T3>(_ t1: T1, _ t2: T2, _ t3: T3)
+      -> Do<(T1, T2, T3)> {
+    .init(value: (t1, t2, t3))
+  }
+
+  static func buildIf<T>(_ value: T?) -> T? { return value }
+
+  static func buildEither<T,U>(first value: T) -> Either<T,U> {
+    return .first(value)
+  }
+  static func buildEither<T,U>(second value: U) -> Either<T,U> {
+    return .second(value)
+  }
+
+  static func buildArray<T>(_ array: [T]) -> [T] { return array }
+}
+
+@available(macOS 10.14, *)
+enum Option {
+  @available(macOS 10.15.4, *)
+  case best
+}
+
+@TupleBuilder
+func bestTuple() -> some Any { // expected-note{{add @available attribute to enclosing global function}}
+  "Hello"
+  Option.best // expected-error{{'best' is only available in macOS 10.15.4 or newer}}
+  // expected-note@-1{{add 'if #available' version check}}
+}
+
+func tuplify<T>(_ cond: Bool, @TupleBuilder body: (Bool) -> T) {
+  print(body(cond))
+}
+
+tuplify(true) { x in
+  x
+  "Hello"
+  Option.best // expected-error{{'best' is only available in macOS 10.15.4 or newer}}
+  // expected-note@-1{{add 'if #available' version check}}
+}
diff --git a/test/decl/var/property_wrappers.swift b/test/decl/var/property_wrappers.swift
index 313d35685f51a..89980ca80e472 100644
--- a/test/decl/var/property_wrappers.swift
+++ b/test/decl/var/property_wrappers.swift
@@ -219,7 +219,7 @@ struct MultipleWrappers {
   // attempting to splice a 'wrappedValue:' argument into the call to Wrapper's
   // init, but it doesn't have a matching init. We're then attempting to access
   // the nested 'wrappedValue', but Wrapper's 'wrappedValue' is Int.
-  @Wrapper(stored: 17) // expected-error{{value of type 'Int' has no member 'wrappedValue'}}
+  @Wrapper(stored: 17) // expected-error{{cannot convert value of type 'Int' to expected argument type 'WrapperWithInitialValue<Int>'}}
   @WrapperWithInitialValue // expected-error{{extra argument 'wrappedValue' in call}}
   var x: Int = 17
 
@@ -1069,6 +1069,51 @@ struct TestComposition {
 	}
 }
 
+// ---------------------------------------------------------------------------
+// Property wrapper composition type inference
+// ---------------------------------------------------------------------------
+
+protocol DefaultValue {
+  static var defaultValue: Self { get }
+}
+
+extension Int: DefaultValue {
+  static var defaultValue: Int { 0 }
+}
+
+struct TestCompositionTypeInference {
+  @propertyWrapper
+  struct A<Value: DefaultValue> {
+    var wrappedValue: Value
+
+    init(wrappedValue: Value = .defaultValue, key: String) {
+      self.wrappedValue = wrappedValue
+    }
+  }
+
+  @propertyWrapper
+  struct B<Value: DefaultValue>: DefaultValue {
+    var wrappedValue: Value
+
+    init(wrappedValue: Value = .defaultValue) {
+      self.wrappedValue = wrappedValue
+    }
+
+    static var defaultValue: B<Value> { B() }
+  }
+
+  // All of these are okay
+
+  @A(key: "b") @B
+  var a: Int = 0
+
+  @A(key: "b") @B
+  var b: Int
+
+  @A(key: "c") @B @B
+  var c: Int
+}
+
 // ---------------------------------------------------------------------------
 // Missing Property Wrapper Unwrap Diagnostics
 // ---------------------------------------------------------------------------
diff --git a/test/diagnostics/Localization/Inputs/en.yaml b/test/diagnostics/Localization/Inputs/en.yaml
new file mode 100644
index 0000000000000..c14e03e543519
--- /dev/null
+++ b/test/diagnostics/Localization/Inputs/en.yaml
@@ -0,0 +1,30 @@
+#===--- en.yaml - Localized diagnostic messages for English ---*- YAML -*-===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===----------------------------------------------------------------------===#
+#
+# This file defines the diagnostic messages for the English language.
+# Each diagnostic is described in the following format:
+# - id: "<diagnostic-id>"
+#   msg: "<diagnostic-message>"
+# 
+#===----------------------------------------------------------------------===#
+
+- id: "lex_unterminated_string"
+  msg: "unterminated string literal"
+  
+- id: "var_init_self_referential"
+  msg: "variable used within its own initial value"
+
+- id: "cannot_find_in_scope"
+  msg: "cannot %select{find|find operator}1 %0 in scope"
+
+- id: "warning_invalid_locale_code"
+  msg: "unsupported locale code; supported locale codes are '%0'"
diff --git a/test/diagnostics/Localization/Inputs/fr.yaml b/test/diagnostics/Localization/Inputs/fr.yaml
new file mode 100644
index 0000000000000..e2a12327bf58a
--- /dev/null
+++ b/test/diagnostics/Localization/Inputs/fr.yaml
@@ -0,0 +1,30 @@
+#===--- fr.yaml - Localized diagnostic messages for French ---*- YAML -*-===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+#===----------------------------------------------------------------------===#
+#
+# This file defines the diagnostic messages for the French language.
+# Each diagnostic is described in the following format:
+# - id: "<diagnostic-id>"
+#   msg: "<diagnostic-message>"
+# 
+#===----------------------------------------------------------------------===#
+
+- id: "lex_unterminated_string"
+  msg: "chaîne non terminée littérale"
+
+- id: "var_init_self_referential"
+  msg: "variable utilisée dans sa propre valeur initiale"
+
+- id: "cannot_find_in_scope"
+  msg: "impossible %select{de trouver|de trouver opérateur}1 %0 portée"
+
+- id: "warning_invalid_locale_code"
+  msg: "code de paramètres régionaux non pris en charge; les codes pris en charge sont '%0'"
diff --git a/test/diagnostics/Localization/en_localization.swift b/test/diagnostics/Localization/en_localization.swift
new file mode 100644
index 0000000000000..6c9842f1d1df9
--- /dev/null
+++ b/test/diagnostics/Localization/en_localization.swift
@@ -0,0 +1,9 @@
+// RUN: %target-typecheck-verify-swift -localization-path %S/Inputs -locale en
+
+_ = "HI!
+// expected-error@-1{{unterminated string literal}}
+var self1 = self1 // expected-error {{variable used within its own initial value}}
+struct Broken {
+  var b : Bool = True // expected-error{{cannot find 'True' in scope}}
+}
+var v1 : Int[1 // expected-error {{expected ']' in array type}} expected-note {{to match this opening '['}}
diff --git a/test/diagnostics/Localization/fr_localization.swift b/test/diagnostics/Localization/fr_localization.swift
new file mode 100644
index 0000000000000..50db4c8e33206
--- /dev/null
+++ b/test/diagnostics/Localization/fr_localization.swift
@@ -0,0 +1,9 @@
+// RUN: %target-typecheck-verify-swift -localization-path %S/Inputs -locale fr
+
+_ = "HI!
+// expected-error@-1{{chaîne non terminée littérale}}
+var self1 = self1 // expected-error {{variable utilisée dans sa propre valeur initiale}}
+struct Broken {
+  var b : Bool = True // expected-error{{impossible de trouver 'True' portée}}
+}
+var v1 : Int[1 // expected-error {{expected ']' in array type}} expected-note {{to match this opening '['}}
diff --git a/test/diagnostics/Localization/no_localization_files_and_wrong_path.swift b/test/diagnostics/Localization/no_localization_files_and_wrong_path.swift
new file mode 100644
index 0000000000000..f2a27dcf7b3f5
--- /dev/null
+++ b/test/diagnostics/Localization/no_localization_files_and_wrong_path.swift
@@ -0,0 +1,11 @@
+// RUN: %target-typecheck-verify-swift -localization-path /Not_exsisting_path -locale en
+
+// <unknown>:0: warning: cannot find translations for 'en' at '/Not_exsisting_path/en.yaml': no such file
+// <unknown>:0: warning: specified localization directory '/Not_exsisting_path' does not exist, translation is disabled
+
+_ = "HI!
+// expected-error@-1{{unterminated string literal}}
+var self1 = self1 // expected-error {{variable used within its own initial value}}
+struct Broken {
+  var b : Bool = True // expected-error{{cannot find 'True' in scope}}
+}
diff --git a/test/diagnostics/Localization/not_available_locale_code.swift b/test/diagnostics/Localization/not_available_locale_code.swift
new file mode 100644
index 0000000000000..e335083f8fd94
--- /dev/null
+++ b/test/diagnostics/Localization/not_available_locale_code.swift
@@ -0,0 +1,3 @@
+// RUN: %target-typecheck-verify-swift -locale NOT_A_LOCALE 2>&1 | %FileCheck -check-prefix=INVALID_OPTION %s
+
+// INVALID_OPTION: warning: unsupported locale code; supported locale codes are: 'ab, aa, af, ak, sq, am, ar, an, hy, as, av, ae, ay, az, bm, ba, eu, be, bn, bh, bi, bs, br, bg, my, ca, km, ch, ce, ny, zh, cu, cv, kw, co, cr, hr, cs, da, dv, nl, dz, en, eo, et, ee, fo, fj, fi, fr, ff, gd, gl, lg, ka, de, ki, el, kl, gn, gu, ht, ha, he, hz, hi, ho, hu, is, io, ig, id, ia, ie, iu, ik, ga, it, ja, jv, kn, kr, ks, kk, rw, kv, kg, ko, kj, ku, ky, lo, la, lv, lb, li, ln, lt, lu, mk, mg, ms, ml, mt, gv, mi, mr, mh, ro, mn, na, nv, nd, ng, ne, se, no, nb, nn, ii, oc, oj, or, om, os, pi, pa, ps, fa, pl, pt, qu, rm, rn, ru, sm, sg, sa, sc, sr, sn, sd, si, sk, sl, so, st, nr, es, su, sw, ss, sv, tl, ty, tg, ta, tt, te, th, bo, ti, to, ts, tn, tr, tk, tw, ug, uk, ur, uz, ve, vi, vo, wa, cy, fy, wo, xh, yi, yo, za, zu'
diff --git a/test/diagnostics/pretty-printed-diagnostics.swift b/test/diagnostics/pretty-printed-diagnostics.swift
index 56373bd5ee36e..514a33eb61c2f 100644
--- a/test/diagnostics/pretty-printed-diagnostics.swift
+++ b/test/diagnostics/pretty-printed-diagnostics.swift
@@ -1,4 +1,4 @@
-// RUN: not %target-swift-frontend -diagnostic-style=swift -typecheck %s 2>&1 | %FileCheck %s
+// RUN: not %target-swift-frontend -diagnostic-style=swift -typecheck %/s 2>&1 | %FileCheck %s
 
 1 + 2
 
diff --git a/test/diagnostics/pretty-printed-source-loc-directive-diags.swift b/test/diagnostics/pretty-printed-source-loc-directive-diags.swift
index e26b5c77524e3..049d85ca16176 100644
--- a/test/diagnostics/pretty-printed-source-loc-directive-diags.swift
+++ b/test/diagnostics/pretty-printed-source-loc-directive-diags.swift
@@ -1,4 +1,4 @@
-// RUN: not %target-swift-frontend -diagnostic-style=swift -typecheck %s 2>&1 | %FileCheck %s
+// RUN: not %target-swift-frontend -diagnostic-style=swift -typecheck %/s 2>&1 | %FileCheck %s
 
 // Error split between the real file and a virtual one.
 #sourceLocation(file: "abc.swift", line: 9)
diff --git a/test/expr/expressions.swift b/test/expr/expressions.swift
index f6aa38a7c39c4..819d681894bec 100644
--- a/test/expr/expressions.swift
+++ b/test/expr/expressions.swift
@@ -791,7 +791,6 @@ func testNilCoalescePrecedence(cond: Bool, a: Int?, r: ClosedRange<Int>?) {
   // ?? should have lower precedence than range and arithmetic operators.
   let r1 = r ?? (0...42) // ok
   let r2 = (r ?? 0)...42 // not ok: expected-error 2 {{cannot convert value of type 'Int' to expected argument type 'ClosedRange<Int>'}}
-  // expected-error@-1 {{referencing operator function '...' on 'Comparable' requires that 'ClosedRange<Int>' conform to 'Comparable'}}
   let r3 = r ?? 0...42 // parses as the first one, not the second.
   
   
diff --git a/test/expr/postfix/dot/init_ref_delegation.swift b/test/expr/postfix/dot/init_ref_delegation.swift
index 7acf0d033477c..e5ffb0be4d804 100644
--- a/test/expr/postfix/dot/init_ref_delegation.swift
+++ b/test/expr/postfix/dot/init_ref_delegation.swift
@@ -323,12 +323,12 @@ class TestOverloadSets {
     self.init(5, 5) // expected-error{{extra argument in call}}
   }
   
-  convenience init(a : Z0) { // expected-note{{candidate has partially matching parameter list (a: Z0)}}
+  convenience init(a : Z0) { // expected-note{{candidate expects value of type 'Z0' for parameter #1}}
     self.init(42 as Int8) // expected-error{{no exact matches in call to initializer}}
   }
   
-  init(value: Int) { /* ... */ } // expected-note{{candidate has partially matching parameter list (value: Int)}}
-  init(value: Double) { /* ... */ } // expected-note{{candidate has partially matching parameter list (value: Double)}}
+  init(value: Int) { /* ... */ } // expected-note{{candidate expects value of type 'Int' for parameter #1}}
+  init(value: Double) { /* ... */ } // expected-note{{candidate expects value of type 'Double' for parameter #1}}
 }
 
 class TestNestedExpr {
diff --git a/test/expr/unary/keypath/keypath.swift b/test/expr/unary/keypath/keypath.swift
index 449876f2c8b98..45824a4f282c1 100644
--- a/test/expr/unary/keypath/keypath.swift
+++ b/test/expr/unary/keypath/keypath.swift
@@ -507,7 +507,7 @@ func testLabeledSubscript() {
   let k = \AA.[labeled: 0]
 
   // TODO: These ought to work without errors.
-  let _ = \AA.[keyPath: k] // expected-error {{extraneous argument label 'keyPath:' in call}}
+  let _ = \AA.[keyPath: k]
   // expected-error@-1 {{cannot convert value of type 'KeyPath<AA, Int>' to expected argument type 'Int'}}
 
   let _ = \AA.[keyPath: \AA.[labeled: 0]] // expected-error {{extraneous argument label 'keyPath:' in call}}
@@ -930,6 +930,85 @@ func testMissingMember() {
   _ = \String.x.y // expected-error {{value of type 'String' has no member 'x'}}
 }
 
+// SR-5688
+struct  SR5688_A {
+    var b: SR5688_B?
+}
+
+struct SR5688_AA {
+    var b: SR5688_B
+}
+
+struct SR5688_B {
+    var m: Int
+    var c: SR5688_C?
+}
+
+struct SR5688_C {
+    var d: Int
+}
+
+struct SR5688_S {
+  subscript(_ x: Int) -> String? { "" }
+}
+
+struct SR5688_O {
+  struct Nested {
+    var foo = ""
+  }
+}
+
+func SR5688_KP(_ kp: KeyPath<String?, Int>) {}
+
+func testMemberAccessOnOptionalKeyPathComponent() {
+
+  _ = \SR5688_A.b.m
+  // expected-error@-1 {{value of optional type 'SR5688_B?' must be unwrapped to refer to member 'm' of wrapped base type 'SR5688_B'}}
+  // expected-note@-2 {{chain the optional using '?' to access member 'm' only for non-'nil' base values}} {{18-18=?}}
+  // expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}} {{18-18=!}}
+
+  _ = \SR5688_A.b.c.d 
+  // expected-error@-1 {{value of optional type 'SR5688_B?' must be unwrapped to refer to member 'c' of wrapped base type 'SR5688_B'}} 
+  // expected-note@-2 {{chain the optional using '?' to access member 'c' only for non-'nil' base values}} {{18-18=?}}
+  // expected-error@-3 {{value of optional type 'SR5688_C?' must be unwrapped to refer to member 'd' of wrapped base type 'SR5688_C'}} 
+  // expected-note@-4 {{chain the optional using '?' to access member 'd' only for non-'nil' base values}} {{20-20=?}}
+  // expected-note@-5 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}} {{20-20=!}}
+  _ = \SR5688_A.b?.c.d 
+  // expected-error@-1 {{value of optional type 'SR5688_C?' must be unwrapped to refer to member 'd' of wrapped base type 'SR5688_C'}}
+  // expected-note@-2 {{chain the optional using '?' to access member 'd' only for non-'nil' base values}} {{21-21=?}}
+
+  _ = \SR5688_AA.b.c.d
+  // expected-error@-1 {{value of optional type 'SR5688_C?' must be unwrapped to refer to member 'd' of wrapped base type 'SR5688_C'}}
+  // expected-note@-2 {{chain the optional using '?' to access member 'd' only for non-'nil' base values}} {{21-21=?}}
+  // expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}} {{21-21=!}}
+
+  \String?.count 
+  // expected-error@-1 {{value of optional type 'String?' must be unwrapped to refer to member 'count' of wrapped base type 'String'}}
+  // expected-note@-2 {{use unwrapped type 'String' as key path root}} {{4-11=String}}
+  
+  \Optional<String>.count 
+  // expected-error@-1 {{value of optional type 'Optional<String>' must be unwrapped to refer to member 'count' of wrapped base type 'String'}}
+  // expected-note@-2 {{use unwrapped type 'String' as key path root}} {{4-20=String}}
+
+  \SR5688_S.[5].count 
+  // expected-error@-1 {{value of optional type 'String?' must be unwrapped to refer to member 'count' of wrapped base type 'String'}}
+  // expected-note@-2 {{chain the optional using '?' to access member 'count' only for non-'nil' base values}}{{16-16=?}}
+  // expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}{{16-16=!}}
+
+
+  \SR5688_O.Nested?.foo.count
+  // expected-error@-1 {{value of optional type 'SR5688_O.Nested?' must be unwrapped to refer to member 'foo' of wrapped base type 'SR5688_O.Nested'}}
+  // expected-note@-2 {{use unwrapped type 'SR5688_O.Nested' as key path root}}{{4-20=SR5688_O.Nested}}
+  
+  \(Int, Int)?.0
+  // expected-error@-1 {{value of optional type '(Int, Int)?' must be unwrapped to refer to member '0' of wrapped base type '(Int, Int)'}}
+  // expected-note@-2 {{use unwrapped type '(Int, Int)' as key path root}}{{4-15=(Int, Int)}}
+  
+  // TODO(diagnostics) Improve diagnostics refering to key path root not able to be infered as an optional type.
+  SR5688_KP(\.count)
+  // expected-error@-1 {{value of optional type 'String?' must be unwrapped to refer to member 'count' of wrapped base type 'String'}}
+}
+
 func testSyntaxErrors() { // expected-note{{}}
   _ = \.  ; // expected-error{{expected member name following '.'}}
   _ = \.a ;
diff --git a/test/expr/unary/keypath/salvage-with-other-type-errors.swift b/test/expr/unary/keypath/salvage-with-other-type-errors.swift
index 56aeeb10982e9..82e99397c2943 100644
--- a/test/expr/unary/keypath/salvage-with-other-type-errors.swift
+++ b/test/expr/unary/keypath/salvage-with-other-type-errors.swift
@@ -6,14 +6,14 @@
 struct P<T: K> { }
 
 struct S {
-    init<B>(_ a: P<B>) {
+    init<B>(_ a: P<B>) { // expected-note {{in call to initializer}}
         fatalError()
     }
 }
 
 protocol K { }
 
-func + <Object>(lhs: KeyPath<A, Object>, rhs: String) -> P<Object> { // expected-note {{where 'Object' = 'String'}}
+func + <Object>(lhs: KeyPath<A, Object>, rhs: String) -> P<Object> {
     fatalError()
 }
 
@@ -27,7 +27,9 @@ struct A {
 }
 
 extension A: K {
-    static let j = S(\A.id + "id") // expected-error {{operator function '+' requires that 'String' conform to 'K'}}
+  static let j = S(\A.id + "id") // expected-error {{generic parameter 'B' could not be inferred}}
+  // expected-error@-1 {{binary operator '+' cannot be applied to operands of type 'KeyPath<A, String>' and 'String'}}
+  // expected-note@-2 {{overloads for '+' exist with these partially matching parameter lists: (String, String)}}
 }
 
 // SR-5034
@@ -52,7 +54,7 @@ protocol Bindable: class { }
 extension Bindable {
   func test<Value>(to targetKeyPath: ReferenceWritableKeyPath<Self, Value>, change: Value?) {
     if self[keyPath:targetKeyPath] != change {
-      // expected-error@-1 {{operator function '!=' requires that 'Value' conform to 'Equatable'}}
+      // expected-error@-1 {{binary operator '!=' cannot be applied to operands of type 'Value' and 'Value?'}}
       self[keyPath: targetKeyPath] = change!
     }
   }
diff --git a/test/lit.cfg b/test/lit.cfg
index 511f4a3fcb89c..08a38a66606f2 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -100,6 +100,8 @@ def get_simulator_command(run_os, run_cpu, sdk_path):
 
 def get_lldb_python_path(lldb_build_root):
     lldb_path = os.path.join(lldb_build_root, 'bin', 'lldb')
+    if not os.access(lldb_path, os.F_OK):
+        return None
     return subprocess.check_output([lldb_path, "-P"]).rstrip()
 
 ###
@@ -238,6 +240,7 @@ if 'gmalloc' in lit_config.params:
     config.environment['MALLOC_LOG_FILE'] = '/dev/null'
     config.available_features.add('gmalloc')
 
+config.swift_frontend = inferSwiftBinary('swift-frontend')
 config.swift = inferSwiftBinary('swift')
 config.swiftc = inferSwiftBinary('swiftc')
 config.sil_opt = inferSwiftBinary('sil-opt')
@@ -376,10 +379,13 @@ config.substitutions.append( ('%validate-incrparse', '%{python} %utils/incrparse
 config.substitutions.append( ('%incr-transfer-tree', '%{python} %utils/incrparse/incr_transfer_tree.py --temp-dir %t --swift-syntax-test %swift-syntax-test') )
 config.substitutions.append( ('%swift_obj_root', config.swift_obj_root) )
 config.substitutions.append( ('%swift_src_root', config.swift_src_root) )
-config.substitutions.append( ('%{python}', sys.executable) )
+config.substitutions.append( ('%{python}', pipes.quote(sys.executable)) )
+config.substitutions.append( ('%{python.unquoted}', sys.executable) )
 config.substitutions.append( ('%mcp_opt', mcp_opt) )
 config.substitutions.append( ('%swift_driver_plain', "%r" % config.swift) )
 config.substitutions.append( ('%swiftc_driver_plain', "%r" % config.swiftc) )
+config.substitutions.append( ('%swift_frontend_plain', "%r" % config.swift_frontend))
+
 if kIsWindows:
     config.substitutions.append( ('%swift_driver',
                                   "%r %s %s %s -libc %s" % (config.swift, mcp_opt,
@@ -392,7 +398,7 @@ if kIsWindows:
                                                                            config.swift_driver_test_options)) )
 else:
     config.substitutions.append( ('%swift_driver', "env SDKROOT=%s %r %s %s %s" % (config.variant_sdk, config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
-    config.substitutions.append( ('%swiftc_driver', "env SDKROOT=%s %r -toolchain-stdlib-rpath %s %s %s" % (config.variant_sdk, config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
+    config.substitutions.append( ('%swiftc_driver', "env SDKROOT=%s %r -toolchain-stdlib-rpath -Xlinker -rpath -Xlinker /usr/lib/swift %s %s %s" % (config.variant_sdk, config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
 config.substitutions.append( ('%sil-opt', "%r %s %s" % (config.sil_opt, mcp_opt, config.sil_test_options)) )
 config.substitutions.append( ('%sil-func-extractor', "%r %s" % (config.sil_func_extractor, mcp_opt)) )
 config.substitutions.append( ('%sil-llvm-gen', "%r %s" % (config.sil_llvm_gen, mcp_opt)) )
@@ -432,8 +438,8 @@ config.substitutions.append( ('%swift-path', config.swift) )
 # This must come after all substitutions containing "%swift".
 config.substitutions.append(
     ('%swift',
-     "%r -frontend %s -disable-objc-attr-requires-foundation-module %s %s"
-       % (config.swift, mcp_opt, config.swift_test_options, config.swift_frontend_test_options)) )
+     "%r %s -disable-objc-attr-requires-foundation-module %s %s"
+       % (config.swift_frontend, mcp_opt, config.swift_test_options, config.swift_frontend_test_options)) )
 
 config.clang_include_dir = make_path(config.swift, '..', '..', 'include')
 config.substitutions.append( ('%clang-include-dir', config.clang_include_dir) )
@@ -693,7 +699,7 @@ if (run_os == 'maccatalyst'):
   target_os_abi = 'macosx'
   target_os_is_maccatalyst = "TRUE"
   config.available_features.add("OS=ios")
-if (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu', 'windows-msvc', 'linux-android']):
+if (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-cygnus', 'windows-gnu', 'windows-msvc', 'linux-android', 'linux-androideabi']):
   target_mandates_stable_abi = "TRUE"
   config.available_features.add('swift_only_stable_abi')
 config.substitutions.append(('%target-os-abi', target_os_abi))
@@ -815,7 +821,7 @@ if run_vendor == 'apple':
         'the swift_test_mode is "only_non_executable". Current '
         'swift_test_mode is {}.'.format(swift_test_mode))
 
-    if 'arm' in run_cpu:
+    if 'arm' in run_cpu and not (run_os == 'macosx' or run_os == 'maccatalyst'):
        # iOS/tvOS/watchOS device
        if run_os == 'ios':
            lit_config.note('Testing iOS ' + config.variant_triple)
@@ -836,7 +842,9 @@ if run_vendor == 'apple':
 
        config.target_build_swift = (
            ("%s %s %s -F %r -toolchain-stdlib-rpath " +
-            "-Xlinker -rpath -Xlinker %r %s %s %s %s") %
+            "-Xlinker -rpath -Xlinker %r " +
+            "-Xlinker -rpath -Xlinker /usr/lib/swift " +
+            "%s %s %s %s") %
            (xcrun_prefix, config.swiftc, target_options,
             extra_frameworks_dir,
             "/tmp/swifttest-device/lib",
@@ -873,7 +881,9 @@ if run_vendor == 'apple':
             (run_cpu, run_os, run_vers, clang_mcp_opt))
 
         config.target_build_swift = (
-            "%s %s %s -F %r -toolchain-stdlib-rpath %s %s %s %s" %
+            ("%s %s %s -F %r -toolchain-stdlib-rpath %s " +
+             "-Xlinker -rpath -Xlinker /usr/lib/swift " +
+             " %s %s %s") %
             (xcrun_prefix, config.swiftc, target_options,
              extra_frameworks_dir,
              sdk_overlay_linker_opt, config.swift_test_options,
@@ -930,7 +940,9 @@ if run_vendor == 'apple':
 
         config.target_build_swift = (
             ("%s %s %s %s -F %r -toolchain-stdlib-rpath "
-             + "-Xlinker -rpath -Xlinker %r %s %s %s %s "
+             + "-Xlinker -rpath -Xlinker %r "
+             + "-Xlinker -rpath -Xlinker /usr/lib/swift "
+             + "%s %s %s %s "
              + "-F %r -Xlinker -rpath -Xlinker %r")
             % (xcrun_prefix, config.swiftc, target_options,
                maccatalyst_frameworks_component,
@@ -941,7 +953,7 @@ if run_vendor == 'apple':
                sourcekitd_framework_dir))
 
         config.target_run = ""
-        target_future_version = "10.99"
+        target_future_version = "99.99"
 
         if 'interpret' in lit_config.params:
             use_interpreter_for_simple_runs()
@@ -964,12 +976,12 @@ if run_vendor == 'apple':
     if run_os == 'maccatalyst':
         maccatalyst_extra_frameworks = "-F {}/System/iOSSupport/System/Library/Frameworks".format(config.variant_sdk)
     config.target_swift_frontend = (
-        "%s -frontend %s -sdk %r %s %s %s" %
-        (config.swiftc, target_options, config.variant_sdk, maccatalyst_extra_frameworks,
+        "%s %s -sdk %r %s %s %s" %
+        (config.swift_frontend, target_options, config.variant_sdk, maccatalyst_extra_frameworks,
          config.swift_test_options, config.swift_frontend_test_options))
     subst_target_swift_frontend_mock_sdk = (
-        "%s -frontend %s -sdk %r %s %s" %
-        (config.swiftc, target_options_for_mock_sdk, config.variant_sdk,
+        "%s %s -sdk %r %s %s" %
+        (config.swift_frontend, target_options_for_mock_sdk, config.variant_sdk,
          config.swift_test_options, config.swift_frontend_test_options))
     config.target_swift_modulewrap = (
         '%s -modulewrap -target %s' %
@@ -999,7 +1011,8 @@ if run_vendor == 'apple':
     subst_target_swift_ide_test_mock_sdk_after = \
         target_options_for_mock_sdk_after
     config.target_swiftc_driver = (
-        "%s %s -toolchain-stdlib-rpath %s" %
+        ("%s %s -toolchain-stdlib-rpath %s " +
+         "-Xlinker -rpath -Xlinker /usr/lib/swift ")%
         (xcrun_prefix, config.swiftc, target_options))
     config.target_clang = (
         "%s clang++ %s" %
@@ -1042,7 +1055,7 @@ elif run_os in ['windows-msvc']:
     config.target_run = ''
 
     config.target_swift_frontend =                                               \
-            ('%r -frontend -target %s %s %s %s %s' % (config.swiftc,             \
+            ('%r -target %s %s %s %s %s' % (config.swift_frontend,             \
                                                       config.variant_triple,     \
                                                       resource_dir_opt, mcp_opt, \
                                                       config.swift_test_options, \
@@ -1167,8 +1180,8 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
         % (config.target_build_swift))
     config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
     config.target_swift_frontend = (
-        '%s -frontend -target %s %s %s %s %s '
-        % (config.swift, config.variant_triple, resource_dir_opt, mcp_opt,
+        '%s -target %s %s %s %s %s '
+        % (config.swift_frontend, config.variant_triple, resource_dir_opt, mcp_opt,
         config.swift_test_options, config.swift_frontend_test_options))
     subst_target_swift_frontend_mock_sdk = config.target_swift_frontend
     subst_target_swift_frontend_mock_sdk_after = ""
@@ -1286,8 +1299,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
         '-o', "'\\1'"])
     config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
     config.target_swift_frontend = ' '.join([
-        config.swift,
-        '-frontend',
+        config.swift_frontend,
         '-target', config.variant_triple,
         android_include_paths_opt, android_link_paths_opt,
         resource_dir_opt, mcp_opt, config.swift_test_options,
@@ -1354,7 +1366,7 @@ elif run_os == 'wasi':
         '-target', config.variant_triple,
         '-Xcc', '--sysroot=%s' % config.variant_sdk,
         '-Xclang-linker', '--sysroot=%s' % config.variant_sdk,
-        '-toolchain-stdlib-rpath', resource_dir_opt, 
+        '-toolchain-stdlib-rpath', resource_dir_opt,
         mcp_opt, config.swift_test_options,
         config.swift_driver_test_options, swift_execution_tests_extra_flags])
     config.target_codesign = "echo"
@@ -1363,8 +1375,7 @@ elif run_os == 'wasi':
         % (config.target_build_swift))
     config.target_add_rpath = ''
     config.target_swift_frontend = ' '.join([
-        config.swift,
-        '-frontend',
+        config.swift_frontend,
         '-target', config.variant_triple,
         '-Xcc', '--sysroot=%s' % config.variant_sdk,
         resource_dir_opt, mcp_opt,
@@ -1400,7 +1411,7 @@ elif run_os == 'wasi':
         "%s -target %s %s -fobjc-runtime=ios-5.0" %
         (config.clang, config.variant_triple, clang_mcp_opt))
     config.target_ld = (
-        "%s -L%r" % 
+        "%s -L%r" %
         (config.wasm_ld, make_path(test_resource_dir, config.target_sdk_name)))
 
     # The Swift interpreter is not available when targeting WebAssembly/WASI.
@@ -1553,7 +1564,7 @@ source_compiler_rt_libs(compiler_rt_dir)
 
 def check_runtime_libs(features_to_check):
     for lib in config.compiler_rt_libs:
-        for (libname, feature) in features_to_check.iteritems():
+        for (libname, feature) in features_to_check.items():
             if lib.startswith("libclang_rt." + libname + "_"):
                 config.available_features.add(feature)
 
@@ -1686,7 +1697,7 @@ if not kIsWindows:
 			"LD_LIBRARY_PATH='{0}:{1}' " # Linux option
 			"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
 			.format(all_stdlib_path, libdispatch_path)) + config.target_run
-			
+
 if not getattr(config, 'target_run_simple_swift', None):
     config.target_run_simple_swift_parameterized = SubstituteCaptures(
         "%%empty-directory(%%t) && "
@@ -1741,10 +1752,10 @@ if not getattr(config, 'target_run_simple_swift', None):
 
 # FIXME: why can we not use %rth and have that be expanded out?
 config.target_resilience_test = (
-     '%r %s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S '
+     '%s %s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S '
      '--s %%s --lib-prefix "%s" --lib-suffix "%s" --target-codesign "%s" '
      '--additional-compile-flags "%s" --triple "%s"'
-     % (sys.executable, config.rth, config.target_build_swift,
+     % (pipes.quote(sys.executable), config.rth, config.target_build_swift,
         config.target_run, config.target_shared_library_prefix,
         config.target_shared_library_suffix, config.target_codesign,
         rth_flags, config.variant_triple))
@@ -1812,15 +1823,15 @@ else:
        SubstituteCaptures(r'ln \1 \2 || cp \1 \2')))
 
 config.substitutions.append(('%utils', config.swift_utils))
-config.substitutions.append(('%line-directive', '%r %s' % (sys.executable, config.line_directive)))
-config.substitutions.append(('%gyb', '%r %s' % (sys.executable, config.gyb)))
+config.substitutions.append(('%line-directive', '%s %s' % (pipes.quote(sys.executable), config.line_directive)))
+config.substitutions.append(('%gyb', '%s %s' % (pipes.quote(sys.executable), config.gyb)))
 config.substitutions.append(('%round-trip-syntax-test',
-                             '%r %s' % (sys.executable,
+                             '%s %s' % (pipes.quote(sys.executable),
                                         config.round_trip_syntax_test)))
-config.substitutions.append(('%rth', '%r %s' % (sys.executable, config.rth)))
+config.substitutions.append(('%rth', '%s %s' % (pipes.quote(sys.executable), config.rth)))
 config.substitutions.append(('%scale-test',
                              '{} {} --swiftc-binary={} --tmpdir=%t'.format(
-                                 sys.executable, config.scale_test,
+                                 pipes.quote(sys.executable), config.scale_test,
                                  config.swiftc)))
 config.substitutions.append(('%empty-directory\(([^)]+)\)',
                              SubstituteCaptures(r'rm -rf "\1" && mkdir -p "\1"')))
@@ -1898,8 +1909,8 @@ if hasattr(config, 'otool_classic'):
     config.substitutions.append(('%otool-classic', config.otool_classic))
 
 config.substitutions.append(('%FileCheck',
-                             '%r %r --sanitize BUILD_DIR=%r --sanitize SOURCE_DIR=%r --use-filecheck %r %s' % (
-        sys.executable,
+                             '%s %r --sanitize BUILD_DIR=%r --sanitize SOURCE_DIR=%r --use-filecheck %r %s' % (
+        pipes.quote(sys.executable),
         config.PathSanitizingFileCheck,
         swift_obj_root,
         config.swift_src_root,
@@ -1909,15 +1920,23 @@ config.substitutions.append(('%raw-FileCheck', pipes.quote(config.filecheck)))
 config.substitutions.append(('%import-libdispatch', getattr(config, 'import_libdispatch', '')))
 
 if config.lldb_build_root != "":
-    config.available_features.add('lldb')
     lldb_python_path = get_lldb_python_path(config.lldb_build_root)
-    config.substitutions.append(('%lldb-python-path', lldb_python_path))
+    if lldb_python_path == None:
+        lit_config.warning("""
+        Specified lldb_build_root, but could not find lldb in that build root
+        """)
+    else:
+        config.available_features.add('lldb')
+        config.substitutions.append(('%lldb-python-path', lldb_python_path))
 
 # Disable randomized hash seeding by default. Tests need to manually opt in to
 # random seeds by unsetting the SWIFT_DETERMINISTIC_HASHING environment
 # variable.
 config.environment[TARGET_ENV_PREFIX + 'SWIFT_DETERMINISTIC_HASHING'] = '1'
 
+# Enable malloc scribble during tests by default.
+config.environment[TARGET_ENV_PREFIX + 'SWIFT_DEBUG_ENABLE_MALLOC_SCRIBBLE'] = 'YES'
+
 # Run lsb_release on the target to be tested and return the results.
 def linux_get_lsb_release():
     lsb_release_path = '/usr/bin/lsb_release'
diff --git a/test/refactoring/RefactoringKind/crashers.swift b/test/refactoring/RefactoringKind/crashers.swift
index cc64000987dcd..7be39848b21ea 100644
--- a/test/refactoring/RefactoringKind/crashers.swift
+++ b/test/refactoring/RefactoringKind/crashers.swift
@@ -38,3 +38,11 @@ func test_42098130<T>(e1: T, e2: E_42098130) {
 // RUN: %refactor -source-filename %s -pos=31:3 | %FileCheck %s -check-prefix=CHECK3
 // RUN: %refactor -source-filename %s -pos=32:3 | %FileCheck %s -check-prefix=CHECK3
 // CHECK3: Action begins
+
+// SR-13000
+enum Foo {}
+typealias Bar = (Any, Any) -> Foo
+extension /*invoke here:*/Bar {}
+
+// RUN: %refactor --actions -source-filename %s -pos=45:27 | %FileCheck %s -check-prefix=CHECK4
+// CHECK4: Action begins
diff --git a/test/stdlib/AVFoundation_Swift4.swift b/test/stdlib/AVFoundation_Swift4.swift
deleted file mode 100644
index 9c57d2dd7b795..0000000000000
--- a/test/stdlib/AVFoundation_Swift4.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 %s -o %t/a.out
-// RUN: %target-codesign %t/a.out
-// RUN: %target-run %t/a.out
-// REQUIRES: objc_interop
-// REQUIRES: executable_test
-// CoreMedia is not present on watchOS.
-// UNSUPPORTED: OS=watchos
-
-import AVFoundation
-import StdlibUnittest
-
-var AVFoundationTests = TestSuite("AVFoundation_Swift4")
-
-let pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
-
-#if os(macOS) || os(iOS)
-
-if #available(iOS 5, *) {
-  AVFoundationTests.test("AVCaptureVideoDataOutput.availableVideoPixelFormatTypes") {
-    func f(v: AVCaptureVideoDataOutput) -> Bool {
-      return v.availableVideoPixelFormatTypes.contains(pixelFormat)
-    }
-  }
-}
-
-#endif
-
-#if os(iOS)
-
-if #available(iOS 7, *) {
-  AVFoundationTests.test("AVMetadataMachineReadableCodeObject.corners") {
-    func f(m: AVMetadataMachineReadableCodeObject) -> Bool {
-      if let c = m.corners.first {
-        return c.x == 0
-      }
-      return false
-    }
-  }
-}
-
-if #available(iOS 10, *) {
-  AVFoundationTests.test("AVCaptureDevice.Format.supportedColorSpaces") {
-    func f(df: AVCaptureDevice.Format) -> Bool {
-      return df.supportedColorSpaces.contains(.sRGB)
-    }
-  }
-
-  AVFoundationTests.test("AVCapturePhotoOutput.supportedFlashModes") {
-    func f(p: AVCapturePhotoOutput) -> Bool {
-      return p.supportedFlashModes.contains(.off)
-    }
-  }
-
-  AVFoundationTests.test("AVCapturePhotoOutput.availablePhotoPixelFormatTypes") {
-    func f(p: AVCapturePhotoOutput) -> Bool {
-      return p.availablePhotoPixelFormatTypes.contains(pixelFormat)
-    }
-  }
-
-  AVFoundationTests.test("AVCapturePhotoOutput.availableRawPhotoPixelFormatTypes") {
-    func f(p: AVCapturePhotoOutput) -> Bool {
-      return p.availableRawPhotoPixelFormatTypes.contains(pixelFormat)
-    }
-  }
-
-  AVFoundationTests.test("AVCapturePhotoSettings.availablePreviewPhotoPixelFormatTypes") {
-    func f(p: AVCapturePhotoSettings) -> Bool {
-      return p.availablePreviewPhotoPixelFormatTypes.contains(pixelFormat)
-    }
-  }
-}
-
-if #available(iOS 11, *) {
-  AVFoundationTests.test("AVCaptureSynchronizedDataCollection.makeIterator()") {
-    func f(c: AVCaptureSynchronizedDataCollection) {
-      for _ in c {}
-    }
-  }
-}
-
-#endif
-
-runAllTests()
diff --git a/test/stdlib/Accelerate.swift b/test/stdlib/Accelerate.swift
deleted file mode 100644
index 7211442e50cec..0000000000000
--- a/test/stdlib/Accelerate.swift
+++ /dev/null
@@ -1,580 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var AccelerateTests = TestSuite("Accelerate")
-
-if #available(iOS 10.0, OSX 10.12, tvOS 10.0, watchOS 4.0, *) {
-    
-    AccelerateTests.test("BNNS/ImageStackDescriptor") {
-        var succeed = BNNSImageStackDescriptor(width: 0, height: 0, channels: 0,
-                                               row_stride: 0, image_stride: 0,
-                                               data_type: .int8)
-        expectEqual(succeed.data_scale, 1)
-        expectEqual(succeed.data_bias, 0)
-        succeed = BNNSImageStackDescriptor(width: 0, height: 0, channels: 0,
-                                           row_stride: 0, image_stride: 0,
-                                           data_type: .int16,
-                                           data_scale: 0.5, data_bias: 0.5)
-        expectEqual(succeed.data_scale, 0.5)
-        expectEqual(succeed.data_bias, 0.5)
-        expectCrashLater()
-        //  indexed8 is not allowed as an imageStack data type.
-        let _ = BNNSImageStackDescriptor(width: 0, height: 0, channels: 0,
-                                         row_stride: 0, image_stride: 0,
-                                         data_type: .indexed8)
-    }
-    
-    AccelerateTests.test("BNNS/VectorDescriptor") {
-        var succeed = BNNSVectorDescriptor(size: 0, data_type: .int8)
-        expectEqual(succeed.data_scale, 1)
-        expectEqual(succeed.data_bias, 0)
-        succeed = BNNSVectorDescriptor(size: 0, data_type: .int8,
-                                       data_scale: 0.5, data_bias: 0.5)
-        expectEqual(succeed.data_scale, 0.5)
-        expectEqual(succeed.data_bias, 0.5)
-        expectCrashLater()
-        //  indexed8 is not allowed as a vector data type.
-        let _ = BNNSVectorDescriptor(size: 0, data_type: .indexed8)
-    }
-    
-    AccelerateTests.test("BNNS/LayerData") {
-        //  The zero layer should have data == nil.
-        expectEqual(BNNSLayerData.zero.data, nil)
-        var succeed = BNNSLayerData(data: nil, data_type: .int8)
-        expectEqual(succeed.data_scale, 1)
-        expectEqual(succeed.data_bias, 0)
-        succeed = BNNSLayerData(data: nil, data_type: .int8, data_scale: 0.5,
-                                data_bias: 0.5, data_table: nil)
-        expectEqual(succeed.data_scale, 0.5)
-        expectEqual(succeed.data_bias, 0.5)
-        var table: [Float] = [1.0]
-        succeed = BNNSLayerData.indexed8(data: nil, data_table: &table)
-        expectCrashLater()
-        // indexed8 requires a non-nil data table.
-        let _ = BNNSLayerData(data: nil, data_type: .indexed8)
-    }
-    
-    AccelerateTests.test("BNNS/Activation") {
-        expectEqual(BNNSActivation.identity.function, .identity)
-        let id = BNNSActivation(function: .identity)
-        expectTrue(id.alpha.isNaN)
-        expectTrue(id.beta.isNaN)
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Discrete Cosine Transform
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-  
-    let n = 1024
-    
-    AccelerateTests.test("vDSP/DiscreteCosineTransform") {
-        
-        let source = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.05) + sin(Float(i) * 0.025)
-        }
-        
-        for transformType in vDSP.DCTTransformType.allCases {
-            
-            let dct = vDSP.DCT(count: n,
-                               transformType: transformType)
-            
-            var destination = [Float](repeating: 0,
-                                      count: n)
-            
-            dct?.transform(source,
-                           result: &destination)
-            
-            let returnedResult = dct!.transform(source)
-            
-            // Legacy API
-            
-            let legacySetup = vDSP_DCT_CreateSetup(nil,
-                                                   vDSP_Length(n),
-                                                   transformType.dctType)!
-            
-            var legacyDestination = [Float](repeating: -1,
-                                            count: n)
-            
-            vDSP_DCT_Execute(legacySetup,
-                             source,
-                             &legacyDestination)
-            
-            expectTrue(elementsAlmostEqual(destination, legacyDestination))
-            expectTrue(elementsAlmostEqual(destination, returnedResult))
-        }
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Sliding window summation
-//
-//===----------------------------------------------------------------------===//
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-  
-    AccelerateTests.test("vDSP/SinglePrecisionSlidingWindowSum") {
-        let source: [Float] = [1, 10, 12, 9, 3, 7, 2, 6]
-        var destination = [Float](repeating: .nan, count: 6)
-        
-        vDSP.slidingWindowSum(source,
-                              usingWindowLength: 3,
-                              result: &destination)
-        
-        let returnedResult = vDSP.slidingWindowSum(source,
-                                                   usingWindowLength: 3)
-        
-        expectTrue(elementsAlmostEqual(destination, returnedResult))
-        expectTrue(destination.map{ Int($0) }.elementsEqual([23, 31, 24, 19, 12, 15]))
-    }
-    
-    AccelerateTests.test("vDSP/DoublePrecisionSlidingWindowSum") {
-        let source: [Double] = [1, 10, 12, 9, 3, 7, 2, 6]
-        var destination = [Double](repeating: .nan, count: 6)
-        
-        vDSP.slidingWindowSum(source,
-                              usingWindowLength: 3,
-                              result: &destination)
-        
-        let returnedResult = vDSP.slidingWindowSum(source,
-                                                   usingWindowLength: 3)
-        
-        expectTrue(elementsAlmostEqual(destination, returnedResult))
-        expectTrue(destination.map{ Int($0) }.elementsEqual([23, 31, 24, 19, 12, 15]))
-    }
-  
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Linear interpolation
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 1024
-    
-    AccelerateTests.test("vDSP/SinglePrecisionInterpolateBetweenVectors") {
-        var result = [Float](repeating: 0, count: n)
-        var legacyResult = [Float](repeating: -1, count: n)
-        
-        let a: [Float] = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025)
-        }
-        
-        let b: [Float] =  (0 ..< n).map{ i in
-            return sin(Float(i) * 0.05)
-        }
-        
-        let interpolationConstant: Float = 0.5
-        
-        vDSP.linearInterpolate(a, b,
-                               using: interpolationConstant,
-                               result: &result)
-        
-        vDSP_vintb(a, 1,
-                   b, 1,
-                   [interpolationConstant],
-                   &legacyResult, 1,
-                   vDSP_Length(n))
-        
-        let returnedResult = vDSP.linearInterpolate(a, b,
-                                                    using: interpolationConstant)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/SinglePrecisionInterpolateBetweenNeighbours") {
-        var result = [Float](repeating: 0, count: n)
-        var legacyResult = [Float](repeating: -1, count: n)
-        
-        let shortSignal: [Float] = (0 ... 10).map{ i in
-            return sin(Float(i) * 0.1 * .pi * 4)
-        }
-        
-        let controlVector: [Float] = {
-            var controlVector = [Float](repeating: 0, count: 1024)
-            
-            vDSP_vgen([0],
-                      [Float(shortSignal.count)],
-                      &controlVector, 1,
-                      vDSP_Length(n))
-            
-            return controlVector
-        }()
-        
-        vDSP.linearInterpolate(elementsOf: shortSignal,
-                               using: controlVector,
-                               result: &result)
-        
-        vDSP_vlint(shortSignal,
-                   controlVector, 1,
-                   &legacyResult, 1,
-                   vDSP_Length(n),
-                   vDSP_Length(shortSignal.count))
-        
-        let returnedResult = vDSP.linearInterpolate(elementsOf: shortSignal,
-                                                    using: controlVector)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/DoublePrecisionInterpolateBetweenVectors") {
-        var result = [Double](repeating: 0, count: n)
-        var legacyResult = [Double](repeating: -1, count: n)
-        
-        let a: [Double] = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025)
-        }
-        
-        let b: [Double] =  (0 ..< n).map{ i in
-            return sin(Double(i) * 0.05)
-        }
-        
-        let interpolationConstant: Double = 0.5
-        
-        vDSP.linearInterpolate(a, b,
-                               using: interpolationConstant,
-                               result: &result)
-        
-        vDSP_vintbD(a, 1,
-                    b, 1,
-                    [interpolationConstant],
-                    &legacyResult, 1,
-                    vDSP_Length(n))
-        
-        let returnedResult = vDSP.linearInterpolate(a, b,
-                                                    using: interpolationConstant)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/DoublePrecisionInterpolateBetweenNeighbours") {
-        var result = [Double](repeating: 0, count: n)
-        var legacyResult = [Double](repeating: -1, count: n)
-        
-        let shortSignal: [Double] = (0 ... 10).map{ i in
-            return sin(Double(i) * 0.1 * .pi * 4)
-        }
-        
-        let controlVector: [Double] = {
-            var controlVector = [Double](repeating: 0, count: 1024)
-            
-            vDSP_vgenD([0],
-                       [Double(shortSignal.count)],
-                       &controlVector, 1,
-                       vDSP_Length(n))
-            
-            return controlVector
-        }()
-        
-        vDSP.linearInterpolate(elementsOf: shortSignal,
-                               using: controlVector,
-                               result: &result)
-        
-        vDSP_vlintD(shortSignal,
-                    controlVector, 1,
-                    &legacyResult, 1,
-                    vDSP_Length(n),
-                    vDSP_Length(shortSignal.count))
-        
-        let returnedResult = vDSP.linearInterpolate(elementsOf: shortSignal,
-                                                    using: controlVector)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP difference equation
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    AccelerateTests.test("vDSP/DifferenceEquationSinglePrecision") {
-        let n = 256
-        
-        let source: [Float] = (0 ..< n).map {
-            return sin(Float($0) * 0.05).sign == .minus ? -1 : 1
-        }
-        var result = [Float](repeating: 0, count: n)
-        var legacyResult = [Float](repeating: -1, count: n)
-        
-        let coefficients: [Float] = [0.0, 0.1, 0.2, 0.4, 0.8]
-        
-        vDSP.twoPoleTwoZeroFilter(source,
-                                  coefficients: (coefficients[0],
-                                                 coefficients[1],
-                                                 coefficients[2],
-                                                 coefficients[3],
-                                                 coefficients[4]),
-                                  result: &result)
-        
-        legacyResult[0] = 0
-        legacyResult[1] = 0
-        
-        vDSP_deq22(source, 1,
-                   coefficients,
-                   &legacyResult, 1,
-                   vDSP_Length(n-2))
-        
-        let returnedResult = vDSP.twoPoleTwoZeroFilter(source,
-                                                       coefficients: (coefficients[0],
-                                                                      coefficients[1],
-                                                                      coefficients[2],
-                                                                      coefficients[3],
-                                                                      coefficients[4]))
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/DifferenceEquationDoublePrecision") {
-        let n = 256
-        
-        let source: [Double] = (0 ..< n).map {
-            return sin(Double($0) * 0.05).sign == .minus ? -1 : 1
-        }
-        var result = [Double](repeating: 0, count: n)
-        var legacyResult = [Double](repeating: -1, count: n)
-        
-        let coefficients: [Double] = [0.0, 0.1, 0.2, 0.4, 0.8]
-        
-        vDSP.twoPoleTwoZeroFilter(source,
-                                  coefficients: (coefficients[0],
-                                                 coefficients[1],
-                                                 coefficients[2],
-                                                 coefficients[3],
-                                                 coefficients[4]),
-                                  result: &result)
-        
-        legacyResult[0] = 0
-        legacyResult[1] = 0
-        
-        vDSP_deq22D(source, 1,
-                    coefficients,
-                    &legacyResult, 1,
-                    vDSP_Length(n-2))
-        
-        let returnedResult = vDSP.twoPoleTwoZeroFilter(source,
-                                                       coefficients: (coefficients[0],
-                                                                      coefficients[1],
-                                                                      coefficients[2],
-                                                                      coefficients[3],
-                                                                      coefficients[4]))
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP downsampling
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    AccelerateTests.test("vDSP/DownsampleSinglePrecision") {
-        let decimationFactor = 2
-        let filterLength: vDSP_Length = 2
-        let filter = [Float](repeating: 1 / Float(filterLength),
-                             count: Int(filterLength))
-        
-        let originalSignal: [Float] = [10, 15, 20, 25, 50, 25, 20, 15, 10,
-                                       10, 15, 20, 25, 50, 25, 20, 15, 10]
-        
-        let inputLength = vDSP_Length(originalSignal.count)
-        
-        let n = vDSP_Length((inputLength - filterLength) / vDSP_Length(decimationFactor)) + 1
-        
-        var result = [Float](repeating: 0,
-                             count: Int(n))
-        
-        
-        vDSP.downsample(originalSignal,
-                        decimationFactor: decimationFactor,
-                        filter: filter,
-                        result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: Int(n))
-        
-        vDSP_desamp(originalSignal,
-                    decimationFactor,
-                    filter,
-                    &legacyResult,
-                    n,
-                    filterLength)
-        
-        let returnedResult = vDSP.downsample(originalSignal,
-                                             decimationFactor: decimationFactor,
-                                             filter: filter)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/DownsampleDoublePrecision") {
-        let decimationFactor = 2
-        let filterLength: vDSP_Length = 2
-        let filter = [Double](repeating: 1 / Double(filterLength),
-                              count: Int(filterLength))
-        
-        let originalSignal: [Double] = [10, 15, 20, 25, 50, 25, 20, 15, 10,
-                                        10, 15, 20, 25, 50, 25, 20, 15, 10]
-        
-        let inputLength = vDSP_Length(originalSignal.count)
-        
-        let n = vDSP_Length((inputLength - filterLength) / vDSP_Length(decimationFactor)) + 1
-        
-        var result = [Double](repeating: 0,
-                              count: Int(n))
-        
-        
-        vDSP.downsample(originalSignal,
-                        decimationFactor: decimationFactor,
-                        filter: filter,
-                        result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: Int(n))
-        
-        vDSP_desampD(originalSignal,
-                     decimationFactor,
-                     filter,
-                     &legacyResult,
-                     n,
-                     filterLength)
-        
-        let returnedResult = vDSP.downsample(originalSignal,
-                                             decimationFactor: decimationFactor,
-                                             filter: filter)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP polynomial evaluation.
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    AccelerateTests.test("vDSP/PolynomialEvaluationSinglePrecision") {
-        let coefficients: [Float] = [2, 3, 4, 5, 6, 7, 8, 9, 10]
-        let variables = (0 ... 100).map { return Float($0) }
-        var result = [Float](repeating: 0, count: variables.count)
-        
-        vDSP.evaluatePolynomial(usingCoefficients: coefficients,
-                                withVariables: variables,
-                                result: &result)
-        
-        var legacyResult = [Float](repeating: -1, count: variables.count)
-        
-        vDSP_vpoly(coefficients, 1,
-                   variables, 1,
-                   &legacyResult, 1,
-                   vDSP_Length(legacyResult.count),
-                   vDSP_Length(coefficients.count - 1))
-        
-        let returnedResult = vDSP.evaluatePolynomial(usingCoefficients: coefficients,
-                                                     withVariables: variables)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-    
-    AccelerateTests.test("vDSP/PolynomialEvaluationDoublePrecision") {
-        let coefficients: [Double] = [2, 3, 4, 5, 6, 7, 8, 9, 10]
-        let variables = (0 ... 100).map { return Double($0) }
-        var result = [Double](repeating: 0, count: variables.count)
-        
-        vDSP.evaluatePolynomial(usingCoefficients: coefficients,
-                                withVariables: variables,
-                                result: &result)
-        
-        var legacyResult = [Double](repeating: -1, count: variables.count)
-        
-        vDSP_vpolyD(coefficients, 1,
-                    variables, 1,
-                    &legacyResult, 1,
-                    vDSP_Length(legacyResult.count),
-                    vDSP_Length(coefficients.count - 1))
-        
-        let returnedResult = vDSP.evaluatePolynomial(usingCoefficients: coefficients,
-                                                     withVariables: variables)
-        
-        expectTrue(elementsAlmostEqual(result, legacyResult))
-        expectTrue(elementsAlmostEqual(result, returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  Array almost equal.
-//
-//===----------------------------------------------------------------------===//
-
-func elementsAlmostEqual<T: FloatingPoint>(_ lhs: [T], _ rhs: [T]) -> Bool {
-  var returnValue = true
-  zip(lhs, rhs).forEach {
-    if !isAlmostEqual($0.0, $0.1) {
-      returnValue = false
-      return
-    }
-  }
-  return returnValue
-}
-
-func isAlmostEqual<T: FloatingPoint>(_ lhs: T,
-  _ rhs: T,
-  tolerance: T = T.ulpOfOne.squareRoot()) -> Bool {
-  assert(tolerance >= .ulpOfOne && tolerance < 1, "tolerance should be in [.ulpOfOne, 1).")
-  guard lhs.isFinite && rhs.isFinite else {
-    return rescaledAlmostEqual(lhs, rhs, tolerance: tolerance)
-  }
-  let scale = max(abs(lhs), abs(rhs), .leastNormalMagnitude)
-  return abs(lhs - rhs) < scale*tolerance
-}
-
-func rescaledAlmostEqual<T: FloatingPoint>(_ lhs: T,
-  _ rhs: T,
-  tolerance: T) -> Bool {
-  if lhs.isNaN || rhs.isNaN { return false }
-  if lhs.isInfinite {
-    if rhs.isInfinite { return lhs == rhs }
-    let scaledLhs = T(sign: lhs.sign,
-      exponent: T.greatestFiniteMagnitude.exponent,
-      significand: 1)
-    let scaledRhs = T(sign: .plus,
-      exponent: -1,
-      significand: rhs)
-    return isAlmostEqual(scaledLhs, scaledRhs, tolerance: tolerance)
-  }
-  return rescaledAlmostEqual(rhs, lhs, tolerance: tolerance)
-}
-
-runAllTests()
-
diff --git a/test/stdlib/Accelerate_Quadrature.swift b/test/stdlib/Accelerate_Quadrature.swift
deleted file mode 100644
index 8ac2861c6ebaa..0000000000000
--- a/test/stdlib/Accelerate_Quadrature.swift
+++ /dev/null
@@ -1,310 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var AccelerateQuadratureTests = TestSuite("Accelerate_Quadrature")
-
-//===----------------------------------------------------------------------===//
-//
-//  Quadrature Tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    func vectorExp(x: UnsafeBufferPointer<Double>,
-                   y: UnsafeMutableBufferPointer<Double>) {
-        let radius: Double = 12.5
-        for i in 0 ..< x.count {
-            y[i] = sqrt(radius * radius - pow(x[i] - radius, 2))
-        }
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/QNG") {
-        var diameter: Double = 25
-        
-        // New API: Scalar
-        let quadrature = Quadrature(integrator: .nonAdaptive,
-                                    absoluteTolerance: 1.0e-8,
-                                    relativeTolerance: 1.0e-2)
-        
-        let result = quadrature.integrate(over: 0.0 ... diameter) { x in
-            let radius = diameter * 0.5
-            return sqrt(radius * radius - pow(x - radius, 2))
-        }
-        
-        // New API: Vectorized
-        let vQuadrature = Quadrature(integrator: .nonAdaptive,
-                                     absoluteTolerance: 1.0e-8,
-                                     relativeTolerance: 1.0e-2)
-        
-        let vRresult = vQuadrature.integrate(over: 0.0 ... diameter,
-                                             integrand: vectorExp)
-        
-        // Legacy API
-        var integrateFunction: quadrature_integrate_function = {
-            return quadrature_integrate_function(
-                fun: { (arg: UnsafeMutableRawPointer?,
-                    n: Int,
-                    x: UnsafePointer<Double>,
-                    y: UnsafeMutablePointer<Double>
-                    ) in
-                    
-                    guard let diameter = arg?.load(as: Double.self) else {
-                        return
-                    }
-                    
-                    let r = diameter * 0.5
-                    
-                    (0 ..< n).forEach { i in
-                        y[i] = sqrt(r * r - pow(x[i] - r, 2))
-                    }
-            },
-                fun_arg: &diameter)
-        }()
-        
-        var options = quadrature_integrate_options(integrator: QUADRATURE_INTEGRATE_QNG,
-                                                   abs_tolerance: 1.0e-8,
-                                                   rel_tolerance: 1.0e-2,
-                                                   qag_points_per_interval: 0,
-                                                   max_intervals: 0)
-        
-        var status = QUADRATURE_SUCCESS
-        var legacyEstimatedAbsoluteError: Double = 0
-        
-        let legacyResult = quadrature_integrate(&integrateFunction,
-                                                0.0,
-                                                diameter,
-                                                &options,
-                                                &status,
-                                                &legacyEstimatedAbsoluteError,
-                                                0,
-                                                nil)
-        
-        switch result {
-        case .success(let integralResult, let estimatedAbsoluteError):
-            expectEqual(integralResult, legacyResult)
-            expectEqual(estimatedAbsoluteError, legacyEstimatedAbsoluteError)
-            switch vRresult {
-            case .success(let vIntegralResult, let vEstimatedAbsoluteError):
-                expectEqual(integralResult, vIntegralResult)
-                expectEqual(estimatedAbsoluteError, vEstimatedAbsoluteError)
-            case .failure(_):
-                expectationFailure("Vectorized non-adaptive integration failed.", trace: "",
-                                   stackTrace: SourceLocStack())
-            }
-        case .failure( _):
-            expectationFailure("Non-adaptive integration failed.", trace: "",
-                               stackTrace: SourceLocStack())
-        }
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/QAGS") {
-        var diameter: Double = 25
-        
-        // New API
-        let quadrature = Quadrature(integrator: .adaptiveWithSingularities(maxIntervals: 11),
-                                    absoluteTolerance: 1.0e-8,
-                                    relativeTolerance: 1.0e-2)
-        
-        let result = quadrature.integrate(over: 0.0 ... diameter) { x in
-            let radius = diameter * 0.5
-            return sqrt(radius * radius - pow(x - radius, 2))
-        }
-        
-        // New API: Vectorized
-        let vQuadrature = Quadrature(integrator: .adaptiveWithSingularities(maxIntervals: 11),
-                                     absoluteTolerance: 1.0e-8,
-                                     relativeTolerance: 1.0e-2)
-        
-        let vRresult = vQuadrature.integrate(over: 0.0 ... diameter,
-                                             integrand: vectorExp)
-        
-        // Legacy API
-        var integrateFunction: quadrature_integrate_function = {
-            return quadrature_integrate_function(
-                fun: { (arg: UnsafeMutableRawPointer?,
-                    n: Int,
-                    x: UnsafePointer<Double>,
-                    y: UnsafeMutablePointer<Double>
-                    ) in
-                    
-                    guard let diameter = arg?.load(as: Double.self) else {
-                        return
-                    }
-                    
-                    let r = diameter * 0.5
-                    
-                    (0 ..< n).forEach { i in
-                        y[i] = sqrt(r * r - pow(x[i] - r, 2))
-                    }
-            },
-                fun_arg: &diameter)
-        }()
-        
-        var options = quadrature_integrate_options(integrator: QUADRATURE_INTEGRATE_QAGS,
-                                                   abs_tolerance: 1.0e-8,
-                                                   rel_tolerance: 1.0e-2,
-                                                   qag_points_per_interval: 0,
-                                                   max_intervals: 11)
-        
-        var status = QUADRATURE_SUCCESS
-        var legacyEstimatedAbsoluteError = Double(0)
-        
-        let legacyResult = quadrature_integrate(&integrateFunction,
-                                                0,
-                                                diameter,
-                                                &options,
-                                                &status,
-                                                &legacyEstimatedAbsoluteError,
-                                                0,
-                                                nil)
-        
-        switch result {
-        case .success(let integralResult, let estimatedAbsoluteError):
-            expectEqual(integralResult, legacyResult)
-            expectEqual(estimatedAbsoluteError, legacyEstimatedAbsoluteError)
-            switch vRresult {
-            case .success(let vIntegralResult, let vEstimatedAbsoluteError):
-                expectEqual(integralResult, vIntegralResult)
-                expectEqual(estimatedAbsoluteError, vEstimatedAbsoluteError)
-            case .failure(_):
-                expectationFailure("Vectorized adaptive with singularities integration failed.", trace: "",
-                                   stackTrace: SourceLocStack())
-            }
-        case .failure( _):
-            expectationFailure("Adaptive with singularities integration failed.", trace: "",
-                               stackTrace: SourceLocStack())
-        }
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/QAG") {
-        var diameter: Double = 25
-        
-        // New API
-        let quadrature = Quadrature(integrator: .adaptive(pointsPerInterval: .sixtyOne,
-                                                          maxIntervals: 7),
-                                    absoluteTolerance: 1.0e-8,
-                                    relativeTolerance: 1.0e-2)
-        
-        let result = quadrature.integrate(over: 0.0 ... diameter) { x in
-            let radius: Double = diameter * 0.5
-            return sqrt(radius * radius - pow(x - radius, 2))
-        }
-        
-        // New API: Vectorized
-        let vQuadrature = Quadrature(integrator: .adaptive(pointsPerInterval: .sixtyOne,
-                                                           maxIntervals: 7),
-                                     absoluteTolerance: 1.0e-8,
-                                     relativeTolerance: 1.0e-2)
-        
-        let vRresult = vQuadrature.integrate(over: 0.0 ... diameter,
-                                             integrand: vectorExp)
-        
-        // Legacy API
-        var integrateFunction: quadrature_integrate_function = {
-            return quadrature_integrate_function(
-                fun: { (arg: UnsafeMutableRawPointer?,
-                    n: Int,
-                    x: UnsafePointer<Double>,
-                    y: UnsafeMutablePointer<Double>
-                    ) in
-                    
-                    guard let diameter = arg?.load(as: Double.self) else {
-                        return
-                    }
-                    
-                    let r = diameter * 0.5
-                    
-                    (0 ..< n).forEach { i in
-                        y[i] = sqrt(r * r - pow(x[i] - r, 2))
-                    }
-            },
-                fun_arg: &diameter)
-        }()
-        
-        var options = quadrature_integrate_options(integrator: QUADRATURE_INTEGRATE_QAG,
-                                                   abs_tolerance: 1.0e-8,
-                                                   rel_tolerance: 1.0e-2,
-                                                   qag_points_per_interval: 61,
-                                                   max_intervals: 7)
-        
-        var status = QUADRATURE_SUCCESS
-        var legacyEstimatedAbsoluteError = Double(0)
-        
-        let legacyResult = quadrature_integrate(&integrateFunction,
-                                                0,
-                                                diameter,
-                                                &options,
-                                                &status,
-                                                &legacyEstimatedAbsoluteError,
-                                                0,
-                                                nil)
-        
-        switch result {
-        case .success(let integralResult, let estimatedAbsoluteError):
-            expectEqual(integralResult, legacyResult)
-            expectEqual(estimatedAbsoluteError, legacyEstimatedAbsoluteError)
-            switch vRresult {
-            case .success(let vIntegralResult, let vEstimatedAbsoluteError):
-                expectEqual(integralResult, vIntegralResult)
-                expectEqual(estimatedAbsoluteError, vEstimatedAbsoluteError)
-            case .failure(_):
-                expectationFailure("Vectorized adaptive integration failed.", trace: "",
-                                   stackTrace: SourceLocStack())
-            }
-        case .failure( _):
-            expectationFailure("Adaptive integration failed.", trace: "",
-                               stackTrace: SourceLocStack())
-        }
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/ToleranceProperties") {
-        var quadrature = Quadrature(integrator: .qng,
-                                    absoluteTolerance: 1,
-                                    relativeTolerance: 2)
-        
-        expectEqual(quadrature.absoluteTolerance, 1)
-        expectEqual(quadrature.relativeTolerance, 2)
-        
-        quadrature.absoluteTolerance = 101
-        quadrature.relativeTolerance = 102
-        
-        expectEqual(quadrature.absoluteTolerance, 101)
-        expectEqual(quadrature.relativeTolerance, 102)
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/QAGPointsPerInterval") {
-        expectEqual(Quadrature.QAGPointsPerInterval.fifteen.points, 15)
-        expectEqual(Quadrature.QAGPointsPerInterval.twentyOne.points, 21)
-        expectEqual(Quadrature.QAGPointsPerInterval.thirtyOne.points, 31)
-        expectEqual(Quadrature.QAGPointsPerInterval.fortyOne.points, 41)
-        expectEqual(Quadrature.QAGPointsPerInterval.fiftyOne.points, 51)
-        expectEqual(Quadrature.QAGPointsPerInterval.sixtyOne.points, 61)
-    }
-    
-    AccelerateQuadratureTests.test("Quadrature/ErrorDescription") {
-        let a = Quadrature.Error(quadratureStatus: QUADRATURE_ERROR)
-        expectEqual(a.errorDescription, "Generic error.")
-        
-        let b = Quadrature.Error(quadratureStatus: QUADRATURE_INVALID_ARG_ERROR)
-        expectEqual(b.errorDescription, "Invalid Argument.")
-        
-        let c = Quadrature.Error(quadratureStatus: QUADRATURE_INTERNAL_ERROR)
-        expectEqual(c.errorDescription, "This is a bug in the Quadrature code, please file a bug report.")
-        
-        let d = Quadrature.Error(quadratureStatus: QUADRATURE_INTEGRATE_MAX_EVAL_ERROR)
-        expectEqual(d.errorDescription, "The requested accuracy limit could not be reached with the allowed number of evals/subdivisions.")
-        
-        let e = Quadrature.Error(quadratureStatus: QUADRATURE_INTEGRATE_BAD_BEHAVIOUR_ERROR)
-        expectEqual(e.errorDescription, "Extremely bad integrand behaviour, or excessive roundoff error occurs at some points of the integration interval.")
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPBiquad.swift b/test/stdlib/Accelerate_vDSPBiquad.swift
deleted file mode 100644
index 26189cc92d343..0000000000000
--- a/test/stdlib/Accelerate_vDSPBiquad.swift
+++ /dev/null
@@ -1,262 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPBiquadTests = TestSuite("Accelerate_vDSPBiquad")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Biquad Filters
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 256
-    
-    // low pass
-    let b0 = 0.0001
-    let b1 = 0.001
-    let b2 = 0.0005
-    let a1 = -1.9795
-    let a2 = 0.98
-    
-    let sections = vDSP_Length(1)
-    
-    Accelerate_vDSPBiquadTests.test("vDSP/BiquadNil") {
-        let biquad = vDSP.Biquad(coefficients: [0.0],
-                                 channelCount: 9999,
-                                 sectionCount: 9999,
-                                 ofType: Float.self)
-        
-        expectTrue(biquad == nil)
-    }
-    
-    Accelerate_vDSPBiquadTests.test("vDSP/SingleChannelSinglePrecision") {
-        let channels = vDSP_Length(1)
-        
-        let signal: [Float] = (0 ..< n).map { i in
-            return sin(Float(i) * 0.1) + sin(Float(i) * 0.01)
-        }
-        
-        var biquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2],
-                                 channelCount: sections,
-                                 sectionCount: channels,
-                                 ofType: Float.self)!
-        
-        var returningBiquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2],
-                                          channelCount: sections,
-                                          sectionCount: channels,
-                                          ofType: Float.self)!
-        
-        var output = [Float](repeating: 0,
-                             count: n)
-        
-        // Legacy...
-        var legacyOutput = [Float](repeating: -1,
-                                   count: n)
-        
-        var delays = [Float](repeating: 0.0,
-                             count: Int(2 * sections) + 2)
-        
-        let setup = vDSP_biquad_CreateSetup([b0, b1, b2, a1, a2],
-                                            sections)!
-        
-        for _ in 0 ... 3 {
-            
-            biquad.apply(input: signal,
-                         output: &output)
-            
-            let returnedOutput = returningBiquad.apply(input: signal)
-            
-            vDSP_biquad(setup,
-                        &delays,
-                        signal, 1,
-                        &legacyOutput, 1,
-                        vDSP_Length(n))
-            
-            expectTrue(output.elementsEqual(legacyOutput))
-            expectTrue(output.elementsEqual(returnedOutput))
-        }
-    }
-    
-    Accelerate_vDSPBiquadTests.test("vDSP/MultiChannelSinglePrecision") {
-        let channelCount = vDSP_Length(2)
-        
-        let signal: [Float] = (0 ..< n).map { i in
-            return sin(Float(i) * 0.1) + sin(Float(i) * 0.01)
-        }
-        
-        var biquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2,
-                                                b0, b1, b2, a1, a2],
-                                 channelCount: channelCount,
-                                 sectionCount: sections,
-                                 ofType: Float.self)!
-        
-        var returningBiquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2,
-                                                         b0, b1, b2, a1, a2],
-                                          channelCount: channelCount,
-                                          sectionCount: sections,
-                                          ofType: Float.self)!
-        
-        var output = [Float](repeating: 0,
-                             count: n)
-        
-        // Legacy...
-        var legacyOutput = [Float](repeating: -1,
-                                   count: n)
-        
-        let setup = vDSP_biquadm_CreateSetup([b0, b1, b2, a1, a2,
-                                              b0, b1, b2, a1, a2],
-                                             vDSP_Length(sections),
-                                             vDSP_Length(channelCount))!
-        
-        for _ in 0 ... 3 {
-            
-            biquad.apply(input: signal,
-                         output: &output)
-            
-            let returnedOutput = returningBiquad.apply(input: signal)
-            
-            signal.withUnsafeBufferPointer { inputBuffer in
-                let inputPointer = inputBuffer.baseAddress!
-                legacyOutput.withUnsafeMutableBufferPointer { outputBuffer in
-                    let outputPointer = outputBuffer.baseAddress!
-                    
-                    let length = vDSP_Length(n) / channelCount
-                    
-                    var inputs: [UnsafePointer<Float>] = (0 ..< channelCount).map { i in
-                        return inputPointer.advanced(by: Int(i * length))
-                    }
-                    
-                    var outputs: [UnsafeMutablePointer<Float>] = (0 ..< channelCount).map { i in
-                        return outputPointer.advanced(by: Int(i * length))
-                    }
-                    
-                    vDSP_biquadm(setup, &inputs, 1, &outputs, 1, vDSP_Length(n) / channelCount)
-                }
-            }
-            
-            expectTrue(output.elementsEqual(legacyOutput))
-            expectTrue(output.elementsEqual(returnedOutput))
-        }
-    }
-    
-    Accelerate_vDSPBiquadTests.test("vDSP/SingleChannelDoublePrecision") {
-        let channels = vDSP_Length(1)
-        
-        let signal: [Double] = (0 ..< n).map { i in
-            return sin(Double(i) * 0.1) + sin(Double(i) * 0.01)
-        }
-        
-        var biquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2],
-                                 channelCount: sections,
-                                 sectionCount: channels,
-                                 ofType: Double.self)!
-        
-        var returningBiquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2],
-                                          channelCount: sections,
-                                          sectionCount: channels,
-                                          ofType: Double.self)!
-        
-        var output = [Double](repeating: 0,
-                              count: n)
-        
-        // Legacy...
-        var legacyOutput = [Double](repeating: -1,
-                                    count: n)
-        
-        var delays = [Double](repeating: 0.0,
-                              count: Int(2 * sections) + 2)
-        
-        let setup = vDSP_biquad_CreateSetupD([b0, b1, b2, a1, a2],
-                                             sections)!
-        
-        for _ in 0 ... 3 {
-            
-            biquad.apply(input: signal,
-                         output: &output)
-            
-            let returnedOutput = returningBiquad.apply(input: signal)
-            
-            vDSP_biquadD(setup,
-                         &delays,
-                         signal, 1,
-                         &legacyOutput, 1,
-                         vDSP_Length(n))
-            
-            expectTrue(output.elementsEqual(legacyOutput))
-            expectTrue(output.elementsEqual(returnedOutput))
-        }
-    }
-    
-    Accelerate_vDSPBiquadTests.test("vDSP/MultiChannelDoublePrecision") {
-        let channelCount = vDSP_Length(2)
-        
-        let signal: [Double] = (0 ..< n).map { i in
-            return sin(Double(i) * 0.1) + sin(Double(i) * 0.01)
-        }
-        
-        var biquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2,
-                                                b0, b1, b2, a1, a2],
-                                 channelCount: channelCount,
-                                 sectionCount: sections,
-                                 ofType: Double.self)!
-        
-        var returningBiquad = vDSP.Biquad(coefficients: [b0, b1, b2, a1, a2,
-                                                         b0, b1, b2, a1, a2],
-                                          channelCount: channelCount,
-                                          sectionCount: sections,
-                                          ofType: Double.self)!
-        
-        var output = [Double](repeating: 0,
-                              count: n)
-        
-        // Legacy...
-        var legacyOutput = [Double](repeating: -1,
-                                    count: n)
-        
-        let setup = vDSP_biquadm_CreateSetupD([b0, b1, b2, a1, a2,
-                                               b0, b1, b2, a1, a2],
-                                              vDSP_Length(sections),
-                                              vDSP_Length(channelCount))!
-        
-        for _ in 0 ... 3 {
-            
-            biquad.apply(input: signal,
-                         output: &output)
-            
-            let returnedOutput = returningBiquad.apply(input: signal)
-            
-            signal.withUnsafeBufferPointer { inputBuffer in
-                let inputPointer = inputBuffer.baseAddress!
-                legacyOutput.withUnsafeMutableBufferPointer { outputBuffer in
-                    let outputPointer = outputBuffer.baseAddress!
-                    
-                    let length = vDSP_Length(n) / channelCount
-                    
-                    var inputs: [UnsafePointer<Double>] = (0 ..< channelCount).map { i in
-                        return inputPointer.advanced(by: Int(i * length))
-                    }
-                    
-                    var outputs: [UnsafeMutablePointer<Double>] = (0 ..< channelCount).map { i in
-                        return outputPointer.advanced(by: Int(i * length))
-                    }
-                    
-                    vDSP_biquadmD(setup, &inputs, 1, &outputs, 1, vDSP_Length(n) / channelCount)
-                }
-            }
-            
-            expectTrue(output.elementsEqual(legacyOutput))
-            expectTrue(output.elementsEqual(returnedOutput))
-        }
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPClippingLimitThreshold.swift b/test/stdlib/Accelerate_vDSPClippingLimitThreshold.swift
deleted file mode 100644
index 19a0d4ef63e8c..0000000000000
--- a/test/stdlib/Accelerate_vDSPClippingLimitThreshold.swift
+++ /dev/null
@@ -1,352 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPClippingLimitThresholdTests = TestSuite("Accelerate_vDSPClippingLimitThreshold")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP clipping, limit, and threshold tests; single-precision.
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 256
-    let n = vDSP_Length(256)
-    let bounds = Float(-0.5) ... Float(0.5)
-    let outputConstant: Float = 99
-    
-    let source: [Float] = (0 ..< 256).map { i in
-        return sin(Float(i) * 0.05) + sin(Float(i) * 0.025)
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionClipping") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.clip(source,
-                  to: bounds,
-                  result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vclip(source, 1,
-                   [bounds.lowerBound],
-                   [bounds.upperBound],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.clip(source,
-                                       to: bounds)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionInvertedClipping") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.invertedClip(source,
-                          to: bounds,
-                          result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_viclip(source, 1,
-                    [bounds.lowerBound],
-                    [bounds.upperBound],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.invertedClip(source,
-                                               to: bounds)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionThreshold") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .clampToThreshold,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vthr(source, 1,
-                  [bounds.lowerBound],
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .clampToThreshold)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionThresholdWithConstant") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .signedConstant(outputConstant),
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vthrsc(source, 1,
-                    [bounds.lowerBound],
-                    [outputConstant],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .signedConstant(outputConstant))
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionThresholdWithZeroFill") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .zeroFill,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vthres(source, 1,
-                    [bounds.lowerBound],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .zeroFill)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/SinglePrecisionLimit") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.limit(source,
-                   limit: bounds.upperBound,
-                   withOutputConstant: outputConstant,
-                   result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vlim(source, 1,
-                  [bounds.upperBound],
-                  [outputConstant],
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.limit(source,
-                                        limit: bounds.upperBound,
-                                        withOutputConstant: outputConstant)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP clipping, limit, and threshold tests; double-precision.
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 256
-    let n = vDSP_Length(256)
-    let bounds = Double(-0.5) ... Double(0.5)
-    let outputConstant: Double = 99
-    
-    let source: [Double] = (0 ..< 256).map { i in
-        return sin(Double(i) * 0.05) + sin(Double(i) * 0.025)
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionClipping") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.clip(source,
-                  to: bounds,
-                  result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vclipD(source, 1,
-                    [bounds.lowerBound],
-                    [bounds.upperBound],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.clip(source,
-                                       to: bounds)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionInvertedClipping") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.invertedClip(source,
-                          to: bounds,
-                          result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_viclipD(source, 1,
-                     [bounds.lowerBound],
-                     [bounds.upperBound],
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.invertedClip(source,
-                                               to: bounds)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionThreshold") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .clampToThreshold,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vthrD(source, 1,
-                   [bounds.lowerBound],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .clampToThreshold)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionThresholdWithConstant") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .signedConstant(outputConstant),
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vthrscD(source, 1,
-                     [bounds.lowerBound],
-                     [outputConstant],
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .signedConstant(outputConstant))
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionThresholdWithZeroFill") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.threshold(source,
-                       to: bounds.lowerBound,
-                       with: .zeroFill,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vthresD(source, 1,
-                     [bounds.lowerBound],
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.threshold(source,
-                                            to: bounds.lowerBound,
-                                            with: .zeroFill)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPClippingLimitThresholdTests.test("vDSP/DoublePrecisionLimit") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.limit(source,
-                   limit: bounds.upperBound,
-                   withOutputConstant: outputConstant,
-                   result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vlimD(source, 1,
-                   [bounds.upperBound],
-                   [outputConstant],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.limit(source,
-                                        limit: bounds.upperBound,
-                                        withOutputConstant: outputConstant)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPComplexOperations.swift b/test/stdlib/Accelerate_vDSPComplexOperations.swift
deleted file mode 100644
index 709be26ffd5c7..0000000000000
--- a/test/stdlib/Accelerate_vDSPComplexOperations.swift
+++ /dev/null
@@ -1,532 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPComplexOperationsTests = TestSuite("Accelerate_vDSPComplexOperations")
-
-//===----------------------------------------------------------------------===//
-//
-//  Complex operations tests; single-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 1024
-    
-    var imaginarySource: [Float] = (0 ..< n).map{ i in
-        return 1 + sin(Float(i) * 0.05)
-    }
-    
-    var realSource: [Float] = (0 ..< n).map{ i in
-        return 1 + cos(Float(i) * 0.05)
-    }
-    
-    var splitComplexSource = DSPSplitComplex(realp: &realSource,
-                                             imagp: &imaginarySource)
-    
-    let vectorSource: [Float] = (0 ..< n).map{ i in
-        return 1 + sin(Float(i) * 0.025)
-    }
-    
-    var realResult = [Float](repeating: 0, count: n)
-    var imaginaryResult = [Float](repeating: 0, count: n)
-    var splitComplexResult = DSPSplitComplex(realp: &realResult,
-                                             imagp: &imaginaryResult)
-    
-    var realLegacyResult = [Float](repeating: -1, count: n)
-    var imaginaryLegacyResult = [Float](repeating: -1, count: n)
-    var splitComplexLegacyResult = DSPSplitComplex(realp: &realLegacyResult,
-                                                   imagp: &imaginaryLegacyResult)
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexAbsolute") {
-        vDSP.absolute(splitComplexSource,
-                      result: &realResult)
-        
-        vDSP_zvabs(&splitComplexSource, 1,
-                   &realLegacyResult, 1,
-                   vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/SquareMagnitudes") {
-        vDSP.squareMagnitudes(splitComplexSource,
-                              result: &realResult)
-        
-        vDSP_zvmags(&splitComplexSource, 1,
-                    &realLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Conjugate") {
-        vDSP.conjugate(splitComplexSource,
-                       count: n,
-                       result: &splitComplexResult)
-        
-        vDSP_zvconj(&splitComplexSource, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexAdd") {
-        var real = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025)
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Float(i) * 0.025)
-        }
-        var splitComplexSource2 = DSPSplitComplex(realp: &real,
-                                                  imagp: &imag)
-        
-        vDSP.add(splitComplexSource,
-                 to: splitComplexSource2,
-                 count: n,
-                 result: &splitComplexResult)
-        
-        vDSP_zvadd(&splitComplexSource, 1,
-                   &splitComplexSource2, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexDivide") {
-        var real = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Float(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPSplitComplex(realp: &real,
-                                                  imagp: &imag)
-        
-        vDSP.divide(splitComplexSource,
-                    by: splitComplexSource2,
-                    count: n,
-                    result: &splitComplexResult)
-        
-        vDSP_zvdiv(&splitComplexSource2, 1,
-                   &splitComplexSource, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexDivide") {
-        var real = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Float(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPSplitComplex(realp: &real,
-                                                  imagp: &imag)
-        
-        vDSP.divide(splitComplexSource,
-                    by: splitComplexSource2,
-                    count: n,
-                    result: &splitComplexResult)
-        
-        vDSP_zvdiv(&splitComplexSource2, 1,
-                   &splitComplexSource, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexSubtract") {
-        var real = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Float(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPSplitComplex(realp: &real,
-                                                  imagp: &imag)
-        
-        vDSP.subtract(splitComplexSource,
-                      from: splitComplexSource2,
-                      count: n,
-                      result: &splitComplexResult)
-        
-        vDSP_zvsub(&splitComplexSource, 1,
-                   &splitComplexSource2, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexMultiply") {
-        var real = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.025)
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Float(i) * 0.025)
-        }
-        var splitComplexSource2 = DSPSplitComplex(realp: &real,
-                                                  imagp: &imag)
-        
-        vDSP.multiply(splitComplexSource,
-                      by: splitComplexSource2,
-                      count: n,
-                      useConjugate: false,
-                      result: &splitComplexResult)
-        
-        vDSP_zvmul(&splitComplexSource, 1,
-                   &splitComplexSource2, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n),
-                   1)
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-        
-        vDSP.multiply(splitComplexSource,
-                      by: splitComplexSource2,
-                      count: n,
-                      useConjugate: true,
-                      result: &splitComplexResult)
-        
-        vDSP_zvmul(&splitComplexSource, 1,
-                   &splitComplexSource2, 1,
-                   &splitComplexLegacyResult, 1,
-                   vDSP_Length(n),
-                   -1)
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Multiply") {
-        vDSP.multiply(splitComplexSource,
-                      by: vectorSource,
-                      result: &splitComplexResult)
-        
-        vDSP_zrvmul(&splitComplexSource, 1,
-                    vectorSource, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Divide") {
-        vDSP.divide(splitComplexSource,
-                    by: vectorSource,
-                    result: &splitComplexResult)
-        
-        vDSP_zrvdiv(&splitComplexSource, 1,
-                    vectorSource, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Phase") {
-        vDSP.phase(splitComplexSource,
-                   result: &realResult)
-        
-        vDSP_zvphas(&splitComplexSource, 1,
-                    &realLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Copy") {
-        expectFalse(imaginaryResult.elementsEqual(imaginarySource))
-        expectFalse(realResult.elementsEqual(realSource))
-        
-        vDSP.copy(splitComplexSource,
-                  to: &splitComplexResult,
-                  count: n)
-        
-        expectTrue(imaginaryResult.elementsEqual(imaginarySource))
-        expectTrue(realResult.elementsEqual(realSource))
-    }
-}
-
-
-//===----------------------------------------------------------------------===//
-//
-//  Complex operations tests; double-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 1024
-    
-    var imaginarySource: [Double] = (0 ..< n).map{ i in
-        return 1 + sin(Double(i) * 0.05)
-    }
-    
-    var realSource: [Double] = (0 ..< n).map{ i in
-        return 1 + cos(Double(i) * 0.05)
-    }
-    
-    var splitComplexSource = DSPDoubleSplitComplex(realp: &realSource,
-                                                   imagp: &imaginarySource)
-    
-    let vectorSource: [Double] = (0 ..< n).map{ i in
-        return 1 + sin(Double(i) * 0.025)
-    }
-    
-    var realResult = [Double](repeating: 0, count: n)
-    var imaginaryResult = [Double](repeating: 0, count: n)
-    var splitComplexResult = DSPDoubleSplitComplex(realp: &realResult,
-                                                   imagp: &imaginaryResult)
-    
-    var realLegacyResult = [Double](repeating: -1, count: n)
-    var imaginaryLegacyResult = [Double](repeating: -1, count: n)
-    var splitComplexLegacyResult = DSPDoubleSplitComplex(realp: &realLegacyResult,
-                                                         imagp: &imaginaryLegacyResult)
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexAbsolute") {
-        vDSP.absolute(splitComplexSource,
-                      result: &realResult)
-        
-        vDSP_zvabsD(&splitComplexSource, 1,
-                    &realLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/SquareMagnitudes") {
-        vDSP.squareMagnitudes(splitComplexSource,
-                              result: &realResult)
-        
-        vDSP_zvmagsD(&splitComplexSource, 1,
-                     &realLegacyResult, 1,
-                     vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Conjugate") {
-        vDSP.conjugate(splitComplexSource,
-                       count: n,
-                       result: &splitComplexResult)
-        
-        vDSP_zvconjD(&splitComplexSource, 1,
-                     &splitComplexLegacyResult, 1,
-                     vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexAdd") {
-        var real = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025)
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Double(i) * 0.025)
-        }
-        var splitComplexSource2 = DSPDoubleSplitComplex(realp: &real,
-                                                        imagp: &imag)
-        
-        vDSP.add(splitComplexSource,
-                 to: splitComplexSource2,
-                 count: n,
-                 result: &splitComplexResult)
-        
-        vDSP_zvaddD(&splitComplexSource, 1,
-                    &splitComplexSource2, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexDivide") {
-        var real = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Double(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPDoubleSplitComplex(realp: &real,
-                                                        imagp: &imag)
-        
-        vDSP.divide(splitComplexSource,
-                    by: splitComplexSource2,
-                    count: n,
-                    result: &splitComplexResult)
-        
-        vDSP_zvdivD(&splitComplexSource2, 1,
-                    &splitComplexSource, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexDivide") {
-        var real = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Double(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPDoubleSplitComplex(realp: &real,
-                                                        imagp: &imag)
-        
-        vDSP.divide(splitComplexSource,
-                    by: splitComplexSource2,
-                    count: n,
-                    result: &splitComplexResult)
-        
-        vDSP_zvdivD(&splitComplexSource2, 1,
-                    &splitComplexSource, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexSubtract") {
-        var real = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025) + 2
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Double(i) * 0.025) + 2
-        }
-        var splitComplexSource2 = DSPDoubleSplitComplex(realp: &real,
-                                                        imagp: &imag)
-        
-        vDSP.subtract(splitComplexSource,
-                      from: splitComplexSource2,
-                      count: n,
-                      result: &splitComplexResult)
-        
-        vDSP_zvsubD(&splitComplexSource, 1,
-                    &splitComplexSource2, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/ComplexComplexMultiply") {
-        var real = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.025)
-        }
-        var imag = (0 ..< n).map{ i in
-            return cos(Double(i) * 0.025)
-        }
-        var splitComplexSource2 = DSPDoubleSplitComplex(realp: &real,
-                                                        imagp: &imag)
-        
-        vDSP.multiply(splitComplexSource,
-                      by: splitComplexSource2,
-                      count: n,
-                      useConjugate: false,
-                      result: &splitComplexResult)
-        
-        vDSP_zvmulD(&splitComplexSource, 1,
-                    &splitComplexSource2, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n),
-                    1)
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-        
-        vDSP.multiply(splitComplexSource,
-                      by: splitComplexSource2,
-                      count: n,
-                      useConjugate: true,
-                      result: &splitComplexResult)
-        
-        vDSP_zvmulD(&splitComplexSource, 1,
-                    &splitComplexSource2, 1,
-                    &splitComplexLegacyResult, 1,
-                    vDSP_Length(n),
-                    -1)
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Multiply") {
-        vDSP.multiply(splitComplexSource,
-                      by: vectorSource,
-                      result: &splitComplexResult)
-        
-        vDSP_zrvmulD(&splitComplexSource, 1,
-                     vectorSource, 1,
-                     &splitComplexLegacyResult, 1,
-                     vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Divide") {
-        vDSP.divide(splitComplexSource,
-                    by: vectorSource,
-                    result: &splitComplexResult)
-        
-        vDSP_zrvdivD(&splitComplexSource, 1,
-                     vectorSource, 1,
-                     &splitComplexLegacyResult, 1,
-                     vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-        expectTrue(imaginaryResult.elementsEqual(imaginaryLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Phase") {
-        vDSP.phase(splitComplexSource,
-                   result: &realResult)
-        
-        vDSP_zvphasD(&splitComplexSource, 1,
-                     &realLegacyResult, 1,
-                     vDSP_Length(n))
-        
-        expectTrue(realResult.elementsEqual(realLegacyResult))
-    }
-    
-    Accelerate_vDSPComplexOperationsTests.test("vDSP/Copy") {
-        expectFalse(imaginaryResult.elementsEqual(imaginarySource))
-        expectFalse(realResult.elementsEqual(realSource))
-        
-        vDSP.copy(splitComplexSource,
-                  to: &splitComplexResult,
-                  count: n)
-        
-        expectTrue(imaginaryResult.elementsEqual(imaginarySource))
-        expectTrue(realResult.elementsEqual(realSource))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPConversion.swift b/test/stdlib/Accelerate_vDSPConversion.swift
deleted file mode 100644
index f337322184381..0000000000000
--- a/test/stdlib/Accelerate_vDSPConversion.swift
+++ /dev/null
@@ -1,1018 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var AccelerateTests_vDSPConversion = TestSuite("Accelerate_vDSPConversion")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP polar / rectangular conversion
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    AccelerateTests_vDSPConversion.test("vDSP/SinglePrecisionRectToPolar") {
-        let source: [Float] = [2, 4,
-                               -10, -20,
-                               100, -300]
-        
-        let n = vDSP_Length(source.count)
-        
-        var result = [Float](repeating: 0,
-                             count: source.count)
-        
-        vDSP.convert(rectangularCoordinates: source,
-                     toPolarCoordinates: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: source.count)
-        
-        vDSP_polar(source, 2,
-                   &legacyResult, 2,
-                   n / 2)
-        
-        let returnedResult = vDSP.rectangularToPolar(source)
-        
-        expectTrue(returnedResult.elementsEqual(legacyResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/SinglePrecisionPolarToRect") {
-        let source: [Float] = [2, 4,
-                               -10, -20,
-                               100, -300]
-        
-        let n = vDSP_Length(source.count)
-        
-        var result = [Float](repeating: 0,
-                             count: source.count)
-        
-        vDSP.convert(polarCoordinates: source,
-                     toRectangularCoordinates: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: source.count)
-        
-        vDSP_rect(source, 2,
-                  &legacyResult, 2,
-                  n / 2)
-        
-        let returnedResult = vDSP.polarToRectangular(source)
-        
-        expectTrue(returnedResult.elementsEqual(legacyResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoublePrecisionRectToPolar") {
-        let source: [Double] = [2, 4,
-                                -10, -20,
-                                100, -300]
-        
-        let n = vDSP_Length(source.count)
-        
-        var result = [Double](repeating: 0,
-                              count: source.count)
-        
-        vDSP.convert(rectangularCoordinates: source,
-                     toPolarCoordinates: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: source.count)
-        
-        vDSP_polarD(source, 2,
-                    &legacyResult, 2,
-                    n / 2)
-        
-        let returnedResult = vDSP.rectangularToPolar(source)
-        
-        expectTrue(returnedResult.elementsEqual(legacyResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoublePrecisionRectToPolar") {
-        let source: [Double] = [2, 4,
-                                -10, -20,
-                                100, -300]
-        
-        let n = vDSP_Length(source.count)
-        
-        var result = [Double](repeating: 0,
-                              count: source.count)
-        
-        vDSP.convert(polarCoordinates: source,
-                     toRectangularCoordinates: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: source.count)
-        
-        vDSP_rectD(source, 2,
-                   &legacyResult, 2,
-                   n / 2)
-        
-        let returnedResult = vDSP.polarToRectangular(source)
-        
-        expectTrue(returnedResult.elementsEqual(legacyResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP type-conversion tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = vDSP_Length(10)
-    
-    let floatingPointValues: [Float] = [-10.9, -20.1, 32.99, 14.001, -16.5,
-                                        90.5, 0, -0, -0.00001, 0.000001]
-    
-    let floatingPointValuesD: [Double] = [-10.9, -20.1, 32.99, 14.001, -16.5,
-                                          90.5, 0, -0, -0.00001, 0.000001]
-    
-    let unsignedIntValues = [5, 250, 0, 99, 127, 65, 78, 1, 33, 10]
-    let signedIntValues = [5, -126, 0, -99, 125, -65, 78, -1, 33, -10]
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToDouble") {
-        let source = floatingPointValues
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vspdp(source, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.floatToDouble(source)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToFloat") {
-        let source = floatingPointValuesD
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vdpsp(source, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.doubleToFloat(source)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/UInt8_to_Float") {
-        let source = unsignedIntValues.map{ return UInt8($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu8(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/UInt8_to_Double") {
-        let source = unsignedIntValues.map{ return UInt8($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu8D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/UInt16_to_Float") {
-        let source = unsignedIntValues.map{ return UInt16($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu16(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/UInt16_to_Double") {
-        let source = unsignedIntValues.map{ return UInt16($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu16D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-
-    AccelerateTests_vDSPConversion.test("vDSP/UInt32_to_Float") {
-        let source = unsignedIntValues.map{ return UInt32($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu32(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/UInt32_to_Double") {
-        let source = unsignedIntValues.map{ return UInt32($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vfltu32D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int8_to_Float") {
-        let source = signedIntValues.map{ return Int8($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt8(source, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int8_to_Double") {
-        let source = signedIntValues.map{ return Int8($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt8D(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int16_to_Float") {
-        let source = signedIntValues.map{ return Int16($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt16(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int16_to_Double") {
-        let source = signedIntValues.map{ return Int16($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt16D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int32_to_Float") {
-        let source = signedIntValues.map{ return Int32($0) }
-        var result = [Float](repeating: 0, count: source.count)
-        var legacyResult = [Float](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt32(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Float.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/Int32_to_Double") {
-        let source = signedIntValues.map{ return Int32($0) }
-        var result = [Double](repeating: 0, count: source.count)
-        var legacyResult = [Double](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result)
-        
-        vDSP_vflt32D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integerToFloatingPoint(source,
-                                                         floatingPointType: Double.self)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt32towardZero") {
-        let source = floatingPointValues
-        var result = [Int32](repeating: 0, count: source.count)
-        var legacyResult = [Int32](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix32(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int32.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt32towardNearest") {
-        let source = floatingPointValues
-        var result = [Int32](repeating: 0, count: source.count)
-        var legacyResult = [Int32](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr32(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int32.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt32towardZero") {
-        let source = floatingPointValuesD
-        var result = [Int32](repeating: 0, count: source.count)
-        var legacyResult = [Int32](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix32D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int32.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt32towardNearest") {
-        let source = floatingPointValuesD
-        var result = [Int32](repeating: 0, count: source.count)
-        var legacyResult = [Int32](repeating: -1, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr32D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int32.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt16towardZero") {
-        let source = floatingPointValues
-        var result = [UInt16](repeating: 0, count: source.count)
-        var legacyResult = [UInt16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu16(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt16.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt16towardNearest") {
-        let source = floatingPointValues
-        var result = [UInt16](repeating: 0, count: source.count)
-        var legacyResult = [UInt16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru16(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt16.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToUInt16towardZero") {
-        let source = floatingPointValuesD
-        var result = [UInt16](repeating: 0, count: source.count)
-        var legacyResult = [UInt16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu16D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt16.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToUInt16towardNearest") {
-        let source = floatingPointValuesD
-        var result = [UInt16](repeating: 0, count: source.count)
-        var legacyResult = [UInt16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru16D(source, 1,
-                       &legacyResult, 1,
-                       n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt16.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt32towardZero") {
-        let source = floatingPointValues
-        var result = [UInt32](repeating: 0, count: source.count)
-        var legacyResult = [UInt32](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu32(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt32.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt32towardNearest") {
-        let source = floatingPointValues
-        var result = [UInt32](repeating: 0, count: source.count)
-        var legacyResult = [UInt32](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru32(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt32.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToUInt32towardZero") {
-        let source = floatingPointValuesD
-        var result = [UInt32](repeating: 0, count: source.count)
-        var legacyResult = [UInt32](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu32D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt32.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToUInt32towardNearest") {
-        let source = floatingPointValuesD
-        var result = [UInt32](repeating: 0, count: source.count)
-        var legacyResult = [UInt32](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru32D(source, 1,
-                       &legacyResult, 1,
-                       n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt32.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt16towardZero") {
-        let source = floatingPointValues
-        var result = [Int16](repeating: 0, count: source.count)
-        var legacyResult = [Int16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix16(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int16.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt16towardNearest") {
-        let source = floatingPointValues
-        var result = [Int16](repeating: 0, count: source.count)
-        var legacyResult = [Int16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr16(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int16.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt16towardZero") {
-        let source = floatingPointValuesD
-        var result = [Int16](repeating: 0, count: source.count)
-        var legacyResult = [Int16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix16D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int16.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt16towardNearest") {
-        let source = floatingPointValuesD
-        var result = [Int16](repeating: 0, count: source.count)
-        var legacyResult = [Int16](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr16D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int16.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt8towardZero") {
-        let source = floatingPointValues
-        var result = [Int8](repeating: 0, count: source.count)
-        var legacyResult = [Int8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix8(source, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int8.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToInt8towardNearest") {
-        let source = floatingPointValues
-        var result = [Int8](repeating: 0, count: source.count)
-        var legacyResult = [Int8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr8(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int8.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt8towardZero") {
-        let source = floatingPointValuesD
-        var result = [Int8](repeating: 0, count: source.count)
-        var legacyResult = [Int8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfix8D(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int8.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToInt8towardNearest") {
-        let source = floatingPointValuesD
-        var result = [Int8](repeating: 0, count: source.count)
-        var legacyResult = [Int8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixr8D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: Int8.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt8towardZero") {
-        let source = floatingPointValues
-        var result = [UInt8](repeating: 0, count: source.count)
-        var legacyResult = [UInt8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu8(source, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt8.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/FloatToUInt8towardNearest") {
-        let source = floatingPointValues
-        var result = [UInt8](repeating: 0, count: source.count)
-        var legacyResult = [UInt8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru8(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt8.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubleToUInt8towardZero") {
-        let source = floatingPointValuesD
-        var result = [UInt8](repeating: 0, count: source.count)
-        var legacyResult = [UInt8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardZero)
-        
-        vDSP_vfixu8D(source, 1,
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt8.self,
-                                                         rounding: .towardZero)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/DoubletoUInt8towardNearest") {
-        let source = floatingPointValuesD
-        var result = [UInt8](repeating: 0, count: source.count)
-        var legacyResult = [UInt8](repeating: 99, count: source.count)
-        
-        vDSP.convertElements(of: source, to: &result, rounding: .towardNearestInteger)
-        
-        vDSP_vfixru8D(source, 1,
-                      &legacyResult, 1,
-                      n)
-        
-        let returnedResult = vDSP.floatingPointToInteger(source,
-                                                         integerType: UInt8.self,
-                                                         rounding: .towardNearestInteger)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP decibel conversion
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    AccelerateTests_vDSPConversion.test("vDSP/PowerToDecibelsSinglePrecision") {
-        let source: [Float] = [1, 10, 100, 2, 4, 8, 16, 101,
-                               27, 13, 11, 44, 0.5, 99, 0.125]
-        let zeroReference = Float(7)
-        let n = source.count
-        
-        var result = [Float](repeating: 0,
-                             count: n)
-        
-        vDSP.convert(power: source,
-                     toDecibels: &result,
-                     zeroReference: zeroReference)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: n)
-        
-        vDSP_vdbcon(source, 1,
-                    [zeroReference],
-                    &legacyResult, 1,
-                    vDSP_Length(n),
-                    0)
-        
-        let returnedResult = vDSP.powerToDecibels(source,
-                                                  zeroReference: zeroReference)
-    }
-
-    AccelerateTests_vDSPConversion.test("vDSP/AmplitudeToDecibelsSinglePrecision") {
-        let source: [Float] = [1, 10, 100, 2, 4, 8, 16, 101,
-                               27, 13, 11, 44, 0.5, 99, 0.125]
-        let zeroReference = Float(7)
-        let n = source.count
-        
-        var result = [Float](repeating: 0,
-                             count: n)
-        
-        vDSP.convert(amplitude: source,
-                     toDecibels: &result,
-                     zeroReference: zeroReference)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: n)
-        
-        vDSP_vdbcon(source, 1,
-                    [zeroReference],
-                    &legacyResult, 1,
-                    vDSP_Length(n),
-                    1)
-        
-        let returnedResult = vDSP.amplitudeToDecibels(source,
-                                                      zeroReference: zeroReference)
-    }
-
-    AccelerateTests_vDSPConversion.test("vDSP/PowerToDecibelsDoublePrecision") {
-        let source: [Double] = [1, 10, 100, 2, 4, 8, 16, 101,
-                                27, 13, 11, 44, 0.5, 99, 0.125]
-        let zeroReference = Double(7)
-        let n = source.count
-        
-        var result = [Double](repeating: 0,
-                              count: n)
-        
-        vDSP.convert(power: source,
-                     toDecibels: &result,
-                     zeroReference: zeroReference)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: n)
-        
-        vDSP_vdbconD(source, 1,
-                     [zeroReference],
-                     &legacyResult, 1,
-                     vDSP_Length(n),
-                     0)
-        
-        let returnedResult = vDSP.powerToDecibels(source,
-                                                  zeroReference: zeroReference)
-    }
-
-    AccelerateTests_vDSPConversion.test("vDSP/AmplitudeToDecibelsDoublePrecision") {
-        let source: [Double] = [1, 10, 100, 2, 4, 8, 16, 101,
-                                27, 13, 11, 44, 0.5, 99, 0.125]
-        let zeroReference = Double(7)
-        let n = source.count
-        
-        var result = [Double](repeating: 0,
-                              count: n)
-        
-        vDSP.convert(amplitude: source,
-                     toDecibels: &result,
-                     zeroReference: zeroReference)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: n)
-        
-        vDSP_vdbconD(source, 1,
-                     [zeroReference],
-                     &legacyResult, 1,
-                     vDSP_Length(n),
-                     1)
-        
-        let returnedResult = vDSP.amplitudeToDecibels(source,
-                                                      zeroReference: zeroReference)
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP complex format conversion
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    AccelerateTests_vDSPConversion.test("vDSP/ComplexFormatConversionSinglePrecision") {
-        var real: [Float] = [4, 5, 6]
-        var imag: [Float] = [1, 2, 3]
-        let src = DSPSplitComplex(realp: &real,
-                                  imagp: &imag)
-        
-        var dest = [DSPComplex](repeating: DSPComplex(),
-                                count: 3)
-        
-        vDSP.convert(splitComplexVector: src,
-                     toInterleavedComplexVector: &dest)
-        
-        var realResult: [Float] = [0, 0, 0]
-        var imagResult: [Float] = [0, 0, 0]
-        var result = DSPSplitComplex(realp: &realResult,
-                                     imagp: &imagResult)
-        
-        vDSP.convert(interleavedComplexVector: dest,
-                     toSplitComplexVector: &result)
-        
-        expectTrue(real.elementsEqual(realResult))
-        expectTrue(imag.elementsEqual(imagResult))
-    }
-    
-    AccelerateTests_vDSPConversion.test("vDSP/ComplexFormatConversionDoublePrecision") {
-        var real: [Double] = [4, 5, 6]
-        var imag: [Double] = [1, 2, 3]
-        let src = DSPDoubleSplitComplex(realp: &real,
-                                        imagp: &imag)
-        
-        var dest = [DSPDoubleComplex](repeating: DSPDoubleComplex(),
-                                      count: 3)
-        
-        vDSP.convert(splitComplexVector: src,
-                     toInterleavedComplexVector: &dest)
-        
-        var realResult: [Double] = [0, 0, 0]
-        var imagResult: [Double] = [0, 0, 0]
-        var result = DSPDoubleSplitComplex(realp: &realResult,
-                                           imagp: &imagResult)
-        
-        vDSP.convert(interleavedComplexVector: dest,
-                     toSplitComplexVector: &result)
-        
-        expectTrue(real.elementsEqual(realResult))
-        expectTrue(imag.elementsEqual(imagResult))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPConvolution.swift b/test/stdlib/Accelerate_vDSPConvolution.swift
deleted file mode 100644
index 76a707ccd2ab0..0000000000000
--- a/test/stdlib/Accelerate_vDSPConvolution.swift
+++ /dev/null
@@ -1,352 +0,0 @@
-
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPConvolutionTests = TestSuite("Accelerate_vDSPConvolution")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Single-precision 1D convolution and correlation
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 256
-    let n = vDSP_Length(256)
-    
-    let kernel:  [Float] = ( 0 ..< 10 ).map {
-        return Float($0) / 45
-    }
-    
-    let signal: [Float] = (0 ..< 256 + 10).map {
-        return sin(Float($0) * 0.05).sign == .minus ? -1 : 1
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/SinglePrecisionConvolve") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        vDSP.convolve(signal,
-                      withKernel: kernel,
-                      result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_conv(signal, 1,
-                  UnsafePointer(kernel).advanced(by: kernel.count - 1), -1,
-                  &legacyResult, 1,
-                  n,
-                  vDSP_Length(kernel.count))
-        
-        let returnedResult = vDSP.convolve(signal,
-                                           withKernel: kernel)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/SinglePrecisionCorrelate") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        vDSP.correlate(signal,
-                       withKernel: kernel,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_conv(signal, 1,
-                  kernel, 1,
-                  &legacyResult, 1,
-                  n,
-                  vDSP_Length(kernel.count))
-        
-        let returnedResult = vDSP.correlate(signal,
-                                           withKernel: kernel)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Double-precision 1D convolution and correlation
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 256
-    let n = vDSP_Length(256)
-    
-    let kernel:  [Double] = ( 0 ..< 10 ).map {
-        return Double($0) / 45
-    }
-    
-    let signal: [Double] = (0 ..< 256 + 10).map {
-        return sin(Double($0) * 0.05).sign == .minus ? -1 : 1
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/DoublePrecisionConvolve") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        vDSP.convolve(signal,
-                      withKernel: kernel,
-                      result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_convD(signal, 1,
-                   UnsafePointer(kernel).advanced(by: kernel.count - 1), -1,
-                   &legacyResult, 1,
-                   n,
-                   vDSP_Length(kernel.count))
-        
-        let returnedResult = vDSP.convolve(signal,
-                                           withKernel: kernel)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/DoublePrecisionCorrelate") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        vDSP.correlate(signal,
-                       withKernel: kernel,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_convD(signal, 1,
-                   kernel, 1,
-                   &legacyResult, 1,
-                   n,
-                   vDSP_Length(kernel.count))
-        
-        let returnedResult = vDSP.correlate(signal,
-                                            withKernel: kernel)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Single-precision 2D convolution
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let width = 512
-    let height = 128
-    let pixelCount = 512 * 128
-    
-    let pixels: [Float] = (0 ..< pixelCount).map { i in
-        let x = floor(Float(i) / 1024) * 25
-        let y = remainder(Float(i), 1024) * 25
-        return (sin(y).sign == .minus && sin(x).sign == .minus) ? 0 : 1
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/SinglePrecision3x3") {
-        let kernel3x3 = [Float](repeating: 1.0 / 9, count: 9)
-        
-        var result = [Float](repeating: .nan,
-                             count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      with3x3Kernel: kernel3x3,
-                      result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: result.count)
-        
-        vDSP_f3x3(pixels,
-                  vDSP_Length(height), vDSP_Length(width),
-                  kernel3x3,
-                  &legacyResult)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           with3x3Kernel: kernel3x3)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/SinglePrecision5x5") {
-        let kernel5x5 = [Float](repeating: 1.0 / 25, count: 25)
-        
-        var result = [Float](repeating: .nan,
-                             count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      with5x5Kernel: kernel5x5,
-                      result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: result.count)
-        
-        vDSP_f5x5(pixels,
-                  vDSP_Length(height), vDSP_Length(width),
-                  kernel5x5,
-                  &legacyResult)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           with5x5Kernel: kernel5x5)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/SinglePrecision7x3") {
-        let kernel7x3 = [Float](repeating: 1.0 / (7 * 3), count: 7 * 3)
-        
-        var result = [Float](repeating: .nan,
-                             count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      withKernel: kernel7x3,
-                      kernelRowCount: 7, kernelColumnCount: 3,
-                      result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: result.count)
-        
-        vDSP_imgfir(pixels,
-                    vDSP_Length(height), vDSP_Length(width),
-                    kernel7x3,
-                    &legacyResult,
-                    7, 3)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           withKernel: kernel7x3,
-                                           kernelRowCount: 7, kernelColumnCount: 3)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Double-precision 2D convolution
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let width = 512
-    let height = 128
-    let pixelCount = 512 * 128
-    
-    let pixels: [Double] = (0 ..< pixelCount).map { i in
-        let x = floor(Double(i) / 1024) * 25
-        let y = remainder(Double(i), 1024) * 25
-        return (sin(y).sign == .minus && sin(x).sign == .minus) ? 0 : 1
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/DoublePrecision3x3") {
-        let kernel3x3 = [Double](repeating: 1.0 / 9, count: 9)
-        
-        var result = [Double](repeating: .nan,
-                              count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      with3x3Kernel: kernel3x3,
-                      result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: result.count)
-        
-        vDSP_f3x3D(pixels,
-                   vDSP_Length(height), vDSP_Length(width),
-                   kernel3x3,
-                   &legacyResult)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           with3x3Kernel: kernel3x3)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/DoublePrecision5x5") {
-        let kernel5x5 = [Double](repeating: 1.0 / 25, count: 25)
-        
-        var result = [Double](repeating: .nan,
-                              count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      with5x5Kernel: kernel5x5,
-                      result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: result.count)
-        
-        vDSP_f5x5D(pixels,
-                   vDSP_Length(height), vDSP_Length(width),
-                   kernel5x5,
-                   &legacyResult)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           with5x5Kernel: kernel5x5)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPConvolutionTests.test("vDSP/DoublePrecision7x3") {
-        let kernel7x3 = [Double](repeating: 1.0 / (7 * 3), count: 7 * 3)
-        
-        var result = [Double](repeating: .nan,
-                              count: pixelCount)
-        
-        vDSP.convolve(pixels,
-                      rowCount: height, columnCount: width,
-                      withKernel: kernel7x3,
-                      kernelRowCount: 7, kernelColumnCount: 3,
-                      result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: result.count)
-        
-        vDSP_imgfirD(pixels,
-                     vDSP_Length(height), vDSP_Length(width),
-                     kernel7x3,
-                     &legacyResult,
-                     7, 3)
-        
-        let returnedResult = vDSP.convolve(pixels,
-                                           rowCount: height, columnCount: width,
-                                           withKernel: kernel7x3,
-                                           kernelRowCount: 7, kernelColumnCount: 3)
-            
-            expectTrue(result.elementsEqual(legacyResult))
-            expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPElementwiseArithmetic.swift b/test/stdlib/Accelerate_vDSPElementwiseArithmetic.swift
deleted file mode 100644
index 64f5397796d03..0000000000000
--- a/test/stdlib/Accelerate_vDSPElementwiseArithmetic.swift
+++ /dev/null
@@ -1,898 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPElementwiseArithmeticTests = TestSuite("Accelerate_vDSPElementwiseArithmetic")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Single Precision Arithmetic
-//
-//===----------------------------------------------------------------------===//
-
-func lround(_ x: Float) -> Int {
-    return lround(Double(x))
-}
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    var result = [Float.nan]
-    
-    var vectorA = [Float.nan]
-    var vectorB = [Float.nan]
-    var vectorC = [Float.nan]
-    
-    var scalarA = Float.nan
-    var scalarB = Float.nan
-    
-    // c[i] = a[i] + b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsadd") {
-        scalarA = 100
-        vectorB = [500]
-        
-        vDSP.add(scalarA,
-                 vectorB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(scalarA,
-                                      vectorB)
-        
-        expectEqual(lround(result.first!), 600)
-        expectEqual(lround(returnedResult.first!), 600)
-    }
-    
-    // c[i] = a[i] + b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vadd") {
-        vectorA = [750]
-        vectorB = [250]
-        
-        vDSP.add(vectorA,
-                 vectorB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(vectorA,
-                                      vectorB)
-        
-        expectEqual(lround(result.first!), 1000)
-        expectEqual(lround(returnedResult.first!), 1000)
-    }
-    
-    // c[i] = a[i] - b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsub") {
-        vectorA = [5]
-        vectorB = [30]
-        
-        vDSP.subtract(vectorA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(vectorA,
-                                           vectorB)
-        
-        expectEqual(lround(result.first!), -25)
-        expectEqual(lround(returnedResult.first!), -25)
-    }
-    
-    // c[i] = a[i] * b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmul") {
-        scalarA = 100
-        vectorB = [3]
-        
-        vDSP.multiply(scalarA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(scalarA,
-                                           vectorB)
-        
-        expectEqual(lround(result.first!), 300)
-        expectEqual(lround(returnedResult.first!), 300)
-    }
-    
-    // a[i] * b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmul") {
-        vectorA = [6]
-        vectorB = [10]
-        
-        vDSP.multiply(vectorA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(vectorA,
-                                           vectorB)
-        
-        expectEqual(lround(result.first!), 60)
-        expectEqual(lround(returnedResult.first!), 60)
-    }
-    
-    // c[i] = a[i] / b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsdiv") {
-        scalarA = 4
-        vectorB = [100]
-        
-        vDSP.divide(vectorB,
-                    scalarA,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(vectorB,
-                                         scalarA)
-        
-        expectEqual(lround(result.first!), 25)
-        expectEqual(lround(returnedResult.first!), 25)
-    }
-    
-    // c[i] = a / b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/svdiv") {
-        scalarA = 200
-        vectorB = [4]
-        
-        vDSP.divide(scalarA,
-                    vectorB,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(scalarA,
-                                         vectorB)
-        
-        expectEqual(lround(result.first!), 50)
-        expectEqual(lround(returnedResult.first!), 50)
-    }
-    
-    // c[i] = a[i] / b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vdiv") {
-        vectorA = [600]
-        vectorB = [3]
-        
-        vDSP.divide(vectorA,
-                    vectorB,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(vectorA,
-                                         vectorB)
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vaddsub") {
-        vectorA = [16]
-        vectorB = [4]
-        var subtractResult = [ Float.nan ]
-        
-        vDSP.addSubtract(vectorA,
-                         vectorB,
-                         addResult: &result,
-                         subtractResult: &subtractResult)
-        
-        expectEqual(lround(result.first!), 20)
-        expectEqual(lround(subtractResult.first!), 12)
-        
-    }
-    
-    // d[i] = (a[i] + b[i]) * c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vasm") {
-        vectorA = [4]
-        vectorB = [16]
-        scalarA = 4
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      scalarA,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           scalarA)
-        
-        expectEqual(lround(result.first!), 80)
-        expectEqual(lround(returnedResult.first!), 80)
-    }
-    
-    // d[i] = (a[i] + b[i]) * c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vam") {
-        vectorA = [4]
-        vectorB = [16]
-        vectorC = [5]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 100)
-        expectEqual(lround(returnedResult.first!), 100)
-    }
-    
-    // d[i] = (a[i] - b[i]) * c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbsm") {
-        vectorA = [20]
-        vectorB = [5]
-        scalarA = 2
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      scalarA,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           scalarA)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // d[i] = (a[i] - b[i]) * c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbm") {
-        vectorA = [20]
-        vectorB = [5]
-        vectorC = [2]
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // a[i]*b[i] + c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmsa") {
-        vectorA = [18]
-        vectorB = [10]
-        scalarA = 20
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 scalarA,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      scalarA)
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // (a[i] * b) + c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsma") {
-        vectorA = [18]
-        scalarB = 10
-        vectorC = [120]
-        
-        vDSP.add(multiplication: (vectorA, scalarB),
-                 vectorC,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarB),
-                                      vectorC)
-        
-        expectEqual(lround(result.first!), 300)
-        expectEqual(lround(returnedResult.first!), 300)
-    }
-    
-    // d[i] = (a[i] * b[i]) + c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vma") {
-        vectorA = [5]
-        vectorB = [20]
-        vectorC = [6]
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 vectorC,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      vectorC)
-        
-        expectEqual(lround(result.first!), 106)
-        expectEqual(lround(returnedResult.first!), 106)
-    }
-    
-    // d[i] = (a[i] * b[i]) - c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmsb") {
-        vectorA = [25]
-        vectorB = [2]
-        vectorC = [50]
-        
-        vDSP.subtract(multiplication: (vectorB, vectorC),
-                      vectorA,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorB, vectorC),
-                                           vectorA)
-        
-        expectEqual(lround(result.first!), 75)
-        expectEqual(lround(returnedResult.first!), 75)
-    }
-    
-    // e[i] = (a[i] * b) + (c[i] * d)
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsma") {
-        vectorA = [5]
-        scalarA = 100
-        vectorB = [50]
-        scalarB = 4
-        
-        vDSP.add(multiplication: (vectorA, scalarA),
-                 multiplication: (vectorB, scalarB),
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarA),
-                                      multiplication: (vectorB, scalarB))
-        
-        expectEqual(lround(result.first!), 700)
-        expectEqual(lround(returnedResult.first!), 700)
-    }
-    
-    // E[n] = A[n]*B[n] + C[n]*D[n]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmma") {
-        vectorA = [2]
-        vectorB = [10]
-        vectorC = [3]
-        let vectorD: [Float] = [20]
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 multiplication: (vectorC, vectorD),
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      multiplication: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 80)
-        expectEqual(lround(returnedResult.first!), 80)
-    }
-    
-    // e[i] = (a[i] + b[i]) * (c[i] + d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vaam") {
-        vectorA = [2]
-        vectorB = [8]
-        vectorC = [3]
-        let vectorD: [Float] = [17]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      addition: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           addition: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // e[i] = (a[i] * b[i]) - (c[i] * d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmmsb") {
-        vectorA = [2]
-        vectorB = [3]
-        vectorC = [5]
-        let vectorD: [Float] = [15]
-        
-        vDSP.subtract(multiplication: (vectorA, vectorB),
-                      multiplication: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorA, vectorB),
-                                           multiplication: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), -69)
-        expectEqual(lround(returnedResult.first!), -69)
-    }
-    
-    // e[i] = (a[i] - b[i]) * (c[i] - d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbsbm") {
-        vectorA = [12]
-        vectorB = [2]
-        vectorC = [20]
-        let vectorD: [Float] = [3]
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      subtraction: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           subtraction: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 170)
-        expectEqual(lround(returnedResult.first!), 170)
-    }
-    
-    // e[i] = (a[i] + b[i]) * (c[i] - d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vasbm") {
-        vectorA = [16]
-        vectorB = [4]
-        vectorC = [102]
-        let vectorD: [Float] = [2]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      subtraction: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           subtraction: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 2000)
-        expectEqual(lround(returnedResult.first!), 2000)
-    }
-    
-    // d[n] = a[n]*b + c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsa") {
-        vectorA = [12]
-        scalarA = 2
-        scalarB = 6
-        
-        vDSP.add(multiplication: (vectorA, scalarA),
-                 scalarB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarA),
-                                      scalarB)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // D[n] = A[n]*B - C[n];
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsb") {
-        vectorA = [10]
-        scalarB = 5
-        vectorC = [25]
-        
-        vDSP.subtract(multiplication: (vectorA, scalarB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorA, scalarB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 25)
-        expectEqual(lround(returnedResult.first!), 25)
-    }
-}
-
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Double Precision Arithmetic
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    var result = [Double.nan]
-    
-    var vectorA = [Double.nan]
-    var vectorB = [Double.nan]
-    var vectorC = [Double.nan]
-    
-    var scalarA = Double.nan
-    var scalarB = Double.nan
-    
-    // c[i] = a[i] + b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsaddD") {
-        scalarA = 100
-        vectorB = [500]
-        
-        vDSP.add(scalarA,
-                 vectorB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(scalarA,
-                                      vectorB)
-        
-        expectEqual(lround(result.first!), 600)
-        expectEqual(lround(returnedResult.first!), 600)
-    }
-    
-    // c[i] = a[i] + b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vaddD") {
-        vectorA = [750]
-        vectorB = [250]
-        
-        vDSP.add(vectorA,
-                 vectorB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(vectorA,
-                                      vectorB)
-        
-        expectEqual(lround(result.first!), 1000)
-        expectEqual(lround(returnedResult.first!), 1000)
-    }
-    
-    // c[i] = a[i] - b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsubD") {
-        vectorA = [5]
-        vectorB = [30]
-        
-        vDSP.subtract(vectorA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(vectorA,
-                                            vectorB)
-        
-        expectEqual(lround(result.first!), -25)
-        expectEqual(lround(returnedResult.first!), -25)
-    }
-    
-    // c[i] = a[i] * b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmulD") {
-        scalarA = 100
-        vectorB = [3]
-        
-        vDSP.multiply(scalarA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(scalarA,
-                                           vectorB)
-        
-        expectEqual(lround(result.first!), 300)
-        expectEqual(lround(returnedResult.first!), 300)
-    }
-    
-    // a[i] * b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmulD") {
-        vectorA = [6]
-        vectorB = [10]
-        
-        vDSP.multiply(vectorA,
-                      vectorB,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(vectorA,
-                                           vectorB)
-        
-        expectEqual(lround(result.first!), 60)
-        expectEqual(lround(returnedResult.first!), 60)
-    }
-    
-    // c[i] = a[i] / b
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsdivD") {
-        scalarA = 4
-        vectorB = [100]
-        
-        vDSP.divide(vectorB,
-                    scalarA,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(vectorB,
-                                         scalarA)
-        
-        expectEqual(lround(result.first!), 25)
-        expectEqual(lround(returnedResult.first!), 25)
-    }
-    
-    // c[i] = a / b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/svdivD") {
-        scalarA = 200
-        vectorB = [4]
-        
-        vDSP.divide(scalarA,
-                    vectorB,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(scalarA,
-                                         vectorB)
-        
-        expectEqual(lround(result.first!), 50)
-        expectEqual(lround(returnedResult.first!), 50)
-    }
-    
-    // c[i] = a[i] / b[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vdivD") {
-        vectorA = [600]
-        vectorB = [3]
-        
-        vDSP.divide(vectorA,
-                    vectorB,
-                    result: &result)
-        
-        let returnedResult = vDSP.divide(vectorA,
-                                         vectorB)
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // o0[i] = i1[i] + i0[i]; o1[i] = i1[i] - i0[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vaddsubD") {
-        vectorA = [16]
-        vectorB = [4]
-        var subtractResult = [ Double.nan ]
-        
-        vDSP.addSubtract(vectorA,
-                         vectorB,
-                         addResult: &result,
-                         subtractResult: &subtractResult)
-        
-        expectEqual(lround(result.first!), 20)
-        expectEqual(lround(subtractResult.first!), 12)
-    }
-    
-    // d[i] = (a[i] + b[i]) * c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vasmD") {
-        vectorA = [4]
-        vectorB = [16]
-        scalarA = 4
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      scalarA,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           scalarA)
-        
-        expectEqual(lround(result.first!), 80)
-        expectEqual(lround(returnedResult.first!), 80)
-    }
-    
-    // d[i] = (a[i] + b[i]) * c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vamD") {
-        vectorA = [4]
-        vectorB = [16]
-        vectorC = [5]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 100)
-        expectEqual(lround(returnedResult.first!), 100)
-    }
-    
-    // d[i] = (a[i] - b[i]) * c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbsmD") {
-        vectorA = [20]
-        vectorB = [5]
-        scalarA = 2
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      scalarA,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           scalarA)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // d[i] = (a[i] - b[i]) * c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbmD") {
-        vectorA = [20]
-        vectorB = [5]
-        vectorC = [2]
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // a[i]*b[i] + c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmsaD") {
-        vectorA = [18]
-        vectorB = [10]
-        scalarA = 20
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 scalarA,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      scalarA)
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // (a[i] * b) + c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmaD") {
-        vectorA = [18]
-        scalarB = 10
-        vectorC = [120]
-        
-        vDSP.add(multiplication: (vectorA, scalarB),
-                 vectorC,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarB),
-                                      vectorC)
-        
-        expectEqual(lround(result.first!), 300)
-        expectEqual(lround(returnedResult.first!), 300)
-    }
-    
-    // d[i] = (a[i] * b[i]) + c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmaD") {
-        vectorA = [5]
-        vectorB = [20]
-        vectorC = [6]
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 vectorC,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      vectorC)
-        
-        expectEqual(lround(result.first!), 106)
-        expectEqual(lround(returnedResult.first!), 106)
-    }
-    
-    // d[i] = (a[i] * b[i]) - c[i]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmsbD") {
-        vectorA = [25]
-        vectorB = [2]
-        vectorC = [50]
-        
-        vDSP.subtract(multiplication: (vectorB, vectorC),
-                      vectorA,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorB, vectorC),
-                                           vectorA)
-        
-        expectEqual(lround(result.first!), 75)
-        expectEqual(lround(returnedResult.first!), 75)
-    }
-    
-    // e[i] = (a[i] * b) + (c[i] * d)
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsmaD") {
-        vectorA = [5]
-        scalarA = 100
-        vectorB = [50]
-        scalarB = 4
-        
-        vDSP.add(multiplication: (vectorA, scalarA),
-                 multiplication: (vectorB, scalarB),
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarA),
-                                      multiplication: (vectorB, scalarB))
-        
-        expectEqual(lround(result.first!), 700)
-        expectEqual(lround(returnedResult.first!), 700)
-    }
-    
-    // E[n] = A[n]*B[n] + C[n]*D[n]
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmmaD") {
-        vectorA = [2]
-        vectorB = [10]
-        vectorC = [3]
-        let vectorD: [Double] = [20]
-        
-        vDSP.add(multiplication: (vectorA, vectorB),
-                 multiplication: (vectorC, vectorD),
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, vectorB),
-                                      multiplication: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 80)
-        expectEqual(lround(returnedResult.first!), 80)
-    }
-    
-    // e[i] = (a[i] + b[i]) * (c[i] + d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vaamD") {
-        vectorA = [2]
-        vectorB = [8]
-        vectorC = [3]
-        let vectorD: [Double] = [17]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      addition: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           addition: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 200)
-        expectEqual(lround(returnedResult.first!), 200)
-    }
-    
-    // e[i] = (a[i] * b[i]) - (c[i] * d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vmmsbD") {
-        vectorA = [2]
-        vectorB = [3]
-        vectorC = [5]
-        let vectorD: [Double] = [15]
-        
-        vDSP.subtract(multiplication: (vectorA, vectorB),
-                      multiplication: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorA, vectorB),
-                                           multiplication: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), -69)
-        expectEqual(lround(returnedResult.first!), -69)
-    }
-    
-    // e[i] = (a[i] - b[i]) * (c[i] - d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsbsbmD") {
-        vectorA = [12]
-        vectorB = [2]
-        vectorC = [20]
-        let vectorD: [Double] = [3]
-        
-        vDSP.multiply(subtraction: (vectorA, vectorB),
-                      subtraction: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(subtraction: (vectorA, vectorB),
-                                           subtraction: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 170)
-        expectEqual(lround(returnedResult.first!), 170)
-    }
-    
-    // e[i] = (a[i] + b[i]) * (c[i] - d[i])
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vasbmD") {
-        vectorA = [16]
-        vectorB = [4]
-        vectorC = [102]
-        let vectorD: [Double] = [2]
-        
-        vDSP.multiply(addition: (vectorA, vectorB),
-                      subtraction: (vectorC, vectorD),
-                      result: &result)
-        
-        let returnedResult = vDSP.multiply(addition: (vectorA, vectorB),
-                                           subtraction: (vectorC, vectorD))
-        
-        expectEqual(lround(result.first!), 2000)
-        expectEqual(lround(returnedResult.first!), 2000)
-    }
-    
-    // d[n] = a[n]*b + c
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsaD") {
-        vectorA = [12]
-        scalarA = 2
-        scalarB = 6
-        
-        vDSP.add(multiplication: (vectorA, scalarA),
-                 scalarB,
-                 result: &result)
-        
-        let returnedResult = vDSP.add(multiplication: (vectorA, scalarA),
-                                      scalarB)
-        
-        expectEqual(lround(result.first!), 30)
-        expectEqual(lround(returnedResult.first!), 30)
-    }
-    
-    // D[n] = A[n]*B - C[n];
-    Accelerate_vDSPElementwiseArithmeticTests.test("vDSP/vsmsbD") {
-        vectorA = [10]
-        scalarB = 5
-        vectorC = [25]
-        
-        vDSP.subtract(multiplication: (vectorA, scalarB),
-                      vectorC,
-                      result: &result)
-        
-        let returnedResult = vDSP.subtract(multiplication: (vectorA, scalarB),
-                                           vectorC)
-        
-        expectEqual(lround(result.first!), 25)
-        expectEqual(lround(returnedResult.first!), 25)
-    }
-}
-
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPFillClearGenerate.swift b/test/stdlib/Accelerate_vDSPFillClearGenerate.swift
deleted file mode 100644
index 66ee215df45c3..0000000000000
--- a/test/stdlib/Accelerate_vDSPFillClearGenerate.swift
+++ /dev/null
@@ -1,647 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPFillClearGenerateTests = TestSuite("Accelerate_vDSPFillClearGenerate")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP vector fill, clear, and generation tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 256
-    let n = vDSP_Length(256)
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionFill") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.fill(&result,
-                  with: 999)
-        
-        vDSP_vfill([999],
-                   &legacyResult, 1,
-                   n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionClear") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.clear(&result)
-        
-        vDSP_vclr(&legacyResult, 1,
-                  n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionFill") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.fill(&result,
-                  with: 999)
-        
-        vDSP_vfillD([999],
-                    &legacyResult, 1,
-                    n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionClear") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.clear(&result)
-        
-        vDSP_vclrD(&legacyResult, 1,
-                   n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHanningNormalized") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningNormalized,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hann_window(&legacyResult,
-                         n,
-                         Int32(vDSP_HANN_NORM))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hanningNormalized,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHanningNormalizedHalf") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningNormalized,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hann_window(&legacyResult,
-                         n,
-                         Int32(vDSP_HANN_NORM | vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hanningNormalized,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHanningDenormalized") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningDenormalized,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hann_window(&legacyResult,
-                         n,
-                         Int32(vDSP_HANN_DENORM))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hanningDenormalized,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHanningDenormalizedHalf") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningDenormalized,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hann_window(&legacyResult,
-                         n,
-                         Int32(vDSP_HANN_DENORM | vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hanningDenormalized,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHamming") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hamming,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hamm_window(&legacyResult,
-                         n,
-                         0)
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hamming,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionHammingHalf") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hamming,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hamm_window(&legacyResult,
-                         n,
-                         Int32(vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .hamming,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionBlackman") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .blackman,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_blkman_window(&legacyResult,
-                           n,
-                           0)
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .blackman,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionBlackmanHalf") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .blackman,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_blkman_window(&legacyResult,
-                           n,
-                           Int32(vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Float.self,
-                                         usingSequence: .blackman,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHanningNormalized") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningNormalized,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hann_windowD(&legacyResult,
-                          n,
-                          Int32(vDSP_HANN_NORM))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hanningNormalized,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHanningNormalizedHalf") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningNormalized,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hann_windowD(&legacyResult,
-                          n,
-                          Int32(vDSP_HANN_NORM | vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hanningNormalized,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHanningDenormalized") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningDenormalized,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hann_windowD(&legacyResult,
-                          n,
-                          Int32(vDSP_HANN_DENORM))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hanningDenormalized,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHanningDenormalizedHalf") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hanningDenormalized,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hann_windowD(&legacyResult,
-                          n,
-                          Int32(vDSP_HANN_DENORM | vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hanningDenormalized,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHamming") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hamming,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_hamm_windowD(&legacyResult,
-                          n,
-                          0)
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hamming,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionHammingHalf") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .hamming,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_hamm_windowD(&legacyResult,
-                          n,
-                          Int32(vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .hamming,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionBlackman") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .blackman,
-                        result: &result,
-                        isHalfWindow: false)
-        
-        vDSP_blkman_windowD(&legacyResult,
-                            n,
-                            0)
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .blackman,
-                                         count: count,
-                                         isHalfWindow: false)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionBlackmanHalf") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formWindow(usingSequence: .blackman,
-                        result: &result,
-                        isHalfWindow: true)
-        
-        vDSP_blkman_windowD(&legacyResult,
-                            n,
-                            Int32(vDSP_HALF_WINDOW))
-        
-        let returnedResult = vDSP.window(ofType: Double.self,
-                                         usingSequence: .blackman,
-                                         count: count,
-                                         isHalfWindow: true)
-        
-        expectTrue(result[0 ..< count / 2].elementsEqual(legacyResult[0 ..< count / 2]))
-        expectTrue(result[0 ..< count / 2].elementsEqual(returnedResult[0 ..< count / 2]))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionWithRange") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formRamp(in: 0 ... 100,
-                      result: &result)
-        
-        vDSP_vgen([0],
-                  [100],
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.ramp(in: Float(0) ... Float(100),
-                                       count: count)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionRampWithIncrement") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.formRamp(withInitialValue: 0,
-                      increment: 0.1,
-                      result: &result)
-        
-        vDSP_vramp([0],
-                   [0.1],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.ramp(withInitialValue: Float(0),
-                                       increment: Float(0.1),
-                                       count: count)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/SinglePrecisionRampWithMultiplier") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        let multiplier = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.05)
-        }
-        
-        var start = Float(10)
-        
-        vDSP.formRamp(withInitialValue: &start,
-                      multiplyingBy: multiplier,
-                      increment: 1,
-                      result: &result)
-        
-        var legacyStart = Float(10)
-        
-        vDSP_vrampmul(multiplier, 1,
-                      &legacyStart,
-                      [1],
-                      &legacyResult, 1,
-                      n)
-        
-        var start2 = Float(10)
-        let returnedResult = vDSP.ramp(withInitialValue: &start2,
-                                       multiplyingBy: multiplier,
-                                       increment: 1)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-   
-        expectEqual(start, legacyStart)
-        expectEqual(start, start2)
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/StereoSinglePrecisionRampWithMultiplier") {
-        var result = [Float](repeating: 1, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        let multiplierOne = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.05)
-        }
-        let multiplierTwo = (0 ..< n).map{ i in
-            return sin(Float(i) * 0.0125)
-        }
-        
-        var start = Float(10)
-        var resultTwo = [Float](repeating: 2, count: result.count)
-        
-        vDSP.formStereoRamp(withInitialValue: &start,
-                            multiplyingBy: multiplierOne, multiplierTwo,
-                            increment: 1,
-                            results: &result, &resultTwo)
-        
-        var legacyStart = Float(10)
-        var legacyResultTwo = [Float](repeating: -2, count: legacyResult.count)
-        
-        vDSP_vrampmul2(multiplierOne, multiplierTwo, 1,
-                       &legacyStart,
-                       [1],
-                       &legacyResult, &legacyResultTwo, 1,
-                       n)
-        
-        var start2 = Float(10)
-        let returnedResult = vDSP.stereoRamp(withInitialValue: &start2,
-                                                multiplyingBy: multiplierOne, multiplierTwo,
-                                                increment: 1)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(resultTwo.elementsEqual(legacyResultTwo))
-        expectEqual(start, legacyStart)
-        
-        expectTrue(result.elementsEqual(returnedResult.firstOutput))
-        expectTrue(resultTwo.elementsEqual(returnedResult.secondOutput))
-        expectEqual(start, start2)
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionRampWithRange") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formRamp(in: 0 ... 100,
-                      result: &result)
-        
-        vDSP_vgenD([0],
-                   [100],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.ramp(in: Double(0) ... Double(100),
-                                       count: count)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionRampWithRange") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.formRamp(withInitialValue: 0,
-                      increment: 0.1,
-                      result: &result)
-        
-        vDSP_vrampD([0],
-                    [0.1],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.ramp(withInitialValue: 0,
-                                       increment: 0.1,
-                                       count: count)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/DoublePrecisionRampWithMultiplier") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        let multiplier = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.05)
-        }
-        
-        var start = Double(10)
-        
-        vDSP.formRamp(withInitialValue: &start,
-                      multiplyingBy: multiplier,
-                      increment: 1,
-                      result: &result)
-        
-        var legacyStart = Double(10)
-        
-        vDSP_vrampmulD(multiplier, 1,
-                       &legacyStart,
-                       [1],
-                       &legacyResult, 1,
-                       n)
-
-        var start2 = Double(10)
-        let returnedResult = vDSP.ramp(withInitialValue: &start2,
-                                       multiplyingBy: multiplier,
-                                       increment: 1)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-        
-        expectEqual(start, legacyStart)
-        expectEqual(start, start2)
-    }
-    
-    Accelerate_vDSPFillClearGenerateTests.test("vDSP/StereoDoublePrecisionRampWithMultiplier") {
-        var result = [Double](repeating: 1, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        let multiplierOne = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.05)
-        }
-        let multiplierTwo = (0 ..< n).map{ i in
-            return sin(Double(i) * 0.0125)
-        }
-        
-        var start = Double(10)
-        var resultTwo = [Double](repeating: 2, count: result.count)
-        
-        vDSP.formStereoRamp(withInitialValue: &start,
-                            multiplyingBy: multiplierOne, multiplierTwo,
-                            increment: 1,
-                            results: &result, &resultTwo)
-        
-        var legacyStart = Double(10)
-        var legacyResultTwo = [Double](repeating: -2, count: legacyResult.count)
-        
-        vDSP_vrampmul2D(multiplierOne, multiplierTwo, 1,
-                        &legacyStart,
-                        [1],
-                        &legacyResult, &legacyResultTwo, 1,
-                        n)
-        
-        var start2 = Double(10)
-        let returnedResult = vDSP.stereoRamp(withInitialValue: &start2,
-                                                 multiplyingBy: multiplierOne, multiplierTwo,
-                                                 increment: 1)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(resultTwo.elementsEqual(legacyResultTwo))
-        expectEqual(start, legacyStart)
-        
-        expectTrue(result.elementsEqual(returnedResult.firstOutput))
-        expectTrue(resultTwo.elementsEqual(returnedResult.secondOutput))
-        expectEqual(start, start2)
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPFourierTransform.swift b/test/stdlib/Accelerate_vDSPFourierTransform.swift
deleted file mode 100644
index 87d74d22eaf34..0000000000000
--- a/test/stdlib/Accelerate_vDSPFourierTransform.swift
+++ /dev/null
@@ -1,725 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPFourierTransformTests = TestSuite("Accelerate_vDSPFourierTransform")
-
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP discrete Fourier transform tests; single-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 2048
-    let tau: Float = .pi * 2
-    
-    let frequencies: [Float] = [1, 5, 25, 30, 75, 100,
-                                300, 500, 512, 1023]
-    
-    let inputReal: [Float] = (0 ..< n).map { index in
-        frequencies.reduce(0) { accumulator, frequency in
-            let normalizedIndex = Float(index) / Float(n)
-            return accumulator + sin(normalizedIndex * frequency * tau)
-        }
-    }
-    
-    let inputImag: [Float] = (0 ..< n).map { index in
-        frequencies.reduce(0) { accumulator, frequency in
-            let normalizedIndex = Float(index) / Float(n)
-            return accumulator + sin(normalizedIndex * 1/frequency * tau)
-        }
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/SinglePrecisionForwardComplexComplex") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .forward,
-                              transformType: .complexComplex,
-                              ofType: Float.self)!
-        
-        var outputReal = [Float](repeating: 0, count: n)
-        var outputImag = [Float](repeating: 0, count: n)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zop_CreateSetup(nil,
-                                                   vDSP_Length(n),
-                                                   .FORWARD)!
-        
-        var legacyOutputReal = [Float](repeating: -1, count: n)
-        var legacyOutputImag = [Float](repeating: -1, count: n)
-        
-        vDSP_DFT_Execute(legacySetup,
-                         inputReal,
-                         inputImag,
-                         &legacyOutputReal,
-                         &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/SinglePrecisionInverseComplexComplex") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .inverse,
-                              transformType: .complexComplex,
-                              ofType: Float.self)!
-        
-        var outputReal = [Float](repeating: 0, count: n)
-        var outputImag = [Float](repeating: 0, count: n)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zop_CreateSetup(nil,
-                                                   vDSP_Length(n),
-                                                   .INVERSE)!
-        
-        var legacyOutputReal = [Float](repeating: -1, count: n)
-        var legacyOutputImag = [Float](repeating: -1, count: n)
-        
-        vDSP_DFT_Execute(legacySetup,
-                         inputReal,
-                         inputImag,
-                         &legacyOutputReal,
-                         &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/SinglePrecisionForwardComplexReal") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .forward,
-                              transformType: .complexReal,
-                              ofType: Float.self)!
-        
-        var outputReal = [Float](repeating: 0, count: n / 2)
-        var outputImag = [Float](repeating: 0, count: n / 2)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zrop_CreateSetup(nil,
-                                                    vDSP_Length(n),
-                                                    .FORWARD)!
-        
-        var legacyOutputReal = [Float](repeating: -1, count: n / 2)
-        var legacyOutputImag = [Float](repeating: -1, count: n / 2)
-        
-        vDSP_DFT_Execute(legacySetup,
-                         inputReal,
-                         inputImag,
-                         &legacyOutputReal,
-                         &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/SinglePrecisionInverseComplexReal") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .inverse,
-                              transformType: .complexReal,
-                              ofType: Float.self)!
-        
-        var outputReal = [Float](repeating: 0, count: n / 2)
-        var outputImag = [Float](repeating: 0, count: n / 2)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zrop_CreateSetup(nil,
-                                                    vDSP_Length(n),
-                                                    .INVERSE)!
-        
-        var legacyOutputReal = [Float](repeating: -1, count: n / 2)
-        var legacyOutputImag = [Float](repeating: -1, count: n / 2)
-        
-        vDSP_DFT_Execute(legacySetup,
-                         inputReal,
-                         inputImag,
-                         &legacyOutputReal,
-                         &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-}
-
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP discrete Fourier transform tests; double-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = 2048
-    let tau: Double = .pi * 2
-    
-    let frequencies: [Double] = [1, 5, 25, 30, 75, 100,
-                                 300, 500, 512, 1023]
-    
-    let inputReal: [Double] = (0 ..< n).map { index in
-        frequencies.reduce(0) { accumulator, frequency in
-            let normalizedIndex = Double(index) / Double(n)
-            return accumulator + sin(normalizedIndex * frequency * tau)
-        }
-    }
-    
-    let inputImag: [Double] = (0 ..< n).map { index in
-        frequencies.reduce(0) { accumulator, frequency in
-            let normalizedIndex = Double(index) / Double(n)
-            return accumulator + sin(normalizedIndex * 1/frequency * tau)
-        }
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/DoublePrecisionForwardComplexComplex") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .forward,
-                              transformType: .complexComplex,
-                              ofType: Double.self)!
-        
-        var outputReal = [Double](repeating: 0, count: n)
-        var outputImag = [Double](repeating: 0, count: n)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zop_CreateSetupD(nil,
-                                                    vDSP_Length(n),
-                                                    .FORWARD)!
-        
-        var legacyOutputReal = [Double](repeating: -1, count: n)
-        var legacyOutputImag = [Double](repeating: -1, count: n)
-        
-        vDSP_DFT_ExecuteD(legacySetup,
-                          inputReal,
-                          inputImag,
-                          &legacyOutputReal,
-                          &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/DoublePrecisionInverseComplexComplex") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .inverse,
-                              transformType: .complexComplex,
-                              ofType: Double.self)!
-        
-        var outputReal = [Double](repeating: 0, count: n)
-        var outputImag = [Double](repeating: 0, count: n)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zop_CreateSetupD(nil,
-                                                    vDSP_Length(n),
-                                                    .INVERSE)!
-        
-        var legacyOutputReal = [Double](repeating: -1, count: n)
-        var legacyOutputImag = [Double](repeating: -1, count: n)
-        
-        vDSP_DFT_ExecuteD(legacySetup,
-                          inputReal,
-                          inputImag,
-                          &legacyOutputReal,
-                          &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/DoublePrecisionForwardComplexReal") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .forward,
-                              transformType: .complexReal,
-                              ofType: Double.self)!
-        
-        var outputReal = [Double](repeating: 0, count: n / 2)
-        var outputImag = [Double](repeating: 0, count: n / 2)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zrop_CreateSetupD(nil,
-                                                     vDSP_Length(n),
-                                                     .FORWARD)!
-        
-        var legacyOutputReal = [Double](repeating: -1, count: n / 2)
-        var legacyOutputImag = [Double](repeating: -1, count: n / 2)
-        
-        vDSP_DFT_ExecuteD(legacySetup,
-                          inputReal,
-                          inputImag,
-                          &legacyOutputReal,
-                          &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/DoublePrecisionInverseComplexReal") {
-        let fwdDFT = vDSP.DFT(count: n,
-                              direction: .inverse,
-                              transformType: .complexReal,
-                              ofType: Double.self)!
-        
-        var outputReal = [Double](repeating: 0, count: n / 2)
-        var outputImag = [Double](repeating: 0, count: n / 2)
-        
-        fwdDFT.transform(inputReal: inputReal,
-                         inputImaginary: inputImag,
-                         outputReal: &outputReal,
-                         outputImaginary: &outputImag)
-        
-        // legacy...
-        
-        let legacySetup = vDSP_DFT_zrop_CreateSetupD(nil,
-                                                     vDSP_Length(n),
-                                                     .INVERSE)!
-        
-        var legacyOutputReal = [Double](repeating: -1, count: n / 2)
-        var legacyOutputImag = [Double](repeating: -1, count: n / 2)
-        
-        vDSP_DFT_ExecuteD(legacySetup,
-                          inputReal,
-                          inputImag,
-                          &legacyOutputReal,
-                          &legacyOutputImag)
-        
-        expectTrue(outputReal.elementsEqual(legacyOutputReal))
-        expectTrue(outputImag.elementsEqual(legacyOutputImag))
-        
-        let returnedResult = fwdDFT.transform(inputReal: inputReal,
-                                              inputImaginary: inputImag)
-        
-        expectTrue(outputReal.elementsEqual(returnedResult.real))
-        expectTrue(outputImag.elementsEqual(returnedResult.imaginary))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Fast Fourier Transform Tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-  
-    Accelerate_vDSPFourierTransformTests.test("vDSP/2DSinglePrecision") {
-        let width = 256
-        let height = 256
-        let pixelCount = width * height
-        let n = pixelCount / 2
-        
-        let pixels: [Float] = (0 ..< pixelCount).map { i in
-            return abs(sin(Float(i) * 0.001 * 2))
-        }
-        
-        var sourceImageReal = [Float](repeating: 0, count: n)
-        var sourceImageImaginary = [Float](repeating: 0, count: n)
-        
-        sourceImageReal.withUnsafeMutableBufferPointer { sourceImageRealPtr in
-            sourceImageImaginary.withUnsafeMutableBufferPointer { sourceImageImaginaryPtr in
-                
-                var sourceImage = DSPSplitComplex(realp: sourceImageRealPtr.baseAddress!,
-                                                  imagp: sourceImageImaginaryPtr.baseAddress!)
-                
-                pixels.withUnsafeBytes{
-                    vDSP_ctoz([DSPComplex]($0.bindMemory(to: DSPComplex.self)), 2,
-                              &sourceImage, 1,
-                              vDSP_Length(pixels.count / 2))
-                }
-                
-                // Create FFT2D object
-                let fft2D = vDSP.FFT2D(width: 256,
-                                       height: 256,
-                                       ofType: DSPSplitComplex.self)!
-                
-                // New style transform
-                var transformedImageReal = [Float](repeating: 0,
-                                                   count: n)
-                var transformedImageImaginary = [Float](repeating: 0,
-                                                        count: n)
-                
-                transformedImageReal.withUnsafeMutableBufferPointer { transformedImageRealPtr in
-                    transformedImageImaginary.withUnsafeMutableBufferPointer { transformedImageImaginaryPtr in
-                        
-                        var transformedImage = DSPSplitComplex(
-                            realp: transformedImageRealPtr.baseAddress!,
-                            imagp: transformedImageImaginaryPtr.baseAddress!)
-                        
-                        fft2D.transform(input: sourceImage,
-                                        output: &transformedImage,
-                                        direction: .forward)
-                    }
-                }
-  
-                // Legacy 2D FFT
-                
-                let log2n = vDSP_Length(log2(Float(width * height)))
-                let legacySetup = vDSP_create_fftsetup(
-                    log2n,
-                    FFTRadix(kFFTRadix2))!
-                
-                var legacyTransformedImageReal = [Float](repeating: -1,
-                                                         count: n)
-                var legacyTransformedImageImaginary = [Float](repeating: -1,
-                                                              count: n)
-                
-                legacyTransformedImageReal.withUnsafeMutableBufferPointer { legacyTransformedImageRealPtr in
-                    legacyTransformedImageImaginary.withUnsafeMutableBufferPointer { legacyTransformedImageImaginaryPtr in
-                        
-                        var legacyTransformedImage = DSPSplitComplex(
-                            realp: legacyTransformedImageRealPtr.baseAddress!,
-                            imagp: legacyTransformedImageImaginaryPtr.baseAddress!)
-                        
-                        vDSP_fft2d_zrop(legacySetup,
-                                        &sourceImage, 1, 0,
-                                        &legacyTransformedImage, 1, 0,
-                                        vDSP_Length(log2(Float(width))),
-                                        vDSP_Length(log2(Float(height))),
-                                        FFTDirection(kFFTDirection_Forward))
-                    }
-                }
-                
-                expectTrue(transformedImageReal.elementsEqual(legacyTransformedImageReal))
-                expectTrue(transformedImageImaginary.elementsEqual(legacyTransformedImageImaginary))
-            }
-        }
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/2DDoublePrecision") {
-        let width = 256
-        let height = 256
-        let pixelCount = width * height
-        let n = pixelCount / 2
-        
-        let pixels: [Double] = (0 ..< pixelCount).map { i in
-            return abs(sin(Double(i) * 0.001 * 2))
-        }
-        
-        var sourceImageReal = [Double](repeating: 0, count: n)
-        var sourceImageImaginary = [Double](repeating: 0, count: n)
-        
-        sourceImageReal.withUnsafeMutableBufferPointer { sourceImageRealPtr in
-            sourceImageImaginary.withUnsafeMutableBufferPointer { sourceImageImaginaryPtr in
-                
-                var sourceImage = DSPDoubleSplitComplex(realp: sourceImageRealPtr.baseAddress!,
-                                                        imagp: sourceImageImaginaryPtr.baseAddress!)
-                
-                pixels.withUnsafeBytes{
-                    vDSP_ctozD([DSPDoubleComplex]($0.bindMemory(to: DSPDoubleComplex.self)), 2,
-                               &sourceImage, 1,
-                               vDSP_Length(pixels.count / 2))
-                }
-                
-                // Create FFT2D object
-                let fft2D = vDSP.FFT2D(width: 256,
-                                       height: 256,
-                                       ofType: DSPDoubleSplitComplex.self)!
-                
-                // New style transform
-                var transformedImageReal = [Double](repeating: 0,
-                                                    count: n)
-                var transformedImageImaginary = [Double](repeating: 0,
-                                                         count: n)
-                
-                transformedImageReal.withUnsafeMutableBufferPointer { transformedImageRealPtr in
-                    transformedImageImaginary.withUnsafeMutableBufferPointer { transformedImageImaginaryPtr in
-                        
-                        var transformedImage = DSPDoubleSplitComplex(
-                            realp: transformedImageRealPtr.baseAddress!,
-                            imagp: transformedImageImaginaryPtr.baseAddress!)
-                        
-                        fft2D.transform(input: sourceImage,
-                                        output: &transformedImage,
-                                        direction: .forward)
-                    }
-                }
-   
-                // Legacy 2D FFT
-                
-                let log2n = vDSP_Length(log2(Float(width * height)))
-                let legacySetup = vDSP_create_fftsetupD(
-                    log2n,
-                    FFTRadix(kFFTRadix2))!
-                
-                var legacyTransformedImageReal = [Double](repeating: -1,
-                                                          count: n)
-                var legacyTransformedImageImaginary = [Double](repeating: -1,
-                                                               count: n)
-                
-                legacyTransformedImageReal.withUnsafeMutableBufferPointer { legacyTransformedImageRealPtr in
-                    legacyTransformedImageImaginary.withUnsafeMutableBufferPointer { legacyTransformedImageImaginaryPtr in
-                        
-                        var legacyTransformedImage = DSPDoubleSplitComplex(
-                            realp: legacyTransformedImageRealPtr.baseAddress!,
-                            imagp: legacyTransformedImageImaginaryPtr.baseAddress!)
-                        
-                        vDSP_fft2d_zropD(legacySetup,
-                                         &sourceImage, 1, 0,
-                                         &legacyTransformedImage, 1, 0,
-                                         vDSP_Length(log2(Float(width))),
-                                         vDSP_Length(log2(Float(height))),
-                                         FFTDirection(kFFTDirection_Forward))
-                    }
-                }
-                
-                expectTrue(transformedImageReal.elementsEqual(legacyTransformedImageReal))
-                expectTrue(transformedImageImaginary.elementsEqual(legacyTransformedImageImaginary))
-            }
-        }
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/1DSinglePrecision") {
-        let n = vDSP_Length(2048)
-          
-          let frequencies: [Float] = [1, 5, 25, 30, 75, 100,
-                                      300, 500, 512, 1023]
-          
-          let tau: Float = .pi * 2
-          let signal: [Float] = (0 ... n).map { index in
-              frequencies.reduce(0) { accumulator, frequency in
-                  let normalizedIndex = Float(index) / Float(n)
-                  return accumulator + sin(normalizedIndex * frequency * tau)
-              }
-          }
-          
-          let halfN = Int(n / 2)
-          
-          var forwardInputReal = [Float](repeating: 0, count: halfN)
-          var forwardInputImag = [Float](repeating: 0, count: halfN)
-          
-          forwardInputReal.withUnsafeMutableBufferPointer { forwardInputRealPtr in
-              forwardInputImag.withUnsafeMutableBufferPointer { forwardInputImagPtr in
-                  
-                  var forwardInput = DSPSplitComplex(realp: forwardInputRealPtr.baseAddress!,
-                                                     imagp: forwardInputImagPtr.baseAddress!)
-                  
-                  signal.withUnsafeBytes{
-                      vDSP_ctoz([DSPComplex]($0.bindMemory(to: DSPComplex.self)), 2,
-                                &forwardInput, 1,
-                                vDSP_Length(signal.count / 2))
-                  }
-                  
-                  let log2n = vDSP_Length(log2(Float(n)))
-                  
-                  // New API
-                  
-                  guard let fft = vDSP.FFT(log2n: log2n,
-                                           radix: .radix2,
-                                           ofType: DSPSplitComplex.self) else {
-                                              fatalError("Can't create FFT.")
-                  }
-                  
-                  var outputReal = [Float](repeating: 0, count: halfN)
-                  var outputImag = [Float](repeating: 0, count: halfN)
-                  
-                  outputReal.withUnsafeMutableBufferPointer { outputRealPtr in
-                      outputImag.withUnsafeMutableBufferPointer { outputImagPtr in
-                          var forwardOutput = DSPSplitComplex(realp: outputRealPtr.baseAddress!,
-                                                              imagp: outputImagPtr.baseAddress!)
-                          
-                          fft.transform(input: forwardInput,
-                                        output: &forwardOutput,
-                                        direction: .forward)
-                      }
-                  }
-                  
-                  // Legacy Style
-                  
-                  let legacySetup = vDSP_create_fftsetup(log2n,
-                                                         FFTRadix(kFFTRadix2))!
-                  
-                  var legacyOutputReal = [Float](repeating: -1, count: halfN)
-                  var legacyOutputImag = [Float](repeating: -1, count: halfN)
-                  
-                  legacyOutputReal.withUnsafeMutableBufferPointer { legacyOutputRealPtr in
-                      legacyOutputImag.withUnsafeMutableBufferPointer { legacyOutputImagPtr in
-                          var legacyForwardOutput = DSPSplitComplex(realp: legacyOutputRealPtr.baseAddress!,
-                                                                    imagp: legacyOutputImagPtr.baseAddress!)
-                          
-                          vDSP_fft_zrop(legacySetup,
-                                        &forwardInput, 1,
-                                        &legacyForwardOutput, 1,
-                                        log2n,
-                                        FFTDirection(kFFTDirection_Forward))
-                      }
-                  }
-                  
-                  expectTrue(outputReal.elementsEqual(legacyOutputReal))
-                  expectTrue(outputImag.elementsEqual(legacyOutputImag))
-              }
-          }
-    }
-    
-    Accelerate_vDSPFourierTransformTests.test("vDSP/1DDoublePrecision") {
-        let n = vDSP_Length(2048)
-        
-        let frequencies: [Double] = [1, 5, 25, 30, 75, 100,
-                                     300, 500, 512, 1023]
-        
-        let tau: Double = .pi * 2
-        let signal: [Double] = (0 ... n).map { index in
-            frequencies.reduce(0) { accumulator, frequency in
-                let normalizedIndex = Double(index) / Double(n)
-                return accumulator + sin(normalizedIndex * frequency * tau)
-            }
-        }
-        
-        let halfN = Int(n / 2)
-        
-        var forwardInputReal = [Double](repeating: 0, count: halfN)
-        var forwardInputImag = [Double](repeating: 0, count: halfN)
-        
-        forwardInputReal.withUnsafeMutableBufferPointer { forwardInputRealPtr in
-            forwardInputImag.withUnsafeMutableBufferPointer { forwardInputImagPtr in
-                
-                var forwardInput = DSPDoubleSplitComplex(realp: forwardInputRealPtr.baseAddress!,
-                                                         imagp: forwardInputImagPtr.baseAddress!)
-                
-                signal.withUnsafeBytes{
-                    vDSP_ctozD([DSPDoubleComplex]($0.bindMemory(to: DSPDoubleComplex.self)), 2,
-                               &forwardInput, 1,
-                               vDSP_Length(signal.count / 2))
-                }
-                
-                let log2n = vDSP_Length(log2(Float(n)))
-                
-                // New API
-                
-                guard let fft = vDSP.FFT(log2n: log2n,
-                                         radix: .radix2,
-                                         ofType: DSPDoubleSplitComplex.self) else {
-                                            fatalError("Can't create FFT.")
-                }
-                
-                var outputReal = [Double](repeating: 0, count: halfN)
-                var outputImag = [Double](repeating: 0, count: halfN)
-                
-                outputReal.withUnsafeMutableBufferPointer { outputRealPtr in
-                    outputImag.withUnsafeMutableBufferPointer { outputImagPtr in
-                        var forwardOutput = DSPDoubleSplitComplex(realp: outputRealPtr.baseAddress!,
-                                                                  imagp: outputImagPtr.baseAddress!)
-                        
-                        fft.transform(input: forwardInput,
-                                      output: &forwardOutput,
-                                      direction: .forward)
-                    }
-                }
-                
-                // Legacy Style
-                
-                let legacySetup = vDSP_create_fftsetupD(log2n,
-                                                        FFTRadix(kFFTRadix2))!
-                
-                var legacyOutputReal = [Double](repeating: -1, count: halfN)
-                var legacyOutputImag = [Double](repeating: -1, count: halfN)
-                
-                legacyOutputReal.withUnsafeMutableBufferPointer { legacyOutputRealPtr in
-                    legacyOutputImag.withUnsafeMutableBufferPointer { legacyOutputImagPtr in
-                        var legacyForwardOutput = DSPDoubleSplitComplex(realp: legacyOutputRealPtr.baseAddress!,
-                                                                        imagp: legacyOutputImagPtr.baseAddress!)
-                        
-                        vDSP_fft_zropD(legacySetup,
-                                       &forwardInput, 1,
-                                       &legacyForwardOutput, 1,
-                                       log2n,
-                                       FFTDirection(kFFTDirection_Forward))
-                    }
-                }
-                
-                expectTrue(outputReal.elementsEqual(legacyOutputReal))
-                expectTrue(outputImag.elementsEqual(legacyOutputImag))
-            }
-        }
-    }
-    
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPGeometry.swift b/test/stdlib/Accelerate_vDSPGeometry.swift
deleted file mode 100644
index b841753c605b9..0000000000000
--- a/test/stdlib/Accelerate_vDSPGeometry.swift
+++ /dev/null
@@ -1,197 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPGeometryTests = TestSuite("Accelerate_vDSPGeometry")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Dot Product
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/SinglePrecisionDot") {
-        let a: [Float] = [ 1.2, 6.7, 0.22334, 101.9, 90.1, 100.999 ]
-        let b: [Float] = [99.9, 0.1, 1000.88, 23.99, 27.9, 87.0444]
-        
-        let result = vDSP.dot(a, b)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_dotpr(a, 1,
-                   b, 1,
-                   &legacyResult,
-                   vDSP_Length(a.count))
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/DoublePrecisionDot") {
-        let a: [Double] = [ 1.2, 6.7, 0.22334, 101.9, 90.1, 100.999 ]
-        let b: [Double] = [99.9, 0.1, 1000.88, 23.99, 27.9, 87.0444]
-        
-        let result = vDSP.dot(a, b)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_dotprD(a, 1,
-                    b, 1,
-                    &legacyResult,
-                    vDSP_Length(a.count))
-        
-        expectEqual(result, legacyResult)
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Hypotenuse and distance squared
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let xlegs = [(1, 2),        (4, 5),     (2, 1),         (1000, 1), (-1055, 55)]
-    let ylegs = [(-1000, 2),    (4, -50),   (-25, -100),    (1, 1000), (5, 1)]
-    
-    let pointA = [1,    4,      1,  -100,   -10, 10,    99]
-    let pointB = [901,  14,     61, -1,     -10, -1000, 27]
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/SinglePrecisionDist") {
-        var distResult = [Float](repeating: 0, count: xlegs.count)
-        
-        let x: [Float] = xlegs.map{ return Float($0.0) - Float($0.1) }
-        let y: [Float] = ylegs.map{ return Float($0.0) - Float($0.1) }
-        
-        vDSP.hypot(x, y,
-                   result: &distResult)
-        
-        var legacyDistResult = [Float](repeating: -1, count: xlegs.count)
-        
-        vDSP_vdist(x, 1,
-                   y, 1,
-                   &legacyDistResult, 1,
-                   vDSP_Length(legacyDistResult.count))
-        
-        let returnedResult = vDSP.hypot(x, y)
-        
-        expectTrue(distResult.elementsEqual(legacyDistResult))
-        expectTrue(distResult.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/SinglePrecisionPyth") {
-        var pythgResult =  [Float](repeating: 0, count: xlegs.count)
-        
-        let x0: [Float] = xlegs.map{ return Float($0.0) }
-        let x1: [Float] = xlegs.map{ return Float($0.1) }
-        let y0: [Float] = ylegs.map{ return Float($0.0) }
-        let y1: [Float] = ylegs.map{ return Float($0.1) }
-        
-        vDSP.hypot(x0: x0, x1: x1,
-                   y0: y0, y1: y1,
-                   result: &pythgResult)
-        
-        var legacyPythgResult = [Float](repeating: -1, count: xlegs.count)
-        
-        vDSP_vpythg(x0, 1, y0, 1,
-                    x1, 1, y1, 1,
-                    &legacyPythgResult, 1,
-                    vDSP_Length(legacyPythgResult.count))
-        
-        let returnedResult = vDSP.hypot(x0: x0, x1: x1,
-                                        y0: y0, y1: y1)
-        
-        expectTrue(pythgResult.elementsEqual(legacyPythgResult))
-        expectTrue(pythgResult.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/DoublePrecisionDist") {
-        var distResult = [Double](repeating: 0, count: xlegs.count)
-        
-        let x: [Double] = xlegs.map{ return Double($0.0) - Double($0.1) }
-        let y: [Double] = ylegs.map{ return Double($0.0) - Double($0.1) }
-        
-        vDSP.hypot(x, y,
-                   result: &distResult)
-        
-        var legacyDistResult = [Double](repeating: -1, count: xlegs.count)
-        
-        vDSP_vdistD(x, 1,
-                    y, 1,
-                    &legacyDistResult, 1,
-                    vDSP_Length(legacyDistResult.count))
-        
-        let returnedResult = vDSP.hypot(x, y)
-        
-        expectTrue(distResult.elementsEqual(legacyDistResult))
-        expectTrue(distResult.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/DoublePrecisionPyth") {
-        var pythgResult =  [Double](repeating: 0, count: xlegs.count)
-        
-        let x0: [Double] = xlegs.map{ return Double($0.0) }
-        let x1: [Double] = xlegs.map{ return Double($0.1) }
-        let y0: [Double] = ylegs.map{ return Double($0.0) }
-        let y1: [Double] = ylegs.map{ return Double($0.1) }
-        
-        vDSP.hypot(x0: x0, x1: x1,
-                   y0: y0, y1: y1,
-                   result: &pythgResult)
-        
-        var legacyPythgResult = [Double](repeating: -1, count: xlegs.count)
-        
-        vDSP_vpythgD(x0, 1, y0, 1,
-                     x1, 1, y1, 1,
-                     &legacyPythgResult, 1,
-                     vDSP_Length(legacyPythgResult.count))
-        
-        let returnedResult = vDSP.hypot(x0: x0, x1: x1,
-                                        y0: y0, y1: y1)
-        
-        expectTrue(pythgResult.elementsEqual(legacyPythgResult))
-        expectTrue(pythgResult.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/SinglePrecisionDistanceSquared") {
-        let a = pointA.map{ return Float($0) }
-        let b = pointB.map{ return Float($0) }
-        
-        let result = vDSP.distanceSquared(a, b)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_distancesq(a, 1,
-                        b, 1,
-                        &legacyResult,
-                        vDSP_Length(a.count))
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPGeometryTests.test("vDSP/DoublePrecisionDistanceSquared") {
-        let a = pointA.map{ return Double($0) }
-        let b = pointB.map{ return Double($0) }
-        
-        let result = vDSP.distanceSquared(a, b)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_distancesqD(a, 1,
-                         b, 1,
-                         &legacyResult,
-                         vDSP_Length(a.count))
-        
-        expectEqual(result, legacyResult)
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPIntegration.swift b/test/stdlib/Accelerate_vDSPIntegration.swift
deleted file mode 100644
index d7a18b509466e..0000000000000
--- a/test/stdlib/Accelerate_vDSPIntegration.swift
+++ /dev/null
@@ -1,171 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPIntegrationTests = TestSuite("Accelerate_vDSPIntegration")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP integration tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 1024
-    let n = vDSP_Length(1024)
-    
-    let sourcef: [Float] = (0 ..< 1024).map {
-        return sin(Float($0) * 0.03) * cos(Float($0) * 0.07)
-    }
-    
-    let sourced: [Double] = (0 ..< 1024).map {
-        return sin(Double($0) * 0.03) * cos(Double($0) * 0.07)
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/SinglePrecisionRunningSum") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.integrate(sourcef,
-                       using: .runningSum,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vrsum(sourcef, 1,
-                   [1],
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.integrate(sourcef,
-                                            using: .runningSum)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/SinglePrecisionTrapezoidal") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.integrate(sourcef,
-                       using: .simpson,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vsimps(sourcef, 1,
-                    [1],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integrate(sourcef,
-                                            using: .simpson)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/SinglePrecisionTrapezoidal") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.integrate(sourcef,
-                       using: .trapezoidal,
-                       result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vtrapz(sourcef, 1,
-                    [1],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integrate(sourcef,
-                                            using: .trapezoidal)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/DoublePrecisionRunningSum") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.integrate(sourced,
-                       using: .runningSum,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vrsumD(sourced, 1,
-                    [1],
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.integrate(sourced,
-                                            using: .runningSum)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/DoublePrecisionSimpson") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.integrate(sourced,
-                       using: .simpson,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vsimpsD(sourced, 1,
-                     [1],
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integrate(sourced,
-                                            using: .simpson)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPIntegrationTests.test("vDSP/DoublePrecisionTrapezoidal") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.integrate(sourced,
-                       using: .trapezoidal,
-                       result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vtrapzD(sourced, 1,
-                     [1],
-                     &legacyResult, 1,
-                     n)
-        
-        let returnedResult = vDSP.integrate(sourced,
-                                            using: .trapezoidal)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPReduction.swift b/test/stdlib/Accelerate_vDSPReduction.swift
deleted file mode 100644
index eda2008b18e8e..0000000000000
--- a/test/stdlib/Accelerate_vDSPReduction.swift
+++ /dev/null
@@ -1,403 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPReductionTests = TestSuite("Accelerate_vDSPReduction")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP vector reduction; single-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = vDSP_Length(256)
-    
-    let a = (0 ..< 256).map {
-        return sin(Float($0) * 0.03) * cos(Float($0) * 0.07)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMaximum") {
-        let result: Float = vDSP.maximum(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_maxv(a, 1,
-                  &legacyResult,
-                  n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMaximumIndex") {
-        let result: (vDSP_Length, Float) = vDSP.indexOfMaximum(a)
-        
-        var legacyValueResult = Float(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_maxvi(a, 1,
-                   &legacyValueResult,
-                   &legacyIndexResult,
-                   n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMaximumMagnitude") {
-        let result: Float = vDSP.maximumMagnitude(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_maxmgv(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMaximumMagnitudeIndex") {
-        let result: (vDSP_Length, Float) = vDSP.indexOfMaximumMagnitude(a)
-        
-        var legacyValueResult = Float(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_maxmgvi(a, 1,
-                     &legacyValueResult,
-                     &legacyIndexResult,
-                     n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMaximumMagnitudeIndex") {
-        let result: Float = vDSP.minimum(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_minv(a, 1,
-                  &legacyResult,
-                  n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionMinimumIndex") {
-        let result: (vDSP_Length, Float) = vDSP.indexOfMinimum(a)
-        
-        var legacyValueResult = Float(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_minvi(a, 1,
-                   &legacyValueResult,
-                   &legacyIndexResult,
-                   n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionSum") {
-        let result: Float = vDSP.sum(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_sve(a, 1,
-                 &legacyResult,
-                 n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionSumOfSquares") {
-        let result: Float = vDSP.sumOfSquares(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_svesq(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionSumOfElementsAndSquares") {
-        let result: (Float, Float) = vDSP.sumAndSumOfSquares(a)
-        
-        var legacySumResult = Float(0)
-        var legacySumOfSquaresResult = Float(0)
-        
-        vDSP_sve_svesq(a, 1,
-                       &legacySumResult,
-                       &legacySumOfSquaresResult,
-                       n)
-        
-        expectEqual(result.0, legacySumResult)
-        expectEqual(result.1, legacySumOfSquaresResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/SinglePrecisionSumOfMagnitudes") {
-        let result: Float = vDSP.sumOfMagnitudes(a)
-        
-        var legacyResult = Float(0)
-        
-        vDSP_svemg(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareSinglePrecision") {
-        let result = vDSP.meanSquare(a)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_measqv(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareSinglePrecision") {
-        let result = vDSP.meanMagnitude(a)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_meamgv(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareSinglePrecision") {
-        let result = vDSP.mean(a)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_meanv(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/RMSSinglePrecision") {
-        let result = vDSP.rootMeanSquare(a)
-        
-        var legacyResult = Float.nan
-        
-        vDSP_rmsqv(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP vector reduction; double-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let n = vDSP_Length(256)
-    
-    let a = (0 ..< 256).map {
-        return sin(Double($0) * 0.03) * cos(Double($0) * 0.07)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMaximum") {
-        let result: Double = vDSP.maximum(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_maxvD(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMaximumIndex") {
-        let result: (vDSP_Length, Double) = vDSP.indexOfMaximum(a)
-        
-        var legacyValueResult = Double(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_maxviD(a, 1,
-                    &legacyValueResult,
-                    &legacyIndexResult,
-                    n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMaximumMagnitude") {
-        let result: Double = vDSP.maximumMagnitude(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_maxmgvD(a, 1,
-                     &legacyResult,
-                     n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMaximumMagnitudeIndex") {
-        let result: (vDSP_Length, Double) = vDSP.indexOfMaximumMagnitude(a)
-        
-        var legacyValueResult = Double(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_maxmgviD(a, 1,
-                      &legacyValueResult,
-                      &legacyIndexResult,
-                      n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMaximumMagnitudeIndex") {
-        let result: Double = vDSP.minimum(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_minvD(a, 1,
-                   &legacyResult,
-                   n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionMinimumIndex") {
-        let result: (vDSP_Length, Double) = vDSP.indexOfMinimum(a)
-        
-        var legacyValueResult = Double(0)
-        var legacyIndexResult = vDSP_Length(0)
-        
-        vDSP_minviD(a, 1,
-                    &legacyValueResult,
-                    &legacyIndexResult,
-                    n)
-        
-        expectEqual(result.1, legacyValueResult)
-        expectEqual(result.0, legacyIndexResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionSum") {
-        let result: Double = vDSP.sum(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_sveD(a, 1,
-                  &legacyResult,
-                  n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionSumOfSquares") {
-        let result: Double = vDSP.sumOfSquares(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_svesqD(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionSumOfElementsAndSquares") {
-        let result: (Double, Double) = vDSP.sumAndSumOfSquares(a)
-        
-        var legacySumResult = Double(0)
-        var legacySumOfSquaresResult = Double(0)
-        
-        vDSP_sve_svesqD(a, 1,
-                        &legacySumResult,
-                        &legacySumOfSquaresResult,
-                        n)
-        
-        expectEqual(result.0, legacySumResult)
-        expectEqual(result.1, legacySumOfSquaresResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/DoublePrecisionSumOfMagnitudes") {
-        let result: Double = vDSP.sumOfMagnitudes(a)
-        
-        var legacyResult = Double(0)
-        
-        vDSP_svemgD(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareDoublePrecision") {
-        let result = vDSP.meanSquare(a)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_measqvD(a, 1,
-                     &legacyResult,
-                     n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareDoublePrecision") {
-        let result = vDSP.meanMagnitude(a)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_meamgvD(a, 1,
-                     &legacyResult,
-                     n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/MeanSquareDoublePrecision") {
-        let result = vDSP.mean(a)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_meanvD(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-    
-    Accelerate_vDSPReductionTests.test("vDSP/RMSDoublePrecision") {
-        let result = vDSP.rootMeanSquare(a)
-        
-        var legacyResult = Double.nan
-        
-        vDSP_rmsqvD(a, 1,
-                    &legacyResult,
-                    n)
-        
-        expectEqual(result, legacyResult)
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vDSPSingleVectorOps.swift b/test/stdlib/Accelerate_vDSPSingleVectorOps.swift
deleted file mode 100644
index f7cae8d8e69cf..0000000000000
--- a/test/stdlib/Accelerate_vDSPSingleVectorOps.swift
+++ /dev/null
@@ -1,462 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vDSPSingleVectorOpsTests = TestSuite("Accelerate_vDSPSingleVectorOps")
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Extrema, absolute & negative, reversing, sorting
-//  and single vector arithmetic; single-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 50
-    let n = vDSP_Length(50)
-    
-    let a = (0 ..< 50).map {
-        return sin(Float($0 * 3))
-    }
-    let b = (0 ..< 50).map {
-        return sin(Float($0 * 7))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionMin") {
-        var result = [Float](repeating: .nan,
-                             count: count)
-        
-        vDSP.minimum(a,
-                     b,
-                     result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vmin(a, 1,
-                  b, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.minimum(a,
-                                          b)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionMax") {
-        var result = [Float](repeating: .nan,
-                             count: count)
-        
-        vDSP.maximum(a,
-                     b,
-                     result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vmax(a, 1,
-                  b, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.maximum(a,
-                                          b)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionAbsolute") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.absolute(a, result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vabs(a, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.absolute(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionNegativeAbsolute") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.negativeAbsolute(a, result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vnabs(a, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.negativeAbsolute(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionNegative") {
-        var result = [Float](repeating: 0,
-                             count: count)
-        
-        vDSP.negative(a, result: &result)
-        
-        var legacyResult = [Float](repeating: -1,
-                                   count: count)
-        
-        vDSP_vneg(a, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.negative(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionReverse") {
-        var mutableA = a
-        var mutableLegacyA = a
-        
-        vDSP.reverse(&mutableA)
-        
-        vDSP_vrvrs(&mutableLegacyA, 1,
-                   n)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionSort") {
-        var mutableA = a
-        var mutableLegacyA = a
-        
-        vDSP.sort(&mutableA,
-                  sortOrder: .ascending)
-        
-        vDSP_vsort(&mutableLegacyA,
-                   n,
-                   1)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-        
-        vDSP.sort(&mutableA,
-                  sortOrder: .descending)
-        
-        vDSP_vsort(&mutableLegacyA,
-                   n,
-                   -1)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionSquare") {
-        var result = [Float](repeating: 0, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.square(a,
-                    result: &result)
-        
-        vDSP_vsq(a, 1,
-                 &legacyResult, 1,
-                 n)
-        
-        let returnedResult = vDSP.square(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionSignedSquare") {
-        var result = [Float](repeating: 0, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.signedSquare(a,
-                          result: &result)
-        
-        vDSP_vssq(a, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.signedSquare(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionTruncateToFraction") {
-        var result = [Float](repeating: 0, count: count)
-        var legacyResult = [Float](repeating: -1, count: count)
-        
-        vDSP.trunc(a,
-                   result: &result)
-        
-        vDSP_vfrac(a, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.trunc(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/SinglePrecisionZeroCrossing") {
-        let crossingCount = vDSP.countZeroCrossings(a)
-        
-        var legacyCrossingCount = vDSP_Length(0)
-        var legacyLastCrossingIndex = vDSP_Length(0)
-        
-        vDSP_nzcros(a, 1,
-                    n,
-                    &legacyLastCrossingIndex,
-                    &legacyCrossingCount,
-                    n)
-        
-        expectEqual(crossingCount, legacyCrossingCount)
-    }
-    
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vDSP Extrema, absolute & negative, reversing, sorting
-//  and single vector arithmetic; double-precision
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    let count = 50
-    let n = vDSP_Length(50)
-    
-    let a = (0 ..< 50).map {
-        return sin(Double($0 * 3))
-    }
-    let b = (0 ..< 50).map {
-        return sin(Double($0 * 7))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionMin") {
-        var result = [Double](repeating: .nan,
-                              count: count)
-        
-        vDSP.minimum(a,
-                     b,
-                     result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vminD(a, 1,
-                   b, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.minimum(a,
-                                          b)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionMax") {
-        var result = [Double](repeating: .nan,
-                              count: count)
-        
-        vDSP.maximum(a,
-                     b,
-                     result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vmaxD(a, 1,
-                   b, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.maximum(a,
-                                          b)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionAbsolute") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.absolute(a, result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vabsD(a, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.absolute(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionNegativeAbsolute") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.negativeAbsolute(a, result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vnabsD(a, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.negativeAbsolute(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionNegative") {
-        var result = [Double](repeating: 0,
-                              count: count)
-        
-        vDSP.negative(a, result: &result)
-        
-        var legacyResult = [Double](repeating: -1,
-                                    count: count)
-        
-        vDSP_vnegD(a, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.negative(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionReverse") {
-        var mutableA = a
-        var mutableLegacyA = a
-        
-        vDSP.reverse(&mutableA)
-        
-        vDSP_vrvrsD(&mutableLegacyA, 1,
-                    n)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionSort") {
-        var mutableA = a
-        var mutableLegacyA = a
-        
-        vDSP.sort(&mutableA,
-                  sortOrder: .ascending)
-        
-        vDSP_vsortD(&mutableLegacyA,
-                    n,
-                    1)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-        
-        vDSP.sort(&mutableA,
-                  sortOrder: .descending)
-        
-        vDSP_vsortD(&mutableLegacyA,
-                    n,
-                    -1)
-        
-        expectTrue(mutableA.elementsEqual(mutableLegacyA))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionSquare") {
-        var result = [Double](repeating: 0, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.square(a,
-                    result: &result)
-        
-        vDSP_vsqD(a, 1,
-                  &legacyResult, 1,
-                  n)
-        
-        let returnedResult = vDSP.square(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionSignedSquare") {
-        var result = [Double](repeating: 0, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.signedSquare(a,
-                          result: &result)
-        
-        vDSP_vssqD(a, 1,
-                   &legacyResult, 1,
-                   n)
-        
-        let returnedResult = vDSP.signedSquare(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionTruncateToFraction") {
-        var result = [Double](repeating: 0, count: count)
-        var legacyResult = [Double](repeating: -1, count: count)
-        
-        vDSP.trunc(a,
-                   result: &result)
-        
-        vDSP_vfracD(a, 1,
-                    &legacyResult, 1,
-                    n)
-        
-        let returnedResult = vDSP.trunc(a)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vDSPSingleVectorOpsTests.test("vDSP/DoublePrecisionZeroCrossing") {
-        let crossingCount = vDSP.countZeroCrossings(a)
-        
-        var legacyCrossingCount = vDSP_Length(0)
-        var legacyLastCrossingIndex = vDSP_Length(0)
-        
-        vDSP_nzcrosD(a, 1,
-                     n,
-                     &legacyLastCrossingIndex,
-                     &legacyCrossingCount,
-                     n)
-        
-        expectEqual(crossingCount, legacyCrossingCount)
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vForce.swift b/test/stdlib/Accelerate_vForce.swift
deleted file mode 100644
index 2d0f9bf8da973..0000000000000
--- a/test/stdlib/Accelerate_vForce.swift
+++ /dev/null
@@ -1,1269 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50301438
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vForceTests = TestSuite("Accelerate_vForce")
-
-//===----------------------------------------------------------------------===//
-//
-//  vForce single-precision tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    var result = [Float]()
-    var legacyResult = [Float]()
-    let x: [Float] = [2, 4, -6.876, 10.9, -100.3, 100]
-    let y: [Float] = [-10, -20, 40, 60, -80, -300]
-    let z: [Float] = [-0.6, 0.2, -0.1, 0.9, -0.1, 0.1]
-    let count = 6
-    var n: Int32 = 6
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionCeiling") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.ceil(x,
-                    result: &result)
-        
-        vvceilf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.ceil(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionFloor") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.floor(x,
-                     result: &result)
-        
-        vvfloorf(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.floor(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionCopySign") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.copysign(magnitudes: x,
-                        signs: y,
-                        result: &result)
-        
-        vvcopysignf(&legacyResult,
-                    x,
-                    y,
-                    &n)
-        
-        let returnedResult = vForce.copysign(magnitudes: x,
-                                             signs: y)
-        
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionModulus") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.truncatingRemainder(dividends: x,
-                                   divisors: y,
-                                   result: &result)
-        
-        vvfmodf(&legacyResult,
-                x,
-                y,
-                &n)
-        
-        let returnedResult = vForce.truncatingRemainder(dividends: x,
-                                                        divisors: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionModulusParameters") {
-        var scalarResult = [Float.nan]
-        let scalarNumerator = [Float(20)]
-        let scalarDenominator = [Float(6)]
-        
-        vForce.truncatingRemainder(dividends: scalarNumerator,
-                                   divisors: scalarDenominator,
-                                   result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 2)
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionRemainder") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.remainder(dividends: x,
-                         divisors: y,
-                         result: &result)
-        
-        vvremainderf(&legacyResult,
-                     x,
-                     y,
-                     &n)
-        
-        let returnedResult = vForce.remainder(dividends: x,
-                                              divisors: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionRemainderParameters") {
-        var scalarResult = [Float.nan]
-        let scalarNumerator = [Float(20)]
-        let scalarDenominator = [Float(6)]
-        
-        vForce.remainder(dividends: scalarNumerator,
-                         divisors: scalarDenominator,
-                         result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 2)
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionIntegerTruncation") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.trunc(x,
-                     result: &result)
-        
-        vvintf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.trunc(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionNearestInteger") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.nearestInteger(x,
-                              result: &result)
-        
-        vvnintf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.nearestInteger(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionrsqrt") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.rsqrt(x,
-                     result: &result)
-        
-        vvrsqrtf(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.rsqrt(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionsqrt") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.sqrt(x,
-                    result: &result)
-        
-        vvsqrtf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.sqrt(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionReciprocal") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.reciprocal(x,
-                          result: &result)
-        
-        vvrecf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.reciprocal(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionExp") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.exp(x,
-                   result: &result)
-        
-        vvexpf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.exp(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionExpm1") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.expm1(x,
-                     result: &result)
-        
-        vvexpm1f(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.expm1(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionExp2") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.exp2(x,
-                    result: &result)
-        
-        vvexp2f(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.exp2(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionLog2") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.log2(x,
-                    result: &result)
-        
-        vvlog2f(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.log2(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionLog10") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.log10(x,
-                     result: &result)
-        
-        vvlog10f(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.log10(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionUnbiasedExponent") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.logb(x,
-                    result: &result)
-        
-        vvlogbf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.logb(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionPower") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.pow(bases: x,
-                   exponents: y,
-                   result: &result)
-        
-        vvpowf(&legacyResult,
-               y,
-               x,
-               &n)
-        
-        let returnedResult = vForce.pow(bases: x,
-                                        exponents: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionPower") {
-        var scalarResult = [Float.nan]
-        let scalarBase = [Float(10)]
-        let scalarExponent = [Float(2)]
-        
-        vForce.pow(bases: scalarBase,
-                   exponents: scalarExponent,
-                   result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 100)
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionSine") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.sin(x,
-                   result: &result)
-        
-        vvsinf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.sin(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionSinPi") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.sinPi(x,
-                     result: &result)
-        
-        vvsinpif(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.sinPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionCosine") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.cos(x,
-                   result: &result)
-        
-        vvcosf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.cos(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionCosPi") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.cosPi(x,
-                     result: &result)
-        
-        vvcospif(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.cosPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionSinCos") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        var cosResult = [Float](repeating: .nan, count: result.count)
-        var legacyCosResult = [Float](repeating: .nan, count: result.count)
-        
-        vForce.sincos(x,
-                      sinResult: &result,
-                      cosResult: &cosResult)
-        
-        vvsincosf(&legacyResult,
-                  &legacyCosResult,
-                  x,
-                  &n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(cosResult.elementsEqual(legacyCosResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionTangent") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.tan(x,
-                   result: &result)
-        
-        vvtanf(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.tan(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionTanPi") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.tanPi(x,
-                     result: &result)
-        
-        vvtanpif(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.tanPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionArcsin") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.asin(z,
-                    result: &result)
-        
-        vvasinf(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.asin(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionArccos") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.acos(z,
-                    result: &result)
-        
-        vvacosf(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.acos(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionArctan") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.atan(z,
-                    result: &result)
-        
-        vvatanf(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.atan(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionSinh") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.sinh(x,
-                    result: &result)
-        
-        vvsinhf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.sinh(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionCosh") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.cosh(x,
-                    result: &result)
-        
-        vvcoshf(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.cosh(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionTanh") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.tanh(z,
-                    result: &result)
-        
-        vvtanhf(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.tanh(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionAsinh") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.asinh(z,
-                     result: &result)
-        
-        vvasinhf(&legacyResult,
-                 z,
-                 &n)
-        
-        let returnedResult = vForce.asinh(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionAcosh") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.acosh(x,
-                     result: &result)
-        
-        vvacoshf(&legacyResult,
-                 x,
-                 &n)
-        
-        let returnedResult = vForce.acosh(x)
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/SinglePrecisionAtan") {
-        result = [Float](repeating: 0, count: count)
-        legacyResult = [Float](repeating: -1, count: count)
-        
-        vForce.atanh(z,
-                     result: &result)
-        
-        vvatanhf(&legacyResult,
-                 z,
-                 &n)
-        
-        let returnedResult = vForce.atanh(z)
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-//===----------------------------------------------------------------------===//
-//
-//  vForce double precision tests
-//
-//===----------------------------------------------------------------------===//
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    
-    var result = [Double]()
-    var legacyResult = [Double]()
-    let x: [Double] = [2, 4, -6.876, 10.9, -100.3, 100]
-    let y: [Double] = [-10, -20, 40, 60, -80, -300]
-    let z: [Double] = [-0.6, 0.2, -0.1, 0.9, -0.1, 0.1]
-    let count = 6
-    var n: Int32 = 6
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionCeiling") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.ceil(x,
-                    result: &result)
-        
-        vvceil(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.ceil(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionFloor") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.floor(x,
-                     result: &result)
-        
-        vvfloor(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.floor(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionCopySign") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.copysign(magnitudes: x,
-                        signs: y,
-                        result: &result)
-        
-        vvcopysign(&legacyResult,
-                   x,
-                   y,
-                   &n)
-        
-        let returnedResult = vForce.copysign(magnitudes: x,
-                                             signs: y)
-        
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionModulus") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.truncatingRemainder(dividends: x,
-                                   divisors: y,
-                                   result: &result)
-        
-        vvfmod(&legacyResult,
-               x,
-               y,
-               &n)
-        
-        let returnedResult = vForce.truncatingRemainder(dividends: x,
-                                                        divisors: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionModulusParameters") {
-        var scalarResult = [Double.nan]
-        let scalarNumerator = [Double(20)]
-        let scalarDenominator = [Double(6)]
-        
-        vForce.truncatingRemainder(dividends: scalarNumerator,
-                                   divisors: scalarDenominator,
-                                   result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 2)
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionRemainder") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.remainder(dividends: x,
-                         divisors: y,
-                         result: &result)
-        
-        vvremainder(&legacyResult,
-                    x,
-                    y,
-                    &n)
-        
-        let returnedResult = vForce.remainder(dividends: x,
-                                              divisors: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionRemainderParameters") {
-        var scalarResult = [Double.nan]
-        let scalarNumerator = [Double(20)]
-        let scalarDenominator = [Double(6)]
-        
-        vForce.remainder(dividends: scalarNumerator,
-                         divisors: scalarDenominator,
-                         result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 2)
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionIntegerTruncation") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.trunc(x,
-                     result: &result)
-        
-        vvint(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.trunc(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionNearestInteger") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.nearestInteger(x,
-                              result: &result)
-        
-        vvnint(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.nearestInteger(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionrsqrt") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.rsqrt(x,
-                     result: &result)
-        
-        vvrsqrt(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.rsqrt(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionsqrt") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.sqrt(x,
-                    result: &result)
-        
-        vvsqrt(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.sqrt(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionReciprocal") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.reciprocal(x,
-                          result: &result)
-        
-        vvrec(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.reciprocal(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionExp") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.exp(x,
-                   result: &result)
-        
-        vvexp(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.exp(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionExpm1") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.expm1(x,
-                     result: &result)
-        
-        vvexpm1(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.expm1(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionExp2") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.exp2(x,
-                    result: &result)
-        
-        vvexp2(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.exp2(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionLog2") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.log2(x,
-                    result: &result)
-        
-        vvlog2(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.log2(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionLog10") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.log10(x,
-                     result: &result)
-        
-        vvlog10(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.log10(x)
-        
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionUnbiasedExponent") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.logb(x,
-                    result: &result)
-        
-        vvlogb(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.logb(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionPower") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.pow(bases: x,
-                   exponents: y,
-                   result: &result)
-        
-        vvpow(&legacyResult,
-              y,
-              x,
-              &n)
-        
-        let returnedResult = vForce.pow(bases: x,
-                                        exponents: y)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionPower") {
-        var scalarResult = [Double.nan]
-        let scalarBase = [Double(10)]
-        let scalarExponent = [Double(2)]
-        
-        vForce.pow(bases: scalarBase,
-                   exponents: scalarExponent,
-                   result: &scalarResult)
-        
-        expectEqual(Int(scalarResult.first!), 100)
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionSine") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.sin(x,
-                   result: &result)
-        
-        vvsin(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.sin(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionSinPi") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.sinPi(x,
-                     result: &result)
-        
-        vvsinpi(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.sinPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionCosine") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.cos(x,
-                   result: &result)
-        
-        vvcos(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.cos(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionCosPi") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.cosPi(x,
-                     result: &result)
-        
-        vvcospi(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.cosPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionSinCos") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        var cosResult = [Double](repeating: .nan, count: result.count)
-        var legacyCosResult = [Double](repeating: .nan, count: result.count)
-        
-        vForce.sincos(x,
-                      sinResult: &result,
-                      cosResult: &cosResult)
-        
-        vvsincos(&legacyResult,
-                 &legacyCosResult,
-                 x,
-                 &n)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(cosResult.elementsEqual(legacyCosResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionTangent") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.tan(x,
-                   result: &result)
-        
-        vvtan(&legacyResult,
-              x,
-              &n)
-        
-        let returnedResult = vForce.tan(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionTanPi") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.tanPi(x,
-                     result: &result)
-        
-        vvtanpi(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.tanPi(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionArcsin") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.asin(z,
-                    result: &result)
-        
-        vvasin(&legacyResult,
-               z,
-               &n)
-        
-        let returnedResult = vForce.asin(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionArccos") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.acos(z,
-                    result: &result)
-        
-        vvacos(&legacyResult,
-               z,
-               &n)
-        
-        let returnedResult = vForce.acos(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionArctan") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.atan(z,
-                    result: &result)
-        
-        vvatan(&legacyResult,
-               z,
-               &n)
-        
-        let returnedResult = vForce.atan(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionSinh") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.sinh(x,
-                    result: &result)
-        
-        vvsinh(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.sinh(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionCosh") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.cosh(x,
-                    result: &result)
-        
-        vvcosh(&legacyResult,
-               x,
-               &n)
-        
-        let returnedResult = vForce.cosh(x)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionTanh") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.tanh(z,
-                    result: &result)
-        
-        vvtanh(&legacyResult,
-               z,
-               &n)
-        
-        let returnedResult = vForce.tanh(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionAsinh") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.asinh(z,
-                     result: &result)
-        
-        vvasinh(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.asinh(z)
-        
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionAcosh") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.acosh(x,
-                     result: &result)
-        
-        vvacosh(&legacyResult,
-                x,
-                &n)
-        
-        let returnedResult = vForce.acosh(x)
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(legacyResult.filter{!$0.isNaN}))
-        expectTrue(result.filter{!$0.isNaN}.elementsEqual(returnedResult.filter{!$0.isNaN}))
-    }
-    
-    Accelerate_vForceTests.test("vForce/DoublePrecisionAtan") {
-        result = [Double](repeating: 0, count: count)
-        legacyResult = [Double](repeating: -1, count: count)
-        
-        vForce.atanh(z,
-                     result: &result)
-        
-        vvatanh(&legacyResult,
-                z,
-                &n)
-        
-        let returnedResult = vForce.atanh(z)
-        expectTrue(result.elementsEqual(legacyResult))
-        expectTrue(result.elementsEqual(returnedResult))
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Accelerate_vImage.swift b/test/stdlib/Accelerate_vImage.swift
deleted file mode 100644
index 2d301ae8bc2cc..0000000000000
--- a/test/stdlib/Accelerate_vImage.swift
+++ /dev/null
@@ -1,666 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: rdar50244151
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import Accelerate
-
-var Accelerate_vImageTests = TestSuite("Accelerate_vImage")
-
-if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) {
-    let width = UInt(64)
-    let height = UInt(32)
-    let widthi = 64
-    let heighti = 32
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: Converter
-    //
-    //===----------------------------------------------------------------------===//
-    
-    Accelerate_vImageTests.test("vImage/CVConverters") {
-        let colorSpace = CGColorSpaceCreateDeviceRGB()
-        
-        let cgFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                            bitsPerPixel: 32,
-                                            colorSpace: colorSpace,
-                                            bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.first.rawValue),
-                                            renderingIntent: .defaultIntent)!
-        
-        let cvFormat = vImageCVImageFormat.make(format: .format32ABGR,
-                                                matrix: kvImage_ARGBToYpCbCrMatrix_ITU_R_601_4.pointee,
-                                                chromaSiting: .center,
-                                                colorSpace: colorSpace,
-                                                alphaIsOpaqueHint: false)!
-        
-        let coreVideoToCoreGraphics = try! vImageConverter.make(sourceFormat: cvFormat,
-                                                                destinationFormat: cgFormat,
-                                                                flags: .printDiagnosticsToConsole)
-        
-        let coreGraphicsToCoreVideo = try! vImageConverter.make(sourceFormat: cgFormat,
-                                                                destinationFormat: cvFormat,
-                                                                flags: .printDiagnosticsToConsole)
-        
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        let sourceCGBuffer = try! vImage_Buffer(cgImage: image)
-        var intermediateCVBuffer = try! vImage_Buffer(width: widthi, height: heighti, bitsPerPixel: 32)
-        var destinationCGBuffer = try! vImage_Buffer(width: widthi, height: heighti, bitsPerPixel: 32)
-        
-        try! coreGraphicsToCoreVideo.convert(source: sourceCGBuffer,
-                                             destination: &intermediateCVBuffer)
-        
-        try! coreVideoToCoreGraphics.convert(source: intermediateCVBuffer,
-                                             destination: &destinationCGBuffer)
-        
-        let destinationPixels: [UInt8] = arrayFromBuffer(buffer: destinationCGBuffer,
-                                                         channelCount: 4,
-                                                         count: pixels.count)
-        
-        expectEqual(destinationPixels, pixels)
-        
-        expectEqual(coreVideoToCoreGraphics.destinationBuffers(colorSpace: colorSpace),
-                    coreGraphicsToCoreVideo.sourceBuffers(colorSpace: colorSpace))
-        
-        expectEqual(coreVideoToCoreGraphics.sourceBuffers(colorSpace: colorSpace),
-                    coreGraphicsToCoreVideo.destinationBuffers(colorSpace: colorSpace))
-    }
-  
-    /* Disabled due to <rdar://problem/50209312>
-    Accelerate_vImageTests.test("vImage/BufferOrder") {
-        let sourceFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                                bitsPerPixel: 32,
-                                                colorSpace: CGColorSpaceCreateDeviceCMYK(),
-                                                bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.none.rawValue),
-                                                renderingIntent: .defaultIntent)!
-        
-        let destinationFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                                     bitsPerPixel: 24,
-                                                     colorSpace: CGColorSpace(name: CGColorSpace.genericLab)!,
-                                                     bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.none.rawValue),
-                                                     renderingIntent: .defaultIntent)!
-        
-        let converter = try! vImageConverter.make(sourceFormat: sourceFormat,
-                                                  destinationFormat: destinationFormat)
-        
-        let sBuffers = converter.sourceBuffers(colorSpace: sourceFormat.colorSpace.takeRetainedValue())
-        let dBuffers = converter.destinationBuffers(colorSpace: destinationFormat.colorSpace.takeRetainedValue())
-        
-        expectEqual(sBuffers, [.coreGraphics])
-        expectEqual(dBuffers, [.coreGraphics])
-    }
-    */
-    
-    Accelerate_vImageTests.test("vImage/AnyToAnyError") {
-        var error = kvImageNoError
-        
-        let format = vImage_CGImageFormat(bitsPerComponent: 8,
-                                          bitsPerPixel: 32,
-                                          colorSpace: CGColorSpaceCreateDeviceCMYK(),
-                                          bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.none.rawValue),
-                                          renderingIntent: .defaultIntent)!
-        
-        expectCrashLater()
-        _ = try! vImageConverter.make(sourceFormat: format,
-                                      destinationFormat: format,
-                                      flags: .imageExtend)
-    }
-    
-    Accelerate_vImageTests.test("vImage/AnyToAny") {
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        let sourceFormat = vImage_CGImageFormat(cgImage: image)!
-        
-        let destinationFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                                     bitsPerPixel: 32,
-                                                     colorSpace: CGColorSpaceCreateDeviceCMYK(),
-                                                     bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.none.rawValue),
-                                                     renderingIntent: .defaultIntent)!
-        
-        let sourceBuffer = try! vImage_Buffer(cgImage: image)
-        var destinationBuffer = try! vImage_Buffer(width: widthi, height: heighti,
-                                                   bitsPerPixel: 32)
-        
-        // New API
-        
-        let converter = try! vImageConverter.make(sourceFormat: sourceFormat,
-                                                  destinationFormat: destinationFormat)
-        
-        try! converter.convert(source: sourceBuffer,
-                               destination: &destinationBuffer)
-        
-        let mustOperateOutOfPlace = try! converter.mustOperateOutOfPlace(source: sourceBuffer,
-                                                                         destination: destinationBuffer)
-        
-        // Legacy API
-        
-        var legacyDestinationBuffer = try! vImage_Buffer(width: widthi, height: heighti,
-                                                         bitsPerPixel: 32)
-        
-        var legacyConverter: vImageConverter?
-        
-        withUnsafePointer(to: destinationFormat) { dest in
-            withUnsafePointer(to: sourceFormat) { src in
-                legacyConverter = vImageConverter_CreateWithCGImageFormat(
-                    src,
-                    dest,
-                    nil,
-                    vImage_Flags(kvImageNoFlags),
-                    nil)?.takeRetainedValue()
-            }
-        }
-        
-        _ = withUnsafePointer(to: sourceBuffer) { src in
-            vImageConvert_AnyToAny(legacyConverter!,
-                                   src,
-                                   &legacyDestinationBuffer,
-                                   nil,
-                                   vImage_Flags(kvImageNoFlags))
-        }
-        
-        var e = kvImageNoError
-        withUnsafePointer(to: sourceBuffer) { src in
-            withUnsafePointer(to: destinationBuffer) { dest in
-                e = vImageConverter_MustOperateOutOfPlace(legacyConverter!,
-                                                          src,
-                                                          dest,
-                                                          vImage_Flags(kvImageNoFlags))
-            }
-        }
-        let legacyMustOperateOutOfPlace = e == kvImageOutOfPlaceOperationRequired
-        
-        // Compare results
-        
-        let destinationPixels: [UInt8] = arrayFromBuffer(buffer: destinationBuffer,
-                                                         channelCount: 4,
-                                                         count: pixels.count)
-        let legacyDestinationPixels: [UInt8] = arrayFromBuffer(buffer: legacyDestinationBuffer,
-                                                               channelCount: 4,
-                                                               count: pixels.count)
-        
-        expectTrue(legacyDestinationPixels.elementsEqual(destinationPixels))
-        
-        expectEqual(converter.sourceBufferCount, 1)
-        expectEqual(converter.destinationBufferCount, 1)
-        expectEqual(legacyMustOperateOutOfPlace, mustOperateOutOfPlace)
-        
-        sourceBuffer.free()
-        destinationBuffer.free()
-        legacyDestinationBuffer.free()
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: Buffer
-    //
-    //===----------------------------------------------------------------------===//
-    
-    Accelerate_vImageTests.test("vImage/IllegalSize") {
-        expectCrashLater()
-        let buffer = try! vImage_Buffer(width: -1, height: -1,
-                                        bitsPerPixel: 32)
-    }
-    
-    Accelerate_vImageTests.test("vImage/IllegalSize") {
-        expectCrashLater()
-        let buffer = try! vImage_Buffer(width: 99999999, height: 99999999,
-                                        bitsPerPixel: 99999999)
-    }
-    
-    Accelerate_vImageTests.test("vImage/InitWithInvalidImageFormat") {
-        let pixels: [UInt8] = (0 ..< width * height).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makePlanar8Image(from: pixels,
-                                     width: width,
-                                     height: height)!
-        
-        let format = vImage_CGImageFormat(bitsPerComponent: 8,
-                                          bitsPerPixel: 32,
-                                          colorSpace: CGColorSpace(name: CGColorSpace.sRGB)!,
-                                          bitmapInfo: CGBitmapInfo(rawValue: 0))!
-        
-        var error = kvImageNoError
-        
-        expectCrashLater()
-        let buffer = try! vImage_Buffer(cgImage: image,
-                                        format: format)
-    }
-    
-    Accelerate_vImageTests.test("vImage/CreateCGImage") {
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        let buffer = try! vImage_Buffer(cgImage: image)
-        
-        let format = vImage_CGImageFormat(cgImage: image)!
-        
-        let bufferImage = try! buffer.createCGImage(format: format)
-        
-        let imagePixels = imageToPixels(image: image)
-        let bufferImagePixels = imageToPixels(image: bufferImage)
-        
-        expectTrue(imagePixels.elementsEqual(bufferImagePixels))
-        
-        buffer.free()
-    }
-    
-    Accelerate_vImageTests.test("vImage/CopyBadWidth") {
-        var source = try! vImage_Buffer(width: 10, height: 100, bitsPerPixel: 32)
-        var destination = try! vImage_Buffer(width: 20, height: 20, bitsPerPixel: 32)
-        
-        expectCrashLater()
-        try! source.copy(destinationBuffer: &destination,
-                         pixelSize: 4)
-    }
-
-    Accelerate_vImageTests.test("vImage/CopyBadHeight") {
-        var source = try! vImage_Buffer(width: 100, height: 10, bitsPerPixel: 32)
-        var destination = try! vImage_Buffer(width: 20, height: 20, bitsPerPixel: 32)
-        
-        expectCrashLater()
-        try! source.copy(destinationBuffer: &destination,
-                         pixelSize: 4)
-    }
-    
-    Accelerate_vImageTests.test("vImage/Copy") {
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        let source = try! vImage_Buffer(cgImage: image)
-        
-        var destination = try! vImage_Buffer(width: widthi, height: heighti,
-                                             bitsPerPixel: 32)
-        
-        try! source.copy(destinationBuffer: &destination,
-                         pixelSize: 4)
-        
-        let sourcePixels: [UInt8] = arrayFromBuffer(buffer: source,
-                                                    channelCount: 4,
-                                                    count: pixels.count)
-        let destinationPixels: [UInt8] = arrayFromBuffer(buffer: destination,
-                                                         channelCount: 4,
-                                                         count: pixels.count)
-        
-        expectTrue(sourcePixels.elementsEqual(destinationPixels))
-        
-        source.free()
-        destination.free()
-    }
-
-    Accelerate_vImageTests.test("vImage/InitializeWithFormat") {
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        let format = vImage_CGImageFormat(cgImage: image)!
-        
-        let buffer = try! vImage_Buffer(cgImage: image,
-                                        format:  format)
-        
-        let bufferPixels: [UInt8] = arrayFromBuffer(buffer: buffer,
-                                                    channelCount: 4,
-                                                    count: pixels.count)
-        
-        expectTrue(bufferPixels.elementsEqual(pixels))
-        expectEqual(buffer.rowBytes, Int(width) * 4)
-        expectEqual(buffer.width, width)
-        expectEqual(buffer.height, height)
-        
-        buffer.free()
-    }
-    
-    Accelerate_vImageTests.test("vImage/Alignment") {
-        // New API
-        
-        var alignment = try! vImage_Buffer.preferredAlignmentAndRowBytes(width: widthi,
-                                                                         height: heighti,
-                                                                         bitsPerPixel: 32)
-        
-        // Legacy API
-        
-        var legacyBuffer = vImage_Buffer()
-        let legacyAlignment = vImageBuffer_Init(&legacyBuffer,
-                                                height, width,
-                                                32,
-                                                vImage_Flags(kvImageNoAllocate))
-        
-        expectEqual(alignment.alignment, legacyAlignment)
-        expectEqual(alignment.rowBytes, legacyBuffer.rowBytes)
-        
-        legacyBuffer.free()
-    }
-    
-    Accelerate_vImageTests.test("vImage/CreateBufferFromCGImage") {
-        let pixels: [UInt8] = (0 ..< width * height * 4).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makeRGBA8888Image(from: pixels,
-                                      width: width,
-                                      height: height)!
-        
-        // New API
-        
-        let buffer = try! vImage_Buffer(cgImage: image)
-        
-        // Legacy API
-        
-        let legacyBuffer: vImage_Buffer = {
-            var format = vImage_CGImageFormat(cgImage: image)!
-            
-            var buffer = vImage_Buffer()
-            
-            vImageBuffer_InitWithCGImage(&buffer,
-                                         &format,
-                                         nil,
-                                         image,
-                                         vImage_Flags(kvImageNoFlags))
-            
-            return buffer
-        }()
-        
-        let bufferPixels: [UInt8] = arrayFromBuffer(buffer: buffer,
-                                                    channelCount: 4,
-                                                    count: pixels.count)
-        
-        let legacyBufferPixels: [UInt8] = arrayFromBuffer(buffer: legacyBuffer,
-                                                          channelCount: 4,
-                                                          count: pixels.count)
-        
-        expectTrue(bufferPixels.elementsEqual(legacyBufferPixels))
-        
-        expectEqual(buffer.width, legacyBuffer.width)
-        expectEqual(buffer.height, legacyBuffer.height)
-        expectEqual(buffer.rowBytes, legacyBuffer.rowBytes)
-        
-        expectEqual(buffer.size, CGSize(width: Int(width),
-                                        height: Int(height)))
-        
-        buffer.free()
-        free(legacyBuffer.data)
-    }
-    
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: CVImageFormat
-    //
-    //===----------------------------------------------------------------------===//
-    
-    Accelerate_vImageTests.test("vImage/MakeFromPixelBuffer") {
-        let pixelBuffer = makePixelBuffer(pixelFormat: kCVPixelFormatType_420YpCbCr8Planar)!
-        
-        let format = vImageCVImageFormat.make(buffer: pixelBuffer)!
-        
-        expectEqual(format.channels, [vImage.BufferType.luminance,
-                                      vImage.BufferType.Cb,
-                                      vImage.BufferType.Cr])
-    }
-    
-    Accelerate_vImageTests.test("vImage/MakeFormat4444YpCbCrA8") {
-        let format = vImageCVImageFormat.make(format: .format4444YpCbCrA8,
-                                              matrix: kvImage_ARGBToYpCbCrMatrix_ITU_R_709_2.pointee,
-                                              chromaSiting: .center,
-                                              colorSpace: CGColorSpaceCreateDeviceRGB(),
-                                              alphaIsOpaqueHint: false)!
-        
-        // test alphaIsOpaqueHint
-        
-        expectEqual(format.alphaIsOpaqueHint, false)
-        
-        format.alphaIsOpaqueHint = true
-        
-        expectEqual(format.alphaIsOpaqueHint, true)
-        
-        // test colorSpace
-        
-        expectEqual(String(format.colorSpace!.name!), "kCGColorSpaceDeviceRGB")
-        
-        format.colorSpace = CGColorSpace(name: CGColorSpace.extendedLinearSRGB)!
-        
-        expectEqual(String(format.colorSpace!.name!), "kCGColorSpaceExtendedLinearSRGB")
-        
-        // test channel names
-        
-        let channels = format.channels
-        
-        expectEqual(channels,
-                    [vImage.BufferType.Cb,
-                     vImage.BufferType.luminance,
-                     vImage.BufferType.Cr,
-                     vImage.BufferType.alpha])
-        
-        let description = format.channelDescription(bufferType: channels.first!)
-        
-        expectEqual(description?.min, 0)
-        expectEqual(description?.max, 255)
-        expectEqual(description?.full, 240)
-        expectEqual(description?.zero, 128)
-    }
-    
-    Accelerate_vImageTests.test("vImage/MakeFormat420YpCbCr8Planar") {
-        let format = vImageCVImageFormat.make(format: .format420YpCbCr8Planar,
-                                              matrix: kvImage_ARGBToYpCbCrMatrix_ITU_R_709_2.pointee,
-                                              chromaSiting: .center,
-                                              colorSpace: CGColorSpaceCreateDeviceRGB(),
-                                              alphaIsOpaqueHint: false)!
-        
-        // test chromaSiting
-        
-        expectEqual(format.chromaSiting, vImageCVImageFormat.ChromaSiting.center)
-        
-        format.chromaSiting = .dv420
-        
-        expectEqual(format.chromaSiting, vImageCVImageFormat.ChromaSiting.dv420)
-        
-        // test formatCode
-        
-        expectEqual(format.formatCode, kCVPixelFormatType_420YpCbCr8Planar)
-        
-        // test channelCount
-        
-        expectEqual(format.channelCount, 3)
-    }
-
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: CGImageFormat
-    //
-    //===----------------------------------------------------------------------===//
-    
-    Accelerate_vImageTests.test("vImage/CGImageFormatIllegalValues") {
-        
-        let formatOne = vImage_CGImageFormat(bitsPerComponent: -1,
-                                             bitsPerPixel: 32,
-                                             colorSpace: CGColorSpaceCreateDeviceRGB(),
-                                             bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue))
-        
-        let formatTwo = vImage_CGImageFormat(bitsPerComponent: 8,
-                                             bitsPerPixel: -1,
-                                             colorSpace: CGColorSpaceCreateDeviceRGB(),
-                                             bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue))
-        
-        expectTrue(formatOne == nil)
-        expectTrue(formatTwo == nil)
-    }
-    
-    Accelerate_vImageTests.test("vImage/CGImageFormatFromCGImage") {
-        let pixels: [UInt8] = (0 ..< width * height).map { _ in
-            return UInt8.random(in: 0 ..< 255)
-        }
-        
-        let image = makePlanar8Image(from: pixels,
-                                     width: width,
-                                     height: height)!
-        
-        var format = vImage_CGImageFormat(cgImage: image)!
-        
-        var legacyFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                                bitsPerPixel: 8,
-                                                colorSpace: Unmanaged.passRetained(CGColorSpaceCreateDeviceGray()),
-                                                bitmapInfo: CGBitmapInfo(rawValue: 0),
-                                                version: 0,
-                                                decode: nil,
-                                                renderingIntent: .defaultIntent)
-        
-        expectTrue(vImageCGImageFormat_IsEqual(&format, &legacyFormat))
-    }
-    
-    Accelerate_vImageTests.test("vImage/CGImageFormatLightweightInit") {
-        let colorspace = CGColorSpaceCreateDeviceRGB()
-        let renderingIntent = CGColorRenderingIntent.defaultIntent
-        let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
-        
-        var format = vImage_CGImageFormat(bitsPerComponent: 8,
-                                          bitsPerPixel: 32,
-                                          colorSpace: colorspace,
-                                          bitmapInfo: bitmapInfo)!
-        
-        var legacyFormat = vImage_CGImageFormat(bitsPerComponent: 8,
-                                                bitsPerPixel: 32,
-                                                colorSpace: Unmanaged.passRetained(colorspace),
-                                                bitmapInfo: bitmapInfo,
-                                                version: 0,
-                                                decode: nil,
-                                                renderingIntent: renderingIntent)
-        
-        expectTrue(vImageCGImageFormat_IsEqual(&format, &legacyFormat))
-        expectTrue(format.componentCount == 4)
-    }
-
-    //===----------------------------------------------------------------------===//
-    //
-    //  MARK: Helper Functions
-    //
-    //===----------------------------------------------------------------------===//
-    
-    func makePixelBuffer(pixelFormat: OSType) -> CVPixelBuffer? {
-        var pixelBuffer: CVPixelBuffer? = nil
-        CVPixelBufferCreate(kCFAllocatorDefault,
-                            1,
-                            1,
-                            pixelFormat,
-                            [:] as CFDictionary?,
-                            &pixelBuffer)
-        
-        return pixelBuffer
-    }
-    
-    func arrayFromBuffer<T>(buffer: vImage_Buffer,
-                            channelCount: Int,
-                            count: Int) -> Array<T> {
-        
-        if (buffer.rowBytes == Int(buffer.width) * MemoryLayout<T>.stride * channelCount) {
-            let ptr = buffer.data.bindMemory(to: T.self,
-                                             capacity: count)
-            
-            let buf = UnsafeBufferPointer(start: ptr, count: count)
-            return Array(buf)
-        } else {
-            var returnArray = [T]()
-            
-            let perRowCount = Int(buffer.width) * MemoryLayout<T>.stride * channelCount
-            var ptr = buffer.data.bindMemory(to: T.self,
-                                             capacity: perRowCount)
-            
-            for _ in 0 ..< buffer.height {
-                let buf = UnsafeBufferPointer(start: ptr, count: perRowCount)
-                
-                returnArray.append(contentsOf: Array(buf))
-                
-                ptr = ptr.advanced(by: buffer.rowBytes)
-            }
-            
-            return returnArray
-        }
-    }
-    
-    func imageToPixels(image: CGImage) -> [UInt8] {
-        let pixelCount = image.width * image.height
-        
-        let pixelData = image.dataProvider?.data
-        let pixels: UnsafePointer<UInt8> = CFDataGetBytePtr(pixelData)
-        let buf = UnsafeBufferPointer(start: pixels, count: pixelCount)
-        return Array(buf)
-    }
-    
-    func makePlanar8Image(from pixels: [UInt8],
-                          width: UInt,
-                          height: UInt) -> CGImage? {
-        
-        if
-            let outputData = CFDataCreate(nil, pixels, pixels.count),
-            let cgDataProvider = CGDataProvider(data: outputData) {
-            
-            return CGImage(width: Int(width),
-                           height: Int(height),
-                           bitsPerComponent: 8,
-                           bitsPerPixel: 8,
-                           bytesPerRow: Int(width),
-                           space: CGColorSpaceCreateDeviceGray(),
-                           bitmapInfo: CGBitmapInfo(rawValue: 0),
-                           provider: cgDataProvider,
-                           decode: nil,
-                           shouldInterpolate: false,
-                           intent: CGColorRenderingIntent.defaultIntent)
-            
-        }
-        return nil
-    }
-    
-    func makeRGBA8888Image(from pixels: [UInt8],
-                           width: UInt,
-                           height: UInt) -> CGImage? {
-        
-        if
-            let outputData = CFDataCreate(nil, pixels, pixels.count),
-            let cgDataProvider = CGDataProvider(data: outputData) {
-            
-            return CGImage(width: Int(width),
-                           height: Int(height),
-                           bitsPerComponent: 8,
-                           bitsPerPixel: 8 * 4,
-                           bytesPerRow: Int(width) * 4,
-                           space: CGColorSpace(name: CGColorSpace.sRGB)!,
-                           bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.last.rawValue),
-                           provider: cgDataProvider,
-                           decode: nil,
-                           shouldInterpolate: false,
-                           intent: CGColorRenderingIntent.defaultIntent)
-            
-        }
-        return nil
-    }
-}
-runAllTests()
diff --git a/test/stdlib/AppKit_Swift4.swift b/test/stdlib/AppKit_Swift4.swift
deleted file mode 100644
index d30fa4f603db9..0000000000000
--- a/test/stdlib/AppKit_Swift4.swift
+++ /dev/null
@@ -1,140 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 %s -o %t/a.out
-// RUN: %target-run %t/a.out
-// REQUIRES: executable_test
-// REQUIRES: OS=macosx
-// REQUIRES: objc_interop
-
-import AppKit
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-let AppKitTests = TestSuite("AppKit_Swift4")
-
-AppKitTests.test("NSEventMaskFromType") {
-  let eventType: NSEvent.EventType = .keyDown
-  let eventMask = NSEvent.EventTypeMask(type: eventType)
-  expectEqual(eventMask, .keyDown)
-}
-
-AppKitTests.test("NSWindowDepth.availableDepths") {
-  let depths = NSWindow.Depth.availableDepths
-  expectGT(depths.count, 0)
-  for depth in depths {
-    expectNotEqual(depth.rawValue, 0)
-  }
-}
-
-AppKitTests.test("NSRectFills") {
-  let bitmapImage = NSBitmapImageRep(
-    bitmapDataPlanes: nil, pixelsWide: 3, pixelsHigh: 3,
-    bitsPerSample: 8, samplesPerPixel: 4,
-    hasAlpha: true, isPlanar: false,
-    colorSpaceName: .deviceRGB,
-    bytesPerRow: 0, bitsPerPixel: 0)!
-  let graphicsContext = NSGraphicsContext(bitmapImageRep: bitmapImage)!
-  NSGraphicsContext.saveGraphicsState()
-  NSGraphicsContext.current = graphicsContext
-
-  let canvas = NSRect(x: 0, y: 0, width: 3, height: 3)
-  let bottomLeft = NSRect(x: 0, y: 0, width: 1, height: 1)
-  let bottomCenter = NSRect(x: 1, y: 0, width: 1, height: 1)
-  let bottomRight = NSRect(x: 2, y: 0, width: 1, height: 1)
-  let middleCenter = NSRect(x: 1, y: 1, width: 1, height: 1)
-  let middleRight = NSRect(x: 2, y: 1, width: 1, height: 1)
-  let topLeft = NSRect(x: 0, y: 2, width: 1, height: 1)
-  let topCenter = NSRect(x: 1, y: 2, width: 1, height: 1)
-  let topRight = NSRect(x: 2, y: 2, width: 1, height: 1)
-  let red = NSColor(deviceRed: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)
-  let green = NSColor(deviceRed: 0.0, green: 1.0, blue: 0.0, alpha: 1.0)
-  let blue = NSColor(deviceRed: 0.0, green: 0.0, blue: 1.0, alpha: 1.0)
-  let black = NSColor(deviceRed: 0.0, green: 0.0, blue: 0.0, alpha: 1.0)
-  let white = NSColor(deviceRed: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
-
-  // Blank out the canvas with white
-  white.set()
-  canvas.fill()
-
-  // Fill the bottomLeft and middleRight with red using the Sequence<Rect> convenience
-  red.set()
-  [bottomLeft, middleRight].fill()
-
-  // Fill the bottom right corner by clipping to it, and then filling the canvas
-  NSGraphicsContext.saveGraphicsState()
-  topRight.clip()
-  black.set()
-  canvas.fill()
-  NSGraphicsContext.restoreGraphicsState()
-
-  // Fill bottomRight and topLeft by clipping to them and filling a superset
-  NSGraphicsContext.saveGraphicsState()
-  [bottomRight, topLeft].clip()
-  green.set()
-  canvas.fill()
-  blue.set()
-  // effectively fill bottomRight only
-  NSRect(x: 0, y: 0, width: 3, height: 1).fill()
-  NSGraphicsContext.restoreGraphicsState()
-
-  // Fill the center regions using the Sequence<(Rect, Color)> convenience
-  [(topCenter, blue),
-   (middleCenter, green),
-   (bottomCenter, red)].fill()
-
-  NSGraphicsContext.restoreGraphicsState()
-
-  expectEqual(bitmapImage.colorAt(x: 0, y: 0), green)
-  expectEqual(bitmapImage.colorAt(x: 1, y: 0), blue)
-  expectEqual(bitmapImage.colorAt(x: 2, y: 0), black)
-  expectEqual(bitmapImage.colorAt(x: 0, y: 1), white)
-  expectEqual(bitmapImage.colorAt(x: 1, y: 1), green)
-  expectEqual(bitmapImage.colorAt(x: 2, y: 1), red)
-  expectEqual(bitmapImage.colorAt(x: 0, y: 2), red)
-  expectEqual(bitmapImage.colorAt(x: 1, y: 2), red)
-  expectEqual(bitmapImage.colorAt(x: 2, y: 2), blue)
-}
-
-AppKitTests.test("NSColor.Literals") {
-  if #available(macOS 10.12, *) {
-    // Color literal in the extended sRGB color space.
-    let c1 = #colorLiteral(red: 1.358, green: -0.074, blue: -0.012, alpha: 1.0)
-    
-    var printedC1 = ""
-    print(c1, to: &printedC1)
-    expectTrue(printedC1.contains("extended"))
-  }
-}
-
-AppKitTests.test("NSLayoutPriority") {
-  let highPriority: NSLayoutConstraint.Priority = .defaultHigh
-
-  let adjustedPriority1 = highPriority + 1
-  let adjustedPriority1RawValue: Float = NSLayoutConstraint.Priority.defaultHigh.rawValue + 1
-  expectEqual(adjustedPriority1.rawValue, adjustedPriority1RawValue)
-
-  let adjustedPriority2 = highPriority - 5.0
-  let adjustedPriority2RawValue: Float = NSLayoutConstraint.Priority.defaultHigh.rawValue - 5.0
-  expectEqual(adjustedPriority2.rawValue, adjustedPriority2RawValue)
-
-  let adjustedPriority3 = 5.0 + highPriority
-  let adjustedPriority3RawValue: Float = 5.0 + NSLayoutConstraint.Priority.defaultHigh.rawValue
-  expectEqual(adjustedPriority3.rawValue, adjustedPriority3RawValue)
-
-  // Inferred typing from result type
-  let adjustedPriority4: NSLayoutConstraint.Priority = .defaultHigh + 2.0
-  let adjustedPriority4RawValue: Float = NSLayoutConstraint.Priority.defaultHigh.rawValue + 2.0
-  expectEqual(adjustedPriority4.rawValue, adjustedPriority4RawValue)
-
-  // Comparable
-  expectTrue(adjustedPriority1 > adjustedPriority2)
-  expectTrue(adjustedPriority2 < adjustedPriority1)
-
-  // Compound assignment
-  var variablePriority: NSLayoutConstraint.Priority = .defaultHigh
-  variablePriority += 1
-  variablePriority -= 5.0
-  let variablePriorityRawValue: Float = NSLayoutConstraint.Priority.defaultHigh.rawValue + 1 - 5.0
-  expectEqual(variablePriority.rawValue, variablePriorityRawValue)
-}
-
-runAllTests()
diff --git a/test/stdlib/ArrayDiagnostics.swift b/test/stdlib/ArrayDiagnostics.swift
index 2b6cf254d6c63..a13948e7f4b18 100644
--- a/test/stdlib/ArrayDiagnostics.swift
+++ b/test/stdlib/ArrayDiagnostics.swift
@@ -4,5 +4,5 @@ class NotEquatable {}
 
 func test_ArrayOfNotEquatableIsNotEquatable() {
   var a = [ NotEquatable(), NotEquatable() ]
-  if a == a {} // expected-error {{operator function '==' requires that 'NotEquatable' conform to 'Equatable'}}
+  if a == a {} // expected-error {{referencing operator function '==' on 'Array' requires that 'NotEquatable' conform to 'Equatable'}}
 }
diff --git a/test/stdlib/AssetsLibrary.swift b/test/stdlib/AssetsLibrary.swift
deleted file mode 100644
index c2277fb5cf5db..0000000000000
--- a/test/stdlib/AssetsLibrary.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: OS=ios
-
-import AssetsLibrary
-
-// Test the enumerateGroupsWithTypes overload that accepts UInt32.
-// This should compile and not crash at runtime.
-
-let library = ALAssetsLibrary()
-library.enumerateGroupsWithTypes(ALAssetsGroupAll,
-  usingBlock: {(group: ALAssetsGroup?, stop: UnsafeMutablePointer<ObjCBool>?) -> Void in
-                print("Swift usingBlock")},
-  failureBlock: {(error: Error?) -> Void in
-                  print("Swift failureBlock")})
-
diff --git a/test/stdlib/Casts.swift b/test/stdlib/Casts.swift
index abab9b680b4ac..e29d94c043f88 100644
--- a/test/stdlib/Casts.swift
+++ b/test/stdlib/Casts.swift
@@ -21,6 +21,8 @@ import StdlibUnittest
 import Foundation
 #endif
 
+private func blackhole<T>(_ t: T) {}
+
 let CastsTests = TestSuite("Casts")
 
 // Test for SR-426: missing release for some types after failed conversion
@@ -84,7 +86,7 @@ CastsTests.test("Optional<T>.none can be casted to Optional<U>.none in generic c
 #if _runtime(_ObjC)
 protocol P2 {}
 CastsTests.test("Cast from ObjC existential to Protocol (SR-3871)") {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     struct S: P2 {}
 
     class ObjCWrapper {
@@ -161,4 +163,63 @@ CastsTests.test("Dynamic casts of CF types to protocol existentials")
 }
 #endif
 
+CastsTests.test("Any.Protocol") {
+  class C {}
+  struct S {}
+  func isAnyProtocol<T>(_ type: T.Type) -> Bool {
+    let result = T.self is Any.Protocol
+		if result {
+			// `as!` should succeed if `is` does
+			blackhole(T.self as! Any.Protocol)
+		}
+    return result
+  }
+  func isAnyType<T>(_ type: T.Type) -> Bool {
+    return T.self is Any.Type
+  }
+  func isType<T,U>(_ type: T.Type, to: U.Type) -> Bool {
+    return T.self is U.Type
+  }
+
+  expectTrue(Int.self is Any.Type)
+  expectNotNil(Int.self as? Any.Type)
+  expectTrue(isAnyType(Int.self))
+  expectFalse(Int.self is Any.Protocol)
+  expectNil(Int.self as? Any.Protocol)
+  expectFalse(isAnyProtocol(Int.self))
+  expectFalse(isType(Int.self, to: Any.self))
+
+  expectTrue(C.self is Any.Type)
+  expectNotNil(C.self as? Any.Type)
+  expectTrue(isAnyType(C.self))
+  expectFalse(C.self is Any.Protocol)
+  expectNil(C.self as? Any.Protocol)
+  expectFalse(isAnyProtocol(C.self))
+  expectFalse(isType(C.self, to: Any.self))
+
+  expectTrue(S.self is Any.Type)
+  expectNotNil(S.self as? Any.Type)
+  expectTrue(isAnyType(S.self))
+  expectFalse(S.self is Any.Protocol)
+  expectNil(S.self as? Any.Protocol)
+  expectFalse(isAnyProtocol(S.self))
+  expectFalse(isType(S.self, to: Any.self))
+
+  expectTrue(Any.self is Any.Type)
+  expectNotNil(Any.self as? Any.Type)
+  expectTrue(isAnyType(Any.self))
+  expectTrue(Any.self is Any.Protocol)
+  expectNotNil(Any.self as? Any.Protocol)
+  expectTrue(isAnyProtocol(Any.self))
+  expectTrue(isType(Any.self, to: Any.self))
+
+  expectTrue(Any?.self is Any.Type)
+  expectNotNil(Any?.self as? Any.Type)
+  expectTrue(isAnyType(Any?.self))
+  expectFalse(Any?.self is Any.Protocol)
+  expectNil(Any?.self as? Any.Protocol)
+  expectFalse(isAnyProtocol(Any?.self))
+  expectFalse(isType(Any?.self, to: Any.self))
+}
+
 runAllTests()
diff --git a/test/stdlib/CloudKit.swift b/test/stdlib/CloudKit.swift
deleted file mode 100644
index 38ca45c77c3ef..0000000000000
--- a/test/stdlib/CloudKit.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 -F %sdk/System/Library/PrivateFrameworks %s -o %t/a.out-4 && %target-codesign %t/a.out-4 && %target-run %t/a.out-4
-// RUN: %target-build-swift -swift-version 4.2 -F %sdk/System/Library/PrivateFrameworks %s -o %t/a.out-4.2 && %target-codesign %t/a.out-4.2 && %target-run %t/a.out-4.2
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-import CloudKit
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-let CloudKitTests = TestSuite("CloudKit")
-
-
-CloudKitTests.test("Type renames") {
-  if #available(macOS 10.10, iOS 8.0, tvOS 9.0, watchOS 3.0, *) {
-#if swift(>=4.2)
-    let _: CKRecord.ID? = nil
-    let _: CKRecord.Reference? = nil
-    let _: CKRecordZone.ID? = nil
-    let _: CKNotification.ID? = nil
-    let _: CKQueryOperation.Cursor? = nil
-    let _: CKModifyRecordsOperation.RecordSavePolicy? = nil
-    let _: CKNotification.NotificationType? = nil
-    let _: CKQueryNotification.Reason? = nil
-    let _: CKRecordZone.Capabilities? = nil
-#else
-    let _: CKRecordID? = nil
-    let _: CKReference? = nil
-    let _: CKRecordZoneID? = nil
-    let _: CKNotificationID? = nil
-    let _: CKQueryCursor? = nil
-    let _: CKRecordSavePolicy? = nil
-    let _: CKNotificationType? = nil
-    let _: CKQueryNotificationReason? = nil
-    let _: CKRecordZoneCapabilities? = nil
-#endif
-  }
-
-  if #available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
-#if swift(>=4.2)
-    let _: CKShare.Participant? = nil
-    let _: CKUserIdentity.LookupInfo? = nil 
-    let _: CKShare.Metadata? = nil
-    let _: CKDatabase.Scope? = nil
-#else
-    let _: CKShareParticipant? = nil
-    let _: CKUserIdentityLookupInfo? = nil
-    let _: CKShareMetadata? = nil
-    let _: CKDatabaseScope? = nil
-#endif
-  }
-
-  if #available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
-#if swift(>=4.2)
-    let _: CKOperation.Configuration? = nil
-    let _: CKOperationGroup.TransferSize? = nil
-#else
-    let _: CKOperationConfiguration? = nil
-    let _: CKOperationGroupTransferSize? = nil
-#endif
-  }
-
-#if !os(watchOS)
-  if #available(macOS 10.10, iOS 8.0, tvOS 9.0, *) {
-#if swift(>=4.2)
-    let _: CKSubscription.SubscriptionType? = nil
-    let _: CKSubscription.NotificationInfo? = nil
-#else
-    let _: CKSubscriptionType? = nil
-    let _: CKNotificationInfo? = nil
-#endif // swift(>=4.2)
-  }
-
-  if #available(macOS 10.12, iOS 10.0, tvOS 10.0, *) {
-#if swift(>=4.2)
-    let _: CKQuerySubscription.Options? = nil
-#else
-    let _: CKQuerySubscriptionOptions? = nil
-#endif // swift(>=4.2)
-  }
-#endif // !os(watchOS)
-}
-
-runAllTests() 
diff --git a/test/stdlib/Compression.swift b/test/stdlib/Compression.swift
deleted file mode 100644
index f49d2d18d387b..0000000000000
--- a/test/stdlib/Compression.swift
+++ /dev/null
@@ -1,148 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-import StdlibUnittest
-import Compression
-import Foundation
-
-// Read from Data
-class DataSource {
-
-  private var _buf : Data
-  private var _bufSize : Int // total byte count
-  private var _pos : Int  // next byte to read
-
-  public init(_ d: Data) {
-    _buf = d
-    _bufSize = d.count
-    _pos = 0
-  }
-
-  public func readData(ofLength len: Int) -> Data? {
-    let n = min(len,_bufSize - _pos)
-    if (n == 0) { return nil } // EOF
-    let d = _buf.subdata(in: _pos ..< _pos + n)
-    _pos += n
-    return d
-  }
-
-}
-
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-func ofiltercompress_ifilterdecompress(
-  _ contents: Data, using algo: Algorithm
-) throws -> Bool {
-
-  var payload = Data()
-  var decompressed = Data()
-
-  // Output filter compress
-  let f = DataSource(contents)
-  let ofilter = try OutputFilter(.compress, using: algo) { (x: Data?) -> () in
-      if let x = x { payload.append(x) }
-  }
-  while (true) {
-    let i = f.readData(ofLength: 900)
-    try ofilter.write(i) // will finalize when i is empty
-    if i == nil { break }
-  }
-
-  // Input filter decompress
-  let g = DataSource(payload)
-  let ifilter = try InputFilter(.decompress, using: algo) { (x: Int) -> Data? in
-    return g.readData(ofLength: x)
-  }
-  while let i = try ifilter.readData(ofLength: 400) {
-    decompressed.append(i)
-  }
-
-  print("ofilter | ifilter \(algo): \(contents.count) -> \(payload.count) -> \(decompressed.count)")
-  return contents == decompressed
-}
-
-@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
-func ifiltercompress_ofilterdecompress(
-  _ contents: Data, using algo: Algorithm
-) throws -> Bool {
-
-  var payload = Data()
-  var decompressed = Data()
-
-  // Input filter compress
-  let f = DataSource(contents)
-  let ifilter = try InputFilter(.compress, using: algo) {(x: Int) -> Data? in
-    return f.readData(ofLength:x)
-  }
-  while let i = try ifilter.readData(ofLength: 400) {
-    payload.append(i)
-  }
-
-  // Output filter decompress
-  let g = DataSource(payload)
-  let ofilter = try OutputFilter(.decompress, using: algo) {(x: Data?) -> () in
-    if let x = x {
-      decompressed.append(x)
-    }
-  }
-  while (true) {
-    let i = g.readData(ofLength: 900)
-    try ofilter.write(i) // will finalize when i is empty
-    if i == nil { break }
-  }
-
-  print("ifilter | ofilter \(algo): \(contents.count) -> \(payload.count) -> \(decompressed.count)")
-
-  return contents == decompressed
-}
-
-func randomString(withBlockLength n: Int) -> String {
-  var strings = [String]()
-  for _ in 0 ..< n {
-    var s = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
-      // Change some random chars
-      for _ in 1...10 {
-        let pos = Int.random(in: 0 ..< s.count)
-        let idx = s.index(s.startIndex, offsetBy: pos)
-        s = String(s[..<idx] + "#" + s[idx...])
-      }
-    strings.append(s)
-  }
-  return strings.joined(separator: "")
-}
-
-let tests = TestSuite("Compression")
-
-if #available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *) {
-
-  do {
-    for blockLength in [0, 1, 2, 5, 10, 100] {
-      let testString = randomString(withBlockLength: blockLength)
-      let contents = testString.data(using: .utf8)!
-
-      for algo in Algorithm.allCases {
-        tests.test("OutputFilter/Compress/InputFilter/Decompress/\(algo)/\(blockLength)") {
-          expectDoesNotThrow({
-            expectTrue(
-              try ofiltercompress_ifilterdecompress(contents, using: algo),
-              "Failing input: \(testString)"
-            )
-          })
-        }
-
-        tests.test("InputFilter/Compress/OutputFilter/Decompress/\(algo)/\(blockLength)") {
-          expectDoesNotThrow({
-            expectTrue(
-              try ifiltercompress_ofilterdecompress(contents, using: algo),
-              "Failing input: \(testString)"
-            )
-          })
-        }
-      }
-
-    } // blockLength
-  }
-
-}
-
-runAllTests()
diff --git a/test/stdlib/DispatchDeprecationMacOS.swift b/test/stdlib/DispatchDeprecationMacOS.swift
index 04440f6f316d7..834a50f303ca3 100644
--- a/test/stdlib/DispatchDeprecationMacOS.swift
+++ b/test/stdlib/DispatchDeprecationMacOS.swift
@@ -1,4 +1,4 @@
-// RUN: %swift -typecheck -target x86_64-apple-macosx10.9 -verify -sdk %sdk %s
+// RUN: %swift -typecheck -target %target-cpu-apple-macosx10.9 -verify -sdk %sdk %s
 // REQUIRES: OS=macosx
 // REQUIRES: libdispatch
 
diff --git a/test/stdlib/EmptyCollectionSingletonRealization.swift b/test/stdlib/EmptyCollectionSingletonRealization.swift
index 6bda22ca54705..11ca77ced1ebb 100644
--- a/test/stdlib/EmptyCollectionSingletonRealization.swift
+++ b/test/stdlib/EmptyCollectionSingletonRealization.swift
@@ -25,7 +25,7 @@ import Foundation
 @objc protocol P {}
 
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   do {
     let d: [NSObject: NSObject] = [:]
     let c: AnyClass? = object_getClass(d)
@@ -53,4 +53,4 @@ if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
   print("Dictionary: false")
   print("Array: false")
   print("Set: false")
-}
\ No newline at end of file
+}
diff --git a/test/stdlib/ErrorBridged.swift b/test/stdlib/ErrorBridged.swift
index 4aa8c7156c885..cc45b487fc0a8 100644
--- a/test/stdlib/ErrorBridged.swift
+++ b/test/stdlib/ErrorBridged.swift
@@ -849,7 +849,7 @@ ErrorBridgingTests.test("Swift Error bridged to NSError description") {
     expectEqual("Something", bridgedError.description)
   }
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     checkDescription()
   }
 }
@@ -880,7 +880,7 @@ ErrorBridgingTests.test("Swift Error description memory management") {
     }
   }
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     checkDescription()
   }
 }
diff --git a/test/stdlib/FloatConstants.swift b/test/stdlib/FloatConstants.swift
index eb03d30e29622..24e3fea8dc6d0 100644
--- a/test/stdlib/FloatConstants.swift
+++ b/test/stdlib/FloatConstants.swift
@@ -1,8 +1,8 @@
 // RUN: %target-typecheck-verify-swift
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/stdlib/GameplayKit.swift b/test/stdlib/GameplayKit.swift
deleted file mode 100644
index 2422772e7950f..0000000000000
--- a/test/stdlib/GameplayKit.swift
+++ /dev/null
@@ -1,55 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-
-import GameplayKit
-
-var GameplayKitTests = TestSuite("GameplayKit")
-
-if #available(OSX 10.12, iOS 10.0, tvOS 10.0, *) {
-
-  // MARK: Doing GameplayKit Stuff
-
-  GameplayKitTests.test("GKPath_float2") {
-    var vec: [float2] = [float2(3.0), float2(4.0)]
-    let path = GKPath(points: vec, radius: Float(30), cyclical: true)
-    expectEqual(path.numPoints, 2)
-    expectEqual(path.radius, Float(30))
-    expectEqual(path.isCyclical, true)
-  }
-  GameplayKitTests.test("GKPath_float3") {
-    var vec: [float3] = [float3(3.0), float3(4.0)]
-    let path = GKPath(points: vec, radius: Float(30), cyclical: true)
-    expectEqual(path.numPoints, 2)
-    expectEqual(path.radius, Float(30))
-    expectEqual(path.isCyclical, true)
-  }
-  GameplayKitTests.test("GKPolygonObstacle") {
-    var vec = [float2(3.0, 3.0), float2(3.0, -3.0), float2(-3.0, 3.0), float2(-3.0, -3.0)]
-    let obstacle = GKPolygonObstacle(points: vec)
-    expectEqual(obstacle.vertexCount, 4)
-  }
-  GameplayKitTests.test("GKEntity") {
-    @objc(MovementComponent)
-    class MovementComponent: GKComponent {
-      override func update(deltaTime seconds: TimeInterval) {}
-      override func didAddToEntity() {}
-      override func willRemoveFromEntity() {}
-    }
-    let comp = MovementComponent()
-    let entity = GKEntity()
-    entity.addComponent(comp)
-    expectEqual(entity.components.count, 1)
-    let grabbedComp = entity.component(ofType: MovementComponent.self)
-    expectEqual(grabbedComp, comp)
-    entity.removeComponent(ofType: MovementComponent.self)
-    expectEqual(entity.components.count, 0)
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/Inputs/CommonArrayTests.gyb b/test/stdlib/Inputs/CommonArrayTests.gyb
index 20924efb2f138..cd14aa47eedd9 100644
--- a/test/stdlib/Inputs/CommonArrayTests.gyb
+++ b/test/stdlib/Inputs/CommonArrayTests.gyb
@@ -116,7 +116,7 @@ ${Suite}.test("${ArrayType}/appendNonUnique")
 %   if ArrayType != 'ArraySlice':
 ${Suite}.test("${ArrayType}/removeNonUnique")
   .code {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     var x = ${ArrayType}<Int>(repeating: 27, count: 200)
     x.reserveCapacity(10002)
     for _ in 1...100 {
diff --git a/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.h b/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.h
deleted file mode 100644
index 321fb99d81316..0000000000000
--- a/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.h
+++ /dev/null
@@ -1,9 +0,0 @@
-@import CoreData;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSFetchRequest<__covariant ResultType: id<NSFetchRequestResult>> (SwiftTesting)
-+ (NSArray<ResultType> *)testGettingSomeDictionaries;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.m b/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.m
deleted file mode 100644
index 75313c8b34775..0000000000000
--- a/test/stdlib/Inputs/CoreDataHelper/CoreDataHelper.m
+++ /dev/null
@@ -1,7 +0,0 @@
-#import "CoreDataHelper.h"
-
-@implementation NSFetchRequest (SwiftTesting)
-+ (NSArray<id<NSFetchRequestResult>> *)testGettingSomeDictionaries {
-  return @[ @{}, @{} ];
-}
-@end
diff --git a/test/stdlib/Inputs/FloatingPointConversion.swift.gyb b/test/stdlib/Inputs/FloatingPointConversion.swift.gyb
index 715510c53ceb9..f6f98723b3eb7 100644
--- a/test/stdlib/Inputs/FloatingPointConversion.swift.gyb
+++ b/test/stdlib/Inputs/FloatingPointConversion.swift.gyb
@@ -31,7 +31,7 @@ var FloatingPointConversionFailures = TestSuite("FloatingPointToFloatingPointCon
 %   if OtherSignificandBits <= SelfSignificandBits:
 
 %    if OtherFloat == 'Float16':
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 %    end
 FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
 
@@ -56,7 +56,7 @@ FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
 %   else:
 
 %    if Self == 'Float16':
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 %    end
 FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
   .forEach(in: [
@@ -77,7 +77,7 @@ FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
 %   end
 
 %    if 'Float16' in [Self, OtherFloat]:
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 %    end
 FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion/special") {
   expectEqual( 1.0 as ${Self},   ${Self}(exactly:  1.0 as ${OtherFloat}))
@@ -138,7 +138,7 @@ _UnimplementedError()
 
 extension ${OtherInt} {
   %    if Self == 'Float16':
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   %    end
   static var _test${Self}Conversion: [(${OtherInt}, ${OtherInt}, ${OtherInt}?)] {
     if bitWidth > ${Self}.significandBitCount + 1 {
@@ -165,7 +165,7 @@ extension ${OtherInt} {
 }
 
 %    if Self == 'Float16':
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 %    end
 FixedPointConversionTruncations.test("${OtherInt}to${Self}")
   .forEach(in: ${OtherInt}._test${Self}Conversion) {
diff --git a/test/stdlib/Intents.swift b/test/stdlib/Intents.swift
deleted file mode 100644
index cbb78ea184ba6..0000000000000
--- a/test/stdlib/Intents.swift
+++ /dev/null
@@ -1,233 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
-// RUN: %target-build-swift %s -o %t/a.out42 -swift-version 4.2 && %target-codesign %t/a.out42 && %target-run %t/a.out42
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-// UNSUPPORTED: OS=tvos
-
-import Intents
-import StdlibUnittest
-
-let IntentsTestSuite = TestSuite("Intents")
-
-#if swift(>=4.2)
-let swiftVersion = "4.2"
-#else
-let swiftVersion = "4"
-#endif
-
-#if !os(macOS)
-if #available(iOS 10.0, watchOS 3.2, *) {
-
-  IntentsTestSuite.test("ErrorDomain/\(swiftVersion)") {
-    expectEqual("IntentsErrorDomain", INIntentErrorDomain)
-  }
-
-  IntentsTestSuite.test("extension/\(swiftVersion)") {
-    expectEqual("IntentsErrorDomain", INIntentError.errorDomain)
-  }
-}
-#endif
-
-#if os(iOS)
-if #available(iOS 11.0, *) {
-
-  IntentsTestSuite.test("INParameter KeyPath/\(swiftVersion)") {
-    let param = INParameter(keyPath: \INRequestRideIntent.pickupLocation)
-    expectEqual("pickupLocation", param?.parameterKeyPath)
-    if let typ = param?.parameterClass {
-      expectEqual(INRequestRideIntent.self, typ)
-    }
-    else {
-      expectUnreachable()
-    }
-  }
-
-  IntentsTestSuite.test("INSetProfileInCarIntent/defaultProfile availability/\(swiftVersion)") {
-    func f(profile: INSetProfileInCarIntent) {
-      var isDefaultProfile = profile.isDefaultProfile
-      expectType(Bool?.self, &isDefaultProfile)
-    }
-  }
-}
-#endif
-
-#if os(iOS) || os(watchOS)
-if #available(iOS 12.0, watchOS 5.0, *) {
-
-  // helper functions to build test data
-  func buildIntent(_ identifier: String) -> INIntent {
-    let person = INPerson(personHandle: INPersonHandle(value: "123-456-7890", type: .phoneNumber), nameComponents: nil, displayName: "test person \(identifier)", image: nil, contactIdentifier: nil, customIdentifier: "testPerson \(identifier)")
-    return INSendMessageIntent(recipients: [person], content: "test content \(identifier)", speakableGroupName: INSpeakableString(spokenPhrase: "test group \(identifier)"), conversationIdentifier: nil, serviceName: "test service \(identifier)", sender: person)
-  }
-  func buildUserActivity(_ identifier: String) -> NSUserActivity {
-    return NSUserActivity(activityType: "test activity \(identifier)")
-  }
-
-  IntentsTestSuite.test("INShortcutOverlay/is enum/\(swiftVersion)") {
-    // INIntent
-    let originalIntent = buildIntent("A")
-    let shortcutWithIntent: INShortcut = .intent(originalIntent)
-    switch shortcutWithIntent {
-    case .intent(let intent):
-      expectEqual(intent, originalIntent)
-    case .userActivity:
-      expectUnreachable()
-    }
-    // test convenince properties
-    expectEqual(shortcutWithIntent.intent, originalIntent)
-    expectEqual(shortcutWithIntent.userActivity, nil)
-    // test convenince init
-    expectEqual(INShortcut(intent: originalIntent), shortcutWithIntent)
-
-    // NSUserActivity
-    let originalUserActivity = buildUserActivity("A")
-    let shortcutWithNSUA: INShortcut = .userActivity(originalUserActivity)
-    switch shortcutWithNSUA {
-    case .intent:
-      expectUnreachable()
-    case .userActivity(let userActivity):
-      expectEqual(userActivity, originalUserActivity)
-    }
-    // test convenince properties
-    expectEqual(shortcutWithNSUA.intent, nil)
-    expectEqual(shortcutWithNSUA.userActivity, originalUserActivity)
-    // test convenince init
-    expectEqual(INShortcut(userActivity: originalUserActivity), shortcutWithNSUA)
-  }
-
-  IntentsTestSuite.test("INShortcutOverlay/conformances/\(swiftVersion)") {
-    let intentA = buildIntent("A")
-    let shortcutIntentA: INShortcut = .intent(intentA)
-    let shortcutIntentA2: INShortcut = .intent(intentA)
-    let shortcutIntentB: INShortcut = .intent(buildIntent("B"))
-    let userActivityA = buildUserActivity("A")
-    let shortcutUserActivityA: INShortcut = .userActivity(userActivityA)
-    let shortcutUserActivityA2: INShortcut = .userActivity(userActivityA)
-    let shortcutUserActivityB: INShortcut = .userActivity(buildUserActivity("B"))
-
-    // Equatable
-    expectEqual(shortcutIntentA, shortcutIntentA2)
-    expectNotEqual(shortcutIntentA, shortcutIntentB)
-    expectEqual(shortcutUserActivityA, shortcutUserActivityA2)
-    expectNotEqual(shortcutUserActivityA, shortcutUserActivityB)
-    expectNotEqual(shortcutIntentA, shortcutUserActivityA)
-
-    // Hashable
-    // expectEqual(shortcutIntentA.hashValue, shortcutIntentA.hashValue)
-//     expectEqual(shortcutUserActivityA.hashValue, shortcutUserActivityA.hashValue)
-
-    // Strings
-    let _: String = shortcutIntentA.description
-    let _: String = shortcutIntentA.debugDescription
-  }
-
-  // Make sure the shortcut property of INVoiceShortcut is imported as the overlay enum type
-  IntentsTestSuite.test("INShortcutOverlay/INVoiceShortcut propertyIsEnum/\(swiftVersion)") {
-    // NOTE: we can't actually run this one becuase we can't easily create an INVoiceShortcut, but at least type-check it
-    func f(voiceShortcut: INVoiceShortcut) {
-      switch voiceShortcut.shortcut {
-      case .intent(let intent):
-        print("got intent \(intent)")
-      case .userActivity(let userActivity):
-        print("got userActivity \(userActivity)")
-      }
-    }
-  }
-}
-#endif
-
-#if os(iOS) || os(watchOS)
-if #available(iOS 10.0, watchOS 3.2, *) {
-
-  IntentsTestSuite.test("INRideOption usesMeteredFare/\(swiftVersion)") {
-    func f(rideOption: inout INRideOption) {
-#if swift(>=4)
-      rideOption.usesMeteredFare = true
-      expectType(Bool?.self, &rideOption.usesMeteredFare)
-      expectTrue(rideOption.usesMeteredFare ?? false)
-#else
-      rideOption.usesMeteredFare = NSNumber(value: true)
-      expectType(NSNumber?.self, &rideOption.usesMeteredFare)
-      expectTrue(rideOption.usesMeteredFare?.boolValue ?? false)
-#endif
-    }
-  }
-
-}
-#endif
-
-#if os(iOS)
-if #available(iOS 11.0, *) {
-  IntentsTestSuite.test("INSetProfileInCarIntent Initializers/\(swiftVersion)") {
-#if swift(>=4)
-    _ = INSetProfileInCarIntent()
-    _ = INSetProfileInCarIntent(isDefaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileName: nil)
-    _ = INSetProfileInCarIntent(profileName: nil, isDefaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil, isDefaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil, profileName: nil)
-    _ = INSetProfileInCarIntent(
-      profileNumber: nil, profileName: nil, isDefaultProfile: nil)
-#else
-    _ = INSetProfileInCarIntent()
-    _ = INSetProfileInCarIntent(defaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileName: nil)
-    _ = INSetProfileInCarIntent(profileName: nil, defaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil, defaultProfile: nil)
-    _ = INSetProfileInCarIntent(profileNumber: nil, profileName: nil)
-    _ = INSetProfileInCarIntent(
-      profileNumber: nil, profileName: nil, defaultProfile: nil)
-#endif
-  }
-}
-#endif
-
-#if os(iOS) || os(watchOS)
-if #available(iOS 12.0, watchOS 5.0, *) {
-    
-  IntentsTestSuite.test("INPlayMediaIntent Initializer/\(swiftVersion)") {
-    let intent = INPlayMediaIntent(mediaItems: nil, mediaContainer: nil, playShuffled: false, playbackRepeatMode: .unknown, resumePlayback: true)
-    expectFalse(intent.playShuffled ?? true)
-    expectTrue(intent.resumePlayback ?? false)
-  }
-    
-}
-#endif
-
-#if os(iOS)
-    
-    IntentsTestSuite.test("Car Commands Intents Initializer/\(swiftVersion)") {
-        if #available(iOS 12.0, *) {
-            _ = INSetProfileInCarIntent(profileNumber: nil, profileName: nil, isDefaultProfile: nil, carName: nil)
-            _ = INSetClimateSettingsInCarIntent(enableFan: nil, enableAirConditioner: nil, enableClimateControl: nil, enableAutoMode: nil, airCirculationMode: .unknown, fanSpeedIndex: nil, fanSpeedPercentage: nil, relativeFanSpeedSetting: .unknown, temperature: nil, relativeTemperatureSetting: .unknown, climateZone: .unknown, carName: nil)
-            _ = INSetDefrosterSettingsInCarIntent(enable: nil, defroster: .unknown, carName: nil)
-            _ = INSetSeatSettingsInCarIntent(enableHeating: nil, enableCooling: nil, enableMassage: nil, seat: .unknown, level: nil, relativeLevel: .unknown, carName: nil)
-        }
-        
-        if #available(iOS 11.0, *) {
-            _ = INSetProfileInCarIntent(profileNumber: nil, profileName: nil, isDefaultProfile: nil)
-            _ = INSetClimateSettingsInCarIntent(enableFan: nil, enableAirConditioner: nil, enableClimateControl: nil, enableAutoMode: nil, airCirculationMode: .unknown, fanSpeedIndex: nil, fanSpeedPercentage: nil, relativeFanSpeedSetting: .unknown, temperature: nil, relativeTemperatureSetting: .unknown, climateZone: .unknown)
-            _ = INSetDefrosterSettingsInCarIntent(enable: nil, defroster: .unknown)
-            _ = INSetSeatSettingsInCarIntent(enableHeating: nil, enableCooling: nil, enableMassage: nil, seat: .unknown, level: nil, relativeLevel: .unknown)
-        }
-    }
-
-#endif
-
-#if os(iOS) || os(watchOS)
-if #available(iOS 12.0, watchOS 5.0, *) {
-
-    IntentsTestSuite.test("INIntent Images/\(swiftVersion)") {
-        let intent = INSendPaymentIntent(payee: nil, currencyAmount: nil, note: nil)
-        intent.setImage(nil, forParameterNamed: \INSendPaymentIntent.payee)
-        intent.setImage(nil, forParameterNamed: \.payee)
-    }
-    
-}
-#endif
-
-runAllTests()
diff --git a/test/stdlib/KeyPathAppending.swift b/test/stdlib/KeyPathAppending.swift
index a4c4f3217d143..a416e3c7cebc1 100644
--- a/test/stdlib/KeyPathAppending.swift
+++ b/test/stdlib/KeyPathAppending.swift
@@ -58,22 +58,20 @@ func mismatchedAppends<T, U, V>(readOnlyLeft: KeyPath<T, U>,
   // expected-note@-2 {{arguments to generic parameter 'Root' ('T' and 'V') are expected to be equal}}
 
   _ = readOnlyRight.appending(path: referenceLeft)
-  // expected-error@-1 {{cannot convert value of type 'ReferenceWritableKeyPath<T, U>' to expected argument type 'ReferenceWritableKeyPath<V, U>'}}
-  // expected-note@-2 {{arguments to generic parameter 'Root' ('T' and 'V') are expected to be equal}}
+  // expected-error@-1 {{no exact matches in call to instance method 'appending'}}
 
   _ = writableRight.appending(path: readOnlyLeft)
-  // expected-error@-1 {{instance method 'appending(path:)' requires that 'KeyPath<U, V>' inherit from 'KeyPath<U, T>'}}
+  // expected-error@-1 {{no exact matches in call to instance method 'appending'}}
 
   _ = writableRight.appending(path: writableLeft)
   // expected-error@-1 {{cannot convert value of type 'WritableKeyPath<T, U>' to expected argument type 'WritableKeyPath<V, U>'}}
   // expected-note@-2 {{arguments to generic parameter 'Root' ('T' and 'V') are expected to be equal}}
 
   _ = writableRight.appending(path: referenceLeft)
-  // expected-error@-1 {{cannot convert value of type 'ReferenceWritableKeyPath<T, U>' to expected argument type 'ReferenceWritableKeyPath<V, U>'}}
-  // expected-note@-2 {{arguments to generic parameter 'Root' ('T' and 'V') are expected to be equal}}
+  // expected-error@-1 {{no exact matches in call to instance method 'appending'}}
 
   _ = referenceRight.appending(path: readOnlyLeft)
-  // expected-error@-1 {{instance method 'appending(path:)' requires that 'KeyPath<U, V>' inherit from 'KeyPath<U, T>'}}
+  // expected-error@-1 {{no exact matches in call to instance method 'appending'}}
 
   _ = referenceRight.appending(path: writableLeft)
   // expected-error@-1 {{cannot convert value of type 'WritableKeyPath<T, U>' to expected argument type 'WritableKeyPath<V, U>'}}
diff --git a/test/stdlib/MapKit.swift b/test/stdlib/MapKit.swift
deleted file mode 100644
index 76625f26d8aa0..0000000000000
--- a/test/stdlib/MapKit.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-import CoreLocation
-import MapKit
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-var mapKit = TestSuite("MapKit")
-
-func coordinatesEqual(_ x: CLLocationCoordinate2D, _ y: CLLocationCoordinate2D)
-    -> Bool {
-  return x.latitude == y.latitude && x.longitude == y.longitude
-}
-func spansEqual(_ x: MKCoordinateSpan, _ y: MKCoordinateSpan)
-    -> Bool {
-  return x.latitudeDelta == y.latitudeDelta
-      && x.longitudeDelta == y.longitudeDelta
-}
-
-if #available(tvOS 9.2, *) {
-  mapKit.test("CLLocationCoordinate2D bridging") {
-    expectBridgeToNSValue(CLLocationCoordinate2D(latitude: 17, longitude: 38),
-                          nsValueInitializer: { NSValue(mkCoordinate: $0) },
-                          nsValueGetter: { $0.mkCoordinateValue },
-                          equal: coordinatesEqual)
-  }
-
-  mapKit.test("MKCoordinateSpan bridging") {
-    expectBridgeToNSValue(MKCoordinateSpan(latitudeDelta: 6,
-                                           longitudeDelta: 79),
-                          nsValueInitializer: { NSValue(mkCoordinateSpan: $0) },
-                          nsValueGetter: { $0.mkCoordinateSpanValue },
-                          equal: spansEqual)
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/MathConstants.swift b/test/stdlib/MathConstants.swift
index 08284143b1a6d..61fb01b584645 100644
--- a/test/stdlib/MathConstants.swift
+++ b/test/stdlib/MathConstants.swift
@@ -1,8 +1,8 @@
 // RUN: %target-typecheck-verify-swift
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/stdlib/MediaPlayer.swift b/test/stdlib/MediaPlayer.swift
deleted file mode 100644
index 597cd0386acba..0000000000000
--- a/test/stdlib/MediaPlayer.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-// REQUIRES: OS=ios
-
-import MediaPlayer
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-let MediaPlayerTests = TestSuite("MediaPlayer")
-
-MediaPlayerTests.test("decodablePlayParameters") {
-    if #available(iOS 11.0, *) {
-        let identifier = "1234567890"
-        let kind = "song"
-        let isLibrary = true
-        let playParamsData = """
-{
-    "id": "\(identifier)",
-    "kind": "\(kind)",
-    "isLibrary": \(isLibrary)
-}
-""".data(using: .utf8)!
-
-        do {
-            let decoder = JSONDecoder()
-            let playParameters = try decoder.decode(MPMusicPlayerPlayParameters.self, from: playParamsData)
-            let playParametersDictionary = playParameters.dictionary
-            expectEqual(identifier, playParametersDictionary["id"] as! String)
-            expectEqual(kind, playParametersDictionary["kind"] as! String)
-            expectEqual(isLibrary, playParametersDictionary["isLibrary"] as! Bool)
-        }
-        catch {
-            expectUnreachableCatch(error)
-        }
-    }
-}
-
-MediaPlayerTests.test("decodingInvalidPlayParameters") {
-    if #available(iOS 11.0, *) {
-        let invalidPlayParamsData = """
-{
-    "kind": "song"
-}
-""".data(using: .utf8)!
-
-        do {
-            let decoder = JSONDecoder()
-            let _ = try decoder.decode(MPMusicPlayerPlayParameters.self, from: invalidPlayParamsData)
-            expectUnreachable()
-        }
-        catch DecodingError.dataCorrupted(_) {}
-        catch {
-            expectUnreachableCatch(error)
-        }
-    }
-}
-
-
-MediaPlayerTests.test("encodablePlayParameters") {
-    if #available(iOS 11.0, *) {
-        let identifier = "1234567890"
-        let kind = "song"
-        let isLibrary = true
-        let correspondingPlayParamsString = """
-{"id":"\(identifier)","kind":"\(kind)","isLibrary":\(isLibrary)}
-"""
-
-        let playParametersDictionary: [String: Any] = [
-            "id": identifier,
-            "kind": kind,
-            "isLibrary": isLibrary
-        ]
-        guard let playParameters = MPMusicPlayerPlayParameters(dictionary: playParametersDictionary) else {
-            expectUnreachable()
-            return
-        }
-
-        do {
-            let encoder = JSONEncoder()
-            let encodedPlayParamsData = try encoder.encode(playParameters)
-            let encodedPlayParamsString = String(data: encodedPlayParamsData, encoding: .utf8)!
-            expectEqual(correspondingPlayParamsString, encodedPlayParamsString)
-        }
-        catch {
-            expectUnreachableCatch(error)
-        }
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/Metal.swift b/test/stdlib/Metal.swift
deleted file mode 100644
index f4386869bd5df..0000000000000
--- a/test/stdlib/Metal.swift
+++ /dev/null
@@ -1,331 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-// REQUIRES: executable_test
-
-import StdlibUnittest
-
-import Metal
-
-var MetalTests = TestSuite("Metal")
-
-if #available(OSX 10.13, iOS 11.0, tvOS 11.0, *) {
-
-  // Call each overlay to ensure nothing explodes
-
-  MetalTests.test("MTLArgumentEncoder") {
-    func apiAvailabilityTest() {
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      let buf = device.makeBuffer(
-        length: 64, options: MTLResourceOptions.storageModeShared)!
-      let texDesc = MTLTextureDescriptor()
-      texDesc.usage = MTLTextureUsage.renderTarget
-      let tex = device.makeTexture(descriptor: texDesc)!
-      let smplr = device.makeSamplerState(descriptor: MTLSamplerDescriptor())
-
-      var arguments = [MTLArgumentDescriptor]()
-      arguments.append(MTLArgumentDescriptor())
-      arguments.append(MTLArgumentDescriptor())
-      arguments.append(MTLArgumentDescriptor())
-      arguments[0].dataType = MTLDataType.pointer
-      arguments[0].index = 0
-      arguments[1].dataType = MTLDataType.texture
-      arguments[1].index = 1
-      arguments[2].dataType = MTLDataType.sampler
-      arguments[2].index = 2
-      if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
-        arguments.append(MTLArgumentDescriptor())
-        arguments[3].dataType = MTLDataType.indirectCommandBuffer
-        arguments[3].index = 3
-      }
-
-      /* Call APIs */
-
-      let argEncoder = device.makeArgumentEncoder(arguments: arguments)!
-      argEncoder.setArgumentBuffer(buf, offset: 0)
-      argEncoder.setBuffers([buf], offsets: [0], range: 0..<1)
-      argEncoder.setTextures([tex], range: 1..<2)
-      argEncoder.setSamplerStates([smplr], range: 2..<3)
-
-      if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
-        let icbDesc = MTLIndirectCommandBufferDescriptor()
-        icbDesc.commandTypes = [.draw, .drawIndexed]
-        icbDesc.inheritBuffers = false
-        icbDesc.maxVertexBufferBindCount = 1
-        icbDesc.maxFragmentBufferBindCount = 1
-        let icb = device.makeIndirectCommandBuffer (descriptor: icbDesc, maxCommandCount: 1, options: MTLResourceOptions.storageModeShared )!
-        argEncoder.setIndirectCommandBuffers([icb], range: 3..<4)
-      }
-    }
-  }
-
-  MetalTests.test("MTLBlitCommandEncoder") {
-    func apiAvailabilityTest() {
-
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      let queue = device.makeCommandQueue()!
-      let cmdBuf = queue.makeCommandBuffer()!
-      let bltCmdEncdr = cmdBuf.makeBlitCommandEncoder()!
-
-      /* Call APIs */
-
-      let buf = device.makeBuffer(length: 4, options: MTLResourceOptions())!
-      bltCmdEncdr.fill(buffer: buf, range: 0..<buf.length, value: 0)
-
-      if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
-        let icbDesc = MTLIndirectCommandBufferDescriptor()
-        icbDesc.commandTypes = [.draw, .drawIndexed]
-        icbDesc.inheritBuffers = false
-        icbDesc.maxVertexBufferBindCount = 1
-        icbDesc.maxFragmentBufferBindCount = 1
-        let icb1 = device.makeIndirectCommandBuffer (descriptor: icbDesc, maxCommandCount: 4, options: MTLResourceOptions.storageModeShared )!
-        let icb2 = device.makeIndirectCommandBuffer (descriptor: icbDesc, maxCommandCount: 4, options: MTLResourceOptions.storageModeShared )!
-        bltCmdEncdr.resetCommandsInBuffer (icb1, range:0..<5)
-        bltCmdEncdr.resetCommandsInBuffer (icb2, range:0..<5)
-        bltCmdEncdr.copyIndirectCommandBuffer (icb1, sourceRange: 0..<5, destination: icb2, destinationIndex:0)
-        bltCmdEncdr.optimizeIndirectCommandBuffer (icb1, range:0..<5)
-      }
-
-      bltCmdEncdr.endEncoding()
-    }
-  }
-
-if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *){
-  MetalTests.test("MTLIndirectCommandBuffer"){
-    func apiAvailabilityTest() {
-
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      let queue = device.makeCommandQueue()!
-      let cmdBuf = queue.makeCommandBuffer()!
-      let texDesc = MTLTextureDescriptor()
-      texDesc.usage = MTLTextureUsage.renderTarget
-      let tex = device.makeTexture(descriptor: texDesc)!
-      let rpDesc = MTLRenderPassDescriptor()
-      rpDesc.colorAttachments[0].texture = tex
-
-      let buf = device.makeBuffer(length: 4, options: MTLResourceOptions.storageModeShared)!
-      let icbDesc = MTLIndirectCommandBufferDescriptor()
-      icbDesc.commandTypes = [.draw, .drawIndexed]
-      icbDesc.inheritBuffers = false
-      icbDesc.maxVertexBufferBindCount = 1
-      icbDesc.maxFragmentBufferBindCount = 1
-      let icb = device.makeIndirectCommandBuffer(descriptor: icbDesc, maxCommandCount: 4, options: MTLResourceOptions.storageModeShared )!
-
-      /* Call APIs */
-
-      let encoder = cmdBuf.makeRenderCommandEncoder(descriptor: rpDesc)!
-      let cmd = icb.indirectRenderCommandAt(0)
-      cmd.setVertexBuffer(buf, offset: 0, at: 0)
-      cmd.setFragmentBuffer(buf, offset: 0, at: 0)
-      cmd.drawPrimitives(MTLPrimitiveType.triangle, vertexStart: 0, vertexCount: 0, instanceCount: 0, baseInstance: 0)
-      let cmd2 = icb.indirectRenderCommandAt(1)
-      cmd2.drawIndexedPrimitives(MTLPrimitiveType.triangle, indexCount: 0, indexType: MTLIndexType.uint16, indexBuffer: buf, indexBufferOffset: 0, instanceCount: 0, baseVertex: 0, baseInstance: 0)
-      let cmd3 = icb.indirectRenderCommandAt(2)
-      cmd3.reset()
-      icb.reset(0..<5)
-      encoder.executeCommandsInBuffer(icb, range:0..<5)
-      encoder.endEncoding()
-    }
-
-  }
-}
-
-  MetalTests.test("MTLBuffer") {
-    func apiAvailabilityTest() {
-
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      #if os(macOS)
-        let options = MTLResourceOptions.storageModeManaged
-      #else
-        let options = MTLResourceOptions.storageModePrivate
-      #endif
-      let buf = device.makeBuffer(length: 4, options: options)!
-
-      /* Call APIs */
-
-      #if os(macOS)
-        buf.didModifyRange(0..<4)
-      #endif
-      buf.addDebugMarker("test marker", range: 0..<4)
-    }
-  }
-
-  MetalTests.test("MTLComputeCommandEncoder") {
-    func apiAvailabilityTest(heapDesc: MTLHeapDescriptor) {
-
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      let queue = device.makeCommandQueue()!
-      let cmdBuf = queue.makeCommandBuffer()!
-
-      #if os(macOS)
-        let options = MTLResourceOptions.storageModeManaged
-      #else
-        let options = MTLResourceOptions.storageModePrivate
-      #endif
-      let buf = device.makeBuffer(length: 4, options: options)!
-      let tex = device.makeTexture(descriptor: MTLTextureDescriptor())!
-      heapDesc.size = 4
-      let heap = device.makeHeap(descriptor: heapDesc)!
-      let smplr = device.makeSamplerState(descriptor: MTLSamplerDescriptor())
-
-      /* Call APIs */
-
-      let encoder = cmdBuf.makeComputeCommandEncoder()!
-      encoder.useResources([buf], usage: MTLResourceUsage.read)
-      encoder.useHeaps([heap])
-      encoder.setBuffers([buf], offsets: [0], range: 0..<1)
-      encoder.setTextures([tex], range: 0..<1)
-      encoder.setSamplerStates([smplr], range: 0..<1)
-      encoder.setSamplerStates(
-        [smplr], lodMinClamps: [0], lodMaxClamps: [0], range: 0..<1)
-        if #available(macOS 10.14, iOS 12.0, tvOS 12.0, *)
-        {
-            encoder.memoryBarrier(resources: [buf])
-            /* encoder.memoryBarrier(scope: MTLBarrierScope.buffers) */
-        }
-      encoder.endEncoding()
-    }
-  }
-
-  MetalTests.test("MTLDevice") {
-    func apiAvailabilityTest() {
-
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-
-      /* Call APIs */
-
-      var samplePositions : [MTLSamplePosition]
-      if (device.supportsTextureSampleCount(2)) {
-        samplePositions = device.getDefaultSamplePositions(sampleCount: 2)
-      }
-      else if (device.supportsTextureSampleCount(4)) {
-        samplePositions = device.getDefaultSamplePositions(sampleCount: 4)
-      }
-      else {
-        expectUnreachable("device unexpectedly does not support sample count 2 or 4")
-      }
-    }
-  }
-
-  MetalTests.test("MTLFunctionConstantValues") {
-    func apiAvailabilityTest() {
-
-      /* Call APIs */
-
-      let vals = MTLFunctionConstantValues()
-      vals.setConstantValues([0], type: MTLDataType.float, range: 0..<1)
-    }
-  }
-
-  MetalTests.test("MTLRenderCommandEncoder") {
-    func apiAvailabilityTest(heapDesc: MTLHeapDescriptor) {
-
-      /* Setup */
-      let device = MTLCreateSystemDefaultDevice()!
-      let queue = device.makeCommandQueue()!
-      let cmdBuf = queue.makeCommandBuffer()!
-
-      #if os(macOS)
-        let options = MTLResourceOptions.storageModeManaged
-      #else
-        let options = MTLResourceOptions.storageModePrivate
-      #endif
-      let buf = device.makeBuffer(length: 4, options: options)!
-      let texDesc = MTLTextureDescriptor()
-      texDesc.usage = MTLTextureUsage.renderTarget
-      let tex = device.makeTexture(descriptor: texDesc)!
-      heapDesc.size = 4
-      let heap = device.makeHeap(descriptor: heapDesc)!
-      let smplr = device.makeSamplerState(descriptor: MTLSamplerDescriptor())
-      let rpDesc = MTLRenderPassDescriptor()
-      rpDesc.colorAttachments[0].texture = tex
-
-      /* Call APIs */
-
-      let encoder = cmdBuf.makeRenderCommandEncoder(descriptor: rpDesc)!
-      encoder.useResources([buf], usage: MTLResourceUsage.read)
-      encoder.useHeaps([heap])
-#if os(macOS) || os(iOS)
-      if #available(iOS 12.0, macOS 10.13, *) {
-        encoder.setViewports([MTLViewport()])
-        encoder.setScissorRects([MTLScissorRect(x:0, y:0, width:1, height:1)])
-      }
-#endif
-      encoder.setVertexBuffers([buf], offsets: [0], range: 0..<1)
-      encoder.setVertexTextures([tex], range: 0..<1)
-      encoder.setVertexSamplerStates([smplr], range: 0..<1)
-      encoder.setVertexSamplerStates(
-        [smplr], lodMinClamps: [0], lodMaxClamps: [0], range: 0..<1)
-      encoder.setFragmentBuffers([buf], offsets: [0], range: 0..<1)
-      encoder.setFragmentTextures([tex], range: 0..<1)
-      encoder.setFragmentSamplerStates([smplr], range: 0..<1)
-      encoder.setFragmentSamplerStates(
-        [smplr], lodMinClamps: [0], lodMaxClamps: [0], range: 0..<1)
-     #if os(iOS)
-         encoder.setTileBuffers([buf], offsets: [0], range: 0..<1)
-         encoder.setTileTextures([tex], range: 0..<1)
-         encoder.setTileSamplerStates([smplr], range: 0..<1)
-         encoder.setTileSamplerStates(
-           [smplr], lodMinClamps: [0], lodMaxClamps: [0], range: 0..<1)
-     #endif
-      #if os(OSX)
-        if #available(macOS 10.14, *)
-        {
-            encoder.memoryBarrier(resources: [buf], after:MTLRenderStages.fragment, before:MTLRenderStages.vertex)
-            /* encoder.memoryBarrier(scope: MTLBarrierScope.renderTargets, after:MTLRenderStages.fragment, before:MTLRenderStages.vertex) */
-        }
-      #endif
-      encoder.endEncoding()
-    }
-  }
-
-  MetalTests.test("MTLRenderPassDescriptor") {
-    func apiAvailabilityTest() {
-
-      /* Setup */
-
-      let rpDesc = MTLRenderPassDescriptor()
-
-      /* Call APIs */
-
-      rpDesc.setSamplePositions(
-        [MTLSamplePosition(x:0.25,y:0.75), MTLSamplePosition(x:0.75, y:0.25)])
-      _ = rpDesc.getSamplePositions()
-    }
-  }
-
-  MetalTests.test("MTLTexture") {
-    func apiAvailabilityTest() {
-      /* Setup */
-
-      let device = MTLCreateSystemDefaultDevice()!
-      let texDesc = MTLTextureDescriptor()
-      texDesc.usage = MTLTextureUsage.renderTarget
-      let tex = device.makeTexture(descriptor: texDesc)!
-
-      /* Call APIs */
-
-      let _ = tex.makeTextureView(
-        pixelFormat: texDesc.pixelFormat,
-        textureType: texDesc.textureType,
-        levels: 0..<1,
-        slices: 0..<1)
-    }
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/MetalKit.swift b/test/stdlib/MetalKit.swift
deleted file mode 100644
index 5f36c75fbde18..0000000000000
--- a/test/stdlib/MetalKit.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-codesign %t/a.out4 &&  %target-run %t/a.out4
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-// REQUIRES: executable_test
-
-import StdlibUnittest
-
-import Metal
-import MetalKit
-
-var MetalKitTests = TestSuite("MetalKit")
-
-// Call each overlay to ensure nothing explodes
-
-if #available(macOS 10.12, iOS 10.0, tvOS 10.0, *) {
-  MetalKitTests.test("Globals") {
-
-    do {
-      let _ = try MTKModelIOVertexDescriptorFromMetalWithError(MTLVertexDescriptor())
-    } catch _ {
-      expectUnreachable("MTKModelIOVertexDescriptorFromMetalWithError has thrown an unexpected error")
-    }
-
-    do {
-      let _ = try MTKMetalVertexDescriptorFromModelIOWithError(MDLVertexDescriptor())
-    } catch _ {
-      expectUnreachable("MTKMetalVertexDescriptorFromModelIOWithError has thrown an unexpected error")
-    }
-  }
-}
-
-if #available(macOS 10.11, iOS 9.0, tvOS 9.0, *) {
-  MetalKitTests.test("MTKMesh") {
-    func apiAvailabilityTest(device: MTLDevice) {
-      do {
-        let _ = try MTKMesh.newMeshes(asset: MDLAsset(), device: device)
-      } catch _ {
-        expectUnreachable("MTKMesh.newMeshes has thrown an unexpected error")
-      }
-    }
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/Mirror.swift b/test/stdlib/Mirror.swift
index 60b45e7e91539..4755be399ad11 100644
--- a/test/stdlib/Mirror.swift
+++ b/test/stdlib/Mirror.swift
@@ -622,7 +622,7 @@ mirrors.test("Weak and Unowned Obj-C refs in class (SR-5289)") {
     }
   }
 
-	if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+	if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 		let objc = WeakUnownedObjCClass()
 		let classWithReferences = SwiftClassWithWeakAndUnowned(objc)
 		let m = Mirror(reflecting: classWithReferences)
@@ -656,7 +656,7 @@ mirrors.test("Weak and Unowned Obj-C refs in struct") {
     }
   }
 
-	if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+	if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 		let objc = WeakUnownedObjCClass()
 		let structWithReferences = SwiftStructWithWeakAndUnowned(objc)
 		let m = Mirror(reflecting: structWithReferences)
@@ -692,7 +692,7 @@ mirrors.test("Weak and Unowned Swift refs in class") {
     }
   }
 
-	if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+	if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 		let swift = WeakUnownedSwiftClass()
 		let classWithReferences = SwiftClassWithWeakAndUnowned(swift)
 		let m = Mirror(reflecting: classWithReferences)
@@ -726,7 +726,7 @@ mirrors.test("Weak and Unowned Swift refs in struct") {
     }
   }
 
-	if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+	if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 		let swift = WeakUnownedSwiftClass()
 		let structWithReferences = SwiftStructWithWeakAndUnowned(swift)
 		let m = Mirror(reflecting: structWithReferences)
diff --git a/test/stdlib/NSEvent.swift b/test/stdlib/NSEvent.swift
deleted file mode 100644
index a4b28fb68761f..0000000000000
--- a/test/stdlib/NSEvent.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: OS=macosx
-// REQUIRES: objc_interop
-
-import AppKit
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-var NSEventTests = TestSuite("NSEventTests")
-
-func testSpecialKey(_ specialKey: NSEvent.SpecialKey, rawValue: Int) {
-    expectEqual(specialKey.rawValue, rawValue)
-    expectEqual(specialKey.unicodeScalar, Unicode.Scalar(rawValue))
-}
-
-NSEventTests.test("NSEvent.specialKey") {
-    testSpecialKey(NSEvent.SpecialKey.upArrow, rawValue: 0xF700)
-
-    if #available(macOS 10.15.4, *) {
-        // NSEvent.SpecialKey.deleteForward used to have the wrong rawValue in
-        // macOS versions below 10.15.4. See
-        // https://github.com/apple/swift/pull/26853 (rdar://54725550).
-        testSpecialKey(NSEvent.SpecialKey.deleteForward, rawValue: 0xF728)
-    }
-}
-
-runAllTests()
diff --git a/test/stdlib/NSStringAPI.swift b/test/stdlib/NSStringAPI.swift
index 16ac3090792fb..a1cdc280f6592 100644
--- a/test/stdlib/NSStringAPI.swift
+++ b/test/stdlib/NSStringAPI.swift
@@ -1368,7 +1368,7 @@ NSStringAPIs.test("smallestEncoding") {
 func getHomeDir() -> String {
 #if os(macOS)
   return String(cString: getpwuid(getuid()).pointee.pw_dir)
-#elseif os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(Darwin)
   // getpwuid() returns null in sandboxed apps under iOS simulator.
   return NSHomeDirectory()
 #else
diff --git a/test/stdlib/NSValueBridging.swift.gyb b/test/stdlib/NSValueBridging.swift.gyb
index a011dff1af6d3..626415bcc7b99 100644
--- a/test/stdlib/NSValueBridging.swift.gyb
+++ b/test/stdlib/NSValueBridging.swift.gyb
@@ -18,12 +18,15 @@
 //
 // REQUIRES: objc_interop
 
+// The UIKit overlay isn't present on iOS 10.3.
+// UNSUPPORTED: CPU=i386
+
 import StdlibUnittest
 import StdlibUnittestFoundationExtras
 import Foundation
 import CoreGraphics
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 import UIKit
 #endif
 
@@ -70,7 +73,7 @@ ${ testCase("CGAffineTransform", "CGAffineTransform(rotationAngle: .pi)",      N
 
 #endif
 
-#if os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(UIKit)
 
 ${ testCase("CGRect",            "CGRect(x: 17, y: 38, width: 6, height: 79)", "cgRect",            "(==)") }
 ${ testCase("CGPoint",           "CGPoint(x: 17, y: 38)",                      "cgPoint",           "(==)") }
diff --git a/test/stdlib/NaturalLanguage.swift b/test/stdlib/NaturalLanguage.swift
deleted file mode 100644
index f55d740a77f64..0000000000000
--- a/test/stdlib/NaturalLanguage.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-import StdlibUnittest
-
-import NaturalLanguage
-
-
-var tests = TestSuite("NaturalLanguage")
-
-if #available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) {
-  tests.test("recognizer") {
-    let recognizer = NLLanguageRecognizer()
-    let str = "This is a test mein Freund"
-    recognizer.processString(str)
-    recognizer.languageHints = [.english: 0.9, .german: 0.1]
-    let lang = recognizer.dominantLanguage
-    expectEqual(NLLanguage.english, lang)
-    let hypotheses = recognizer.languageHypotheses(withMaximum: 2)
-    expectEqual(hypotheses.count, 2)
-    let enProb = hypotheses[.english] ?? 0.0
-    let deProb = hypotheses[.german] ?? 0.0
-    let frProb = hypotheses[.french] ?? 0.0
-    expectNotEqual(0.0, enProb)
-    expectNotEqual(0.0, deProb)
-    expectEqual(0.0, frProb)
-  }
-
-  tests.test("tokenizer") {
-    let tokenizer = NLTokenizer(unit:.word)
-    let str = "This is a test. 😀"
-    let strRange = Range(NSMakeRange(0, 18), in: str)!
-    tokenizer.string = str
-    tokenizer.setLanguage(.english)
-    let tokenRange1 = tokenizer.tokenRange(at: str.startIndex)
-    let tokenArray = tokenizer.tokens(for: strRange)
-    let tokenRange2 = tokenArray[0]
-    expectEqual(tokenRange1, tokenRange2)
-    expectEqual("This", str[tokenRange1])
-    expectEqual(5, tokenArray.count)
-    var numTokens = 0
-    tokenizer.enumerateTokens(in: strRange) { (tokenRange, attrs) -> Bool in
-      if (numTokens == 0) {
-        expectEqual(tokenRange, tokenRange1)
-      }
-      numTokens = numTokens + 1
-      return true
-    }
-    expectEqual(5, numTokens)
-    expectEqual("😀", str[tokenArray[4]])
-  }
-
-
-  tests.test("tagger") {
-    let tagger = NLTagger(tagSchemes: [.tokenType])
-    let str = "This is a test. 😀"
-    let strRange = Range(NSMakeRange(0, 18), in: str)!
-    tagger.string = str
-    tagger.setLanguage(.english, range: strRange)
-    let ortho = NSOrthography.defaultOrthography(forLanguage: "en")
-    tagger.setOrthography(ortho, range: strRange)
-    let (tag1, tokenRange1) = tagger.tag(at: str.startIndex, unit: .word, scheme: .tokenType)
-    let tags = tagger.tags(in: strRange, unit: .word, scheme: .tokenType, options: .omitWhitespace)
-    let (tag2, tokenRange2) = tags[0]
-    let tokenRange3 = tagger.tokenRange(at: str.startIndex, unit: .word)
-    expectEqual(NLTag.word, tag1)
-    expectEqual(NLTag.word, tag2)
-    expectEqual(tokenRange1, tokenRange2)
-    expectEqual(tokenRange2, tokenRange3)
-    expectEqual("This", str[tokenRange1])
-    expectEqual(6, tags.count)
-    var numTokens = 0
-    tagger.enumerateTags(in: strRange, unit: .word, scheme: .tokenType, options: .omitWhitespace) { (tag, tokenRange) -> Bool in
-      let (tagAt, tokenRangeAt) = tagger.tag(at: tokenRange.lowerBound, unit: .word, scheme: .tokenType)
-      expectEqual(tag, tagAt)
-      expectEqual(tokenRange, tokenRangeAt)
-      if (numTokens == 0) {
-        expectEqual(NLTag.word, tag)
-        expectEqual(tokenRange, tokenRange1)
-      }
-      numTokens += 1
-      return true
-    }
-    expectEqual(6, numTokens)
-    let (_, tokenRange4) = tags[5]
-    expectEqual("😀", str[tokenRange4])
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/Network.swift b/test/stdlib/Network.swift
deleted file mode 100644
index aa9e3d1f79625..0000000000000
--- a/test/stdlib/Network.swift
+++ /dev/null
@@ -1,908 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-
-import Network
-import Foundation
-import StdlibUnittest
-
-
-defer { runAllTests() }
-
-var NetworkAPI = TestSuite("NetworkAPI")
-
-#if !os(watchOS)
-
-if #available(macOS 10.14, iOS 12.0, tvOS 12.0, *) {
-	NetworkAPI.test("constants") {
-		expectNotNil(NWConnection.ContentContext.defaultMessage)
-		expectNotNil(NWConnection.ContentContext.finalMessage)
-		expectNotNil(NWConnection.ContentContext.defaultStream)
-		expectNotNil(NWParameters.tcp)
-		expectNotNil(NWParameters.tls)
-		expectNotNil(NWParameters.udp)
-		expectNotNil(NWParameters.dtls)
-		expectNotNil(IPv4Address.any)
-		expectNotNil(IPv4Address.broadcast)
-		expectNotNil(IPv4Address.loopback)
-		expectNotNil(IPv4Address.allHostsGroup)
-		expectNotNil(IPv4Address.allRoutersGroup)
-		expectNotNil(IPv4Address.allReportsGroup)
-		expectNotNil(IPv4Address.mdnsGroup)
-		expectNotNil(IPv6Address.any)
-		expectNotNil(IPv6Address.loopback)
-		expectNotNil(IPv6Address.nodeLocalNodes)
-		expectNotNil(IPv6Address.linkLocalNodes)
-		expectNotNil(IPv6Address.linkLocalRouters)
-		expectNotNil(NWEndpoint.Port.any)
-		expectNotNil(NWEndpoint.Port.ssh)
-		expectNotNil(NWEndpoint.Port.smtp)
-		expectNotNil(NWEndpoint.Port.http)
-		expectNotNil(NWEndpoint.Port.pop)
-		expectNotNil(NWEndpoint.Port.imap)
-		expectNotNil(NWEndpoint.Port.https)
-		expectNotNil(NWEndpoint.Port.imaps)
-		expectNotNil(NWEndpoint.Port.socks)
-	}
-
-	NetworkAPI.test("NWEndpoint") {
-		let hostEndpoint = NWEndpoint.hostPort(host: "www.apple.com", port: .http)
-		expectNotNil(hostEndpoint)
-		expectNil(hostEndpoint.interface)
-
-		let bonjourEndpoint = NWEndpoint.service(name: "myprinter", type: "_ipp._tcp", domain: "local", interface: nil)
-		expectNotNil(bonjourEndpoint)
-		expectNil(bonjourEndpoint.interface)
-
-		let unixEndpoint = NWEndpoint.unix(path: "/foo/bar")
-		expectNotNil(unixEndpoint)
-		expectNil(unixEndpoint.interface)
-	}
-
-	NetworkAPI.test("NWEndpoint.Host") {
-		var host = NWEndpoint.Host("www.apple.com")
-		expectNotNil(host)
-		expectNil(host.interface)
-
-		host = NWEndpoint.Host("127.0.0.1")
-		expectNotNil(host)
-		expectNil(host.interface)
-
-		host = NWEndpoint.Host("::1")
-		expectNotNil(host)
-		expectNil(host.interface)
-
-		host = NWEndpoint.Host("::1%lo0")
-		expectNotNil(host)
-		expectNotNil(host.interface)
-		if let interface = host.interface {
-			expectEqual(interface.name, "lo0")
-			expectEqual(interface.type, .loopback)
-		}
-
-		var ipv4Address = IPv4Address("127.0.0.1")
-		expectNotNil(ipv4Address)
-		expectNotNil(ipv4Address!.rawValue)
-		expectEqual(ipv4Address!.rawValue.count, 4)
-		expectNil(ipv4Address!.interface)
-		expectTrue(ipv4Address!.isLoopback)
-
-		let otherIPv4Address = IPv4Address("127.0.0.1")
-		expectEqual(ipv4Address, otherIPv4Address)
-
-		ipv4Address = IPv4Address("169.254.1.0")
-		expectNotNil(ipv4Address)
-		expectTrue(ipv4Address!.isLinkLocal)
-
-		ipv4Address = IPv4Address("224.0.0.1")
-		expectNotNil(ipv4Address)
-		expectTrue(ipv4Address!.isMulticast)
-
-		var ipv6Address = IPv6Address("::0")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isAny)
-		expectNotNil(ipv6Address!.rawValue)
-		expectEqual(ipv6Address!.rawValue.count, 16)
-		expectNil(ipv6Address!.interface)
-
-		ipv6Address = IPv6Address("::1")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isLoopback)
-		expectNil(ipv6Address!.interface)
-
-		ipv6Address = IPv6Address("::1%lo0")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isLoopback)
-		expectNotNil(ipv6Address!.interface)
-		if let interface = ipv6Address!.interface {
-			expectEqual(interface.name, "lo0")
-			expectEqual(interface.type, .loopback)
-		}
-
-		ipv6Address = IPv6Address("::1.2.3.4")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isIPv4Compatabile)
-
-		ipv6Address = IPv6Address("::ffff:1.2.3.4")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isIPv4Mapped)
-
-		ipv4Address = ipv6Address!.asIPv4
-		expectNotNil(ipv4Address)
-
-		ipv6Address = IPv6Address("2002::1")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.is6to4)
-
-		ipv6Address = IPv6Address("fe80::1")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isLinkLocal)
-
-		ipv6Address = IPv6Address("ff02::1")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isMulticast)
-
-		expectEqual(ipv6Address!.multicastScope, .linkLocal)
-
-		// Try a bad multicast scope
-		ipv6Address = IPv6Address("ff03::1")
-		expectNotNil(ipv6Address)
-		expectTrue(ipv6Address!.isMulticast)
-		expectTrue(ipv6Address!.multicastScope != .linkLocal)
-	}
-
-	NetworkAPI.test("NWEndpoint.Port") {
-		let port: NWEndpoint.Port = 1234
-		expectNotNil(port)
-		expectEqual(port.rawValue, 1234)
-
-		expectEqual(NWEndpoint.Port.https, 443)
-		expectEqual(NWEndpoint.Port("https")!.rawValue, 443)
-	}
-
-	NetworkAPI.test("NWParameters") {
-		var parameters = NWParameters.tcp
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.internetProtocol is NWProtocolIP.Options)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-
-		parameters = parameters.copy()
-		expectTrue(parameters.defaultProtocolStack.internetProtocol is NWProtocolIP.Options)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-
-		parameters = NWParameters.udp
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-
-		parameters = NWParameters.tls
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 1)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols[0] is NWProtocolTLS.Options)
-
-		parameters.defaultProtocolStack.transportProtocol = NWProtocolUDP.Options()
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-
-		parameters = NWParameters.tls
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-
-		parameters = NWParameters.dtls
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 1)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols[0] is NWProtocolTLS.Options)
-
-		parameters = NWParameters(tls:nil, tcp:NWProtocolTCP.Options())
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-
-		parameters = NWParameters(dtls:nil, udp:NWProtocolUDP.Options())
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-
-		parameters = NWParameters(tls:NWProtocolTLS.Options(), tcp:NWProtocolTCP.Options())
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 1)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols[0] is NWProtocolTLS.Options)
-
-		parameters = NWParameters(dtls:NWProtocolTLS.Options(), udp:NWProtocolUDP.Options())
-		expectNotNil(parameters)
-		expectTrue(parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 1)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols[0] is NWProtocolTLS.Options)
-
-		parameters = NWParameters()
-		expectNotNil(parameters)
-		expectNotNil(parameters.defaultProtocolStack)
-		expectTrue(parameters.defaultProtocolStack.applicationProtocols.count == 0)
-		expectNil(parameters.defaultProtocolStack.transportProtocol)
-
-		parameters.defaultProtocolStack.transportProtocol = NWProtocolTCP.Options()
-
-		expectNil(parameters.requiredInterface)
-
-		expectEqual(parameters.requiredInterfaceType, NWInterface.InterfaceType.other)
-		parameters.requiredInterfaceType = .wifi
-		expectEqual(parameters.requiredInterfaceType, NWInterface.InterfaceType.wifi)
-
-		expectTrue(parameters.prohibitedInterfaces == nil ||
-				   parameters.prohibitedInterfaces!.count == 0)
-
-		expectTrue(parameters.prohibitedInterfaceTypes == nil ||
-				   parameters.prohibitedInterfaceTypes!.count == 0)
-		parameters.prohibitedInterfaceTypes = [ .cellular ]
-		expectTrue(parameters.prohibitedInterfaceTypes!.count == 1)
-		expectEqual(parameters.prohibitedInterfaceTypes![0], .cellular)
-
-		expectEqual(parameters.prohibitExpensivePaths, false)
-		parameters.prohibitExpensivePaths = true;
-		expectEqual(parameters.prohibitExpensivePaths, true)
-
-		expectEqual(parameters.preferNoProxies, false)
-		parameters.preferNoProxies = true;
-		expectEqual(parameters.preferNoProxies, true)
-
-		expectNil(parameters.requiredLocalEndpoint)
-		parameters.requiredLocalEndpoint = NWEndpoint.hostPort(host: "127.0.0.1", port: 1234)
-		expectNotNil(parameters.requiredLocalEndpoint)
-
-		expectEqual(parameters.allowLocalEndpointReuse, false)
-		parameters.allowLocalEndpointReuse = true;
-		expectEqual(parameters.allowLocalEndpointReuse, true)
-
-		expectEqual(parameters.acceptLocalOnly, false)
-		parameters.acceptLocalOnly = true;
-		expectEqual(parameters.acceptLocalOnly, true)
-
-		expectEqual(parameters.serviceClass, NWParameters.ServiceClass.bestEffort)
-		parameters.serviceClass = .background;
-		expectEqual(parameters.serviceClass, NWParameters.ServiceClass.background)
-
-		expectEqual(parameters.multipathServiceType, NWParameters.MultipathServiceType.disabled)
-		parameters.multipathServiceType = .handover;
-		expectEqual(parameters.multipathServiceType, NWParameters.MultipathServiceType.handover)
-
-		expectEqual(parameters.expiredDNSBehavior, NWParameters.ExpiredDNSBehavior.systemDefault)
-		parameters.expiredDNSBehavior = .allow;
-		expectEqual(parameters.expiredDNSBehavior, NWParameters.ExpiredDNSBehavior.allow)
-
-		expectEqual(parameters.allowFastOpen, false)
-		parameters.allowFastOpen = true;
-		expectEqual(parameters.allowFastOpen, true)
-
-        expectEqual(parameters.includePeerToPeer, false)
-        parameters.includePeerToPeer = true;
-        expectEqual(parameters.includePeerToPeer, true)
-	}
-
-	NetworkAPI.test("NWProtocolTCP") {
-		expectNotNil(NWProtocolTCP.definition)
-		expectEqual(NWProtocolTCP.definition.name, "tcp")
-
-		let options = NWProtocolTCP.Options()
-		expectNotNil(options)
-
-		expectEqual(options.noDelay, false)
-		options.noDelay = true;
-		expectEqual(options.noDelay, true)
-
-		expectEqual(options.noPush, false)
-		options.noPush = true;
-		expectEqual(options.noDelay, true)
-
-		expectEqual(options.noOptions, false)
-		options.noOptions = true;
-		expectEqual(options.noOptions, true)
-
-		expectEqual(options.enableKeepalive, false)
-		options.enableKeepalive = true;
-		expectEqual(options.enableKeepalive, true)
-
-		expectEqual(options.keepaliveCount, 0)
-		options.keepaliveCount = 5;
-		expectEqual(options.keepaliveCount, 5)
-
-		expectEqual(options.keepaliveIdle, 0)
-		options.keepaliveIdle = 5;
-		expectEqual(options.keepaliveIdle, 5)
-
-		expectEqual(options.keepaliveInterval, 0)
-		options.keepaliveInterval = 5;
-		expectEqual(options.keepaliveInterval, 5)
-
-		expectEqual(options.maximumSegmentSize, 0)
-		options.maximumSegmentSize = 500;
-		expectEqual(options.maximumSegmentSize, 500)
-
-		expectEqual(options.connectionTimeout, 0)
-		options.connectionTimeout = 60;
-		expectEqual(options.connectionTimeout, 60)
-
-		expectEqual(options.persistTimeout, 0)
-		options.persistTimeout = 60;
-		expectEqual(options.persistTimeout, 60)
-
-		expectEqual(options.connectionDropTime, 0)
-		options.connectionDropTime = 60;
-		expectEqual(options.connectionDropTime, 60)
-
-		expectEqual(options.retransmitFinDrop, false)
-		options.retransmitFinDrop = true;
-		expectEqual(options.retransmitFinDrop, true)
-
-		expectEqual(options.disableAckStretching, false)
-		options.disableAckStretching = true;
-		expectEqual(options.disableAckStretching, true)
-
-		expectEqual(options.enableFastOpen, false)
-		options.enableFastOpen = true;
-		expectEqual(options.enableFastOpen, true)
-
-		expectEqual(options.disableECN, false)
-		options.disableECN = true;
-		expectEqual(options.disableECN, true)
-	}
-
-	NetworkAPI.test("NWProtocolUDP") {
-		expectNotNil(NWProtocolUDP.definition)
-		expectEqual(NWProtocolUDP.definition.name, "udp")
-
-		let options = NWProtocolUDP.Options()
-		expectNotNil(options)
-
-		expectEqual(options.preferNoChecksum, false)
-		options.preferNoChecksum = true;
-		expectEqual(options.preferNoChecksum, true)
-	}
-
-	NetworkAPI.test("NWProtocolIP") {
-		expectNotNil(NWProtocolIP.definition)
-		expectEqual(NWProtocolIP.definition.name, "ip")
-
-		let parameters = NWParameters()
-		let options = parameters.defaultProtocolStack.internetProtocol
-		expectNotNil(options)
-
-		expectTrue(options is NWProtocolIP.Options)
-
-		let ipOptions = options as! NWProtocolIP.Options
-
-		expectEqual(ipOptions.version, .any)
-		ipOptions.version = .v6;
-		expectEqual(ipOptions.version, .v6)
-
-		expectEqual(ipOptions.hopLimit, 0)
-		ipOptions.hopLimit = 5;
-		expectEqual(ipOptions.hopLimit, 5)
-
-		expectEqual(ipOptions.useMinimumMTU, false)
-		ipOptions.useMinimumMTU = true;
-		expectEqual(ipOptions.useMinimumMTU, true)
-
-		expectEqual(ipOptions.disableFragmentation, false)
-		ipOptions.disableFragmentation = true;
-		expectEqual(ipOptions.disableFragmentation, true)
-
-		let metadata = NWProtocolIP.Metadata()
-		expectNotNil(metadata)
-
-		expectEqual(metadata.ecn, .nonECT)
-		metadata.ecn = .ect0;
-		expectEqual(metadata.ecn, .ect0)
-
-		expectEqual(metadata.serviceClass, .bestEffort)
-		metadata.serviceClass = .background;
-		expectEqual(metadata.serviceClass, .background)
-
-        expectEqual(metadata.receiveTime, 0)
-	}
-
-	NetworkAPI.test("NWProtocolTLS") {
-		expectNotNil(NWProtocolTLS.definition)
-		expectEqual(NWProtocolTLS.definition.name, "tls")
-
-		let options = NWProtocolTLS.Options()
-		expectNotNil(options)
-		expectNotNil(options.securityProtocolOptions)
-	}
-
-	NetworkAPI.test("NWPath")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-
-		let monitor = NWPathMonitor()
-		expectNotNil(monitor)
-
-		monitor.pathUpdateHandler = { (newPath) in
-			expectNotNil(newPath)
-			group.leave()
-		}
-
-		group.enter();
-		monitor.start(queue: testQueue)
-
-		let path = monitor.currentPath
-		expectNotNil(path)
-
-		let result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		expectEqual(monitor.queue, testQueue)
-
-		expectNil(path.localEndpoint)
-		expectNil(path.remoteEndpoint)
-
-		for interface in path.availableInterfaces {
-			expectNotNil(interface.name)
-			expectTrue(interface.index != 0)
-		}
-
-		monitor.cancel()
-
-		let wifiMonitor = NWPathMonitor(requiredInterfaceType: .wifi)
-		expectNotNil(wifiMonitor)
-
-		wifiMonitor.start(queue: testQueue)
-
-		let wifiPath = wifiMonitor.currentPath
-		expectNotNil(wifiPath)
-
-		if wifiPath.status == .satisfied {
-			expectTrue(wifiPath.usesInterfaceType(.wifi))
-			expectTrue(wifiPath.supportsIPv4 || wifiPath.supportsIPv6 || wifiPath.supportsDNS)
-			expectTrue(wifiPath.availableInterfaces.count > 0)
-			var someInterfaceWiFi = false
-			for interface in wifiPath.availableInterfaces {
-				if (interface.type == .wifi) {
-					someInterfaceWiFi = true
-					break
-				}
-			}
-			expectTrue(someInterfaceWiFi)
-		}
-
-		wifiMonitor.cancel()
-
-		let loopbackMonitor = NWPathMonitor(requiredInterfaceType: .loopback)
-		expectNotNil(loopbackMonitor)
-
-		loopbackMonitor.start(queue: testQueue)
-
-		let loopbackPath = loopbackMonitor.currentPath
-		expectNotNil(loopbackPath)
-
-		expectTrue(!loopbackPath.isExpensive)
-
-		loopbackMonitor.cancel()
-	}
-
-	NetworkAPI.test("NWListener failure")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let parameters: NWParameters = .tcp
-		parameters.requiredLocalEndpoint = NWEndpoint.hostPort(host: "127.0.0.1", port: 1234)
-
-		var listener: NWListener? = nil
-		do {
-			listener = try NWListener(using: parameters, on: 2345)
-		} catch {
-			print("Received listener error: \(error).")
-		}
-		expectNil(listener)
-	}
-
-	NetworkAPI.test("NWListener")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-		let advertiseGroup = DispatchGroup()
-
-		let listener = try! NWListener(using: .tcp, on: 1234)
-		expectNotNil(listener)
-
-		listener.service = NWListener.Service(type: "_ipp._tcp")
-
-		listener.stateUpdateHandler = { (newState) in
-			switch(newState) {
-			case .ready:
-				group.leave()
-			case .failed(let error):
-				expectNotNil(error)
-				listener.cancel()
-			case .cancelled:
-				group.leave()
-			default:
-				break
-			}
-		}
-
-		listener.newConnectionHandler = { (newConn) in
-			expectNotNil(newConn)
-			newConn.forceCancel()
-		}
-
-		listener.serviceRegistrationUpdateHandler = { (serviceChange) in
-			switch(serviceChange) {
-			case .add(let endpoint):
-				expectNotNil(endpoint)
-			case .remove(let endpoint):
-				expectNotNil(endpoint)
-			}
-			advertiseGroup.leave()
-		}
-
-		group.enter()
-		advertiseGroup.enter()
-		listener.start(queue: testQueue)
-
-		// Wait for ready
-		var result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		// Wait for advertise
-		result = advertiseGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		expectEqual(listener.queue, testQueue)
-		expectTrue(listener.parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectEqual(listener.port, 1234)
-
-		group.enter()
-		listener.cancel()
-
-		// Wait for cancelled
-		result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-	}
-
-	NetworkAPI.test("NWConnection creation") {
-		var connection = NWConnection(host: "localhost", port: 2345, using:.tcp)
-		expectNotNil(connection)
-
-		connection = NWConnection(to: .hostPort(host: "localhost", port: 2345), using:.tcp)
-		expectNotNil(connection)
-
-		connection = NWConnection(to: .service(name: "myprinter", type: "_ipp._tcp", domain: "local", interface: nil), using:.tcp)
-		expectNotNil(connection)
-
-		connection = NWConnection(to: .unix(path: "/foo/bar"), using:.tcp)
-		expectNotNil(connection)
-	}
-
-	NetworkAPI.test("NWConnection Waiting Reset")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-
-		let connection = NWConnection(host: "localhost", port: 3456, using:.tls)
-		expectNotNil(connection)
-
-		connection.stateUpdateHandler = { (newState) in
-			switch(newState) {
-			case .waiting(let error):
-				expectNotNil(error)
-				switch(error) {
-				case .posix(let code):
-					expectEqual(code, .ECONNREFUSED)
-				default:
-					break
-				}
-				group.leave()
-			case .failed(let error):
-				expectNotNil(error)
-				connection.cancel()
-			case .cancelled:
-				group.leave()
-			default:
-				break
-			}
-		}
-
-		group.enter()
-		connection.start(queue: testQueue)
-
-		// Wait for waiting
-		var result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		connection.restart()
-
-		group.enter()
-		connection.cancel()
-
-		// Wait for cancelled
-		result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-	}
-
-	NetworkAPI.test("NWConnection Waiting DNS")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-
-		let connection = NWConnection(host: "foobar.fake.apple.com", port: .https, using:.tls)
-		expectNotNil(connection)
-
-		connection.stateUpdateHandler = { (newState) in
-			switch(newState) {
-			case .waiting(let error):
-				expectNotNil(error)
-				switch(error) {
-				case .dns(let code):
-					expectEqual(code, DNSServiceErrorType(kDNSServiceErr_NoSuchRecord))
-				default:
-					break
-				}
-				group.leave()
-			case .failed(let error):
-				expectNotNil(error)
-				connection.cancel()
-			case .cancelled:
-				group.leave()
-			default:
-				break
-			}
-		}
-
-		group.enter()
-		connection.start(queue: testQueue)
-
-		// Wait for waiting
-		var result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		group.enter()
-		connection.cancel()
-
-		// Wait for cancelled
-		result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-	}
-
-	NetworkAPI.test("NWConnection TCP")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-		let viableGroup = DispatchGroup()
-		let pathGroup = DispatchGroup()
-		let sendGroup = DispatchGroup()
-		let receiveGroup = DispatchGroup()
-
-		let listener = try! NWListener(using: .tcp, on: 2345)
-		expectNotNil(listener)
-
-		var inboundConnection: NWConnection? = nil
-		listener.newConnectionHandler = { (newConn) in
-			expectNotNil(newConn)
-			inboundConnection = newConn
-			newConn.receive(minimumIncompleteLength: 5, maximumLength: 5) { (receivedContent, context, isComplete, receivedError) in
-				expectTrue(!isComplete)
-				expectNil(receivedError)
-				expectNotNil(receivedContent)
-				expectNotNil(context)
-				receiveGroup.leave()
-			}
-			newConn.start(queue: testQueue)
-		}
-		listener.start(queue: testQueue)
-
-		// Make sure connecting by address works
-		let ipv4Address = IPv4Address("127.0.0.1")
-		let connection = NWConnection(to: NWEndpoint.hostPort(host: .ipv4(ipv4Address!), port: 2345), using:.tcp)
-		expectNotNil(connection)
-
-		connection.stateUpdateHandler = { (newState) in
-			switch(newState) {
-			case .ready:
-				group.leave()
-			case .failed(let error):
-				expectNotNil(error)
-				connection.cancel()
-			case .cancelled:
-				group.leave()
-			default:
-				break
-			}
-		}
-
-		connection.pathUpdateHandler = { (newPath) in
-			expectNotNil(newPath)
-			pathGroup.leave()
-		}
-
-		connection.viabilityUpdateHandler = { (isViable) in
-			expectTrue(isViable)
-			viableGroup.leave()
-		}
-
-		connection.betterPathUpdateHandler = { (betterPathAvailable) in
-			expectTrue(!betterPathAvailable)
-		}
-
-		group.enter()
-		viableGroup.enter()
-		pathGroup.enter()
-		receiveGroup.enter()
-		connection.start(queue: testQueue)
-
-		// Wait for ready
-		var result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		let path = connection.currentPath
-		expectNotNil(path)
-		if let path = path {
-			expectTrue(path.usesInterfaceType(.loopback))
-			expectNotNil(path.localEndpoint)
-			expectNotNil(path.remoteEndpoint)
-		}
-
-		let metadata = connection.metadata(definition: NWProtocolTCP.definition)
-		expectNotNil(metadata)
-		expectTrue(metadata is NWProtocolTCP.Metadata)
-
-		let tcpMetadata = metadata as! NWProtocolTCP.Metadata
-		expectEqual(tcpMetadata.availableReceiveBuffer, 0)
-		expectEqual(tcpMetadata.availableSendBuffer, 0)
-
-		// Wait for viable
-		result = viableGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		// Wait for path
-		result = pathGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		expectEqual(connection.queue, testQueue)
-		expectTrue(connection.parameters.defaultProtocolStack.transportProtocol is NWProtocolTCP.Options)
-		expectNotNil(connection.endpoint)
-
-		sendGroup.enter()
-
-		let sendContent: Data = "hello".data(using: .utf8)!
-		connection.send(content: sendContent, isComplete: false, completion: .contentProcessed({ (sendError) in
-			expectNil(sendError)
-			sendGroup.leave()
-		}))
-
-		// Wait for send
-		result = sendGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		// Wait for receive
-		result = receiveGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		// Send complete
-		connection.send(content: sendContent, contentContext: .finalMessage, isComplete: true, completion: .idempotent)
-
-		group.enter()
-		connection.cancel()
-
-		// Wait for cancelled
-		result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		if let inboundConnection = inboundConnection {
-			inboundConnection.forceCancel()
-		}
-		listener.cancel()
-	}
-
-	NetworkAPI.test("NWConnection UDP")
-		.skip(.iOSSimulatorAny("Path not fully supported on simulator"))
-		.skip(.tvOSSimulatorAny("Path not fully supported on simulator"))
-		.code {
-		let testQueue = DispatchQueue(label: "testQueue")
-		let group = DispatchGroup()
-		let cancelGroup = DispatchGroup()
-		let receiveGroup = DispatchGroup()
-
-		var inboundConnection: NWConnection? = nil
-		let listener = try! NWListener(using: .udp, on: 4567)
-		expectNotNil(listener)
-
-		listener.newConnectionHandler = { (newConn) in
-			expectNotNil(newConn)
-			inboundConnection = newConn
-			newConn.receiveMessage() { (receivedContent, context, isComplete, receivedError) in
-				expectTrue(isComplete)
-				expectNil(receivedError)
-				expectNotNil(receivedContent)
-				expectNotNil(context)
-				receiveGroup.leave()
-			}
-			newConn.start(queue: testQueue)
-		}
-		listener.start(queue: testQueue)
-
-		let connection = NWConnection(host: "localhost", port: 4567, using:.udp)
-		expectNotNil(connection)
-
-		connection.stateUpdateHandler = { (newState) in
-			switch(newState) {
-			case .ready:
-				group.leave()
-			case .failed(let error):
-				expectNotNil(error)
-				connection.cancel()
-			case .cancelled:
-				cancelGroup.leave()
-			default:
-				break
-			}
-		}
-
-		group.enter()
-		receiveGroup.enter()
-		connection.start(queue: testQueue)
-
-		// Wait for ready
-		var result = group.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		expectEqual(connection.queue, testQueue)
-		expectTrue(connection.parameters.defaultProtocolStack.transportProtocol is NWProtocolUDP.Options)
-		expectNotNil(connection.endpoint)
-
-		let ipMetadata = NWProtocolIP.Metadata()
-		ipMetadata.ecn = .ect0
-		let sendContext = NWConnection.ContentContext(identifier: "sendHello", expiration: 5000, priority: 1.0, isFinal: false, antecedent: nil, metadata: [ipMetadata])
-
-		expectNotNil(sendContext)
-		expectNotNil(sendContext.protocolMetadata)
-		expectNil(sendContext.antecedent)
-		expectEqual(sendContext.expirationMilliseconds, 5000)
-		expectEqual(sendContext.relativePriority, 1.0)
-		expectEqual(sendContext.isFinal, false)
-		expectEqual(sendContext.identifier, "sendHello")
-
-		let sendContent: Data = "hello".data(using: .utf8)!
-
-		connection.batch {
-			connection.send(content: sendContent, contentContext: sendContext, completion: .idempotent)
-		}
-
-		// Wait for receive
-		result = receiveGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		cancelGroup.enter()
-
-		connection.cancelCurrentEndpoint()
-		connection.cancel()
-
-		// Wait for cancelled
-		result = cancelGroup.wait(timeout: DispatchTime.now() + .seconds(10))
-		expectTrue(result == .success)
-
-		if let inboundConnection = inboundConnection {
-			inboundConnection.forceCancel()
-		}
-		listener.cancel()
-	}
-}
-
-#endif
diff --git a/test/stdlib/NumericParsing.swift.gyb b/test/stdlib/NumericParsing.swift.gyb
index fe0239efdb32d..c592fbbeab482 100644
--- a/test/stdlib/NumericParsing.swift.gyb
+++ b/test/stdlib/NumericParsing.swift.gyb
@@ -17,6 +17,7 @@
 // RUN: %line-directive %t/NumericParsing.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
 %{
+from __future__ import division
 from SwiftIntTypes import all_integer_types
 
 word_bits = int(CMAKE_SIZEOF_VOID_P)
@@ -36,7 +37,7 @@ Note: the third parameter, zero, is not for user consumption.
   else:
     r = n % radix
     digit = chr((ord('0') + r) if r < 10 else (ord('a') + r - 10))
-    return inRadix(radix, int(n / radix), '') + digit
+    return inRadix(radix, int(n // radix), '') + digit
 
 # The maximal legal radix
 max_radix = ord('z') - ord('a') + 1 + 10
@@ -96,7 +97,7 @@ tests.test("${Self}/success") {
   % for radix in radices_to_test:
   %   for n in required_values + list(range(
   %     minValue + 1, maxValue - 1,
-  %     int((maxValue - minValue - 2) / (number_of_values - len(required_values))))):
+  %     int((maxValue - minValue - 2) // (number_of_values - len(required_values))))):
   %     prefix = '+' if n > 0 and n % 2 == 0 else '' # leading '+'
   %     text = inRadix(radix, n)
   expectEqual(${n}, ${Self}("${prefix + text}", radix: ${radix}))
diff --git a/test/stdlib/OSLogExecutionTest.swift b/test/stdlib/OSLogExecutionTest.swift
index 3d6bd4fb06748..041de11b41ff2 100644
--- a/test/stdlib/OSLogExecutionTest.swift
+++ b/test/stdlib/OSLogExecutionTest.swift
@@ -6,7 +6,7 @@
 // RUN: %target-run %t/OSLogExecutionTest
 // REQUIRES: executable_test
 //
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
+// REQUIRES: VENDOR=apple
 
 // Run-time tests for testing the correctness of the optimizations that optimize the
 // construction of the format string and the byte buffer from a string interpolation.
diff --git a/test/stdlib/OptionSetTest.swift b/test/stdlib/OptionSetTest.swift
index 05fea8eaebe14..221cec6b03ed6 100644
--- a/test/stdlib/OptionSetTest.swift
+++ b/test/stdlib/OptionSetTest.swift
@@ -94,7 +94,7 @@ tests.test("set algebra") {
 
   p = P.boxOrBag
   let removed = p.remove(P.satchelOrBag)
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     // https://github.com/apple/swift/pull/28378
     expectEqual(P.bag, removed)
   }
diff --git a/test/stdlib/POSIX.swift b/test/stdlib/POSIX.swift
index d5250e9156e99..4452159554e9c 100644
--- a/test/stdlib/POSIX.swift
+++ b/test/stdlib/POSIX.swift
@@ -3,9 +3,9 @@
 // UNSUPPORTED: OS=windows-msvc
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #else
 #error("Unsupported platform")
diff --git a/test/stdlib/PrintFloat.swift.gyb b/test/stdlib/PrintFloat.swift.gyb
index 3bd8c417e8920..5a7ce9552421d 100644
--- a/test/stdlib/PrintFloat.swift.gyb
+++ b/test/stdlib/PrintFloat.swift.gyb
@@ -10,9 +10,9 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -345,7 +345,7 @@ let PrintTests = TestSuite("FloatingPointPrinting")
 
 % for FloatType in ['Float16', 'Float', 'Double', 'Float80']:
 % if FloatType == 'Float16':
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 % end
 % if FloatType == 'Float80':
 #if !os(Windows) && (arch(i386) || arch(x86_64))
@@ -383,7 +383,7 @@ fileprivate func expectDescription(_ expected: String, _ object: ${FloatType},
 //   that is closest (as an infinitely-precise real number) to the original
 //   binary float (interpreted as an infinitely-precise real number).
 % if FloatType == 'Float16':
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 % end
 fileprivate func expectAccurateDescription(_ object: ${FloatType},
   _ message: @autoclosure () -> String = "",
@@ -584,7 +584,7 @@ PrintTests.test("Printable_CDouble") {
   expectDescription("-1.0", CDouble(-1.0))
 }
 
-if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
 PrintTests.test("Printable_Float16") {
   func asFloat16(_ f: Float16) -> Float16 { return f }
 
diff --git a/test/stdlib/QuartzCore.swift b/test/stdlib/QuartzCore.swift
deleted file mode 100644
index c32702758c6bd..0000000000000
--- a/test/stdlib/QuartzCore.swift
+++ /dev/null
@@ -1,63 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-// QuartzCore is not present on watchOS.
-// UNSUPPORTED: OS=watchos
-
-import QuartzCore
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-var CanaryAssocObjectHandle: UInt8 = 0
-
-// Attach a LifetimeTracked associated object to an object so we can see that
-// the object died.
-func hangCanary(_ o: AnyObject) {
-  objc_setAssociatedObject(o, &CanaryAssocObjectHandle, LifetimeTracked(0),
-                           .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-}
-
-let deviceRGB = CGColorSpaceCreateDeviceRGB()
-
-class FooLayer: CALayer {
-  var black: CGColor 
-  var white = CGColor(colorSpace: deviceRGB, components: [1,1,1,1])!
-
-  override init() {
-    black = CGColor(colorSpace: deviceRGB, components: [0,0,0,1])!
-    super.init()
-    hangCanary(self)
-  }
-
-  required init?(coder: NSCoder) {
-    black = coder.decodeObject(forKey: "black") as! CGColor
-    super.init(coder: coder)
-  }
-
-  override var description: String {
-    return "FooLayer"
-  }
-}
-
-let quartzCore = TestSuite("QuartzCore")
-
-quartzCore.test("CALayer retain/release through subclass initializers") {
-  let layer = FooLayer()
-  expectEqual("FooLayer", "\(layer)")
-}
-
-func equalCATransform3D(_ x: CATransform3D, _ y: CATransform3D) -> Bool {
-  var xx = x, yy = y
-  return memcmp(&xx, &yy, MemoryLayout<CATransform3D>.size) == 0
-}
-
-quartzCore.test("CATransform3D bridges to NSValue") {
-  expectBridgeToNSValue(CATransform3DMakeRotation(.pi, 1, 0, 0),
-                        nsValueInitializer: { NSValue(caTransform3D: $0) },
-                        nsValueGetter: { $0.caTransform3DValue },
-                        equal: equalCATransform3D)
-}
-
-runAllTests()
-
diff --git a/test/stdlib/Reflection_objc.swift b/test/stdlib/Reflection_objc.swift
index 5c3936e062b0b..0ec4732b6b6f5 100644
--- a/test/stdlib/Reflection_objc.swift
+++ b/test/stdlib/Reflection_objc.swift
@@ -18,20 +18,20 @@ import Swift
 import Foundation
 import simd
 
-#if os(macOS)
+#if canImport(AppKit)
 import AppKit
 
 typealias OSImage = NSImage
 typealias OSColor = NSColor
 typealias OSBezierPath = NSBezierPath
-#endif
-
-#if os(iOS) || os(tvOS) || os(watchOS)
+#elseif canImport(UIKit)
 import UIKit
 
 typealias OSImage = UIImage
 typealias OSColor = UIColor
 typealias OSBezierPath = UIBezierPath
+#else
+#error("Platform does not support UIKit or AppKit!")
 #endif
 
 // Check ObjC mirror implementation.
diff --git a/test/stdlib/Runtime.swift.gyb b/test/stdlib/Runtime.swift.gyb
index 37251d51619e1..ae05de0b0b8c6 100644
--- a/test/stdlib/Runtime.swift.gyb
+++ b/test/stdlib/Runtime.swift.gyb
@@ -10,9 +10,9 @@ import Swift
 import StdlibUnittest
 import SwiftShims
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -595,7 +595,7 @@ Runtime.test("SwiftError layout constants for LLDB") {
   let offsetof_SwiftError_typeMetadata = pointerToSwiftCoreSymbol(name: "_swift_lldb_offsetof_SwiftError_typeMetadata")!
   let sizeof_SwiftError = pointerToSwiftCoreSymbol(name: "_swift_lldb_sizeof_SwiftError")!
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 #if arch(i386) || arch(arm)
   expectEqual(20, offsetof_SwiftError_typeMetadata.load(as: UInt.self))
   expectEqual(36, sizeof_SwiftError.load(as: UInt.self))
@@ -762,7 +762,7 @@ AvailabilityVersionsTestSuite.test("_stdlib_isOSVersionAtLeast") {
 
 // _stdlib_isOSVersionAtLeast is broken for
 // watchOS. rdar://problem/20234735
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   // This test assumes that no version component on an OS we test upon
   // will ever be greater than 1066 and that every major version will always
   // be greater than 1.
diff --git a/test/stdlib/SceneKit.swift b/test/stdlib/SceneKit.swift
deleted file mode 100644
index 2472340141b6e..0000000000000
--- a/test/stdlib/SceneKit.swift
+++ /dev/null
@@ -1,243 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-
-import SceneKit
-
-// SceneKit is only available on iOS 8.0 and above and on OS X 10.8 and above.
-// That said SCNMatrix4Scale &co are only available on OS X 10.10 and above.
-
-var SceneKitTests = TestSuite("SceneKit")
-
-if #available(iOS 8.0, OSX 10.10, *) {
-  let scn_vec3_ref = SCNVector3Make(1, 2, 3)
-  let scn_vec4_ref = SCNVector4Make(1, 2, 3, 4)
-  let scn_mat4_ref = SCNMatrix4Scale(SCNMatrix4Translate(SCNMatrix4MakeRotation(SCNFloat(M_PI), 1, 0, 0), 1, 2, 3), 10, 20, 30)
-
-  // MARK: Exposing SCNFloat
-
-  SceneKitTests.test("SCNFloat") {
-    let f = Float(1.0)
-    let scn_float_from_f = SCNFloat(f)
-    expectEqual(scn_float_from_f, 1.0)
-
-    let d = Double(2.0)
-    let scn_float_from_d = SCNFloat(d)
-    expectEqual(scn_float_from_d, 2.0)
-
-    let cg = CGFloat(3.0)
-    let scn_float_from_cg = SCNFloat(cg as NSNumber)
-    expectEqual(scn_float_from_cg, 3.0)
-
-    let node = SCNNode()
-    node.position.x = scn_float_from_f
-    node.position.y = scn_float_from_d
-    node.position.z = scn_float_from_cg
-    expectTrue(SCNVector3EqualToVector3(node.position, scn_vec3_ref))
-
-    let f1: SCNFloat = scn_vec3_ref.x
-    let f2: SCNFloat = scn_vec4_ref.y
-    expectEqual(f1, 1.0);
-    expectEqual(f2, 2.0);
-  }
-
-  // MARK: Working with SCNVector3
-
-  SceneKitTests.test("SCNVector3.init()/Literal") {
-    let scn_vec3_from_lit = SCNVector3(1, 2, 3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_lit, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/Float") {
-    let f1: Float = 1.0
-    let f2: Float = 2.0
-    let f3: Float = 3.0
-    let scn_vec3_from_f = SCNVector3(f1, f2, f3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_f, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/CGFloat") {
-    let d1: CGFloat = 1.0
-    let d2: CGFloat = 2.0
-    let d3: CGFloat = 3.0
-    let scn_vec3_from_cg = SCNVector3(d1, d2, d3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_cg, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/Double") {
-    let d1: Double = 1.0
-    let d2: Double = 2.0
-    let d3: Double = 3.0
-    let scn_vec3_from_d = SCNVector3(d1, d2, d3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_d, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/Int") {
-    let i1: Int = 1
-    let i2: Int = 2
-    let i3: Int = 3
-    let scn_vec3_from_i = SCNVector3(i1, i2, i3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_i, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/float3") {
-    let v3 = float3(1, 2, 3)
-    let scn_vec3_from_float3 = SCNVector3(v3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_float3, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/double3") {
-    let v3 = double3(1, 2, 3)
-    let scn_vec3_from_double3 = SCNVector3(v3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_double3, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("SCNVector3.init()/mix") {
-    let f1: Float = 1.0
-    let d2: CGFloat = 2.0
-    let scn_vec3_from_mixed = SCNVector3(f1, Float(d2), 3)
-    expectTrue(SCNVector3EqualToVector3(scn_vec3_from_mixed, scn_vec3_ref))
-  }
-
-  SceneKitTests.test("float3.init()/SCNVector3") {
-    let v3 = float3(scn_vec3_ref)
-    expectEqual(v3.x, 1.0)
-    expectEqual(v3.y, 2.0)
-    expectEqual(v3.z, 3.0)
-  }
-
-  SceneKitTests.test("double3.init()/SCNVector3") {
-    let v3 = double3(scn_vec3_ref)
-    expectEqual(v3.x, 1.0)
-    expectEqual(v3.y, 2.0)
-    expectEqual(v3.z, 3.0)
-  }
-
-  // MARK: Working with SCNVector4
-
-  SceneKitTests.test("SCNVector4.init()/Literal") {
-    let scn_vec4_from_lit = SCNVector4(1, 2, 3, 4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_lit, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/Float") {
-    let f1: Float = 1.0
-    let f2: Float = 2.0
-    let f3: Float = 3.0
-    let f4: Float = 4.0
-    let scn_vec4_from_f = SCNVector4(f1, f2, f3, f4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_f, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/CGFloat") {
-    let d1: CGFloat = 1.0
-    let d2: CGFloat = 2.0
-    let d3: CGFloat = 3.0
-    let d4: CGFloat = 4.0
-    let scn_vec4_from_cg = SCNVector4(d1, d2, d3, d4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_cg, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/Double") {
-    let d1: Double = 1.0
-    let d2: Double = 2.0
-    let d3: Double = 3.0
-    let d4: Double = 4.0
-    let scn_vec4_from_d = SCNVector4(d1, d2, d3, d4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_d, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/Int") {
-    let i1: Int = 1
-    let i2: Int = 2
-    let i3: Int = 3
-    let i4: Int = 4
-    let scn_vec4_from_i = SCNVector4(i1, i2, i3, i4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_i, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/float4") {
-    let v4 = float4(1, 2, 3, 4)
-    let scn_vec4_from_float4 = SCNVector4(v4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_float4, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/double4") {
-    let v4 = double4(1, 2, 3, 4)
-    let scn_vec4_from_double4 = SCNVector4(v4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_double4, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("SCNVector4.init()/mix") {
-    let f1: Float = 1.0
-    let d2: CGFloat = 2.0
-    let f4: Float = 4.0
-    let scn_vec4_from_mixed = SCNVector4(f1, Float(d2), 3, f4)
-    expectTrue(SCNVector4EqualToVector4(scn_vec4_from_mixed, scn_vec4_ref))
-  }
-
-  SceneKitTests.test("float4.init()/SCNVector4") {
-    let v4 = float4(scn_vec4_ref)
-    expectEqual(v4.x, 1.0)
-    expectEqual(v4.y, 2.0)
-    expectEqual(v4.z, 3.0)
-    expectEqual(v4.w, 4.0)
-  }
-
-  SceneKitTests.test("double4.init()/SCNVector4") {
-    let v4 = double4(scn_vec4_ref)
-    expectEqual(v4.x, 1.0)
-    expectEqual(v4.y, 2.0)
-    expectEqual(v4.z, 3.0)
-    expectEqual(v4.w, 4.0)
-  }
-
-  // MARK: Working with SCNMatrix4
-
-  SceneKitTests.test("SCNMatrix4.init()/float4x4 + float4x4.init()/SCNMatrix4") {
-    let mat4_from_scn_mat4 = float4x4(scn_mat4_ref)
-    let scn_vec4_from_mat4 = SCNMatrix4(mat4_from_scn_mat4)
-    expectTrue(SCNMatrix4EqualToMatrix4(scn_vec4_from_mat4, scn_mat4_ref))
-  }
-
-  SceneKitTests.test("SCNMatrix4.init()/double4x4 + double4x4.init()/SCNMatrix4") {
-    let mat4_from_scn_mat4 = double4x4(scn_mat4_ref)
-    let scn_vec4_from_mat4 = SCNMatrix4(mat4_from_scn_mat4)
-    expectTrue(SCNMatrix4EqualToMatrix4(scn_vec4_from_mat4, scn_mat4_ref))
-  }
-
-  func equalVector3s(_ x: SCNVector3, _ y: SCNVector3) -> Bool {
-    return x.x == y.x && x.y == y.y && x.z == y.z
-  }
-  func equalVector4s(_ x: SCNVector4, _ y: SCNVector4) -> Bool {
-    return x.x == y.x && x.y == y.y && x.z == y.z && x.w == y.w
-  }
-  func equalMatrix4s(_ x: SCNMatrix4, _ y: SCNMatrix4) -> Bool {
-    var xx = x, yy = y
-    return memcmp(&xx, &yy, MemoryLayout<SCNMatrix4>.size) == 0
-  }
-
-  SceneKitTests.test("NSValue bridging") {
-    expectBridgeToNSValue(scn_vec3_ref,
-                          nsValueInitializer: { NSValue(scnVector3: $0) },
-                          nsValueGetter: { $0.scnVector3Value },
-                          equal: equalVector3s)
-    expectBridgeToNSValue(scn_vec4_ref,
-                          nsValueInitializer: { NSValue(scnVector4: $0) },
-                          nsValueGetter: { $0.scnVector4Value },
-                          equal: equalVector4s)
-    expectBridgeToNSValue(scn_mat4_ref,
-                          nsValueInitializer: { NSValue(scnMatrix4: $0) },
-                          nsValueGetter: { $0.scnMatrix4Value },
-                          equal: equalMatrix4s)
-  }
-}
-
-runAllTests()
-
diff --git a/test/stdlib/StringCreate.swift b/test/stdlib/StringCreate.swift
index be0798b74fa7a..9bdce7e0c317d 100644
--- a/test/stdlib/StringCreate.swift
+++ b/test/stdlib/StringCreate.swift
@@ -46,7 +46,7 @@ StringCreateTests.test("String(decoding:as:)") {
     "", String(decoding: UnsafeBufferPointer(_empty: ()), as: UTF32.self))
 }
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   StringCreateTests.test("String(unsafeUninitializedCapacity:initializingUTF8With:)") {
     for simpleString in SimpleString.allCases {
       let expected = simpleString.rawValue
diff --git a/test/stdlib/StringDiagnostics.swift b/test/stdlib/StringDiagnostics.swift
index 3a53a26c69ee0..c3fde8ff884f5 100644
--- a/test/stdlib/StringDiagnostics.swift
+++ b/test/stdlib/StringDiagnostics.swift
@@ -48,6 +48,7 @@ func testAmbiguousStringComparisons(s: String) {
   
   // Shouldn't suggest 'as' in a pattern-matching context, as opposed to all these other situations
   if case nsString = "" {} // expected-error{{expression pattern of type 'NSString' cannot match values of type 'String'}}
+  // expected-note@-1 {{overloads for '~=' exist with these partially matching parameter lists: (Substring, String)}}
 }
 
 func testStringDeprecation(hello: String) {
diff --git a/test/stdlib/TestData.swift b/test/stdlib/TestData.swift
index 7de1cc5f02388..88abfb35e5eb9 100644
--- a/test/stdlib/TestData.swift
+++ b/test/stdlib/TestData.swift
@@ -3838,7 +3838,7 @@ class TestData : TestDataSuper {
     }
 
     func test_increaseCount() {
-        guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
+        guard #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else { return }
         let initials: [Range<UInt8>] = [
             0..<0,
             0..<2,
@@ -3861,7 +3861,7 @@ class TestData : TestDataSuper {
     }
 
     func test_decreaseCount() {
-        guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else { return }
+        guard #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else { return }
         let initials: [Range<UInt8>] = [
             0..<0,
             0..<2,
@@ -4373,4 +4373,3 @@ DataTests.test("bounding failure subscript") {
 
 runAllTests()
 #endif
-
diff --git a/test/stdlib/TestDecimal.swift b/test/stdlib/TestDecimal.swift
index 2e0b13a5c2b80..ee0c7e492432f 100644
--- a/test/stdlib/TestDecimal.swift
+++ b/test/stdlib/TestDecimal.swift
@@ -501,7 +501,7 @@ class TestDecimal : TestDecimalSuper {
     }
 
     func test_Round() {
-        let testCases = [
+        var testCases = [
             // expected, start, scale, round
             ( 0, 0.5, 0, Decimal.RoundingMode.down ),
             ( 1, 0.5, 0, Decimal.RoundingMode.up ),
@@ -515,14 +515,18 @@ class TestDecimal : TestDecimalSuper {
             
             ( -1, -0.5, 0, Decimal.RoundingMode.down ),
             ( -2, -2.5, 0, Decimal.RoundingMode.up ),
-            ( -3, -2.5, 0, Decimal.RoundingMode.bankers ),
-            ( -4, -3.5, 0, Decimal.RoundingMode.bankers ),
             ( -5, -5.2, 0, Decimal.RoundingMode.plain ),
             ( -4.5, -4.5, 1, Decimal.RoundingMode.down ),
             ( -5.5, -5.5, 1, Decimal.RoundingMode.up ),
             ( -6.5, -6.5, 1, Decimal.RoundingMode.plain ),
             ( -7.5, -7.5, 1, Decimal.RoundingMode.bankers ),
+        ]
+        if #available(macOS 10.16, iOS 14, watchOS 7, tvOS 14, *) {
+            testCases += [
+                ( -2, -2.5, 0, Decimal.RoundingMode.bankers ),
+                ( -4, -3.5, 0, Decimal.RoundingMode.bankers ),
             ]
+        }
         for testCase in testCases {
             let (expected, start, scale, mode) = testCase
             var num = Decimal(start)
diff --git a/test/stdlib/TypeNameInterpolation.swift b/test/stdlib/TypeNameInterpolation.swift
new file mode 100644
index 0000000000000..cd92c2641bd11
--- /dev/null
+++ b/test/stdlib/TypeNameInterpolation.swift
@@ -0,0 +1,105 @@
+// RUN: %target-build-swift -O %s -module-name=test -Xfrontend -sil-verify-all -emit-sil | %FileCheck %s
+// RUN: %target-build-swift -Onone %s -module-name=test -Xfrontend -sil-verify-all -emit-sil | %FileCheck %s
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+
+import StdlibUnittest
+
+let TypeNameTests = TestSuite("TypeName")
+
+class C {}
+struct S {}
+enum E {}
+
+protocol P {}
+protocol P2 {}
+protocol P3 {}
+protocol AssociatedTypes {
+  associatedtype A
+  associatedtype B
+  associatedtype C
+}
+
+class Model : AssociatedTypes {
+  typealias A = C
+  typealias B = S
+  typealias C = E
+}
+
+struct Model2 : AssociatedTypes {
+  typealias A = C
+  typealias B = S
+  typealias C = E
+}
+
+class GC<T : AssociatedTypes> {}
+struct GS<T : AssociatedTypes> {}
+enum GE<T : AssociatedTypes> {}
+class GC2<T : AssociatedTypes, U : AssociatedTypes> {}
+
+class SomeOuterClass {
+  struct SomeInnerStruct {}
+  struct SomeInnerGenericStruct<T> {}
+}
+
+class SomeOuterGenericClass<T> {
+  struct SomeInnerStruct {}
+  struct SomeInnerGenericStruct<U> {}
+}
+
+extension SomeOuterGenericClass {
+  struct OtherInnerStruct {}
+  struct OtherInnerGenericStruct<U> {}
+}
+
+@inline(never)
+func printTypename(_ s: String) {
+  print(s)
+}
+
+// CHECK-LABEL: sil {{.*}} @$s4test0A21TypenameInterpolationyyF :
+// CHECK-NOT:     $ss26DefaultStringInterpolationV06appendC0yyxlF
+// CHECK-NOT:     _print_unlocked
+// CHECK:       } // end sil function '$s4test0A21TypenameInterpolationyyF'
+@inline(never)
+func testTypenameInterpolation() {
+  expectEqual("Int", "\(Int.self)")
+  expectEqual("C", "\(C.self)")
+  expectEqual("S", "\(S.self)")
+  expectEqual("E", "\(E.self)")
+  expectEqual("GC<Model>",
+    "\(GC<Model>.self)")
+  expectEqual("GS<Model>",
+    "\(GS<Model>.self)")
+  expectEqual("GE<Model>",
+    "\(GE<Model>.self)")
+  expectEqual("GC2<Model, Model2>",
+    "\(GC2<Model, Model2>.self)")
+  
+  expectEqual("P", "\(P.self)")
+  typealias PP2 = P & P2
+  expectEqual("P & P2",
+    "\(PP2.self)")
+  expectEqual("Any", "\(Any.self)")
+  expectEqual("P & P2", "\((P & P2).self)")
+
+
+  expectEqual("SomeInnerStruct",
+              "\(SomeOuterClass.SomeInnerStruct.self)")
+  expectEqual("SomeInnerGenericStruct<Int>",
+              "\(SomeOuterClass.SomeInnerGenericStruct<Int>.self)")
+  expectEqual("SomeInnerStruct",
+              "\(SomeOuterGenericClass<Int>.SomeInnerStruct.self)")
+  expectEqual("SomeInnerGenericStruct<Int>",
+              "\(SomeOuterGenericClass<String>.SomeInnerGenericStruct<Int>.self)")
+  expectEqual("OtherInnerStruct",
+              "\(SomeOuterGenericClass<Int>.OtherInnerStruct.self)")
+  expectEqual("OtherInnerGenericStruct<String>",
+              "\(SomeOuterGenericClass<Int>.OtherInnerGenericStruct<String>.self)")
+}
+
+TypeNameTests.test("Interpolation") {
+  testTypenameInterpolation()
+}
+
+runAllTests()
\ No newline at end of file
diff --git a/test/stdlib/UIKit.swift b/test/stdlib/UIKit.swift
deleted file mode 100644
index 41d5d8f8742ea..0000000000000
--- a/test/stdlib/UIKit.swift
+++ /dev/null
@@ -1,346 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-build-swift -swift-version 4 %s -o %t/a.out4 && %target-codesign %t/a.out4 && %target-run %t/a.out4
-// RUN: %target-build-swift -swift-version 4.2 %s -o %t/a.out4_2 && %target-codesign %t/a.out4_2 && %target-run %t/a.out4_2
-// REQUIRES: executable_test
-// UNSUPPORTED: OS=macosx
-// REQUIRES: objc_interop
-
-import UIKit
-import StdlibUnittest
-import StdlibUnittestFoundationExtras
-
-#if swift(>=4.2)
-  let UIKitTests = TestSuite("UIKit_Swift4_2")
-#else
-  let UIKitTests = TestSuite("UIKit_Swift4")
-#endif
-
-#if !os(watchOS) && !os(tvOS)
-private func printDevice(_ o: UIDeviceOrientation) -> String {
-  return "\(o.isPortrait) \(o.isLandscape) \(o.isFlat) \(o.isValidInterfaceOrientation)"
-}
-
-private func printInterface(_ o: UIInterfaceOrientation) -> String {
-  return "\(o.isPortrait) \(o.isLandscape)"
-}
-
-UIKitTests.test("UIDeviceOrientation") {
-  expectEqual("false false false false", printDevice(.unknown))
-  expectEqual("true false false true", printDevice(.portrait))
-  expectEqual("true false false true", printDevice(.portraitUpsideDown))
-  expectEqual("false true false true", printDevice(.landscapeLeft))
-  expectEqual("false true false true", printDevice(.landscapeRight))
-  expectEqual("false false true false", printDevice(.faceUp))
-  expectEqual("false false true false", printDevice(.faceDown))
-#if !swift(>=4.2)
-  // Orientation functions should still be available
-  _ = UIDeviceOrientationIsLandscape
-  _ = UIDeviceOrientationIsPortrait
-  _ = UIDeviceOrientationIsValidInterfaceOrientation
-#endif
-}
-
-UIKitTests.test("UIInterfaceOrientation") {
-  expectEqual("false false", printInterface(.unknown))
-  expectEqual("true false", printInterface(.portrait))
-  expectEqual("true false", printInterface(.portraitUpsideDown))
-  expectEqual("false true", printInterface(.landscapeLeft))
-  expectEqual("false true", printInterface(.landscapeRight))
-#if !swift(>=4.2)
-  // Orientation functions should still be available
-  _ = UIInterfaceOrientationIsLandscape
-  _ = UIInterfaceOrientationIsPortrait
-#endif
-}
-#endif // !os(watchOS) && !os(tvOS)
-
-UIKitTests.test("UIEdgeInsets") {
-  let insets = [
-    UIEdgeInsets(top: 1.0, left: 2.0, bottom: 3.0, right: 4.0),
-    UIEdgeInsets(top: 1.0, left: 2.0, bottom: 3.1, right: 4.0),
-    UIEdgeInsets.zero
-  ]
-  checkEquatable(insets, oracle: { $0 == $1 })
-  expectFalse(UIEdgeInsetsEqualToEdgeInsets(insets[0], insets[1]))
-
-  let encodedInsets = try! JSONEncoder().encode(insets[0])
-  let decodedInsets = try! JSONDecoder().decode(UIEdgeInsets.self, from: encodedInsets)
-  expectTrue(decodedInsets == insets[0])
-}
-
-UIKitTests.test("NSDirectionalEdgeInsets") {
-  guard #available(iOS 11.0, tvOS 11.0, watchOS 5.0, *) else { return }
-  let insets = [
-    NSDirectionalEdgeInsets(top: 1.0, leading: 2.0, bottom: 3.0, trailing: 4.0),
-    NSDirectionalEdgeInsets(top: 1.0, leading: 2.0, bottom: 3.1, trailing: 4.0),
-    NSDirectionalEdgeInsets.zero
-  ]
-  checkEquatable(insets, oracle: { $0 == $1 })
-  // NSDirectionalEdgeInsetsEqualToDirectionalEdgeInsets was never exposed in Swift
-
-  let encodedInsets = try! JSONEncoder().encode(insets[0])
-  let decodedInsets = try! JSONDecoder().decode(NSDirectionalEdgeInsets.self, from: encodedInsets)
-  expectTrue(decodedInsets == insets[0])
-}
-
-UIKitTests.test("UIOffset") {
-  let offsets = [
-    UIOffset(horizontal: 1.0, vertical: 2.0),
-    UIOffset(horizontal: 1.0, vertical: 3.0),
-    UIOffset.zero
-  ]
-  checkEquatable(offsets, oracle: { $0 == $1 })
-  expectFalse(UIOffsetEqualToOffset(offsets[0], offsets[1]))
-
-  let encodedOffset = try! JSONEncoder().encode(offsets[0])
-  let decodedOffset = try! JSONDecoder().decode(UIOffset.self, from: encodedOffset)
-  expectTrue(decodedOffset == offsets[0])
-}
-
-#if os(iOS) || os(tvOS)
-UIKitTests.test("UIFloatRange") {
-  guard #available(iOS 9.0, tvOS 9.0, *) else { return }
-  #if swift(>=4.2)
-    let zero = UIFloatRange.zero
-  #else
-    let zero = UIFloatRangeZero
-  #endif
-
-  let ranges = [
-    UIFloatRange(minimum: 1.0, maximum: 2.0),
-    UIFloatRange(minimum: 1.0, maximum: 3.0),
-    zero
-  ]
-  checkEquatable(ranges, oracle: { $0 == $1 })
-  expectFalse(UIFloatRangeIsEqualToRange(ranges[0], ranges[1]))
-
-  let encodedRange = try! JSONEncoder().encode(ranges[0])
-  let decodedRange = try! JSONDecoder().decode(UIFloatRange.self, from: encodedRange)
-  expectTrue(decodedRange == ranges[0])
-}
-#endif
-
-UIKitTests.test("UIFont.Weight") {
-  guard #available(iOS 8.2, *) else { return }
-  #if swift(>=4) // Swift 4
-    let regularFontWeight: UIFont.Weight = .regular
-
-    expectTrue(regularFontWeight == .regular)
-    expectTrue(regularFontWeight > .light)
-    expectTrue(regularFontWeight < .heavy)
-    expectTrue(regularFontWeight + 0.1 == 0.1 + regularFontWeight)
-  #else // Swift 3
-    let regularFontWeight: UIFontWeight = UIFontWeightRegular
-
-    expectTrue(regularFontWeight == UIFontWeightRegular)
-    expectTrue(regularFontWeight > UIFontWeightLight)
-    expectTrue(regularFontWeight < UIFontWeightHeavy)
-    expectTrue(regularFontWeight + 0.1 == 0.1 + UIFontWeightRegular)
-  #endif
-}
-
-#if !os(watchOS)
-UIKitTests.test("UILayoutPriority") {
-  let lowLayoutPriority: UILayoutPriority = .defaultLow
-  let highLayoutPriority: UILayoutPriority = .defaultHigh
-
-  expectTrue(lowLayoutPriority < highLayoutPriority)
-
-  expectTrue(lowLayoutPriority + 2.0 == UILayoutPriority(lowLayoutPriority.rawValue + 2.0))
-  expectTrue(2.0 + lowLayoutPriority == UILayoutPriority(lowLayoutPriority.rawValue + 2.0))
-  expectTrue(lowLayoutPriority - 2.0 == UILayoutPriority(lowLayoutPriority.rawValue - 2.0))
-  expectTrue(highLayoutPriority - lowLayoutPriority == highLayoutPriority.rawValue - lowLayoutPriority.rawValue)
-
-  expectTrue(lowLayoutPriority + (highLayoutPriority - lowLayoutPriority) == highLayoutPriority)
-
-  var mutablePriority = lowLayoutPriority
-  mutablePriority -= 1.0
-  mutablePriority += 2.0
-  expectTrue(mutablePriority == lowLayoutPriority + 1.0)
-
-  let priorotyRange = lowLayoutPriority...highLayoutPriority
-  expectTrue(priorotyRange.contains(.defaultLow))
-  expectFalse(priorotyRange.contains(.required))
-}
-#endif
-
-#if !os(watchOS)
-UIKitTests.test("UIWindow.Level") {
-  #if swift(>=4.2) // Swift 4.2
-    let normalWindowLevel: UIWindow.Level = .normal
-    
-    expectTrue(normalWindowLevel == .normal)
-    expectTrue(normalWindowLevel < .alert)
-    expectTrue(normalWindowLevel + 1 == 1 + normalWindowLevel)
-  #else // Swift 3 and 4
-    let normalWindowLevel: UIWindowLevel = UIWindowLevelNormal
-    
-    expectTrue(normalWindowLevel == UIWindowLevelNormal)
-    expectTrue(normalWindowLevel < UIWindowLevelAlert)
-    expectTrue(normalWindowLevel + 1 == 1 + UIWindowLevelNormal)
-  #endif
-}
-#endif
-
-#if !os(watchOS)
-class TestChildView : UIView, CustomPlaygroundQuickLookable {
-  convenience init() {
-    self.init(frame: CGRect(x: 0, y: 0, width: 10, height: 10))
-  }
-  var customPlaygroundQuickLook: PlaygroundQuickLook {
-    return .text("child")
-  }
-}
-
-UIKitTests.test("CustomPlaygroundQuickLookable") {
-  switch PlaygroundQuickLook(reflecting: TestChildView()) {
-  case .text("child"): break
-  default: expectUnreachable(
-    "TestChildView custom quicklookable should have been invoked")
-  }
-}
-#endif
-
-UIKitTests.test("NSValue bridging") {
-  expectBridgeToNSValue(UIEdgeInsets(top: 17, left: 38, bottom: 6, right: 79),
-                        nsValueInitializer: { NSValue(uiEdgeInsets: $0) },
-                        nsValueGetter: { $0.uiEdgeInsetsValue },
-                        equal: (==))
-  if #available(iOS 11.0, tvOS 11.0, watchOS 5.0, *) {
-    expectBridgeToNSValue(NSDirectionalEdgeInsets(top: 86, leading: 75, bottom: 30, trailing: 9),
-                          nsValueInitializer: { NSValue(directionalEdgeInsets: $0) },
-                          nsValueGetter: { $0.directionalEdgeInsetsValue },
-                          equal: (==))
-  }
-  expectBridgeToNSValue(UIOffset(horizontal: 17, vertical: 38),
-                        nsValueInitializer: { NSValue(uiOffset: $0) },
-                        nsValueGetter: { $0.uiOffsetValue },
-                        equal: (==))
-}
-
-#if os(iOS) || os(tvOS)
-UIKitTests.test("UIContentSizeCategory comparison") {
-    if #available(iOS 11.0, tvOS 11.0, *) {
-        expectTrue(UIContentSizeCategory.large < UIContentSizeCategory.extraLarge)
-        expectTrue(UIContentSizeCategory.large <= UIContentSizeCategory.extraLarge)
-        expectFalse(UIContentSizeCategory.large >= UIContentSizeCategory.extraLarge)
-        expectFalse(UIContentSizeCategory.large > UIContentSizeCategory.extraLarge)
-        expectFalse(UIContentSizeCategory.large == UIContentSizeCategory.extraLarge)
-        
-        expectTrue(UIContentSizeCategory.extraLarge > UIContentSizeCategory.large)
-        expectTrue(UIContentSizeCategory.extraLarge >= UIContentSizeCategory.large)
-        expectFalse(UIContentSizeCategory.extraLarge < UIContentSizeCategory.large)
-        expectFalse(UIContentSizeCategory.extraLarge <= UIContentSizeCategory.large)
-        expectFalse(UIContentSizeCategory.extraLarge == UIContentSizeCategory.large)
-        
-        expectTrue(UIContentSizeCategory.large == UIContentSizeCategory.large)
-        expectTrue(UIContentSizeCategory.large >= UIContentSizeCategory.large)
-        expectTrue(UIContentSizeCategory.large <= UIContentSizeCategory.large)
-        expectFalse(UIContentSizeCategory.large > UIContentSizeCategory.large)
-        expectFalse(UIContentSizeCategory.large < UIContentSizeCategory.large)
-        
-        expectTrue(UIContentSizeCategory.accessibilityExtraExtraExtraLarge.isAccessibilityCategory)
-        expectFalse(UIContentSizeCategory.extraSmall.isAccessibilityCategory)
-    }
-}
-#endif
-
-#if os(iOS) || os(watchOS) || os(tvOS)
-UIKitTests.test("UIFontMetrics scaling") {
-    if #available(iOS 11.0, watchOS 4.0, tvOS 11.0, *) {
-        let metrics = UIFont.TextStyle.headline.metrics
-        expectTrue(metrics != nil)
-#if !swift(>=4.2)
-        _ = UIFontTextStyle.headline.metrics
-#endif
-    }
-}
-#endif
-
-#if os(iOS) || os(tvOS)
-UIKitTests.test("UIFocusEnvironment") {
-  if #available(iOS 11.0, tvOS 11.0, *) {
-    let item1 = UIView()
-    let item2 = UIView()
-    _ = item1.contains(item2)
-    _ = item1.isFocused
-  }
-}
-#endif
-
-#if os(iOS)
-
-UIKitTests.test("NSItemProviderReadingWriting support") {
-  if #available(iOS 11.0, *) {
-    func f<T : UIDragDropSession>(session: T) {
-      _ = session.canLoadObjects(ofClass: String.self)
-      _ = session.canLoadObjects(ofClass: URL.self)
-    }
-    func g<T : UIDropSession>(session: T) {
-      _ = session.loadObjects(ofClass: String.self) { _ in ()}
-      _ = session.loadObjects(ofClass: URL.self) { _ in () }
-    }
-
-    let pc0 = UIPasteConfiguration(forAccepting: String.self)
-    let pc1 = UIPasteConfiguration(forAccepting: URL.self)
-    pc0.addTypeIdentifiers(forAccepting: URL.self)
-    pc1.addTypeIdentifiers(forAccepting: String.self)
-
-    var pb = UIPasteboard.general
-    pb.setObjects(["Hello"])
-    pb.setObjects([URL(string: "https://www.apple.com")!])
-    pb.setObjects(["Hello"], localOnly: true, expirationDate: nil)
-    pb.setObjects([URL(string: "https://www.apple.com")!], localOnly: true, expirationDate: nil)
-  }
-}
-
-#endif
-
-#if os(iOS)
-UIKitTests.test("UIPrintError compatibility") {
-  #if swift(>=4.2)
-  _ = UIPrintError.Code.notAvailable
-  _ = UIPrintError.Code.noContent
-  _ = UIPrintError.Code.unknownImageFormat
-  _ = UIPrintError.Code.jobFailed
-  #else
-  _ = UIPrintingNotAvailableError
-  _ = UIPrintNoContentError
-  _ = UIPrintUnknownImageFormatError
-  _ = UIPrintJobFailedError
-  #endif
-}
-#endif
-
-#if !os(watchOS)
-UIKitTests.test("UIApplicationMain") {
-  #if swift(>=4.2)
-  _ = { UIApplicationMain(CommandLine.argc, CommandLine.unsafeArgv, nil, nil) }
-  #endif
-  _ = { UIApplicationMain(CommandLine.argc, UnsafeMutableRawPointer(CommandLine.unsafeArgv).bindMemory(to: UnsafeMutablePointer<Int8>.self, capacity: Int(CommandLine.argc)), nil, nil) }
-}
-#endif
-
-UIKitTests.test("UIAccessibilityTraits") {
-  #if swift(>=4.2)
-  let traits: UIAccessibilityTraits = [.link, .button]
-  expectTrue(traits.contains(.link))
-  expectFalse(traits.contains(.header))
-  #else
-  let _: UIAccessibilityTraits = UIAccessibilityTraitLink | UIAccessibilityTraitButton
-  #endif
-}
-
-#if !os(watchOS)
-UIKitTests.test("UITextDirection") {
-  #if swift(>=4.2)
-  let _: UITextDirection = .storage(.forward)
-  let _: UITextDirection = .layout(.right)
-  #else
-  let _: UITextDirection = UITextStorageDirection.backward.rawValue
-  #endif
-}
-#endif
-
-
-runAllTests()
diff --git a/test/stdlib/UIViewControllerAdditions.swift b/test/stdlib/UIViewControllerAdditions.swift
deleted file mode 100644
index 5979d242a0fd0..0000000000000
--- a/test/stdlib/UIViewControllerAdditions.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-// RxUN: %target-build-swift -g %s -o %t/ViewControllerAdditions.out
-// RxUN: %target-run %t/ViewControllerAdditions.out %S/Inputs/UIViewControllerAdditions/* | %FileCheck %s
-// RUN: %target-run-simple-swift %S/Inputs/UIViewControllerAdditions/* | %FileCheck %s
-// REQUIRES: executable_test
-
-// REQUIRES: OS=ios
-
-import UIKit
-
-// _TtC1a15View1Controller.nib
-class View1Controller : UIViewController { }
-
-// _TtC1a15View2.nib
-class View2Controller : UIViewController { }
-
-// a.View3Controller.nib
-class View3Controller : UIViewController { }
-
-// a.View4.nib
-class View4Controller : UIViewController { }
-
-// View5Controller.nib
-class View5Controller : UIViewController { }
-
-// View6.nib
-class View6Controller : UIViewController { }
-
-// no nib
-class MissingViewController : UIViewController { }
-
-let nsarg1 = CommandLine.arguments[1] as NSString
-let bundlePath = nsarg1.deletingLastPathComponent
-let bundle = Bundle(path: bundlePath)
-
-let v1 = View1Controller(nibName:nil, bundle:bundle)
-print("tag 1 0=\(v1.view.tag) you're it")
-// CHECK: tag 1 0=0 you're it
-
-let v2 = View2Controller(nibName:nil, bundle:bundle)
-print("tag 2 0=\(v2.view.tag) you're it")
-// CHECK: tag 2 0=0 you're it
-
-let v3 = View3Controller(nibName:nil, bundle:bundle)
-print("tag 3 3=\(v3.view.tag) you're it")
-// CHECK: tag 3 3=3 you're it
-
-let v4 = View4Controller(nibName:nil, bundle:bundle)
-print("tag 4 4=\(v4.view.tag) you're it")
-// CHECK: tag 4 4=4 you're it
-
-let v5 = View5Controller(nibName:nil, bundle:bundle)
-print("tag 5 5=\(v5.view.tag) you're it")
-// CHECK: tag 5 5=5 you're it
-
-let v6 = View6Controller(nibName:nil, bundle:bundle)
-print("tag 6 6=\(v6.view.tag) you're it")
-// CHECK: tag 6 6=6 you're it
-
-let v7 = MissingViewController(nibName:nil, bundle:bundle)
-print("tag 7 0=\(v7.view.tag) you're it")
-// CHECK: tag 7 0=0 you're it
-
diff --git a/test/stdlib/UnicodeScalarDiagnostics.swift b/test/stdlib/UnicodeScalarDiagnostics.swift
index 6446f3e7155bb..f9d26537109b6 100644
--- a/test/stdlib/UnicodeScalarDiagnostics.swift
+++ b/test/stdlib/UnicodeScalarDiagnostics.swift
@@ -12,10 +12,10 @@ func test_UnicodeScalarDoesNotImplementArithmetic(_ us: UnicodeScalar, i: Int) {
   let a3 = "a" * "b" // expected-error {{binary operator '*' cannot be applied to two 'String' operands}}
   let a4 = "a" / "b" // expected-error {{binary operator '/' cannot be applied to two 'String' operands}}
 
-  let b1 = us + us // expected-error {{referencing operator function '+' on 'RangeReplaceableCollection' requires that 'UnicodeScalar' (aka 'Unicode.Scalar') conform to 'RangeReplaceableCollection'}}
-  let b2 = us - us // expected-error {{referencing operator function '-' on 'FloatingPoint' requires that 'UnicodeScalar' (aka 'Unicode.Scalar') conform to 'FloatingPoint'}}
-  let b3 = us * us // expected-error {{referencing operator function '*' on 'FloatingPoint' requires that 'UnicodeScalar' (aka 'Unicode.Scalar') conform to 'FloatingPoint'}}
-  let b4 = us / us // expected-error {{referencing operator function '/' on 'FloatingPoint' requires that 'UnicodeScalar' (aka 'Unicode.Scalar') conform to 'FloatingPoint'}}
+  let b1 = us + us // expected-error {{binary operator '+' cannot be applied to two 'UnicodeScalar' (aka 'Unicode.Scalar') operands}}
+  let b2 = us - us // expected-error {{binary operator '-' cannot be applied to two 'UnicodeScalar' (aka 'Unicode.Scalar') operands}}
+  let b3 = us * us // expected-error {{binary operator '*' cannot be applied to two 'UnicodeScalar' (aka 'Unicode.Scalar') operands}}
+  let b4 = us / us // expected-error {{binary operator '/' cannot be applied to two 'UnicodeScalar' (aka 'Unicode.Scalar') operands}}
 
   let c1 = us + i // expected-error {{cannot convert value of type 'UnicodeScalar' (aka 'Unicode.Scalar') to expected argument type 'Int'}}
   let c2 = us - i // expected-error {{cannot convert value of type 'UnicodeScalar' (aka 'Unicode.Scalar') to expected argument type 'Int'}}
diff --git a/test/stdlib/UnicodeScalarPropertiesTests.swift b/test/stdlib/UnicodeScalarPropertiesTests.swift
index d77d1bac2751d..fed1c10430d50 100644
--- a/test/stdlib/UnicodeScalarPropertiesTests.swift
+++ b/test/stdlib/UnicodeScalarPropertiesTests.swift
@@ -82,7 +82,7 @@ UnicodeScalarPropertiesTests.test("properties.booleanProperties") {
   expectBooleanProperty(\.changesWhenCaseMapped, trueFor: "A", falseFor: "!")
   expectBooleanProperty(\.changesWhenNFKCCaseFolded, trueFor: "A", falseFor: "!")
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
   if #available(macOS 10.12.2, iOS 10.2, tvOS 10.1, watchOS 3.1.1, *) {
     // U+2708 AIRPLANE
     expectBooleanProperty(\.isEmoji, trueFor: "\u{2708}", falseFor: "A")
diff --git a/test/stdlib/UnsafePointerDiagnostics.swift b/test/stdlib/UnsafePointerDiagnostics.swift
index 7b654dcfdcc77..b41e5401218af 100644
--- a/test/stdlib/UnsafePointerDiagnostics.swift
+++ b/test/stdlib/UnsafePointerDiagnostics.swift
@@ -67,8 +67,8 @@ func unsafePointerConversionAvailability(
   _ = UnsafeMutablePointer<Void>(umpi) // expected-warning {{UnsafeMutablePointer<Void> has been replaced by UnsafeMutableRawPointer}}
   _ = UnsafeMutablePointer<Void>(umps) // expected-warning {{UnsafeMutablePointer<Void> has been replaced by UnsafeMutableRawPointer}}
 
-  _ = UnsafePointer<Void>(rp)  // expected-error {{cannot convert value of type 'UnsafeRawPointer' to expected argument type 'Builtin.RawPointer'}} expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
-  _ = UnsafePointer<Void>(mrp) // expected-error {{cannot convert value of type 'UnsafeMutableRawPointer' to expected argument type 'Builtin.RawPointer'}} expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
+  _ = UnsafePointer<Void>(rp)  // expected-error {{no exact matches in call to initializer}} expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
+  _ = UnsafePointer<Void>(mrp) // expected-error {{no exact matches in call to initializer}} expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
   _ = UnsafePointer<Void>(umpv) // expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
   _ = UnsafePointer<Void>(upv) // expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
   _ = UnsafePointer<Void>(umpi) // expected-warning {{UnsafePointer<Void> has been replaced by UnsafeRawPointer}}
@@ -81,10 +81,10 @@ func unsafePointerConversionAvailability(
   _ = UnsafeMutablePointer<Int>(orp) // expected-error {{no exact matches in call to initializer}}
   _ = UnsafeMutablePointer<Int>(omrp) // expected-error {{no exact matches in call to initializer}}
 
-  _ = UnsafePointer<Int>(rp)  // expected-error {{cannot convert value of type 'UnsafeRawPointer' to expected argument type 'Builtin.RawPointer'}}
-  _ = UnsafePointer<Int>(mrp) // expected-error {{cannot convert value of type 'UnsafeMutableRawPointer' to expected argument type 'Builtin.RawPointer'}}
-  _ = UnsafePointer<Int>(orp)  // expected-error {{cannot convert value of type 'UnsafeRawPointer?' to expected argument type 'Builtin.RawPointer'}}
-  _ = UnsafePointer<Int>(omrp) // expected-error {{cannot convert value of type 'UnsafeMutableRawPointer?' to expected argument type 'Builtin.RawPointer'}}
+  _ = UnsafePointer<Int>(rp)  // expected-error {{no exact matches in call to initializer}}
+  _ = UnsafePointer<Int>(mrp) // expected-error {{no exact matches in call to initializer}}
+  _ = UnsafePointer<Int>(orp)  // expected-error {{no exact matches in call to initializer}}
+  _ = UnsafePointer<Int>(omrp) // expected-error {{no exact matches in call to initializer}}
 
   _ = UnsafePointer<Int>(ups) // expected-error {{cannot convert value of type 'UnsafePointer<String>' to expected argument type 'UnsafePointer<Int>'}}
   // expected-note@-1 {{arguments to generic parameter 'Pointee' ('String' and 'Int') are expected to be equal}}
diff --git a/test/stdlib/VarArgs.swift b/test/stdlib/VarArgs.swift
index ea9317fef5fe2..90dff40f81e3a 100644
--- a/test/stdlib/VarArgs.swift
+++ b/test/stdlib/VarArgs.swift
@@ -6,7 +6,7 @@ import Swift
 #if _runtime(_ObjC)
   import Darwin
   import CoreGraphics
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
   typealias CGFloat = Double
 #elseif os(Windows)
diff --git a/test/stdlib/Vision.swift b/test/stdlib/Vision.swift
deleted file mode 100644
index 4b89bb0ccff93..0000000000000
--- a/test/stdlib/Vision.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-import Vision
-
-
-var testsuite = TestSuite("Vision")
-
-if #available(OSX 10.13, iOS 11.0, tvOS 11.0, *) {
-  testsuite.test("normalizedPoints overlay") {
-    // NOTE: This function is here only to validate syntactical correctness of the overlay.
-    func overlaySyntaxTest(region: VNFaceLandmarkRegion2D) -> [CGPoint] {
-      return region.normalizedPoints
-    }
-  }
-
-  testsuite.test("pointsInImage() overlay") {
-    // NOTE: This function is here only to validate syntactical correctness of the overlay.
-    func overlaySyntaxTest(region: VNFaceLandmarkRegion2D) -> [CGPoint] {
-      return region.pointsInImage(imageSize: CGSize(width: 1024, height: 768))
-    }
-  }
-}
-
-runAllTests()
diff --git a/test/stdlib/mmap.swift b/test/stdlib/mmap.swift
index 392a35738459e..e69a701e634bb 100644
--- a/test/stdlib/mmap.swift
+++ b/test/stdlib/mmap.swift
@@ -3,9 +3,9 @@
 // UNSUPPORTED: OS=windows-msvc
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #else
 #error("Unsupported platform")
diff --git a/test/stdlib/os.swift b/test/stdlib/os.swift
deleted file mode 100644
index 42dd8d9455801..0000000000000
--- a/test/stdlib/os.swift
+++ /dev/null
@@ -1,55 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-
-import os
-import Foundation
-import StdlibUnittest
-
-defer { runAllTests() }
-
-var osAPI = TestSuite("osAPI")
-
-if #available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
-  osAPI.test("log") {
-    os_log("test: %d", 42)
-    os_log("test2: %@", "test")
-  }
-
-  osAPI.test("logData") {
-    let data = "hello logging world".data(using: .utf8)!
-
-    data.withUnsafeBytes { (bytes: UnsafePointer<CChar>) in
-      os_log("%.3P", OpaquePointer(bytes))
-      os_log("%.10P", OpaquePointer(bytes))
-      os_log("%.*P", data.count, OpaquePointer(bytes))
-    }
-  }
-
-  osAPI.test("newLog") {
-    let newLog = OSLog(subsystem: "com.apple.Swift", category: "Test")
-    os_log("test", log: newLog)
-  }
-}
-
-if #available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) {
-  osAPI.test("signpost") {
-    let interestingLog = OSLog(subsystem: "com.apple.example.swift",
-                                category: .pointsOfInterest)
-    os_log(.info, log: interestingLog, "a=%d b=%d c=%d", 1, 2, 3)
-    os_signpost(.event, log: interestingLog, name: "Basic Sans Message")
-    os_signpost(.begin, log: interestingLog, name: "Basic Test", "%d", 42)
-    os_signpost(.event, log: interestingLog, name: "Basic Test", "%d", 43)
-    os_signpost(.end, log: interestingLog, name: "Basic Test", "%d", 44)
-
-    let log = OSLog(subsystem: "com.apple.swift", category: "SignpostIDs")
-    let v: UInt64 = 15
-    let spidOne = OSSignpostID(v)
-    let spidTwo = OSSignpostID(16 as UInt64)
-    os_signpost(.event, log: log, name: "With Signpost ID", signpostID: spidOne)
-    os_signpost(.event, log: log, name: "With Signpost ID", signpostID: spidTwo)
-    os_signpost(.event, log: log, name: "Negative Test", signpostID: .null)
-    os_signpost(.event, log: log, name: "Negative Test", signpostID: .invalid)
-  }
-}
diff --git a/test/stdlib/os_log_format.m b/test/stdlib/os_log_format.m
deleted file mode 100644
index ee1594e78a925..0000000000000
--- a/test/stdlib/os_log_format.m
+++ /dev/null
@@ -1,200 +0,0 @@
-// RUN: %empty-directory(%t)
-// RUN: %clang %target-cc-options -g -O0 -isysroot %sdk -I %swift_src_root/stdlib/public/Darwin/os -framework Foundation %swift_src_root/stdlib/public/Darwin/os/format.m %swift_src_root/stdlib/public/Darwin/os/os_trace_blob.c %s -o %t/os_log_format
-// RUN: %target-run %t/os_log_format | %FileCheck %s
-
-// REQUIRES: objc_interop
-// REQUIRES: executable_test
-
-#import <Foundation/Foundation.h>
-#import <stdint.h>
-
-#import "format.h"
-
-// CHECK-NOT: FAIL
-// CHECK: PASS
-
-static bool
-compare_buffers(char *fail_prefix, char *bufa, char *bufb, size_t size)
-{
-  if (!memcmp(bufa, bufb, size)) {
-    return true;
-  }
-
-  os_log_fmt_hdr_t hdra = (os_log_fmt_hdr_t)bufa;
-  os_log_fmt_hdr_t hdrb = (os_log_fmt_hdr_t)bufb;
-
-  if (hdra->hdr_flags != hdrb->hdr_flags) {
-    printf("FAIL: %s: header flags mismatch (0x%x != 0x%x)\n", fail_prefix,
-        hdra->hdr_flags, hdrb->hdr_flags);
-    return false;
-  }
-
-  if (hdra->hdr_cmd_cnt != hdrb->hdr_cmd_cnt) {
-    printf("FAIL: %s: command count mismatch (0x%x != 0x%x)\n", fail_prefix,
-        hdra->hdr_cmd_cnt, hdrb->hdr_cmd_cnt);
-    return false;
-  }
-
-  os_log_fmt_cmd_t cmda = (os_log_fmt_cmd_t)((uint8_t *)hdra + 
-      sizeof(os_log_fmt_hdr_s));
-  os_log_fmt_cmd_t cmdb = (os_log_fmt_cmd_t)((uint8_t *)hdrb + 
-      sizeof(os_log_fmt_hdr_s));
-
-  for (size_t idx = 0; idx < hdra->hdr_cmd_cnt; idx++) {
-    if (cmda->cmd_flags != cmdb->cmd_flags) {
-      printf("FAIL: %s: command %zu flags mismatch (0x%x != 0x%x)\n",
-          fail_prefix, idx, cmda->cmd_flags, cmdb->cmd_flags);
-      return false;
-    }
-    if (cmda->cmd_type != cmdb->cmd_type) {
-      printf("FAIL: %s: command %zu type mismatch (0x%x != 0x%x)\n",
-          fail_prefix, idx, cmda->cmd_type, cmdb->cmd_type);
-      return false;
-    }
-    if (cmda->cmd_size != cmdb->cmd_size) {
-      printf("FAIL: %s: command %zu size mismatch (0x%x != 0x%x)\n",
-          fail_prefix, idx, cmda->cmd_size, cmdb->cmd_size);
-      return false;
-    }
-    if (memcmp(cmda->cmd_data, cmdb->cmd_data, cmda->cmd_size)) {
-      printf("FAIL: %s: command %zu data mismatch\n", fail_prefix, idx);
-      printf("COMPILER: ");
-      for (size_t i=0; i<cmda->cmd_size; i++) {
-        printf("%02x ", cmda->cmd_data[i]);
-      }
-      printf("\nOVERLAY:  ");
-      for (size_t i=0; i<cmdb->cmd_size; i++) {
-        printf("%02x ", cmdb->cmd_data[i]);
-      }
-      printf("\n");
-      return false;
-    }
-    cmda = (os_log_fmt_cmd_t)((uint8_t *)cmda + sizeof(os_log_fmt_cmd_s)
-        + cmda->cmd_size);
-    cmdb = (os_log_fmt_cmd_t)((uint8_t *)cmdb + sizeof(os_log_fmt_cmd_s)
-        + cmdb->cmd_size);
-  }
-  return true;
-}
-
-static bool
-_t_log_encode(char buf[OS_LOG_FMT_BUF_SIZE], int saved_errno,
-  os_trace_blob_t blob, const char *format, ...)
-{
-  va_list va;
-  bool rv;
-
-  va_start(va, format);
-  rv = _os_log_encode(buf, format, va, saved_errno, blob);
-  va_end(va);
-  return rv;
-}
-
-#define compiler_format(buf, fmt, ...) ({ \
-    __builtin_os_log_format(buf, fmt, ##__VA_ARGS__); \
-    (uint32_t)__builtin_os_log_format_buffer_size(fmt, ##__VA_ARGS__); \
-  })
-
-#define overlay_format(buf, fmt, ...) ({ \
-    os_trace_blob_s ob = { \
-      .ob_s = os_trace_buf, \
-      .ob_size = OS_LOG_FMT_BUF_SIZE, \
-      .ob_maxsize = OS_LOG_FMT_BUF_SIZE, \
-      .ob_binary = true \
-    }; \
-    _t_log_encode(os_trace_buf, 0, &ob, fmt, ##__VA_ARGS__); \
-    (uint32_t)ob.ob_len; \
-  })
-
-int
-main(int argc, char **argv)
-{
-  static char compiler_buf[8192];
-  static char os_trace_buf[OS_LOG_FMT_BUF_SIZE];
-  uint32_t compiler_size, our_size;
-  int i;
-
-#define ACCEPT(_fmt, ...) ({ \
-    compiler_size = compiler_format(compiler_buf, _fmt, ##__VA_ARGS__); \
-    our_size = overlay_format(os_trace_buf, _fmt, ##__VA_ARGS__); \
-    if (!compare_buffers("during: \"" _fmt "\"", compiler_buf, os_trace_buf, \
-      our_size)) { \
-      exit(1); \
-    } \
-  })
-
-  ACCEPT("doesn't even have an argument");
-
-  ACCEPT("simple char %hhd", (char)10);
-  ACCEPT("simple short %hd", (short)10);
-  ACCEPT("simple integer %d", 10);
-  ACCEPT("simple long long %lld", (long long)10);
-  ACCEPT("simple pointer %p", "sad");
-
-  ACCEPT("simple float %f", (float)1.5);
-  ACCEPT("simple double %f", 1.5);
-#ifdef __LP64__
-  // Disabled because the upstream clang output for long double changed
-  // and causes CI fallout
-  // ACCEPT("simple long double %Lf", (long double)1.5);
-#endif
-
-  ACCEPT("integer with a static width %666d", 10);
-  ACCEPT("integer with a static precision %.42d", 10);
-  ACCEPT("integer with a static width & precision %666.42d", 10);
-  ACCEPT("integer with dynamic width %*d", 666, 10);
-  ACCEPT("integer with dynamic precision %.*d", 42, 10);
-  ACCEPT("integer with dynamic width & precision %*.*d", 666, 42, 10);
-
-  // All the %s tests below are disabled for the overlay because
-  // the overlay assumes %s really means %@.
-
-  // ACCEPT("simple string %s", "sad");
-  // ACCEPT("string with a static width %666s", "sad");
-  // ACCEPT("string with a static precision %.42s", "sad");
-  // ACCEPT("string with a static width & precision %666.42s", "sad");
-  // ACCEPT("string with dynamic width %*s", 666, "sad");
-  // ACCEPT("string with dynamic precision %.*s", 42, "sad");
-  // ACCEPT("string with dynamic width & precision %*.*s", 666, 42, "sad");
-
-  ACCEPT("data with a static precision %.42P", "sad");
-  ACCEPT("data with a static width & precision %666.42P", "sad");
-  ACCEPT("data with dynamic precision %.*P", 42, "sad");
-  ACCEPT("data with dynamic width & precision %*.*P", 666, 42, "sad");
-
-  ACCEPT("simple object %@", @"sad");
-  ACCEPT("object with a static width %666@", @"sad");
-  ACCEPT("object with dynamic width %*@", 666, @"sad");
-
-  // privacy and annotations
-  ACCEPT("simple integer %{public}d", 10);
-  ACCEPT("simple integer %{private}d", 10);
-  ACCEPT("simple integer %{public, blah}d", 10);
-  ACCEPT("simple integer %{public, builtin:blah::bluh}d", 10);
-
-  ACCEPT("integer with a static width %{private}666d", 10);
-  ACCEPT("integer with a static precision %{private}.42d", 10);
-  ACCEPT("integer with a static width & precision %{private}666.42d", 10);
-  ACCEPT("integer with dynamic width %{private}*d", 666, 10);
-  ACCEPT("integer with dynamic precision %{private}.*d", 42, 10);
-  ACCEPT("integer with dynamic width & precision %{private}*.*d", 666, 42, 10);
-
-  // ACCEPT("simple string %{private}s", "sad");
-  // ACCEPT("string with a static width %{private}666s", "sad");
-  // ACCEPT("string with a static precision %{private}.42s", "sad");
-  // ACCEPT("string with a static width & precision %{private}666.42s", "sad");
-  // ACCEPT("string with dynamic width %{private}*s", 666, "sad");
-  // ACCEPT("string with dynamic precision %{private}.*s", 42, "sad");
-  // ACCEPT("string with dynamic width & precision %{private}*.*s", 666, 42, "sad");
-
-  ACCEPT("data with a static precision %{private}.42P", "sad");
-  ACCEPT("data with a static width & precision %{private}666.42P", "sad");
-  ACCEPT("data with dynamic precision %{private}.*P", 42, "sad");
-  ACCEPT("data with dynamic width & precision %{private}*.*P", 666, 42, "sad");
-
-  ACCEPT("simple object %{private}@", @"sad");
-  ACCEPT("object with a static width %{private}666@", @"sad");
-  ACCEPT("object with dynamic width %{private}*@", 666, @"sad");
-
-  printf("PASS\n");
-}
diff --git a/test/stdlib/simd.swift.gyb b/test/stdlib/simd.swift.gyb
deleted file mode 100644
index 26fafc6817027..0000000000000
--- a/test/stdlib/simd.swift.gyb
+++ /dev/null
@@ -1,322 +0,0 @@
-// RUN: %target-run-simple-swiftgyb
-// REQUIRES: executable_test
-
-// FIXME: No simd module on linux rdar://problem/20795411
-// XFAIL: linux, windows, openbsd
-
-import simd
-import StdlibUnittest
-
-
-% scalar_types = ['Float', 'Double', 'Int32', 'UInt32']
-% float_types = ['Float', 'Double']
-% ctype = { 'Float':'float', 'Double':'double', 'Int32':'int', 'UInt32':'uint'}
-% component = ['.x','.y','.z','.w']
-
-% for type in scalar_types:
-%   for cols in [2,3,4]:
-//    Workaround <rdar://problem/18900352>
-%     vectype = ctype[type] + str(cols)
-func same(_ x: ${vectype}, _ y: ${vectype}) -> Bool {
-  for i in 0..<${cols} {
-//    Workaround <rdar://problem/18900352>
-%   if type in float_types:
-    if x[i] != y[i] && !(x[i].isNaN && y[i].isNaN) { return false }
-%   else:
-    if x[i] != y[i] { return false }
-% end
-  }
-  return true
-}
-%     if type in float_types:
-//      Workaround <rdar://problem/18900352>
-%       for rows in [2,3,4]:
-//        Workaround <rdar://problem/18900352>
-%         mattype = ctype[type] + str(cols) + 'x' + str(rows)
-func same(_ x: ${mattype}, _ y: ${mattype}) -> Bool {
-  for i in 0..<${cols} {
-    if !same(x[i], y[i]) { return false }
-  }
-  return true
-}
-%       end # for rows in [2,3,4]
-%     end # if type in float_types
-%   end # for cols in [2,3,4]
-% end # for type in scalar_types
-
-
-
-/*
-func same<M: SIMDMatrixType>(_ x:M, _ y:M) -> Bool {
-  for i in 0 ..< x.columns {
-    if (!same(x[i], y[i])) { return false }
-  }
-  return true
-}
-*/
-
-var simdTestSuite = TestSuite("simd")
-
-simdTestSuite.test("sizes") {
-//  C interop requires that vector be the right size.
-  expectEqual(8, MemoryLayout<float2>.size)
-  expectEqual(16, MemoryLayout<float3>.size)
-  expectEqual(16, MemoryLayout<float4>.size)
-  expectEqual(8, MemoryLayout<int2>.size)
-  expectEqual(16, MemoryLayout<int3>.size)
-  expectEqual(16, MemoryLayout<int4>.size)
-  expectEqual(16, MemoryLayout<double2>.size)
-  expectEqual(32, MemoryLayout<double3>.size)
-  expectEqual(32, MemoryLayout<double4>.size)
-
-  expectEqual(16, MemoryLayout<float2x2>.size)
-  expectEqual(32, MemoryLayout<float2x3>.size)
-  expectEqual(32, MemoryLayout<float2x4>.size)
-  expectEqual(24, MemoryLayout<float3x2>.size)
-  expectEqual(48, MemoryLayout<float3x3>.size)
-  expectEqual(48, MemoryLayout<float3x4>.size)
-  expectEqual(32, MemoryLayout<float4x2>.size)
-  expectEqual(64, MemoryLayout<float4x3>.size)
-  expectEqual(64, MemoryLayout<float4x4>.size)
-
-  expectEqual(32, MemoryLayout<double2x2>.size)
-  expectEqual(64, MemoryLayout<double2x3>.size)
-  expectEqual(64, MemoryLayout<double2x4>.size)
-  expectEqual(48, MemoryLayout<double3x2>.size)
-  expectEqual(96, MemoryLayout<double3x3>.size)
-  expectEqual(96, MemoryLayout<double3x4>.size)
-  expectEqual(64, MemoryLayout<double4x2>.size)
-  expectEqual(128, MemoryLayout<double4x3>.size)
-  expectEqual(128, MemoryLayout<double4x4>.size)
-}
-
-simdTestSuite.test("alignment") {
-  struct GenericLayout<T> {
-    let t: T = 0 as! T
-    let v: int4 = [1,2,3,4]
-  }
-
-  let g = GenericLayout<Int>()
-  expectEqual(0, g.t)
-  expectEqual([1,2,3,4], g.v)
-}
-
-
-simdTestSuite.test("vector init") {
-% for type in scalar_types:
-%   for size in [2,3,4]:
-//    Workaround <rdar://problem/18900352>
-%     vectype = ctype[type] + str(size)
-%     vec = 'v_' + vectype
-
-  //  Check empty initializer.
-  var ${vec} = ${vectype}()
-  expectEqualTest(${[0]*size}, ${vec}, sameValue: same)
-
-  //  Check literal initializer.
-  ${vec} = ${vectype}(2)
-  expectEqualTest(${[2]*size}, ${vec}, sameValue: same)
-
-  //  Check scalar initializer.
-  expectEqualTest(${vectype}(${type}(2)), ${vec}, sameValue: same)
-
-  //  Check elementwise initializer.
-  ${vec} = ${vectype}(${', '.join(map(lambda i: str(i), range(size)))})
-  expectEqualTest(${range(size)}, ${vec}, sameValue: same)
-
-  //  Check labeled elementwise initializer.
-  ${vec} = ${vectype}(${', '.join(map(lambda i:
-                      component[i][1:] + ':' + str(i),
-                      range(size)))})
-  expectEqualTest(${range(size)}, ${vec}, sameValue: same)
-
-  //  Previous checks implicitly use the array initializer, so we're good
-  //  with that one already.
-
-%   end # for size in [2,3,4]
-% end # for type in scalar_types
-}
-
-simdTestSuite.test("vector elements") {
-% for type in scalar_types:
-%   for size in [2,3,4]:
-//    Workaround <rdar://problem/18900352>
-%     vectype = ctype[type] + str(size)
-%     vec = 'v_' + vectype
-  var ${vec} = ${vectype}()
-
-  //  Check getting and setting .xyzw
-% for i in range(size):
-  ${vec + component[i]} = ${2*i}
-  expectEqual(${vec + component[i]}, ${2*i})
-% end
-
-  //  Check getting and setting [i]
-  for i in 0..<${size} { ${vec}[i] = ${vec}[i]/2 }
-  expectEqualTest(${vec}, ${range(size)}, sameValue: same)
-
-%   end # for size in [2,3,4]
-% end # for type in scalar_types
-}
-
-% for type in scalar_types:
-// ----
-%   if type not in float_types:
-// ----
-%     for size in [2,3,4]:
-// ----
-%       vectype = ctype[type] + str(size)
-
-simdTestSuite.test("${vectype} wrapping arithmetic") {
-
-  expectEqual(${vectype}(.max) &+ ${vectype}(1),
-              ${vectype}(.min))
-
-  expectEqual(${vectype}(.min) &- ${vectype}(1),
-              ${vectype}(.max))
-
-  expectEqual(${vectype}(.max) &* ${vectype}(.max),
-              ${vectype}(1))
-  expectEqual(${vectype}(.max) &* .max,
-              ${vectype}(1))
-  expectEqual(.max &* ${vectype}(.max),
-              ${vectype}(1))
-}
-
-%     end
-%   end
-% end
-
-simdTestSuite.test("vector distance") {
-% for type in float_types:
-  let ${ctype[type]}2_x = ${ctype[type]}2(0,5)
-  let ${ctype[type]}2_y = ${ctype[type]}2(3,1)
-  expectEqual(5, distance(${ctype[type]}2_x, ${ctype[type]}2_y))
-  expectEqual(0, distance(${ctype[type]}2_x, ${ctype[type]}2_x))
-  expectEqual(25, distance_squared(${ctype[type]}2_x, ${ctype[type]}2_y))
-  expectEqual(0, distance_squared(${ctype[type]}2_x, ${ctype[type]}2_x))
-
-  let ${ctype[type]}3_x = ${ctype[type]}3(-1,-2,-4)
-  let ${ctype[type]}3_y = ${ctype[type]}3( 1, 1, 2)
-  expectEqual(7, distance(${ctype[type]}3_x, ${ctype[type]}3_y))
-  expectEqual(0, distance(${ctype[type]}3_x, ${ctype[type]}3_x))
-  expectEqual(49, distance_squared(${ctype[type]}3_x, ${ctype[type]}3_y))
-  expectEqual(0, distance_squared(${ctype[type]}3_x, ${ctype[type]}3_x))
-
-  let ${ctype[type]}4_x = ${ctype[type]}4(-1, 0, 1, 1)
-  let ${ctype[type]}4_y = ${ctype[type]}4( 0, 1, 0, 2)
-  expectEqual(2, distance(${ctype[type]}4_x, ${ctype[type]}4_y))
-  expectEqual(0, distance(${ctype[type]}4_x, ${ctype[type]}4_x))
-  expectEqual(4, distance_squared(${ctype[type]}4_x, ${ctype[type]}4_y))
-  expectEqual(0, distance_squared(${ctype[type]}4_x, ${ctype[type]}4_x))
-% end # for type in float_types
-}
-
-simdTestSuite.test("matrix init") {
-% for type in float_types:
-%   for cols in [2,3,4]:
-//    Workaround <rdar://problem/18900352>
-%     for rows in [2,3,4]:
-//      Workaround <rdar://problem/18900352>
-%       mattype = ctype[type] + str(cols) + 'x' + str(rows)
-%       coltype = ctype[type] + str(rows)
-%       mat = 'm_' + mattype
-%       diagsize = rows if rows < cols else cols
-
-  //  Check empty initializer.
-  var ${mat} = ${mattype}()
-  expectEqualTest(${mat}, ${mattype}(${[[0]*rows]*cols}), sameValue: same)
-
-  //  Check scalar initializer.
-  ${mat} = ${mattype}(2)
-  for i in 0..<${rows} {
-    for j in 0..<${cols} {
-      if i == j { expectEqual(${mat}[i, i], 2) }
-      else { expectEqual(${mat}[j, i], 0) }
-    }
-  }
-
-  //  Check diagonal initializer.
-  ${mat} = ${mattype}(diagonal: ${range(diagsize)})
-  for i in 0..<${rows} {
-    for j in 0..<${cols} {
-      if i == j { expectEqual(${mat}[i, i], ${type}(i)) }
-      else { expectEqual(${mat}[j, i], 0) }
-    }
-  }
-
-  //  All the previous checks implicitly used the column initializer.
-
-  //  Check row initializer.
-  ${mat} = ${mattype}(rows:[
-% for i in range(rows):
-    ${range(i*cols, (i+1)*cols)},
-% end # for i
-  ])
-  for i in 0..<${rows} {
-    for j in 0..<${cols} {
-      expectEqual(${mat}[j, i], ${type}(${cols}*i + j))
-    }
-  }
-
-%     end # for rows
-%   end # for cols
-% end # for type
-}
-
-simdTestSuite.test("matrix elements") {
-% for type in float_types:
-%   for cols in [2,3,4]:
-//    Workaround <rdar://problem/18900352>
-%     for rows in [2,3,4]:
-//      Workaround <rdar://problem/18900352>
-%       mattype = ctype[type] + str(cols) + 'x' + str(rows)
-%       coltype = ctype[type] + str(rows)
-%       mat = 'm_' + mattype
-%       basis = type.lower() + 'basis' + str(cols) + 'x' + str(rows)
-%       diagsize = rows if rows < cols else cols
-
-  //  Check getting and setting columns.
-  let ${basis} : [${coltype}] = [
-% for i in range(cols):
-    [${', '.join(map(lambda j:
-     '1' if i == j else '0',
-     range(rows)))}],
-% end
-  ]
-  var ${mat} = ${mattype}()
-  for i in 0..<${cols} {
-    ${mat}[i] = ${type}(i+1)*${basis}[i]
-  }
-  expectEqualTest(
-    ${mat}, ${mattype}(diagonal:${range(1, diagsize + 1)}), sameValue: same)
-  for i in 0..<${cols} {
-    expectEqualTest(${mat}[i], ${type}(i + 1)*${basis}[i], sameValue: same)
-  }
-
-  //  Check getting and setting elements (and transpose).
-  ${mat} = ${mattype}()
-  for i in 0..<${rows} {
-    for j in 0..<${cols} {
-      ${mat}[j, i] = ${type}(${cols}*i + j)
-    }
-  }
-  var ${'trans'+mat} = ${mat}.transpose
-  for j in 0..<${cols} {
-    for i in 0..<${rows} {
-      expectEqual(${'trans'+mat}[i, j], ${type}(${cols}*i + j))
-    }
-  }
-
-%     end # for rows
-%   end # for cols
-% end # for type
-}
-
-simdTestSuite.test("debug description") {
-  expectEqual("SIMD2<Float>(1.0, 2.5)",
-    SIMD2<Float>(1.0, 2.5).debugDescription)
-}
-
-runAllTests()
-
diff --git a/test/stdlib/subString.swift b/test/stdlib/subString.swift
index e670910bb55b9..8e7ee6cc9183c 100644
--- a/test/stdlib/subString.swift
+++ b/test/stdlib/subString.swift
@@ -255,7 +255,7 @@ SubstringTests.test("UTF8View") {
 
     // The specialization for Substring.withContiguousStorageIfAvailable was
     // added in https://github.com/apple/swift/pull/29146.
-    guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
+    guard #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else {
       return
     }
     checkHasContiguousStorage(t)
diff --git a/test/stdlib/symbol-visibility-linux.test-sh b/test/stdlib/symbol-visibility-linux.test-sh
index b4e5a7df71e50..62be057f4d919 100644
--- a/test/stdlib/symbol-visibility-linux.test-sh
+++ b/test/stdlib/symbol-visibility-linux.test-sh
@@ -30,6 +30,7 @@
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA80_cEEEvv \
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA88_cEEEvv \
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA104_cEEEvv \
+// RUN:             -e _ZN9__gnu_cxx12__to_xstringISscEET_PFiPT0_mPKS2_P13__va_list_tagEmS5_z \
 // RUN:   > %t/swiftCore-all.txt
 // RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftCore) > %t/swiftCore-no-weak.txt
 // RUN: diff -u %t/swiftCore-all.txt %t/swiftCore-no-weak.txt
@@ -51,6 +52,7 @@
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA80_cEEEvv \
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA88_cEEEvv \
 // RUN:             -e _ZSt16__once_call_implISt12_Bind_simpleIFPFvPvEPA104_cEEEvv \
+// RUN:             -e _ZN9__gnu_cxx12__to_xstringISscEET_PFiPT0_mPKS2_P13__va_list_tagEmS5_z \
 // RUN:   > %t/swiftRemoteMirror-all.txt
 // RUN: %llvm-nm --defined-only --extern-only --no-weak %platform-dylib-dir/%target-library-name(swiftRemoteMirror) > %t/swiftRemoteMirror-no-weak.txt
 // RUN: diff -u %t/swiftRemoteMirror-all.txt %t/swiftRemoteMirror-no-weak.txt
diff --git a/test/stdlib/tgmath.swift.gyb b/test/stdlib/tgmath.swift.gyb
index fede221f148e8..3a1e526ab30f0 100644
--- a/test/stdlib/tgmath.swift.gyb
+++ b/test/stdlib/tgmath.swift.gyb
@@ -17,9 +17,9 @@
 // RUN: %line-directive %t/tgmath.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin.C.tgmath
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/stdlib/tgmath_optimized.swift b/test/stdlib/tgmath_optimized.swift
index fdf3b75299db1..b1628b922e707 100644
--- a/test/stdlib/tgmath_optimized.swift
+++ b/test/stdlib/tgmath_optimized.swift
@@ -4,9 +4,9 @@
 // RUN: %target-run %t/a.out
 // REQUIRES: executable_test
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/test/stmt/foreach.swift b/test/stmt/foreach.swift
index 8b7b8d0cea18d..0b4ca6de47112 100644
--- a/test/stmt/foreach.swift
+++ b/test/stmt/foreach.swift
@@ -68,7 +68,7 @@ func patterns(gir: GoodRange<Int>, gtr: GoodTupleIterator) {
   for (i, f) in gtr {
     sum = sum + i
     sumf = sumf + f
-    sum = sum + f  // expected-error {{cannot convert value of type 'Float' to expected argument type 'Int'}}
+    sum = sum + f  // expected-error {{cannot convert value of type 'Float' to expected argument type 'Int'}} {{17-17=Int(}} {{18-18=)}}
   }
 
   for (i, _) : (Int, Float) in gtr { sum = sum + i }
@@ -177,7 +177,7 @@ func testOptionalSequence() {
 
 // Crash with (invalid) for each over an existential
 func testExistentialSequence(s: Sequence) { // expected-error {{protocol 'Sequence' can only be used as a generic constraint because it has Self or associated type requirements}}
-  for x in s { // expected-error {{value of protocol type 'Sequence' cannot conform to 'Sequence'; only struct/enum/class types can conform to protocols}}
+  for x in s { // expected-error {{protocol 'Sequence' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
     _ = x
   }
 }
diff --git a/test/swift-indent/basic.swift b/test/swift-indent/basic.swift
index c4e160d818de2..e1a837f4b0324 100644
--- a/test/swift-indent/basic.swift
+++ b/test/swift-indent/basic.swift
@@ -1036,3 +1036,30 @@ private var secondThing = item
     .filter {},
     firstThing = 20,
     thirdThing = 56
+
+
+// Function decls missing their parameter list and body shouldn't pick up the next token as a continuation.
+
+struct BarType {
+    func bar
+}
+
+struct <#name#> {
+    <#fields#>
+}
+
+struct <#name#> {
+    <#fields#>
+    func foo() {}
+}
+
+
+// Array literal elements should have their continuation lines indented relative to their first line.
+
+doStuffWithList([
+    baseThing()
+        .map { $0 }
+        .append(\.sdfsdf),
+    secondItem
+        .filter {$0 < 10}
+])
diff --git a/test/type/opaque.swift b/test/type/opaque.swift
index 276933e611580..5f3f34c7225e8 100644
--- a/test/type/opaque.swift
+++ b/test/type/opaque.swift
@@ -13,7 +13,7 @@ class C {}
 class D: C, P, Q { func paul() {}; func priscilla() {}; func quinn() {} }
 
 let property: some P = 1
-let deflessLet: some P // expected-error{{has no initializer}}
+let deflessLet: some P // expected-error{{has no initializer}} {{educational-notes=opaque-type-inference}}
 var deflessVar: some P // expected-error{{has no initializer}}
 
 struct GenericProperty<T: P> {
@@ -173,13 +173,13 @@ func recursion(x: Int) -> some P {
   return recursion(x: x - 1)
 }
 
-func noReturnStmts() -> some P {} // expected-error {{function declares an opaque return type, but has no return statements in its body from which to infer an underlying type}}
+func noReturnStmts() -> some P {} // expected-error {{function declares an opaque return type, but has no return statements in its body from which to infer an underlying type}} {{educational-notes=opaque-type-inference}}
 
 func returnUninhabited() -> some P { // expected-note {{opaque return type declared here}}
     fatalError() // expected-error{{return type of global function 'returnUninhabited()' requires that 'Never' conform to 'P'}}
 }
 
-func mismatchedReturnTypes(_ x: Bool, _ y: Int, _ z: String) -> some P { // expected-error{{do not have matching underlying types}}
+func mismatchedReturnTypes(_ x: Bool, _ y: Int, _ z: String) -> some P { // expected-error{{do not have matching underlying types}} {{educational-notes=opaque-type-inference}}
   if x {
     return y // expected-note{{underlying type 'Int'}}
   } else {
@@ -209,7 +209,7 @@ func jan() -> some P {
   return [marcia(), marcia(), marcia()]
 }
 func marcia() -> some P {
-  return [marcia(), marcia(), marcia()] // expected-error{{defines the opaque type in terms of itself}}
+  return [marcia(), marcia(), marcia()] // expected-error{{defines the opaque type in terms of itself}} {{educational-notes=opaque-type-inference}}
 }
 
 protocol R {
@@ -383,7 +383,7 @@ protocol P_51641323 {
 func rdar_51641323() {
   struct Foo: P_51641323 {
     var foo: some P_51641323 { // expected-note {{required by opaque return type of property 'foo'}}
-      {} // expected-error {{type '() -> ()' cannot conform to 'P_51641323'; only struct/enum/class types can conform to protocols}}
+      {} // expected-error {{type '() -> ()' cannot conform to 'P_51641323'; only concrete types such as structs, enums and classes can conform to protocols}}
     }
   }
 }
diff --git a/test/type/protocol_composition.swift b/test/type/protocol_composition.swift
index c6ec77766eb01..f6df6bdc94d18 100644
--- a/test/type/protocol_composition.swift
+++ b/test/type/protocol_composition.swift
@@ -174,6 +174,10 @@ takesP1AndP2([AnyObject & protocol_composition.P1 & P2]())
 takesP1AndP2([AnyObject & P1 & protocol_composition.P2]())
 takesP1AndP2([DoesNotExist & P1 & P2]()) // expected-error {{cannot find 'DoesNotExist' in scope}}
 takesP1AndP2([Swift.DoesNotExist & P1 & P2]()) // expected-error {{module 'Swift' has no member named 'DoesNotExist'}}
+// expected-error@-1 {{binary operator '&' cannot be applied to operands of type 'UInt8' and 'P1.Protocol'}}
+// expected-error@-2 {{binary operator '&' cannot be applied to operands of type 'UInt8' and 'P2.Protocol'}}
+// expected-note@-3 2 {{overloads for '&' exist with these partially matching parameter lists}}
+
 
 typealias T08 = P1 & inout P2 // expected-error {{'inout' may only be used on parameters}}
 typealias T09 = P1 & __shared P2 // expected-error {{'__shared' may only be used on parameters}}
diff --git a/test/type/subclass_composition.swift b/test/type/subclass_composition.swift
index 1139c4bf3d34f..a7c52f539bf58 100644
--- a/test/type/subclass_composition.swift
+++ b/test/type/subclass_composition.swift
@@ -413,7 +413,7 @@ func conformsTo<T1 : P2, T2 : Base<Int> & P2>(
   // expected-error@-1 {{global function 'conformsToAnyObject' requires that 'P1' be a class type}}
 
   conformsToP1(p1)
-  // expected-error@-1 {{value of protocol type 'P1' cannot conform to 'P1'; only struct/enum/class types can conform to protocols}}
+  // expected-error@-1 {{protocol 'P1' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
 
   // FIXME: Following diagnostics are not great because when
   // `conformsTo*` methods are re-typechecked, they loose information
diff --git a/test/type/types.swift b/test/type/types.swift
index 7716a1582c3cf..135607476d43f 100644
--- a/test/type/types.swift
+++ b/test/type/types.swift
@@ -20,14 +20,7 @@ var d4 : () -> Int = { d2 }  // expected-error{{function produces expected type
 
 if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
   var e0 : [Int]
-  e0[] // expected-error {{no exact matches in call to subscript}}
-  // expected-note@-1 {{candidate has partially matching parameter list (Int)}}
-  // expected-note@-2 {{candidate has partially matching parameter list (Range<Int>)}}
-  // expected-note@-3 {{candidate has partially matching parameter list ((UnboundedRange_) -> ())}}
-  // expected-note@-4 {{candidate has partially matching parameter list (RangeSet<Array<Int>.Index>)}}
-  // expected-note@-5 {{candidate has partially matching parameter list (Range<Array<Int>.Index>)}}
-  // expected-note@-6 {{candidate has partially matching parameter list ((UnboundedRange_) -> ())}}
-  // expected-note@-7 {{candidate has partially matching parameter list (RangeSet<Array<Int>.Index>)}}
+  e0[] // expected-error {{missing argument for parameter #1 in call}} {{6-6=<#Int#>}}
 }
 
 var f0 : [Float]
diff --git a/tools/SourceKit/include/SourceKit/Core/LangSupport.h b/tools/SourceKit/include/SourceKit/Core/LangSupport.h
index 7bfbd371d9e49..6ed2f9141dad1 100644
--- a/tools/SourceKit/include/SourceKit/Core/LangSupport.h
+++ b/tools/SourceKit/include/SourceKit/Core/LangSupport.h
@@ -619,6 +619,7 @@ class TypeContextInfoConsumer {
 
   virtual void handleResult(const TypeContextInfoItem &Result) = 0;
   virtual void failed(StringRef ErrDescription) = 0;
+  virtual void setReusingASTContext(bool flag) = 0;
 };
 
 struct ConformingMethodListResult {
@@ -643,6 +644,7 @@ class ConformingMethodListConsumer {
   virtual ~ConformingMethodListConsumer() {}
 
   virtual void handleResult(const ConformingMethodListResult &Result) = 0;
+  virtual void setReusingASTContext(bool flag) = 0;
   virtual void failed(StringRef ErrDescription) = 0;
 };
 
@@ -811,12 +813,14 @@ class LangSupport {
 
   virtual void getExpressionContextInfo(llvm::MemoryBuffer *inputBuf,
                                         unsigned Offset,
+                                        OptionsDictionary *options,
                                         ArrayRef<const char *> Args,
                                         TypeContextInfoConsumer &Consumer,
                                         Optional<VFSOptions> vfsOptions) = 0;
 
   virtual void getConformingMethodList(llvm::MemoryBuffer *inputBuf,
                                        unsigned Offset,
+                                       OptionsDictionary *options,
                                        ArrayRef<const char *> Args,
                                        ArrayRef<const char *> ExpectedTypes,
                                        ConformingMethodListConsumer &Consumer,
diff --git a/tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp b/tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
index fabdc567da6f2..8ac901da4de3c 100644
--- a/tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
+++ b/tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
@@ -355,12 +355,11 @@ ImportDepth::ImportDepth(ASTContext &context,
 
   // Private imports from this module.
   // FIXME: only the private imports from the current source file.
-  ModuleDecl::ImportFilter importFilter;
-  importFilter |= ModuleDecl::ImportFilterKind::Private;
-  importFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
   // FIXME: ImportFilterKind::ShadowedBySeparateOverlay?
   SmallVector<ModuleDecl::ImportedModule, 16> mainImports;
-  main->getImportedModules(mainImports, importFilter);
+  main->getImportedModules(mainImports,
+                           {ModuleDecl::ImportFilterKind::Private,
+                            ModuleDecl::ImportFilterKind::ImplementationOnly});
   for (auto &import : mainImports) {
     uint8_t depth = 1;
     if (auxImports.count(import.importedModule->getName().str()))
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp b/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
index eba624bce0d32..7b30a003845b7 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
@@ -907,9 +907,9 @@ static void collectModuleDependencies(ModuleDecl *TopMod,
 
   auto ClangModuleLoader = TopMod->getASTContext().getClangModuleLoader();
 
-  ModuleDecl::ImportFilter ImportFilter;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Public;
-  ImportFilter |= ModuleDecl::ImportFilterKind::Private;
+  ModuleDecl::ImportFilter ImportFilter = {
+      ModuleDecl::ImportFilterKind::Public,
+      ModuleDecl::ImportFilterKind::Private};
   if (Visited.empty()) {
     // Only collect implementation-only dependencies from the main module.
     ImportFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
index 42db5bc49f7ae..f2814e606baf0 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
@@ -26,6 +26,13 @@ using namespace SourceKit;
 using namespace swift;
 using namespace ide;
 
+static void translateConformingMethodListOptions(OptionsDictionary &from,
+                                                 ConformingMethodList::Options &to) {
+  static UIdent KeyReuseASTContext("key.conformingmethods.reuseastcontext");
+
+  from.valueForOption(KeyReuseASTContext, to.reuseASTContextIfPossible);
+}
+
 static bool swiftConformingMethodListImpl(
     SwiftLangSupport &Lang, llvm::MemoryBuffer *UnresolvedInputFile,
     unsigned Offset, ArrayRef<const char *> Args,
@@ -44,12 +51,14 @@ static bool swiftConformingMethodListImpl(
 
         auto *SF = CI.getCodeCompletionFile();
         performCodeCompletionSecondPass(*SF, *callbacksFactory);
+        Consumer.setReusingASTContext(reusingASTContext);
       });
 }
 
 void SwiftLangSupport::getConformingMethodList(
     llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
-    ArrayRef<const char *> Args, ArrayRef<const char *> ExpectedTypeNames,
+    OptionsDictionary *optionsDict, ArrayRef<const char *> Args,
+    ArrayRef<const char *> ExpectedTypeNames,
     SourceKit::ConformingMethodListConsumer &SKConsumer,
     Optional<VFSOptions> vfsOptions) {
   std::string error;
@@ -60,6 +69,11 @@ void SwiftLangSupport::getConformingMethodList(
   if (!fileSystem)
     return SKConsumer.failed(error);
 
+  ConformingMethodList::Options options;
+  if (optionsDict) {
+    translateConformingMethodListOptions(*optionsDict, options);
+  }
+
   class Consumer : public ide::ConformingMethodListConsumer {
     SourceKit::ConformingMethodListConsumer &SKConsumer;
 
@@ -68,7 +82,7 @@ void SwiftLangSupport::getConformingMethodList(
         : SKConsumer(SKConsumer) {}
 
     /// Convert an IDE result to a SK result and send it to \c SKConsumer .
-    void handleResult(const ide::ConformingMethodListResult &Result) {
+    void handleResult(const ide::ConformingMethodListResult &Result) override {
       SmallString<512> SS;
       llvm::raw_svector_ostream OS(SS);
 
@@ -172,11 +186,15 @@ void SwiftLangSupport::getConformingMethodList(
 
       SKConsumer.handleResult(SKResult);
     }
+
+    void setReusingASTContext(bool flag) override {
+      SKConsumer.setReusingASTContext(flag);
+    }
   } Consumer(SKConsumer);
 
   if (!swiftConformingMethodListImpl(*this, UnresolvedInputFile, Offset, Args,
                                      ExpectedTypeNames, Consumer, fileSystem,
-                                     /*EnableASTCaching=*/false, error)) {
+                                     options.reuseASTContextIfPossible, error)) {
     SKConsumer.failed(error);
   }
 }
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp b/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
index 336417b300ecb..68943da63c200 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
@@ -659,7 +659,7 @@ class SwiftDocumentSemanticInfo :
   }
 
 private:
-  std::vector<SwiftSemanticToken> takeSemanticTokens(
+  std::vector<SwiftSemanticToken> getSemanticTokens(
       ImmutableTextSnapshotRef NewSnapshot);
 
   Optional<std::vector<DiagnosticEntryInfo>> getSemanticDiagnostics(
@@ -760,12 +760,12 @@ void SwiftDocumentSemanticInfo::readSemanticInfo(
 
   llvm::sys::ScopedLock L(Mtx);
 
-  Tokens = takeSemanticTokens(NewSnapshot);
+  Tokens = getSemanticTokens(NewSnapshot);
   Diags = getSemanticDiagnostics(NewSnapshot, ParserDiags);
 }
 
 std::vector<SwiftSemanticToken>
-SwiftDocumentSemanticInfo::takeSemanticTokens(
+SwiftDocumentSemanticInfo::getSemanticTokens(
     ImmutableTextSnapshotRef NewSnapshot) {
 
   llvm::sys::ScopedLock L(Mtx);
@@ -773,13 +773,15 @@ SwiftDocumentSemanticInfo::takeSemanticTokens(
   if (SemaToks.empty())
     return {};
 
+  auto result = SemaToks;
+
   // Adjust the position of the tokens.
   TokSnapshot->foreachReplaceUntil(NewSnapshot,
     [&](ReplaceImmutableTextUpdateRef Upd) -> bool {
-      if (SemaToks.empty())
+      if (result.empty())
         return false;
 
-      auto ReplaceBegin = std::lower_bound(SemaToks.begin(), SemaToks.end(),
+      auto ReplaceBegin = std::lower_bound(result.begin(), result.end(),
           Upd->getByteOffset(),
           [&](const SwiftSemanticToken &Tok, unsigned StartOffset) -> bool {
             return Tok.ByteOffset+Tok.Length < StartOffset;
@@ -789,7 +791,7 @@ SwiftDocumentSemanticInfo::takeSemanticTokens(
       if (Upd->getLength() == 0) {
         ReplaceEnd = ReplaceBegin;
       } else {
-        ReplaceEnd = std::upper_bound(ReplaceBegin, SemaToks.end(),
+        ReplaceEnd = std::upper_bound(ReplaceBegin, result.end(),
             Upd->getByteOffset() + Upd->getLength(),
             [&](unsigned EndOffset, const SwiftSemanticToken &Tok) -> bool {
               return EndOffset < Tok.ByteOffset;
@@ -800,14 +802,14 @@ SwiftDocumentSemanticInfo::takeSemanticTokens(
       int Delta = InsertLen - Upd->getLength();
       if (Delta != 0) {
         for (std::vector<SwiftSemanticToken>::iterator
-               I = ReplaceEnd, E = SemaToks.end(); I != E; ++I)
+               I = ReplaceEnd, E = result.end(); I != E; ++I)
           I->ByteOffset += Delta;
       }
-      SemaToks.erase(ReplaceBegin, ReplaceEnd);
+      result.erase(ReplaceBegin, ReplaceEnd);
       return true;
     });
 
-  return std::move(SemaToks);
+  return result;
 }
 
 Optional<std::vector<DiagnosticEntryInfo>>
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
index 387bde3a2dab7..166362d27fdfc 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
+++ b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
@@ -220,6 +220,18 @@ class SessionCacheMap {
 };
 } // end namespace CodeCompletion
 
+namespace TypeContextInfo {
+struct Options {
+  bool reuseASTContextIfPossible = true;
+};
+} // namespace TypeContextInfo
+
+namespace ConformingMethodList {
+struct Options {
+  bool reuseASTContextIfPossible = true;
+};
+} // namespace ConformingMethodList
+
 class SwiftInterfaceGenMap {
   llvm::StringMap<SwiftInterfaceGenContextRef> IFaceGens;
   mutable llvm::sys::Mutex Mtx;
@@ -606,11 +618,13 @@ class SwiftLangSupport : public LangSupport {
                std::function<void(const RequestResult<ArrayRef<StringRef>> &)> Receiver) override;
 
   void getExpressionContextInfo(llvm::MemoryBuffer *inputBuf, unsigned Offset,
+                                OptionsDictionary *options,
                                 ArrayRef<const char *> Args,
                                 TypeContextInfoConsumer &Consumer,
                                 Optional<VFSOptions> vfsOptions) override;
 
   void getConformingMethodList(llvm::MemoryBuffer *inputBuf, unsigned Offset,
+                               OptionsDictionary *options,
                                ArrayRef<const char *> Args,
                                ArrayRef<const char *> ExpectedTypes,
                                ConformingMethodListConsumer &Consumer,
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
index 0b24a343de4ec..bd366f9de63de 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
@@ -415,14 +415,13 @@ static void printAnnotatedDeclaration(const ValueDecl *VD,
   while (VD->isImplicit() && VD->getOverriddenDecl())
     VD = VD->getOverriddenDecl();
 
-  // If this is a property wrapper backing property (_foo) or projected value
-  // ($foo) and the wrapped property is not implicit, still print it.
-  if (auto *VarD = dyn_cast<VarDecl>(VD)) {
-    if (auto *Wrapped = VarD->getOriginalWrappedProperty()) {
-      if (!Wrapped->isImplicit())
-        PO.TreatAsExplicitDeclList.push_back(VD);
-    }
-  }
+  // VD may be a compiler synthesized member, constructor, or shorthand argument
+  // so always print it even if it's implicit.
+  //
+  // FIXME: Update PrintOptions::printQuickHelpDeclaration to print implicit
+  // decls by default. That causes issues due to newlines being printed before
+  // implicit OpaqueTypeDecls at time of writing.
+  PO.TreatAsExplicitDeclList.push_back(VD);
 
   // Wrap this up in XML, as that's what we'll use for documentation comments.
   OS<<"<Declaration>";
@@ -446,14 +445,14 @@ void SwiftLangSupport::printFullyAnnotatedDeclaration(const ValueDecl *VD,
   while (VD->isImplicit() && VD->getOverriddenDecl())
     VD = VD->getOverriddenDecl();
 
-  // If this is a property wrapper backing property (_foo) or projected value
-  // ($foo) and the wrapped property is not implicit, still print it.
-  if (auto *VarD = dyn_cast<VarDecl>(VD)) {
-    if (auto *Wrapped = VarD->getOriginalWrappedProperty()) {
-      if (!Wrapped->isImplicit())
-        PO.TreatAsExplicitDeclList.push_back(VD);
-    }
-  }
+  // VD may be a compiler synthesized member, constructor, or shorthand argument
+  // so always print it even if it's implicit.
+  //
+  // FIXME: Update PrintOptions::printQuickHelpDeclaration to print implicit
+  // decls by default. That causes issues due to newlines being printed before
+  // implicit OpaqueTypeDecls at time of writing.
+  PO.TreatAsExplicitDeclList.push_back(VD);
+
   VD->print(Printer, PO);
 }
 
@@ -1208,8 +1207,8 @@ class CursorRangeInfoConsumer : public SwiftASTConsumer {
     ImmutableTextSnapshotRef InputSnap;
     if (auto EditorDoc = Lang.getEditorDocuments()->findByPath(InputFile))
       InputSnap = EditorDoc->getLatestSnapshot();
-      if (!InputSnap)
-        return false;
+    if (!InputSnap)
+      return false;
 
     auto mappedBackOffset = [&]()->llvm::Optional<unsigned> {
       for (auto &Snap : Snapshots) {
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
index db6a6ed03f176..5a7b8bdd3dcad 100644
--- a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
+++ b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
@@ -25,6 +25,13 @@ using namespace SourceKit;
 using namespace swift;
 using namespace ide;
 
+static void translateTypeContextInfoOptions(OptionsDictionary &from,
+                                            TypeContextInfo::Options &to) {
+  static UIdent KeyReuseASTContext("key.typecontextinfo.reuseastcontext");
+
+  from.valueForOption(KeyReuseASTContext, to.reuseASTContextIfPossible);
+}
+
 static bool swiftTypeContextInfoImpl(
     SwiftLangSupport &Lang, llvm::MemoryBuffer *UnresolvedInputFile,
     unsigned Offset, ide::TypeContextInfoConsumer &Consumer,
@@ -41,16 +48,22 @@ static bool swiftTypeContextInfoImpl(
 
         auto *SF = CI.getCodeCompletionFile();
         performCodeCompletionSecondPass(*SF, *callbacksFactory);
+        Consumer.setReusingASTContext(reusingASTContext);
       });
 }
 
 void SwiftLangSupport::getExpressionContextInfo(
     llvm::MemoryBuffer *UnresolvedInputFile, unsigned Offset,
-    ArrayRef<const char *> Args,
+    OptionsDictionary *optionsDict, ArrayRef<const char *> Args,
     SourceKit::TypeContextInfoConsumer &SKConsumer,
     Optional<VFSOptions> vfsOptions) {
   std::string error;
 
+  TypeContextInfo::Options options;
+  if (optionsDict) {
+    translateTypeContextInfoOptions(*optionsDict, options);
+  }
+
   // FIXME: the use of None as primary file is to match the fact we do not read
   // the document contents using the editor documents infrastructure.
   auto fileSystem = getFileSystem(vfsOptions, /*primaryFile=*/None, error);
@@ -144,15 +157,19 @@ void SwiftLangSupport::getExpressionContextInfo(
     Consumer(SourceKit::TypeContextInfoConsumer &SKConsumer)
         : SKConsumer(SKConsumer){};
 
-    void handleResults(ArrayRef<ide::TypeContextInfoItem> Results) {
+    void handleResults(ArrayRef<ide::TypeContextInfoItem> Results) override {
       for (auto &Item : Results)
         handleSingleResult(Item);
     }
+
+    void setReusingASTContext(bool flag) override {
+      SKConsumer.setReusingASTContext(flag);
+    }
   } Consumer(SKConsumer);
 
   if (!swiftTypeContextInfoImpl(*this, UnresolvedInputFile, Offset, Consumer,
-                                Args, fileSystem, /*EnableASTCaching=*/false,
-                                error)) {
+                                Args, fileSystem,
+                                options.reuseASTContextIfPossible, error)) {
     SKConsumer.failed(error);
   }
 }
diff --git a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
index 21683a1f976a6..7f9d37228fb62 100644
--- a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
+++ b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
@@ -298,13 +298,14 @@ static int printDiags();
 
 static void getSemanticInfo(sourcekitd_variant_t Info, StringRef Filename);
 
-static void addCodeCompleteOptions(sourcekitd_object_t Req, TestOptions &Opts) {
+static void addRequestOptions(sourcekitd_object_t Req, TestOptions &Opts,
+                              sourcekitd_uid_t Key, StringRef(prefix)) {
   if (!Opts.RequestOptions.empty()) {
     sourcekitd_object_t CCOpts =
         sourcekitd_request_dictionary_create(nullptr, nullptr, 0);
     for (auto &Opt : Opts.RequestOptions) {
       auto KeyValue = StringRef(Opt).split('=');
-      std::string KeyStr("key.codecomplete.");
+      std::string KeyStr(prefix.str());
       KeyStr.append(KeyValue.first.str());
       sourcekitd_uid_t Key = sourcekitd_uid_get_from_cstr(KeyStr.c_str());
 
@@ -312,14 +313,27 @@ static void addCodeCompleteOptions(sourcekitd_object_t Req, TestOptions &Opts) {
       if (KeyValue.first == "filtertext") {
         sourcekitd_request_dictionary_set_stringbuf(
             CCOpts, Key, KeyValue.second.data(), KeyValue.second.size());
+      } else if (KeyValue.first == "expectedtypes") {
+        SmallVector<StringRef, 4> expectedTypeNames;
+        KeyValue.second.split(expectedTypeNames, ';');
+
+        auto typenames = sourcekitd_request_array_create(nullptr, 0);
+        for (auto &name : expectedTypeNames) {
+          std::string n = name.str();
+          sourcekitd_request_array_set_string(typenames,
+                                              SOURCEKITD_ARRAY_APPEND,
+                                              n.c_str());
+        }
+        // NOTE: 'key.expectedtypes' directly to the request.
+        sourcekitd_request_dictionary_set_value(Req, KeyExpectedTypes,
+                                                typenames);
       } else {
         int64_t Value = 0;
         KeyValue.second.getAsInteger(0, Value);
         sourcekitd_request_dictionary_set_int64(CCOpts, Key, Value);
       }
     }
-    sourcekitd_request_dictionary_set_value(Req, KeyCodeCompleteOptions,
-                                            CCOpts);
+    sourcekitd_request_dictionary_set_value(Req, Key, CCOpts);
     sourcekitd_request_release(CCOpts);
   }
 }
@@ -444,28 +458,6 @@ static int handleTestInvocation(ArrayRef<const char *> Args,
   return 0;
 }
 
-static int setExpectedTypes(const sourcekitd_test::TestOptions &Opts,
-                            sourcekitd_object_t Req) {
-  for (auto &Opt : Opts.RequestOptions) {
-    auto KeyValue = StringRef(Opt).split('=');
-    if (KeyValue.first == "expectedtypes") {
-      SmallVector<StringRef, 4> expectedTypeNames;
-      KeyValue.second.split(expectedTypeNames, ';');
-
-      auto typenames = sourcekitd_request_array_create(nullptr, 0);
-      for (auto &name : expectedTypeNames) {
-        std::string n = name.str();
-        sourcekitd_request_array_set_string(typenames, SOURCEKITD_ARRAY_APPEND, n.c_str());
-      }
-      sourcekitd_request_dictionary_set_value(Req, KeyExpectedTypes, typenames);
-    } else {
-      llvm::errs() << "invalid key '" << KeyValue.first << "' in -req-opts\n";
-      return 1;
-    }
-  }
-  return 0;
-}
-
 static bool sendGlobalConfigRequest() {
   TestOptions Opts;
   sourcekitd_object_t Req = sourcekitd_request_dictionary_create(nullptr,
@@ -601,7 +593,7 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
     sourcekitd_request_dictionary_set_string(Req, KeyName, SemaName.c_str());
     // Default to sort by name.
     Opts.RequestOptions.insert(Opts.RequestOptions.begin(), "sort.byname=1");
-    addCodeCompleteOptions(Req, Opts);
+    addRequestOptions(Req, Opts, KeyCodeCompleteOptions, "key.codecomplete.");
     break;
 
   case SourceKitRequest::CodeCompleteOpen:
@@ -609,7 +601,7 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
                                           RequestCodeCompleteOpen);
     sourcekitd_request_dictionary_set_int64(Req, KeyOffset, ByteOffset);
     sourcekitd_request_dictionary_set_string(Req, KeyName, SemaName.c_str());
-    addCodeCompleteOptions(Req, Opts);
+    addRequestOptions(Req, Opts, KeyCodeCompleteOptions, "key.codecomplete.");
     break;
 
   case SourceKitRequest::CodeCompleteClose:
@@ -624,7 +616,7 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
                                           RequestCodeCompleteUpdate);
     sourcekitd_request_dictionary_set_int64(Req, KeyOffset, ByteOffset);
     sourcekitd_request_dictionary_set_string(Req, KeyName, SemaName.c_str());
-    addCodeCompleteOptions(Req, Opts);
+    addRequestOptions(Req, Opts, KeyCodeCompleteOptions, "key.codecomplete.");
     break;
 
   case SourceKitRequest::CodeCompleteCacheOnDisk:
@@ -673,13 +665,16 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
     sourcekitd_request_dictionary_set_uid(Req, KeyRequest,
                                           RequestTypeContextInfo);
     sourcekitd_request_dictionary_set_int64(Req, KeyOffset, ByteOffset);
+    addRequestOptions(Req, Opts, KeyTypeContextInfoOptions,
+                      "key.typecontextinfo.");
     break;
 
   case SourceKitRequest::ConformingMethodList:
     sourcekitd_request_dictionary_set_uid(Req, KeyRequest,
                                           RequestConformingMethodList);
     sourcekitd_request_dictionary_set_int64(Req, KeyOffset, ByteOffset);
-    setExpectedTypes(Opts, Req);
+    addRequestOptions(Req, Opts, KeyConformingMethodListOptions,
+                      "key.conformingmethods.");
     break;
 
   case SourceKitRequest::CursorInfo:
@@ -711,7 +706,10 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
 
   case SourceKitRequest::CollectExpresstionType: {
     sourcekitd_request_dictionary_set_uid(Req, KeyRequest, RequestCollectExpressionType);
-    setExpectedTypes(Opts, Req);
+    // NOTE: KeyCodeCompletion and the prefix are just dummy. This request
+    // only accepts 'expectedtypes' which is placed to the Req root dictionary.
+    addRequestOptions(Req, Opts, KeyCodeCompleteOptions,
+                      "key.expression.type.");
     break;
   }
 
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
index e388918ef6a49..7aa013f842b64 100644
--- a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
+++ b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
@@ -178,11 +178,13 @@ static sourcekitd_response_t codeCompleteClose(StringRef name, int64_t Offset);
 
 static sourcekitd_response_t typeContextInfo(llvm::MemoryBuffer *InputBuf,
                                              int64_t Offset,
+                                             Optional<RequestDict> optionsDict,
                                              ArrayRef<const char *> Args,
                                              Optional<VFSOptions> vfsOptions);
 
 static sourcekitd_response_t
 conformingMethodList(llvm::MemoryBuffer *InputBuf, int64_t Offset,
+                     Optional<RequestDict> optionsDict,
                      ArrayRef<const char *> Args,
                      ArrayRef<const char *> ExpectedTypes,
                      Optional<VFSOptions> vfsOptions);
@@ -995,7 +997,9 @@ static void handleSemanticRequest(
     int64_t Offset;
     if (Req.getInt64(KeyOffset, Offset, /*isOptional=*/false))
       return Rec(createErrorRequestInvalid("missing 'key.offset'"));
-    return Rec(typeContextInfo(InputBuf.get(), Offset, Args,
+    Optional<RequestDict> options =
+        Req.getDictionary(KeyTypeContextInfoOptions);
+    return Rec(typeContextInfo(InputBuf.get(), Offset, options, Args,
                                std::move(vfsOptions)));
   }
 
@@ -1010,9 +1014,11 @@ static void handleSemanticRequest(
     SmallVector<const char *, 8> ExpectedTypeNames;
     if (Req.getStringArray(KeyExpectedTypes, ExpectedTypeNames, true))
       return Rec(createErrorRequestInvalid("invalid 'key.expectedtypes'"));
+    Optional<RequestDict> options =
+        Req.getDictionary(KeyConformingMethodListOptions);
     return Rec(
-        conformingMethodList(InputBuf.get(), Offset, Args, ExpectedTypeNames,
-                             std::move(vfsOptions)));
+        conformingMethodList(InputBuf.get(), Offset, options, Args,
+                             ExpectedTypeNames, std::move(vfsOptions)));
   }
 
   if (!SourceFile.hasValue())
@@ -2266,17 +2272,20 @@ void SKGroupedCodeCompletionConsumer::setAnnotatedTypename(bool flag) {
 
 static sourcekitd_response_t typeContextInfo(llvm::MemoryBuffer *InputBuf,
                                              int64_t Offset,
+                                             Optional<RequestDict> optionsDict,
                                              ArrayRef<const char *> Args,
                                              Optional<VFSOptions> vfsOptions) {
   ResponseBuilder RespBuilder;
 
   class Consumer : public TypeContextInfoConsumer {
+    ResponseBuilder RespBuilder;
     ResponseBuilder::Array SKResults;
     Optional<std::string> ErrorDescription;
 
   public:
     Consumer(ResponseBuilder Builder)
-        : SKResults(Builder.getDictionary().setArray(KeyResults)) {}
+        : RespBuilder(Builder),
+          SKResults(Builder.getDictionary().setArray(KeyResults)) {}
 
     void handleResult(const TypeContextInfoItem &Item) override {
       auto SKElem = SKResults.appendDictionary();
@@ -2293,6 +2302,11 @@ static sourcekitd_response_t typeContextInfo(llvm::MemoryBuffer *InputBuf,
       }
     }
 
+    void setReusingASTContext(bool flag) override {
+      if (flag)
+        RespBuilder.getDictionary().setBool(KeyReusingASTContext, flag);
+    }
+
     void failed(StringRef ErrDescription) override {
       ErrorDescription = ErrDescription.str();
     }
@@ -2303,8 +2317,12 @@ static sourcekitd_response_t typeContextInfo(llvm::MemoryBuffer *InputBuf,
     }
   } Consumer(RespBuilder);
 
+  std::unique_ptr<SKOptionsDictionary> options;
+  if (optionsDict)
+    options = std::make_unique<SKOptionsDictionary>(*optionsDict);
+
   LangSupport &Lang = getGlobalContext().getSwiftLangSupport();
-  Lang.getExpressionContextInfo(InputBuf, Offset, Args, Consumer,
+  Lang.getExpressionContextInfo(InputBuf, Offset, options.get(), Args, Consumer,
                                 std::move(vfsOptions));
 
   if (Consumer.isError())
@@ -2318,6 +2336,7 @@ static sourcekitd_response_t typeContextInfo(llvm::MemoryBuffer *InputBuf,
 
 static sourcekitd_response_t
 conformingMethodList(llvm::MemoryBuffer *InputBuf, int64_t Offset,
+                     Optional<RequestDict> optionsDict,
                      ArrayRef<const char *> Args,
                      ArrayRef<const char *> ExpectedTypes,
                      Optional<VFSOptions> vfsOptions) {
@@ -2346,6 +2365,11 @@ conformingMethodList(llvm::MemoryBuffer *InputBuf, int64_t Offset,
       }
     }
 
+    void setReusingASTContext(bool flag) override {
+      if (flag)
+        SKResult.setBool(KeyReusingASTContext, flag);
+    }
+
     void failed(StringRef ErrDescription) override {
       ErrorDescription = ErrDescription.str();
     }
@@ -2356,9 +2380,13 @@ conformingMethodList(llvm::MemoryBuffer *InputBuf, int64_t Offset,
     }
   } Consumer(RespBuilder);
 
+  std::unique_ptr<SKOptionsDictionary> options;
+  if (optionsDict)
+    options = std::make_unique<SKOptionsDictionary>(*optionsDict);
+
   LangSupport &Lang = getGlobalContext().getSwiftLangSupport();
-  Lang.getConformingMethodList(InputBuf, Offset, Args, ExpectedTypes, Consumer,
-                               std::move(vfsOptions));
+  Lang.getConformingMethodList(InputBuf, Offset, options.get(), Args,
+                               ExpectedTypes, Consumer, std::move(vfsOptions));
 
   if (Consumer.isError())
     return createErrorRequestFailed(Consumer.getErrorDescription());
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 23f1654593201..aabba372ae647 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_host_tool(swift
+add_swift_host_tool(swift-frontend
   driver.cpp
   autolink_extract_main.cpp
   modulewrap_main.cpp
@@ -6,55 +6,64 @@ add_swift_host_tool(swift
   swift_symbolgraph_extract_main.cpp
   SWIFT_COMPONENT compiler
 )
-target_link_libraries(swift
+target_link_libraries(swift-frontend
                       PRIVATE
                         swiftDriver
                         swiftFrontendTool
                         swiftSymbolGraphGen
                         LLVMBitstreamReader)
 
-swift_create_post_build_symlink(swift
-  SOURCE "swift${CMAKE_EXECUTABLE_SUFFIX}"
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
+  DESTINATION "swift${CMAKE_EXECUTABLE_SUFFIX}"
+  WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
   DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
-swift_create_post_build_symlink(swift
-  SOURCE "swift${CMAKE_EXECUTABLE_SUFFIX}"
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
   DESTINATION "swift-indent${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
-swift_create_post_build_symlink(swift
-  SOURCE "swift${CMAKE_EXECUTABLE_SUFFIX}"
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
   DESTINATION "swift-symbolgraph-extract${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
-swift_create_post_build_symlink(swift
-  SOURCE "swift${CMAKE_EXECUTABLE_SUFFIX}"
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
   DESTINATION "swift-autolink-extract${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
-add_swift_tool_symlink(swiftc swift compiler)
-add_swift_tool_symlink(swift-symbolgraph-extract swift compiler)
-add_swift_tool_symlink(swift-autolink-extract swift autolink-driver)
-add_swift_tool_symlink(swift-indent swift editor-integration)
+add_swift_tool_symlink(swift swift-frontend compiler)
+add_swift_tool_symlink(swiftc swift-frontend compiler)
+add_swift_tool_symlink(swift-symbolgraph-extract swift-frontend compiler)
+add_swift_tool_symlink(swift-autolink-extract swift-frontend autolink-driver)
+add_swift_tool_symlink(swift-indent swift-frontend editor-integration)
 
 # If building as part of clang, make sure the headers are installed.
 if(NOT SWIFT_BUILT_STANDALONE)
-  add_dependencies(swift clang-resource-headers)
+  add_dependencies(swift-frontend clang-resource-headers)
 endif()
 
-add_dependencies(compiler swift)
+add_dependencies(compiler swift-frontend)
+swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift${CMAKE_EXECUTABLE_SUFFIX}"
+                           DESTINATION "bin"
+                           COMPONENT compiler)
 swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swiftc${CMAKE_EXECUTABLE_SUFFIX}"
                            DESTINATION "bin"
                            COMPONENT compiler)
 swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-symbolgraph-extract${CMAKE_EXECUTABLE_SUFFIX}"
                            DESTINATION "bin"
                            COMPONENT compiler)
-add_dependencies(autolink-driver swift)
+add_dependencies(autolink-driver swift-frontend)
 swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-autolink-extract${CMAKE_EXECUTABLE_SUFFIX}"
                            DESTINATION "bin"
                            COMPONENT autolink-driver)
-add_dependencies(editor-integration swift)
+add_dependencies(editor-integration swift-frontend)
 swift_install_in_component(FILES "${SWIFT_RUNTIME_OUTPUT_INTDIR}/swift-indent${CMAKE_EXECUTABLE_SUFFIX}"
                            DESTINATION "bin"
                            COMPONENT editor-integration)
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index e01a9efb59d15..ff189f773ab28 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -142,6 +142,14 @@ static int run_driver(StringRef ExecName,
     }
   }
 
+  // Run the integrated Swift frontend when called as "swift-frontend" but
+  // without a leading "-frontend".
+  if (ExecName == "swift-frontend") {
+    return performFrontend(llvm::makeArrayRef(argv.data()+1,
+                                              argv.data()+argv.size()),
+                           argv[0], (void *)(intptr_t)getExecutablePath);
+  }
+
   std::string Path = getExecutablePath(argv[0]);
 
   PrintingDiagnosticConsumer PDC;
diff --git a/tools/sil-opt/SILOpt.cpp b/tools/sil-opt/SILOpt.cpp
index cdbba938fe322..26f1f1c8f505d 100644
--- a/tools/sil-opt/SILOpt.cpp
+++ b/tools/sil-opt/SILOpt.cpp
@@ -87,11 +87,6 @@ static llvm::cl::opt<bool> DisableSILOwnershipVerifier(
     llvm::cl::desc(
         "Do not verify SIL ownership invariants during SIL verification"));
 
-static llvm::cl::opt<bool> EnableOwnershipLoweringAfterDiagnostics(
-    "enable-ownership-lowering-after-diagnostics",
-    llvm::cl::desc("Enable ownership lowering after diagnostics"),
-    llvm::cl::init(false));
-
 static llvm::cl::opt<bool>
 EnableSILOpaqueValues("enable-sil-opaque-values",
                       llvm::cl::desc("Compile the module with sil-opaque-values enabled."));
@@ -304,6 +299,7 @@ void anchorForGetMainExecutable() {}
 int main(int argc, char **argv) {
   PROGRAM_START(argc, argv);
   INITIALIZE_LLVM();
+  llvm::EnablePrettyStackTraceOnSigInfoForThisThread();
 
   llvm::cl::ParseCommandLineOptions(argc, argv, "Swift SIL optimizer\n");
 
@@ -375,8 +371,6 @@ int main(int argc, char **argv) {
   if (OptimizationGroup != OptGroup::Diagnostics)
     SILOpts.OptMode = OptimizationMode::ForSpeed;
   SILOpts.VerifySILOwnership = !DisableSILOwnershipVerifier;
-  SILOpts.StripOwnershipAfterSerialization =
-      EnableOwnershipLoweringAfterDiagnostics;
   SILOpts.OptRecordFile = RemarksFilename;
   SILOpts.OptRecordPasses = RemarksPasses;
 
diff --git a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
index 66d1112058750..a48769a9bc2f0 100644
--- a/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
+++ b/tools/swift-api-digester/ModuleAnalyzerNodes.cpp
@@ -1573,6 +1573,7 @@ SwiftDeclCollector::constructInitNode(ConstructorDecl *CD) {
 bool swift::ide::api::
 SDKContext::shouldIgnore(Decl *D, const Decl* Parent) const {
   // Exclude all clang nodes if we're comparing Swift decls specifically.
+  // FIXME: isFromClang also excludes Swift decls with @objc. We should allow those.
   if (Opts.SwiftOnly && isFromClang(D)) {
     return true;
   }
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
index b8ab15e72a9d2..7415faf9a55c1 100644
--- a/tools/swift-api-digester/swift-api-digester.cpp
+++ b/tools/swift-api-digester/swift-api-digester.cpp
@@ -2653,7 +2653,9 @@ static CheckerOptions getCheckOpts(int argc, char *argv[]) {
   Opts.AbortOnModuleLoadFailure = options::AbortOnModuleLoadFailure;
   Opts.LocationFilter = options::LocationFilter;
   Opts.PrintModule = options::PrintModule;
-  Opts.SwiftOnly = options::SwiftOnly;
+  // When ABI checking is enabled, we should only include Swift symbols because
+  // the checking logics are language-specific.
+  Opts.SwiftOnly = options::Abi || options::SwiftOnly;
   Opts.SkipOSCheck = options::DisableOSChecks;
   for (int i = 1; i < argc; ++i)
     Opts.ToolArgs.push_back(argv[i]);
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
index a0401c1581dc1..c32dedc0d7d62 100644
--- a/tools/swift-ide-test/swift-ide-test.cpp
+++ b/tools/swift-ide-test/swift-ide-test.cpp
@@ -58,13 +58,16 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/Program.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/ManagedStatic.h"
 #include <system_error>
 
+#include <random>
 #include <string>
+#include <chrono>
 
 using namespace swift;
 using namespace ide;
@@ -74,6 +77,7 @@ namespace {
 
 enum class ActionType {
   None,
+  BatchCodeCompletion,
   CodeCompletion,
   REPLCodeCompletion,
   DumpCompletionCache,
@@ -158,6 +162,8 @@ static llvm::cl::opt<ActionType>
 Action(llvm::cl::desc("Mode:"), llvm::cl::init(ActionType::None),
        llvm::cl::cat(Category),
        llvm::cl::values(
+           clEnumValN(ActionType::BatchCodeCompletion,
+                      "batch-code-completion", "Perform code completion in batch mode"),
            clEnumValN(ActionType::CodeCompletion,
                       "code-completion", "Perform code completion"),
            clEnumValN(ActionType::REPLCodeCompletion,
@@ -403,6 +409,29 @@ DebugForbidTypecheckPrefix("debug-forbid-typecheck-prefix",
                  "a decl with the provided prefix name"),
   llvm::cl::cat(Category));
 
+// '-batch-code-completion' options.
+
+static llvm::cl::opt<uint64_t>
+RandomSeed("random-seed", llvm::cl::value_desc("seed"),
+                    llvm::cl::desc("Seed for the random number generator"),
+                    llvm::cl::cat(Category),
+                    llvm::cl::init(0));
+
+
+static llvm::cl::opt<std::string>
+CompletionOutputDir("completion-output-dir", llvm::cl::value_desc("path"),
+                    llvm::cl::desc("Directory for completion output"),
+                    llvm::cl::cat(Category));
+
+static llvm::cl::opt<std::string>
+FileCheckPath("filecheck", llvm::cl::value_desc("path"),
+                           llvm::cl::desc("Path to 'FileCheck' utility"),
+                           llvm::cl::cat(Category));
+
+static llvm::cl::opt<bool>
+SkipFileCheck("skip-filecheck", llvm::cl::desc("Skip 'FileCheck' checking"),
+                                llvm::cl::cat(Category));
+
 // '-code-completion' options.
 
 static llvm::cl::opt<std::string>
@@ -723,6 +752,10 @@ EnableSwiftSourceInfo("enable-swiftsourceinfo",
                  llvm::cl::cat(Category),
                  llvm::cl::init(false));
 
+static llvm::cl::opt<std::string>
+ExplicitSwiftModuleMap("explicit-swift-module-map-file",
+                       llvm::cl::desc("JSON file to include explicit Swift modules"),
+                       llvm::cl::cat(Category));
 } // namespace options
 
 static std::unique_ptr<llvm::MemoryBuffer>
@@ -876,6 +909,397 @@ static int doCodeCompletion(const CompilerInvocation &InitInvok,
                               CodeCompletionDiagnostics);
 }
 
+namespace {
+struct CompletionTestToken {
+  unsigned Line;
+  unsigned Column;
+  unsigned Offset;
+  StringRef Name;
+  SmallVector<StringRef, 1> CheckPrefixes;
+  StringRef Skip;
+  Optional<bool> IncludeKeywords = None;
+  Optional<bool> IncludeComments = None;
+
+  CompletionTestToken(unsigned Line, unsigned Column, unsigned Offset)
+      : Line(Line), Column(Column), Offset(Offset){};
+
+  static bool isStartOfToken(const char *Ptr) {
+    return Ptr[0] == '#' && Ptr[1] == '^';
+  }
+
+  static bool isEndOfToken(const char *Ptr) {
+    return Ptr[0] == '^' && Ptr[1] == '#';
+  }
+
+  static bool isValidTokenChar(char Chr) {
+    return (Chr >= 'A' && Chr <= 'Z') || (Chr >= 'a' && Chr <= 'z') ||
+           (Chr >= '0' && Chr <= '9') || Chr == '_' || Chr == '-' || Chr == '.';
+  }
+
+  static bool parseBooleanValue(StringRef Value, bool &Result,
+                                std::string &Error) {
+    if (Value.empty() || Value == "true" || Value == "1") {
+      Result = true;
+      return false;
+    }
+    if (Value == "false" || Value == "0") {
+      Result = false;
+      return false;
+    }
+
+    Error = "invalid value for keywords";
+    return true;
+  }
+
+  // #^TOKEN_NAME?check-prefix=CHECK1,CHECK2&keywords=1&comments=true^#
+  static bool parse(const char *&InputPtr, CompletionTestToken &Result,
+                    std::string &Error) {
+    auto Ptr = InputPtr;
+    assert(isStartOfToken(Ptr));
+    Ptr += 2;
+
+    // Parse the token name.
+    auto NameStart = Ptr;
+    while (isValidTokenChar(*Ptr)) { ++Ptr; }
+    Result.Name = StringRef(NameStart, Ptr - NameStart);
+
+    // Parse optional query string.
+    if (*Ptr == '?') {
+      ++Ptr;
+      auto QueryStart = Ptr;
+      while (!isEndOfToken(Ptr) && *Ptr != 0 && *Ptr != '\n' && *Ptr != '\r')
+        ++Ptr;
+      StringRef QueryString(QueryStart, Ptr - QueryStart);
+
+      while (!QueryString.empty()) {
+        StringRef Query, Key, Value;
+        std::tie(Query, QueryString) = QueryString.split(';');
+        std::tie(Key, Value) = Query.split('=');
+
+        if (Key == "check") {
+          // This value is passed to 'FileCheck --check-prefixes' as is.
+          Result.CheckPrefixes.push_back(Value);
+          continue;
+        }
+        if (Key == "keywords") {
+          Result.IncludeKeywords.emplace();
+          if (parseBooleanValue(Value, *Result.IncludeKeywords, Error))
+            return true;
+          continue;
+        }
+        if (Key == "comments") {
+          Result.IncludeComments.emplace();
+          if (parseBooleanValue(Value, *Result.IncludeComments, Error))
+            return true;
+          continue;
+        }
+        if (Key == "skip") {
+          Result.Skip = Value;
+          continue;
+        }
+        Error = "unknown option (" + Key.str() + ") for token";
+        return true;
+      }
+    }
+
+    // Default check prefix is the token name.
+    if (Result.CheckPrefixes.empty())
+      Result.CheckPrefixes.push_back(Result.Name);
+
+    // Tokens must end with '^#'.
+    if (!isEndOfToken(Ptr)) {
+      Error = "expected '^#' at the end of completion token";
+      return true;
+    }
+
+    InputPtr = Ptr + 2;
+    return false;;
+  }
+};
+
+static std::unique_ptr<llvm::MemoryBuffer>
+removeCodeCompletionTokens(llvm::MemoryBuffer *Input,
+                           SmallVectorImpl<CompletionTestToken> &Tokens,
+                           std::string &Error) {
+  const char *Start = Input->getBufferStart();
+  const char *End = Input->getBufferEnd();
+  assert(*End == 0 && "buffer must be nul terminated");
+
+  std::string Out;
+  Out.reserve(Input->getBufferSize());
+
+  llvm::StringSet<> seenTokenName;
+  const char *Ptr = Start;
+  const char *SegmentStart = Ptr;
+  unsigned Removed = 0;
+  unsigned Line = 1;
+  unsigned Column = 1;
+  while (Ptr != End) {
+    if (CompletionTestToken::isStartOfToken(Ptr)) {
+      Out.append(SegmentStart, Ptr - SegmentStart);
+
+      // Emplace a token with the offset, and parse it.
+      const char *TokenStart = Ptr;
+      Tokens.emplace_back(Line, Column, Ptr - Start - Removed);
+      if (CompletionTestToken::parse(Ptr, Tokens.back(), Error)) {
+        Error = "while parsing a token at " +
+                (llvm::utostr(Line) + ":" + llvm::utostr(Column)) + ": " +
+                Error;
+        return nullptr;
+      }
+
+      if (!seenTokenName.insert(Tokens.back().Name).second) {
+        Error = "Duplicated token name '" + Tokens.back().Name.str() +
+                "' at " + (llvm::utostr(Line) + ":" + llvm::utostr(Column));
+        return nullptr;
+      }
+
+      auto TokLen =  Ptr - TokenStart;
+      SegmentStart = Ptr;
+      Removed += TokLen;
+      Column += TokLen;
+      continue;
+    }
+    if (*Ptr == '\r' || *Ptr == '\n') {
+      Ptr += (Ptr[0] == '\r' && Ptr[1] == '\n') ? 2 : 1;
+      Line += 1;
+      Column = 1;
+      continue;
+    }
+    ++Ptr;
+    ++Column;
+  }
+  Out.append(SegmentStart, Ptr - SegmentStart);
+
+  return llvm::MemoryBuffer::getMemBufferCopy(Out,
+                                              Input->getBufferIdentifier());
+}
+
+} // namespace
+
+static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
+                                 StringRef SourceFilename,
+                                 bool CodeCompletionDiagnostics,
+                                 bool CodeCompletionKeywords,
+                                 bool CodeCompletionComments) {
+  auto FileBufOrErr = llvm::MemoryBuffer::getFile(SourceFilename);
+  if (!FileBufOrErr) {
+    llvm::errs() << "error opening input file: "
+                 << FileBufOrErr.getError().message() << '\n';
+    return 1;
+  }
+
+  // Completion results are output to
+  // '${OutputDir}/complete-{Token.Name}.result'.
+  SmallString<128> OutputDir;
+  if (!options::CompletionOutputDir.empty()) {
+    OutputDir = options::CompletionOutputDir;
+    if (auto result = llvm::sys::fs::create_directories(OutputDir))
+      return result.value();
+  } else if (!options::SkipFileCheck) {
+    llvm::errs() << "error: -completion-output-dir is needed unless "
+                    "-skip-filecheck is specified.\n";
+    return 1;
+  }
+
+  std::string Error;
+
+  llvm::SmallVector<CompletionTestToken, 0> CCTokens;
+  auto CleanFile =
+      removeCodeCompletionTokens(FileBufOrErr.get().get(), CCTokens, Error);
+  if (!CleanFile) {
+    llvm::errs() << "error: " << Error << "\n";
+    return 1;
+  }
+
+  if (!options::CodeCompletionToken.empty()) {
+    // If `-code-completion-token` is specified, test only that token.
+    // TODO: Multiple tokens.
+    StringRef TargetTokName = options::CodeCompletionToken;
+    Optional<CompletionTestToken> FoundTok;
+    for (auto Tok : CCTokens) {
+      if (Tok.Name == TargetTokName) {
+        FoundTok = Tok;
+        break;
+      }
+    }
+    if (FoundTok) {
+      CCTokens = {*FoundTok};
+    } else {
+      llvm::errs() << "error: could not find code completion token \""
+                   << TargetTokName << "\"\n";
+      return 1;
+    }
+  } else {
+    // Shuffle tokens to detect order-dependent bugs.
+    if (CCTokens.empty()) {
+      llvm::errs()
+          << "error: could not find any code completion tokens in input file\n";
+      return 1;
+    }
+    unsigned RandomSeed = options::RandomSeed;
+    if (RandomSeed == 0)
+      RandomSeed = std::chrono::system_clock::now().time_since_epoch().count();
+    llvm::errs() << "Use --random-seed=" << RandomSeed
+                 << " to reproduce the order of this run.\n";
+
+    std::shuffle(CCTokens.begin(), CCTokens.end(),
+                 std::default_random_engine(RandomSeed));
+  }
+
+  CompilerInvocation Invocation(InitInvok);
+  auto FileSystem = llvm::vfs::getRealFileSystem();
+
+  CompletionInstance CompletionInst;
+
+  std::unique_ptr<ide::OnDiskCodeCompletionCache> OnDiskCache;
+  if (!options::CompletionCachePath.empty())
+    OnDiskCache = std::make_unique<ide::OnDiskCodeCompletionCache>(
+        options::CompletionCachePath);
+  ide::CodeCompletionCache CompletionCache(OnDiskCache.get());
+
+  // Process tokens.
+  SmallVector<StringRef, 0> FailedTokens;
+  for (const auto &Token : CCTokens) {
+    if (!options::CodeCompletionToken.empty() &&
+        options::CodeCompletionToken != Token.Name)
+      continue;
+
+    llvm::errs() << "----\n";
+    llvm::errs() << "Token: " << Token.Name << "; offset=" << Token.Offset
+                 << "; pos=" << Token.Line << ":" << Token.Column;
+    for (auto Prefix : Token.CheckPrefixes) {
+      llvm::errs() << "; check=" << Prefix;
+    }
+    llvm::errs() << "\n";
+
+    // Skip tokens with '?skip=${reason}'.
+    if (!Token.Skip.empty()) {
+      llvm::errs() << "Skipped: " << Token.Skip << "\n";
+      continue;
+    }
+
+    auto IncludeKeywords = CodeCompletionKeywords;
+    if (Token.IncludeKeywords)
+      IncludeKeywords = *Token.IncludeKeywords;
+
+    auto IncludeComments = CodeCompletionComments;
+    if (Token.IncludeComments)
+      IncludeComments = *Token.IncludeComments;
+
+    // Store the result to a string.
+    std::string ResultStr;
+    llvm::raw_string_ostream OS(ResultStr);
+    OS << "// Token: "  << Token.Name << "\n";
+
+    auto Offset = Token.Offset;
+    auto completionBuffer = ide::makeCodeCompletionMemoryBuffer(
+        CleanFile.get(), Offset, CleanFile->getBufferIdentifier());
+
+    PrintingDiagnosticConsumer PrintDiags;
+    auto completionStart = std::chrono::high_resolution_clock::now();
+    bool isSuccess = CompletionInst.performOperation(
+        Invocation, /*Args=*/{}, FileSystem, completionBuffer.get(), Offset,
+        /*EnableASTCaching=*/true, Error,
+        CodeCompletionDiagnostics ? &PrintDiags : nullptr,
+        [&](CompilerInstance &CI, bool reusingASTContext) {
+          // Create a CodeCompletionConsumer.
+          std::unique_ptr<ide::CodeCompletionConsumer> Consumer(
+              new ide::PrintingCodeCompletionConsumer(OS, IncludeKeywords,
+                                                      IncludeComments));
+
+          // Create a factory for code completion callbacks that will feed the
+          // Consumer.
+          ide::CodeCompletionContext CompletionContext(CompletionCache);
+          std::unique_ptr<CodeCompletionCallbacksFactory> callbacksFactory(
+              ide::makeCodeCompletionCallbacksFactory(CompletionContext,
+                                                      *Consumer));
+
+          auto *SF = CI.getCodeCompletionFile();
+          performCodeCompletionSecondPass(*SF, *callbacksFactory);
+        });
+    auto completionEnd = std::chrono::high_resolution_clock::now();
+    auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+        completionEnd - completionStart);
+    llvm::errs() << "Elapsed: " << elapsed.count() << " msec\n";
+    OS.flush();
+
+    if (OutputDir.empty()) {
+      // If output directory is not specified, print the results to STDOUT.
+      llvm::outs() << ResultStr;
+      continue;
+    }
+
+    // Print to '${OutputDir}/complete-{Token.Name}.result'.
+    int resultFD;
+    SmallString<128> resultFilename(OutputDir);
+    llvm::sys::path::append(resultFilename,
+                            "complete-" + Token.Name + ".result");
+    if (auto res = llvm::sys::fs::openFileForWrite(resultFilename, resultFD)) {
+      llvm::errs() << "error: failed to create output file: "
+                   << resultFilename << "\n";
+      return res.value();
+    }
+
+    llvm::raw_fd_ostream fileOut(resultFD, /*shouldClose=*/true);
+    fileOut << ResultStr;
+    fileOut.close();
+
+    if (!isSuccess) {
+      llvm::errs() << "error: " << Error << "\n";
+      return 1;
+    }
+
+    if (options::SkipFileCheck)
+      continue;
+
+    assert(!options::FileCheckPath.empty());
+
+    bool isFileCheckFailed = false;
+    for (auto Prefix : Token.CheckPrefixes) {
+      StringRef FileCheckArgs[] = {options::FileCheckPath, SourceFilename,
+                                   "--check-prefixes",     Prefix,
+                                   "--input-file",         resultFilename};
+
+      int result =
+          llvm::sys::ExecuteAndWait(options::FileCheckPath, FileCheckArgs,
+                                    /*Env=*/None,
+                                    /*Redirects=*/{},
+                                    /*SecondsToWait=*/0,
+                                    /*MemoryLimit=*/0,
+                                    /*ErrMsg=*/&Error);
+      if (result != 0) {
+        isFileCheckFailed = true;
+        if (!Error.empty())
+          llvm::errs() << "error: " << Error << "\n";
+
+        // Output the FileCheck invocation.
+        llvm::errs() << "+";
+        for (auto arg : FileCheckArgs)
+          llvm::errs() << " " << arg;
+        llvm::errs() << "\n";
+      }
+    }
+
+    if (isFileCheckFailed) {
+      FailedTokens.push_back(Token.Name);
+    } else {
+      // The result may be huge. Remove the result if it's succeeded.
+      llvm::sys::fs::remove(resultFilename);
+    }
+  }
+
+  if (!FailedTokens.empty()) {
+    llvm::errs() << "----\n";
+    llvm::errs() << "Unexpected failures: ";
+    llvm::interleave(
+        FailedTokens, [&](StringRef name) { llvm::errs() << name; },
+        [&]() { llvm::errs() << ", "; });
+  }
+
+  return !FailedTokens.empty();
+}
+
 static int doREPLCodeCompletion(const CompilerInvocation &InitInvok,
                                 StringRef SourceFilename) {
   std::unique_ptr<llvm::MemoryBuffer> FileBuf;
@@ -3462,6 +3886,11 @@ int main(int argc, char *argv[]) {
   for (auto ConfigName : options::BuildConfigs)
     InitInvok.getLangOptions().addCustomConditionalCompilationFlag(ConfigName);
 
+  if (!options::ExplicitSwiftModuleMap.empty()) {
+    InitInvok.getSearchPathOptions().ExplicitSwiftModuleMap =
+      options::ExplicitSwiftModuleMap;
+    InitInvok.getFrontendOptions().DisableImplicitModules = true;
+  }
   // Process the clang arguments last and allow them to override previously
   // set options.
   if (!CCArgs.empty()) {
@@ -3526,6 +3955,19 @@ int main(int argc, char *argv[]) {
   case ActionType::DumpCompletionCache:
     llvm_unreachable("should be handled above");
 
+  case ActionType::BatchCodeCompletion:
+    if (options::FileCheckPath.empty() && !options::SkipFileCheck) {
+      llvm::errs() << "'FileCheck' path required or explicitly specify "
+                   << "'-skip-filecheck'\n";
+      return 1;
+    }
+    ExitCode = doBatchCodeCompletion(InitInvok,
+                                     options::SourceFilename,
+                                     options::CodeCompletionDiagnostics,
+                                     options::CodeCompletionKeywords,
+                                     options::CodeCompletionComments);
+    break;
+
   case ActionType::CodeCompletion:
     if (options::CodeCompletionToken.empty()) {
       llvm::errs() << "code completion token name required\n";
diff --git a/tools/swift-inspect/Sources/swift-inspect/main.swift b/tools/swift-inspect/Sources/swift-inspect/main.swift
index 0c14d546c5132..e42b6b8886d62 100644
--- a/tools/swift-inspect/Sources/swift-inspect/main.swift
+++ b/tools/swift-inspect/Sources/swift-inspect/main.swift
@@ -40,8 +40,10 @@ func dumpRawMetadata(
 ) throws {
   let backtraces = backtraceStyle != nil ? context.allocationBacktraces : [:]
   for allocation in context.allocations {
+    let tagNameC = swift_reflection_metadataAllocationTagName(context, allocation.tag)
+    let tagName = tagNameC.map(String.init) ?? "<unknown>"
     print("Metadata allocation at: \(hex: allocation.ptr) " +
-          "size: \(allocation.size) tag: \(allocation.tag)")
+          "size: \(allocation.size) tag: \(allocation.tag) (\(tagName))")
     printBacktrace(style: backtraceStyle, for: allocation.ptr, in: backtraces, inspector: inspector)
   }
 }
diff --git a/tools/swift-reflection-dump/swift-reflection-dump.cpp b/tools/swift-reflection-dump/swift-reflection-dump.cpp
index 999f467b06da8..c06ec35de5f81 100644
--- a/tools/swift-reflection-dump/swift-reflection-dump.cpp
+++ b/tools/swift-reflection-dump/swift-reflection-dump.cpp
@@ -458,7 +458,7 @@ class ObjectMemoryReader : public MemoryReader {
 #else
     auto applePlatform = false;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
     auto iosDerivedPlatform = true;
 #else
     auto iosDerivedPlatform = false;
diff --git a/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp b/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp
index 80aaf7d4ca6fd..a47ac394e3561 100644
--- a/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp
+++ b/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp
@@ -61,7 +61,7 @@ class ObjectMemoryReader : public MemoryReader {
 #else
     auto applePlatform = false;
 #endif
-#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV))
+#if defined(__APPLE__) && __APPLE__ && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_IOS) && TARGET_OS_WATCH) || (defined(TARGET_OS_TV) && TARGET_OS_TV) || defined(__arm64__))
     auto iosDerivedPlatform = true;
 #else
     auto iosDerivedPlatform = false;
diff --git a/tools/swift-remoteast-test/CMakeLists.txt b/tools/swift-remoteast-test/CMakeLists.txt
index ecf4c953a1857..b2c76e10faa59 100644
--- a/tools/swift-remoteast-test/CMakeLists.txt
+++ b/tools/swift-remoteast-test/CMakeLists.txt
@@ -10,6 +10,6 @@ set_target_properties(swift-remoteast-test PROPERTIES ENABLE_EXPORTS 1)
 
 # If building as part of clang, make sure the headers are installed.
 if(NOT SWIFT_BUILT_STANDALONE)
-  add_dependencies(swift clang-resource-headers)
+  add_dependencies(swift-frontend clang-resource-headers)
 endif()
 
diff --git a/unittests/AST/TestContext.cpp b/unittests/AST/TestContext.cpp
index 9cd85e28bd428..7b86295f5c179 100644
--- a/unittests/AST/TestContext.cpp
+++ b/unittests/AST/TestContext.cpp
@@ -40,7 +40,7 @@ TestContext::TestContext(ShouldDeclareOptionalTypes optionals)
   registerTypeCheckerRequestFunctions(Ctx.evaluator);
   auto stdlibID = Ctx.getIdentifier(STDLIB_NAME);
   auto *module = ModuleDecl::create(stdlibID, Ctx);
-  Ctx.LoadedModules[stdlibID] = module;
+  Ctx.addLoadedModule(module);
 
   FileForLookups = new (Ctx) SourceFile(*module, SourceFileKind::Library,
                                         /*buffer*/ None);
diff --git a/unittests/Reflection/CMakeLists.txt b/unittests/Reflection/CMakeLists.txt
index fdd3530ba7708..d63bcfe0b4668 100644
--- a/unittests/Reflection/CMakeLists.txt
+++ b/unittests/Reflection/CMakeLists.txt
@@ -5,6 +5,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
       TypeRef.cpp)
     target_include_directories(SwiftReflectionTests BEFORE PRIVATE
       ${SWIFT_SOURCE_DIR}/stdlib/include)
+    target_compile_definitions(SwiftReflectionTests PRIVATE
+      SWIFT_INLINE_NAMESPACE=__runtime)
     target_link_libraries(SwiftReflectionTests
       PRIVATE
       swiftReflection${SWIFT_PRIMARY_VARIANT_SUFFIX})
diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt
index a827a54610c00..3ca27587f9e7b 100644
--- a/unittests/runtime/CMakeLists.txt
+++ b/unittests/runtime/CMakeLists.txt
@@ -83,7 +83,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
   # with swiftCore_EXPORTS to permit exporting the stdlib interfaces.
   target_compile_definitions(SwiftRuntimeTests
                              PRIVATE
-                               swiftCore_EXPORTS)
+                               swiftCore_EXPORTS
+                               SWIFT_INLINE_NAMESPACE=__runtime)
 
   target_include_directories(SwiftRuntimeTests BEFORE PRIVATE
     ${SWIFT_SOURCE_DIR}/stdlib/include)
diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt
index e569e3f0554af..685d29f7547b3 100644
--- a/unittests/runtime/LongTests/CMakeLists.txt
+++ b/unittests/runtime/LongTests/CMakeLists.txt
@@ -47,7 +47,8 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
   # interfaces.
   target_compile_definitions(SwiftRuntimeLongTests
                              PRIVATE
-                               swiftCore_EXPORTS)
+                               swiftCore_EXPORTS
+                               SWIFT_INLINE_NAMESPACE=__runtime)
 
   # FIXME: cross-compile for all variants.
   target_link_libraries(SwiftRuntimeLongTests
diff --git a/userdocs/diagnostics/opaque-type-inference.md b/userdocs/diagnostics/opaque-type-inference.md
new file mode 100644
index 0000000000000..ebf63955530f5
--- /dev/null
+++ b/userdocs/diagnostics/opaque-type-inference.md
@@ -0,0 +1,68 @@
+# Underlying Type Inference for Opaque Result Types
+
+Opaque result types are a useful tool for abstracting the return type of a function or subscript, or type of a property. Although the concrete underlying type of an opaque type is hidden from clients, it is still inferred by the compiler, which enforces certain usage requirements:
+
+- Property declarations with opaque types must have an initializer expression or getter, and functions or subscripts returning opaque types must have at least one `return` statement:
+
+```swift
+let x: some Equatable // error: property declares an opaque return type, but has no initializer expression from which to infer an underlying type
+let y: some Equatable = 42 // OK
+let z: some Equatable { // Also OK
+  return "hello, " + "world!"
+}
+
+func foo() -> some Equatable { // error: function declares an opaque return type, but has no return statements in its body from which to infer an underlying type
+  fatalError("Unimplemented")
+}
+
+func bar() -> some Equatable { // OK
+  fatalError("Unimplemented")
+  return 42
+}
+```
+
+- The underlying type of an opaque type must be unique. In other words, if a function or subscript returns an opaque type, it must return values of the same underlying type from every `return` statement in its body.
+
+```swift
+func foo(bar: Bool) -> some Equatable { // error: function declares an opaque return type, but the return statements in its body do not have matching underlying types
+  if bar {
+    return "hello, world!" // note: return statement has underlying type 'String'
+  } else {
+    return 1 // note: return statement has underlying type 'Int'
+  }
+}
+
+func bar(baz: Bool) -> some Equatable { // OK, both branches of the if statement return a value of the same underlying type, Int.
+  if baz {
+    return 100
+  } else {
+    return 200
+  }
+}
+```
+
+- Functions returning opaque types may be recursive. However, such functions must have at least one `return` statement that returns a concrete underlying type as opposed to the function's own opaque result type. Additionally, recursive calls may not be used to create an infinitely recursive opaque type.
+
+```swift
+func foo(_ x: Int) -> some Equatable { // error: function declares an opaque return type, but has no return statements in its body from which to infer an underlying type
+  // Not allowed because there aren't any non-recursive returns to infer the underlying type from.
+  return foo(x+1)
+}
+
+struct EquatableWrapper<T: Equatable>: Equatable { var value: T }
+func foo() -> some Equatable { // error: function opaque return type was inferred as 'EquatableWrapper<some Equatable>', which defines the opaque type in terms of itself
+  // Not allowed because the use of EquatableWrapper creates an infinitely recursive underlying type: EquatableWrapper<EquatableWrapper<EquatableWrapper<...>>>...>
+  return EquatableWrapper(value: foo())
+}
+
+func bar(_ x: Int) -> some Equatable { // OK, the underlying type can be inferred from the second return statement.
+  if x > 0 {
+    return bar(x-1)
+  } else {
+    return x
+  }
+}
+```
+
+To learn more about opaque result types, see the [Opaque Types](https://docs.swift.org/swift-book/LanguageGuide/OpaqueTypes.html) section of _The Swift Programming Language_.
+
diff --git a/userdocs/diagnostics/protocol-type-non-conformance.md b/userdocs/diagnostics/protocol-type-non-conformance.md
new file mode 100644
index 0000000000000..47cc95193a130
--- /dev/null
+++ b/userdocs/diagnostics/protocol-type-non-conformance.md
@@ -0,0 +1,46 @@
+# Protocol type not conforming to itself
+Protocols in Swift may be used as types. Protocols as types are sometimes called existential types.
+
+
+```swift 
+protocol P {}
+
+struct S: P {}
+
+var s: P = S() // This creates existential type because the protocol P is used as a type
+```
+
+However, a protocol type does not conform to protocols - not even the protocol itself. 
+Allowing existential types to conform to protocols is unsound. For protocols with static method, initializer, or associated type requirements, the implementation of these requirements cannot be accessed from the protocol type - accessing these kinds of requirements must be done using a concrete type.
+
+Let's walk through the example below:
+
+```swift
+protocol Word: Hashable {
+    var word: String { get }
+}
+
+struct Singular: Word {
+    var word: String
+}
+
+struct Plural: Word {
+    var word: String
+}
+
+let singularWord = Singular(word: "mango")
+let pluralWord = Plural(word: "mangoes")
+
+let wordPairDict: [Word: Word] = [singularWord: pluralWord] // Error
+```
+
+One workaround to fix this problem is to use type erasure for the protocol `Word`. Think of type erasure as a way to hide an object's type. Since `Word` is of type `Hashable`, we already have `AnyHashable` type erasure available in the standard library which we can easily use here.
+
+```swift 
+// The fix
+let wordPairDict: [AnyHashable: AnyHashable] = [singularWord: pluralWord]
+```
+
+# Exceptions
+`@objc` protocol type with no static requirements however do conform to its own protocol. Another exception is the `Error` Swift protocol.
+
diff --git a/utils/PathSanitizingFileCheck b/utils/PathSanitizingFileCheck
index 55cc4a5d286ac..3496895ec0d07 100755
--- a/utils/PathSanitizingFileCheck
+++ b/utils/PathSanitizingFileCheck
@@ -67,20 +67,21 @@ constants.""")
 
     if args.enable_windows_compatibility:
         if args.enable_yaml_compatibility:
-            slashes_re = b'(/|\\\\\\\\|\\\\\\\\\\\\\\\\)'
+            slashes_re = r'(/|\\\\|\\\\\\\\)'
         else:
-            slashes_re = b'(/|\\\\\\\\)'
+            slashes_re = r'(/|\\\\)'
     else:
-        slashes_re = b'/'
+        slashes_re = r'/'
 
-    stdin = io.open(sys.stdin.fileno(), 'rb').read()
+    stdin = io.open(sys.stdin.fileno(), 'r', encoding='utf-8', errors='ignore').read()
 
     for s in args.sanitize_strings:
-        replacement, pattern = s.encode(encoding="utf-8").split(b'=', 1)
+        replacement, pattern = s.split('=', 1)
         # Since we want to use pattern as a regex in some platforms, we need
         # to escape it first, and then replace the escaped slash
         # literal (r'\\/') for our platform-dependent slash regex.
-        stdin = re.sub(re.sub(b'\\\\/', slashes_re, re.escape(pattern)),
+        stdin = re.sub(re.sub('\\\\/' if sys.version_info[0] < 3 else r'[/\\]',
+                              slashes_re, re.escape(pattern)),
                        replacement,
                        stdin)
 
@@ -90,7 +91,7 @@ constants.""")
     else:
         p = subprocess.Popen(
             [args.file_check_path] + unknown_args, stdin=subprocess.PIPE)
-        stdout, stderr = p.communicate(stdin)
+        stdout, stderr = p.communicate(stdin.encode('utf-8'))
         if stdout is not None:
             print(stdout)
         if stderr is not None:
diff --git a/utils/analyze_code_size.py b/utils/analyze_code_size.py
index f78ce3f1d4d7d..3e84cf18ff01d 100755
--- a/utils/analyze_code_size.py
+++ b/utils/analyze_code_size.py
@@ -7,6 +7,8 @@
 
 
 useCSV = False
+groupSpecializations = False
+listGroupSpecializations = False
 
 
 def main(arguments):
@@ -19,6 +21,10 @@ def main(arguments):
                         default=False)
     parser.add_argument('-list-category', type=str,
                         help='list symbols in category')
+    parser.add_argument('-group-specializations', action='store_true',
+                        help='group specializations')
+    parser.add_argument('-list-group-specializations', action='store_true',
+                        help='list group specializations')
     parser.add_argument('-csv', dest='use_csv', action='store_true',
                         help='print results as csv')
     parser.add_argument('-uncategorized', action='store_true',
@@ -34,6 +40,14 @@ def main(arguments):
         useCSV = True
         print("Using csv")
 
+    if args.group_specializations:
+        global groupSpecializations
+        groupSpecializations = True
+
+    if args.list_group_specializations:
+        global listGroupSpecializations
+        listGroupSpecializations = True
+
     segments = parse_segments(args.bin, args.arch)
 
     if args.build_categories:
@@ -82,14 +96,53 @@ def add(self, symbol):
         self.size += symbol.size
 
 
+class GenericSpecializationGroupKey(object):
+    def __init__(self, module_name, type_name, specialization):
+        self.module_name = module_name
+        self.type_name = type_name
+        self.specialization = specialization
+
+    def __hash__(self):
+        return hash((self.module_name, self.type_name, self.specialization))
+
+    def __eq__(self, other):
+        return (self.module_name == other.module_name
+                and self.type_name == other.type_name
+                and self.specialization == other.specialization)
+
+
+class GenericSpecialization(object):
+    def __init__(self, module_name, type_name, specialization):
+        self.module_name = module_name
+        self.type_name = type_name
+        self.specialization = specialization
+        self.size = 0
+        self.symbols = []
+
+    def add(self, symbol):
+        self.symbols.append(symbol)
+        self.size += symbol.size
+
+    def list_symbols(self):
+        sorted_symbols = []
+        for symbol in self.symbols:
+            sorted_symbols.append((symbol.name, symbol.size))
+        sorted_symbols.sort(key=lambda entry: entry[1], reverse=True)
+        for symbol in sorted_symbols:
+            print("%9d %s" % (symbol[1], symbol[0]))
+
+
 class Categories(object):
     def __init__(self):
         self.category_matching = [
             ['Objective-C function', re.compile(r'.*[+-]\[')],
             ['C++', re.compile(r'_+swift')],
-            ['Generic specialization of stdlib', 
-                re.compile(r'.*generic specialization.* of Swift\.')],
-            ['Generic specialization', 
+            ['Generic specialization of stdlib',
+                re.compile(
+                    r'.*generic specialization.* of ' +
+                    r'(static )?(\(extension in Swift\):)?Swift\.'
+                )],
+            ['Generic specialization',
                 re.compile(r'.*generic specialization')],
             ['Merged function', re.compile(r'merged ')],
             ['Key path', re.compile(r'key path')],
@@ -178,6 +231,44 @@ def __init__(self):
             ['Swift unknown', re.compile(r'^_\$s.*')],
         ]
         self.categories = {}
+        self.specializations = {}
+        self.specialization_matcher = re.compile(
+            r'.*generic specialization <(?P<spec_list>.*)> of' +
+            r' (static )?(\(extension in Swift\):)?(?P<module_name>[^.]*)\.' +
+            r'(?:(?P<first_type>[^.^(^<]*)\.){0,1}' +
+            r'(?:(?P<last_type>[^.^(^<]*)\.)*(?P<function_name>[^(^<]*)'
+        )
+        self.single_stdlib_specialized_type_matcher = re.compile(
+            r'(Swift\.)?[^,^.]*$'
+        )
+        self.two_specialized_stdlib_types_matcher = re.compile(
+            r'(Swift\.)?[^,^.]*, (Swift\.)?[^,^.]*$'
+        )
+        self.single_specialized_foundation_type_matcher = re.compile(
+            r'(Foundation\.)?[^,^.]*$'
+        )
+        self.two_specialized_foundation_types_matcher = re.compile(
+            r'(Swift\.)?[^,^.]*, (Foundation\.)?[^,^.]*$'
+        )
+        self.two_specialized_foundation_types_matcher2 = re.compile(
+            r'(Foundation\.)?[^,^.]*, (Foundation\.)?[^,^.]*$'
+        )
+        self.two_specialized_foundation_types_matcher3 = re.compile(
+            r'(Foundation\.)?[^,^.]*, (Swift\.)?[^,^.]*$'
+        )
+        self.array_type_matcher = re.compile(r'Array')
+        self.dictionary = re.compile(r'Array')
+        self.single_specialized_types_matcher = re.compile(
+            r'(?P<module_name>[^,^.]*)\.([^,^.]*\.)*(?P<type_name>[^,^.]*)$'
+        )
+        self.is_class_type_dict = {}
+        self.stdlib_and_other_type_matcher = re.compile(
+            r'(Swift\.)?[^,^.]*, (?P<module_name>[^,^.]*)\.(?P<type_name>[^,^.]*)$'
+        )
+        self.foundation_and_other_type_matcher = re.compile(
+            r'(Foundation\.)?[^,^.]*, (?P<module_name>[^,^.]*)\.' +
+            r'(?P<type_name>[^,^.]*)$'
+        )
 
     def categorize_by_name(self, symbol):
         for c in self.category_matching:
@@ -204,12 +295,121 @@ def add(self, symbol):
         category_name = self.categorize_by_name(symbol)
         if category_name:
             self.add_symbol(category_name, symbol)
+            if (groupSpecializations and
+                    category_name == 'Generic specialization of stdlib'):
+                self.add_specialization(symbol)
             return
         category_name = self.categorize_by_mangled_name(symbol)
         if category_name:
             self.add_symbol(category_name, symbol)
         else:
             self.add_symbol('Unknown', symbol)
+        if (groupSpecializations and
+                category_name == 'Generic specialization of stdlib'):
+            self.add_specialization(symbol)
+
+    def is_class_type_(self, type_name, mangled_name):
+        match_class_name = str(len(type_name)) + type_name + 'C'
+        if match_class_name in mangled_name:
+            return True
+        return False
+
+    def is_class_type(self, type_name, mangled_name):
+        existing_categorization = self.is_class_type_dict.get(type_name, 3)
+        if existing_categorization == 3:
+            is_class = self.is_class_type_(type_name, mangled_name)
+            self.is_class_type_dict[type_name] = is_class
+            return is_class
+        else:
+            return existing_categorization
+
+    def is_dictionary_like_type(self, type_name):
+        if 'Dictionary' in type_name:
+            return True
+        if 'Set' in type_name:
+            return True
+        return False
+
+    def group_library_types(self, module, type_name, specialization, mangled_name):
+        if module != 'Swift':
+            return module, type_name, specialization
+        if self.single_stdlib_specialized_type_matcher.match(specialization):
+            return module, 'stdlib', 'stdlib'
+        if self.two_specialized_stdlib_types_matcher.match(specialization):
+            return module, 'stdlib', 'stdlib'
+        if self.single_specialized_foundation_type_matcher.match(specialization):
+            return module, 'stdlib', 'foundation'
+        if self.two_specialized_foundation_types_matcher.match(specialization):
+            return module, 'stdlib', 'foundation'
+        if self.two_specialized_foundation_types_matcher2.match(specialization):
+            return module, 'stdlib', 'foundation'
+        if self.two_specialized_foundation_types_matcher3.match(specialization):
+            return module, 'stdlib', 'foundation'
+        single_spec = self.single_specialized_types_matcher.match(specialization)
+        if single_spec:
+            is_class = self.is_class_type(single_spec.group('type_name'), mangled_name)
+            is_dict = type_name is not None and self.is_dictionary_like_type(type_name)
+            if not is_dict and is_class:
+                return module, 'stdlib', 'class'
+            if is_dict and is_class:
+                return module, 'stdlib', 'class(dict)'
+        stdlib_other_spec = self.stdlib_and_other_type_matcher.match(specialization)
+        if stdlib_other_spec:
+            is_class = self.is_class_type(stdlib_other_spec.group('type_name'),
+                                          mangled_name)
+            if is_class:
+                return module, 'stdlib', 'stdlib, class'
+        foundation_other_spec = self.foundation_and_other_type_matcher.match(
+            specialization)
+        if foundation_other_spec:
+            is_class = self.is_class_type(foundation_other_spec.group('type_name'),
+                                          mangled_name)
+            if is_class:
+                return module, 'stdlib', 'foundation, class'
+        return module, 'stdlib', 'other'
+
+    def add_specialization(self, symbol):
+        specialization_match = self.specialization_matcher.match(symbol.name)
+        if specialization_match:
+            module = specialization_match.group('module_name')
+            type_name = specialization_match.group('first_type')
+            specialization = specialization_match.group('spec_list')
+            module, type_name, specialization = self.group_library_types(
+                module, type_name, specialization, symbol.mangled_name)
+            key = GenericSpecializationGroupKey(module, type_name, specialization)
+            existing_specialization = self.specializations.get(key)
+            if existing_specialization:
+                existing_specialization.add(symbol)
+            else:
+                new_specialization = GenericSpecialization(module, type_name,
+                                                           specialization)
+                new_specialization.add(symbol)
+                self.specializations[key] = new_specialization
+        else:
+            print(symbol.name)
+            print('not matched')
+        return
+
+    def print_specializations(self):
+        values = self.specializations.values()
+        sorted_specializations = []
+        for v in values:
+            sorted_specializations.append(v)
+
+        if not sorted_specializations:
+            return None
+        else:
+            sorted_specializations.sort(key=lambda entry: entry.specialization)
+            sorted_specializations.sort(key=lambda entry: entry.type_name)
+            sorted_specializations.sort(key=lambda entry: entry.module_name)
+            print("Specialization info")
+            for spec in sorted_specializations:
+                print("%20s.%s %20s %8d" % (spec.module_name, spec.type_name,
+                                            spec.specialization, spec.size))
+                if listGroupSpecializations:
+                    spec.list_symbols()
+            print("")
+            return None
 
     def categorize(self, symbols):
         for sym in symbols:
@@ -361,6 +561,8 @@ def categorize(segments):
             categories.categorize(symbols)
             categories.print_summary(section.size)
             print('')
+            if groupSpecializations:
+                categories.print_specializations()
 
 
 def uncategorized(segments):
@@ -382,6 +584,9 @@ def list_category(segments, category):
                 print('Section %22s: %8d' %
                       (segment.name + ';' + section.name, section.size))
                 categories.print_category(category)
+                print('')
+                if groupSpecializations:
+                    categories.print_specializations()
 
 
 if __name__ == '__main__':
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index d8f302ffe4cc1..9eaa76a841a99 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -760,7 +760,6 @@ assertions
 # compiler significantly.
 [preset: mixin_lightweight_assertions]
 assertions
-no-swift-stdlib-assertions
 
 # FIXME: This should be:
 # no-assertions
@@ -772,6 +771,12 @@ dash-dash
 # AST verifier slows down the compiler significantly.
 swift-enable-ast-verifier=0
 
+[preset: mixin_lightweight_assertions,no-stdlib-asserts]
+mixin-preset=
+    mixin_lightweight_assertions
+
+no-swift-stdlib-assertions
+
 #===------------------------------------------------------------------------===#
 # Linux Builders
 #===------------------------------------------------------------------------===#
@@ -870,7 +875,7 @@ mixin-preset=
 
 [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
 mixin-preset=
-    mixin_lightweight_assertions
+    mixin_lightweight_assertions,no-stdlib-asserts
     mixin_linux_install_components_with_clang
 build-subdir=buildbot_linux
 
@@ -1287,7 +1292,7 @@ installable-package=%(installable_package)s
 mixin-preset=
     mixin_osx_package_base
     mixin_osx_package_test
-    mixin_lightweight_assertions
+    mixin_lightweight_assertions,no-stdlib-asserts
 
 
 [preset: buildbot_osx_package,no_assertions]
@@ -1701,6 +1706,22 @@ assertions
 swiftsyntax
 swiftsyntax-verify-generated-files
 
+#===------------------------------------------------------------------------===#
+# Test Swift Format
+#===------------------------------------------------------------------------===#
+
+[preset: buildbot_swiftformat_macos]
+mixin-preset=mixin_swiftpm_package_macos_platform
+release
+assertions
+swiftformat
+
+[preset: buildbot_swiftformat_linux]
+mixin-preset=mixin_swiftpm_package_linux_platform
+release
+assertions
+swiftformat
+
 #===------------------------------------------------------------------------===#
 # Test Swift Stress Tester
 #===------------------------------------------------------------------------===#
diff --git a/utils/build-script b/utils/build-script
index 47ef2165b7766..c0493460bc626 100755
--- a/utils/build-script
+++ b/utils/build-script
@@ -352,6 +352,19 @@ def apply_default_arguments(toolchain, args):
                 target.arch in supported_archs)
         ]
 
+    # Filter out any macOS stdlib deployment targets that are not supported
+    # by the macOS SDK.
+    if platform.system() == "Darwin":
+        targets = StdlibDeploymentTarget.get_targets_by_name(
+            args.stdlib_deployment_targets)
+        args.stdlib_deployment_targets = [
+            target.name
+            for target in targets
+            if (target.platform.is_darwin and
+                target.platform.sdk_supports_architecture(
+                    target.arch, args.darwin_xcrun_toolchain))
+        ]
+
     # Include the Darwin module-only architectures in the CMake options.
     if args.swift_darwin_module_archs:
         args.extra_cmake_options.append(
@@ -701,6 +714,11 @@ class BuildScriptInvocation(object):
                 "--host-lipo", toolchain.lipo,
             ]
 
+            # Isolate build from the system; Darwin toolchains build against SDKs.
+            args.extra_cmake_options.append(
+                '-DCMAKE_IGNORE_PATH=/usr/lib;/usr/local/lib;/lib'
+            )
+
         if toolchain.libtool is not None:
             impl_args += [
                 "--host-libtool", toolchain.libtool,
@@ -857,10 +875,14 @@ class BuildScriptInvocation(object):
         product_classes = []
         if self.args.build_swiftpm:
             product_classes.append(products.SwiftPM)
+        if self.args.build_swift_driver:
+            product_classes.append(products.SwiftDriver)
         if self.args.build_swiftsyntax:
             product_classes.append(products.SwiftSyntax)
         if self.args.build_skstresstester:
             product_classes.append(products.SKStressTester)
+        if self.args.build_swiftformat:
+            product_classes.append(products.SwiftFormat)
         if self.args.build_swiftevolve:
             product_classes.append(products.SwiftEvolve)
         if self.args.build_indexstoredb:
diff --git a/utils/build-script-impl b/utils/build-script-impl
index e7414a74486e5..71057c73630cb 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -417,15 +417,20 @@ function verify_host_is_supported() {
       | linux-powerpc64le       \
       | linux-s390x             \
       | macosx-x86_64           \
+      | macosx-arm64            \
+      | macosx-arm64e           \
       | iphonesimulator-i386    \
       | iphonesimulator-x86_64  \
+      | iphonesimulator-arm64   \
       | iphoneos-armv7          \
       | iphoneos-armv7s         \
       | iphoneos-arm64          \
       | iphoneos-arm64e         \
       | appletvsimulator-x86_64 \
+      | appletvsimulator-arm64  \
       | appletvos-arm64         \
       | watchsimulator-i386     \
+      | watchsimulator-arm64    \
       | watchos-armv7k          \
       | android-armv7           \
       | android-aarch64)
@@ -494,6 +499,24 @@ function set_build_options_for_host() {
                     SWIFT_HOST_VARIANT_SDK="OSX"
                     cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
                     ;;
+                macosx-arm64)
+                    xcrun_sdk_name="macosx"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    SWIFT_HOST_VARIANT="macosx"
+                    SWIFT_HOST_VARIANT_SDK="OSX"
+                    SWIFT_HOST_VARIANT_ARCH="arm64"
+                    cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    ;;
+                macosx-arm64e)
+                    xcrun_sdk_name="macosx"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64e-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    SWIFT_HOST_VARIANT="macosx"
+                    SWIFT_HOST_VARIANT_SDK="OSX"
+                    SWIFT_HOST_VARIANT_ARCH="arm64e"
+                    cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
+                    ;;
                 iphonesimulator-i386)
                     SWIFT_HOST_TRIPLE="i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
                     llvm_target_arch="X86"
@@ -508,6 +531,21 @@ function set_build_options_for_host() {
                     SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
                     cmake_osx_deployment_target=""
                     ;;
+                iphonesimulator-arm64)
+                    xcrun_sdk_name="iphonesimulator"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
+                    SWIFT_HOST_VARIANT="iphonesimulator"
+                    SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
+                    SWIFT_HOST_VARIANT_ARCH="arm64"
+
+                    cmake_osx_deployment_target=""
+                    cmark_cmake_options=(
+                        -DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
+                    )
+                    ;;
                 iphoneos-armv7)
                     SWIFT_HOST_TRIPLE="armv7-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
                     llvm_target_arch="ARM"
@@ -543,6 +581,21 @@ function set_build_options_for_host() {
                     SWIFT_HOST_VARIANT_SDK="TVOS_SIMULATOR"
                     cmake_osx_deployment_target=""
                     ;;
+                appletvsimulator-arm64)
+                    xcrun_sdk_name="appletvsimulator"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
+                    SWIFT_HOST_VARIANT="appletvsimulator"
+                    SWIFT_HOST_VARIANT_SDK="TVOS_SIMULATOR"
+                    SWIFT_HOST_VARIANT_ARCH="arm64"
+
+                    cmake_osx_deployment_target=""
+                    cmark_cmake_options=(
+                        -DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
+                    )
+                    ;;
                 appletvos-arm64)
                     SWIFT_HOST_TRIPLE="arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
                     llvm_target_arch="AArch64"
@@ -557,6 +610,21 @@ function set_build_options_for_host() {
                     SWIFT_HOST_VARIANT_SDK="WATCHOS_SIMULATOR"
                     cmake_osx_deployment_target=""
                     ;;
+                watchsimulator-arm64)
+                    xcrun_sdk_name="watchsimulator"
+                    llvm_target_arch="AArch64"
+                    SWIFT_HOST_TRIPLE="arm64-apple-watchos${DARWIN_DEPLOYMENT_VERSION_IOS}-simulator"
+                    SWIFT_HOST_VARIANT="watchsimulator"
+                    SWIFT_HOST_VARIANT_SDK="WATCHOS_SIMULATOR"
+                    SWIFT_HOST_VARIANT_ARCH="arm64"
+
+                    cmake_osx_deployment_target=""
+                    cmark_cmake_options=(
+                        -DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
+                        -DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
+                    )
+                    ;;
                 watchos-armv7k)
                     SWIFT_HOST_TRIPLE="armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
                     llvm_target_arch="ARM"
@@ -584,6 +652,17 @@ function set_build_options_for_host() {
 
             cmake_os_sysroot="$(xcrun --sdk ${platform} --show-sdk-path)"
 
+            # Customize the CMake `find_*` search paths to search the SDK
+            # sysroot before searching `pkg-config` paths. This prevents compile
+            # failures caused when `pkg-config` returns CommandLineTools paths
+            # instead of Xcode paths.
+            #
+            # These search paths can be user customized either by setting the
+            # `CMAKE_PREFIX_PATH` environment variable, or by setting the same
+            # CMake variable via the command line (`-DCMAKE_PREFIX_PATH`).
+            # See https://cmake.org/cmake/help/latest/command/find_path.html
+            export CMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}:${cmake_os_sysroot}/usr"
+
             cmark_cmake_options=(
                 -DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
                 -DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
@@ -630,10 +709,19 @@ function set_build_options_for_host() {
     esac
 
 
-    llvm_cmake_options+=(
-        -DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
-        -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
-    )
+    # We don't currently support building compiler-rt for cross-compile targets.
+    # It's not clear that's useful anyway.
+    if [[ $(is_cross_tools_host "${host}") ]] ; then
+      llvm_cmake_options+=(
+          -DLLVM_TOOL_COMPILER_RT_BUILD:BOOL=FALSE
+          -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=FALSE
+      )
+    else
+      llvm_cmake_options+=(
+          -DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
+          -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
+      )
+    fi
 
     # If we are asked to not generate test targets for LLVM and or Swift,
     # disable as many LLVM tools as we can. This improves compile time when
@@ -842,11 +930,6 @@ if [[ "${CMAKE_GENERATOR}" == "Xcode" ]]; then
     SKIP_BUILD_COMPILER_RT=1
 fi
 
-# FIXME: We currently do not support cross-compiling swift with compiler-rt.
-if [[ "${CROSS_COMPILE_HOSTS}" ]]; then
-    SKIP_BUILD_COMPILER_RT=1
-fi
-
 if [[ "${SKIP_RECONFIGURE}" ]]; then
     RECONFIGURE=""
 fi
@@ -921,7 +1004,7 @@ function false_true() {
 CROSS_COMPILE_HOSTS=($CROSS_COMPILE_HOSTS)
 for t in "${CROSS_COMPILE_HOSTS[@]}"; do
     case ${t} in
-        iphone* | appletv* | watch* | linux-armv6 | linux-armv7 | android-* )
+        macosx-arm64* | iphone* | appletv* | watch* | linux-armv6 | linux-armv7 | android-* )
             ;;
         *)
             echo "Unknown host to cross-compile for: ${t}"
@@ -952,6 +1035,9 @@ function get_host_install_destdir() {
         if [[ $(should_include_host_in_lipo ${host}) ]]; then
             # If this is one of the hosts we should lipo, install in to a temporary subdirectory.
             local host_install_destdir="${BUILD_DIR}/intermediate-install/${host}"
+        elif [[ "${host}" == "merged-hosts" ]]; then
+            # This assumes that all hosts are merged to the lipo.
+            local host_install_destdir="${INSTALL_DESTDIR}"
         else
             local host_install_destdir="${INSTALL_DESTDIR}/${host}"
         fi
@@ -1013,7 +1099,7 @@ function should_include_host_in_lipo() {
     local host="$1"
     if [[ $(has_cross_compile_hosts) ]] && [[ -z "${SKIP_MERGE_LIPO_CROSS_COMPILE_TOOLS}" ]]; then
         case ${host} in
-            iphone* | appletv* | watch* )
+            macosx* | iphone* | appletv* | watch* )
                 echo 1
                 ;;
         esac
@@ -1030,6 +1116,10 @@ function host_has_darwin_symbols() {
 }
 
 function get_stdlib_targets_for_host() {
+    # Don't build the stdlib in the Xcode train for host and cross-compilations host.
+    if [[ "${STDLIB_DEPLOYMENT_TARGETS[@]}" == "" ]]; then
+        return 0
+    fi
 
 # FIXME: STDLIB_DEPLOYMENT_TARGETS argument assumed to apply when Host == Build
 # Cross-compile Hosts are only built with their native standard libraries.
@@ -1188,6 +1278,9 @@ function common_cross_c_flags() {
     local arch=${host##*-}
 
     case $host in
+        macosx-*)
+            echo -n " -arch ${arch} "
+            ;;
         iphonesimulator-*)
             echo -n " -arch ${arch}  -mios-simulator-version-min=${DARWIN_DEPLOYMENT_VERSION_IOS}"
             ;;
@@ -1942,7 +2035,6 @@ for host in "${ALL_HOSTS[@]}"; do
                         "${cmake_options[@]}"
 
                         -DSQLite3_INCLUDE_DIR:PATH="$(xcrun -sdk macosx -show-sdk-path)/usr/include"
-                        -DSQLite3_LIBRARY:PATH="/usr/lib/libsqlite3.dylib"
                     )
                 fi
                 ;;
@@ -2812,6 +2904,15 @@ for host in "${ALL_HOSTS[@]}"; do
     if [[ "${DARWIN_INSTALL_EXTRACT_SYMBOLS}" ]] && [[ $(host_has_darwin_symbols ${host}) ]]; then
         echo "--- Extracting symbols ---"
 
+        # The usage for this script says that lipo happens before
+        # dsym extraction but that's not really what happens.  At this point,
+        # we're processing an individual host (eg macosx-x86_64) but targeting
+        # the (shared) SYMROOT which can cause mutliple hosts to stomp on each
+        # other.  As a hack, I'm segregating the hosts in the symroot but it
+        # would probably be better to make the script behave as the usage
+        # descibes
+        host_symroot="${INSTALL_SYMROOT}/${host}"
+
         # FIXME: Since it's hard to trace output pipe call,
         #        For now, We don't support dry-run trace for this block
         #        Instead, just echo we do "darwin_intall_extract_symbols".
@@ -2826,7 +2927,7 @@ for host in "${ALL_HOSTS[@]}"; do
             # Copy executables and shared libraries from the `host_install_destdir` to
             # INSTALL_SYMROOT and run dsymutil on them.
             (cd "${CURRENT_INSTALL_DIR}" &&
-             find ./"${CURRENT_PREFIX}" -perm -0111 -type f -print | cpio --insecure -pdm "${INSTALL_SYMROOT}")
+             find ./"${CURRENT_PREFIX}" -perm -0111 -type f -print | cpio --insecure -pdm "${host_symroot}")
 
             dsymutil_path=
             if [[ -n "${DARWIN_INSTALL_EXTRACT_SYMBOLS_USE_JUST_BUILT_DSYMUTIL}" ]]; then
@@ -2839,7 +2940,7 @@ for host in "${ALL_HOSTS[@]}"; do
             #
             # Exclude shell scripts and static archives.
             # Exclude swift-api-digester dSYM to reduce debug toolchain size.
-            (cd "${INSTALL_SYMROOT}" &&
+            (cd "${host_symroot}" &&
              find ./"${CURRENT_PREFIX}" -perm -0111 -type f -print | \
                grep -v '.py$' | \
                grep -v '.a$' | \
@@ -2992,21 +3093,21 @@ done
 
 # Lipo those products which require it, optionally build and test an installable package.
 mergedHost="merged-hosts"
-if [[ ${#LIPO_SRC_DIRS[@]} -gt 0 ]] && [[ $(should_execute_action "${mergedHost}-lipo") ]]; then
+if [[ ${#LIPO_SRC_DIRS[@]} -gt 0 ]]; then
     # This is from multiple hosts; Which host should we say it is?
     # Let's call it 'merged-hosts' so that we can identify it.
 
-    echo "--- Merging and running lipo ---"
+    if [[ $(should_execute_action "${mergedHost}-lipo") ]]; then
+        # Allow passing lipo with --host-lipo
+        if [[ -z "${HOST_LIPO}" ]] ; then
+            LIPO_PATH=$(xcrun_find_tool lipo)
+        else
+            LIPO_PATH="${HOST_LIPO}"
+        fi
+        call "${SWIFT_SOURCE_DIR}"/utils/recursive-lipo --lipo=${LIPO_PATH} --copy-subdirs="$(get_host_install_prefix ${host})lib/swift $(get_host_install_prefix ${host})lib/swift_static" --destination="$(get_host_install_destdir ${mergedHost})" ${LIPO_SRC_DIRS[@]}
 
-    # Allow passing lipo with --host-lipo
-    if [[ -z "${HOST_LIPO}" ]] ; then
-        LIPO_PATH=$(xcrun_find_tool lipo)
-    else
-        LIPO_PATH="${HOST_LIPO}"
+        # Build and test the lipo-ed package.
+        build_and_test_installable_package ${mergedHost}
     fi
-    call "${SWIFT_SOURCE_DIR}"/utils/recursive-lipo --lipo=${LIPO_PATH} --copy-subdirs="$(get_host_install_prefix ${host})lib/swift $(get_host_install_prefix ${host})lib/swift_static" --destination="$(get_host_install_destdir ${mergedHost})" ${LIPO_SRC_DIRS[@]}
-
-    # Build and test the lipo-ed package.
-    build_and_test_installable_package ${mergedHost}
 fi
 # END
diff --git a/utils/build-windows.bat b/utils/build-windows.bat
index ca62cfef8f43e..3c9c11e65ff49 100644
--- a/utils/build-windows.bat
+++ b/utils/build-windows.bat
@@ -97,6 +97,7 @@ git clone --depth 1 --single-branch https://github.com/apple/swift-cmark cmark %
 git clone --depth 1 --single-branch --branch swift/master https://github.com/apple/llvm-project llvm-project %exitOnError%
 mklink /D "%source_root%\clang" "%source_root%\llvm-project\clang"
 mklink /D "%source_root%\llvm" "%source_root%\llvm-project\llvm"
+mklink /D "%source_root%\lld" "%source_root%\llvm-project\lld"
 mklink /D "%source_root%\lldb" "%source_root%\llvm-project\lldb"
 mklink /D "%source_root%\compiler-rt" "%source_root%\llvm-project\compiler-rt"
 mklink /D "%source_root%\libcxx" "%source_root%\llvm-project\libcxx"
@@ -165,7 +166,7 @@ cmake^
     -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-windows-msvc^
     -DLLVM_ENABLE_PDB:BOOL=YES^
     -DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
-    -DLLVM_ENABLE_PROJECTS:STRING=clang^
+    -DLLVM_ENABLE_PROJECTS:STRING=lld;clang^
     -DLLVM_TARGETS_TO_BUILD:STRING="AArch64;ARM;X86"^
     -DLLVM_INCLUDE_BENCHMARKS:BOOL=NO^
     -DLLVM_INCLUDE_DOCS:BOOL=NO^
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
index 04d5eef190834..e0ba50d143734 100644
--- a/utils/build_swift/build_swift/driver_arguments.py
+++ b/utils/build_swift/build_swift/driver_arguments.py
@@ -184,10 +184,12 @@ def _apply_default_arguments(args):
         args.test_watchos = False
         args.test_android = False
         args.test_swiftpm = False
+        args.test_swift_driver = False
         args.test_swiftsyntax = False
         args.test_indexstoredb = False
         args.test_sourcekitlsp = False
         args.test_skstresstester = False
+        args.test_swiftformat = False
         args.test_swiftevolve = False
         args.test_toolchainbenchmarks = False
 
@@ -571,9 +573,15 @@ def create_argument_parser():
     option(['--skstresstester'], store_true('build_skstresstester'),
            help='build the SourceKit stress tester')
 
+    option(['--swiftformat'], store_true('build_swiftformat'),
+           help='build swift-format')
+
     option(['--swiftevolve'], store_true('build_swiftevolve'),
            help='build the swift-evolve tool')
 
+    option(['--swift-driver'], toggle_true('build_swift_driver'),
+           help='build swift-driver')
+
     option(['--indexstore-db'], toggle_true('build_indexstoredb'),
            help='build IndexStoreDB')
     option('--test-indexstore-db-sanitize-all',
@@ -596,6 +604,8 @@ def create_argument_parser():
            help='install SourceKitLSP')
     option(['--install-skstresstester'], toggle_true('install_skstresstester'),
            help='install the SourceKit stress tester')
+    option(['--install-swift-driver'], toggle_true('install_swift_driver'),
+           help='install new Swift driver')
     option(['--install-swiftevolve'], toggle_true('install_swiftevolve'),
            help='install SwiftEvolve')
     option(['--toolchain-benchmarks'],
@@ -1009,6 +1019,8 @@ def create_argument_parser():
 
     option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
            help='skip testing swiftpm')
+    option('--skip-test-swift-driver', toggle_false('test_swift_driver'),
+           help='skip testing Swift driver')
     option('--skip-test-swiftsyntax', toggle_false('test_swiftsyntax'),
            help='skip testing SwiftSyntax')
     option('--skip-test-indexstore-db', toggle_false('test_indexstoredb'),
@@ -1020,6 +1032,8 @@ def create_argument_parser():
            help='skip testing PlaygroundSupport')
     option('--skip-test-skstresstester', toggle_false('test_skstresstester'),
            help='skip testing the SourceKit Stress tester')
+    option('--skip-test-swiftformat', toggle_false('test_swiftformat'),
+           help='skip testing swift-format')
     option('--skip-test-swiftevolve', toggle_false('test_swiftevolve'),
            help='skip testing SwiftEvolve')
     option('--skip-test-toolchain-benchmarks',
diff --git a/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata b/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata
index ef015dfc533d6..92ad6dd28df5b 100644
--- a/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata
+++ b/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata
@@ -7,6 +7,9 @@
    <FileRef
       location = "group:../../../../swift-stress-tester/SourceKitStressTester">
    </FileRef>
+   <FileRef
+      location = "group:../../../../swift-format">
+   </FileRef>
    <FileRef
       location = "group:../../../../swift-stress-tester/SwiftEvolve">
    </FileRef>
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
index 160fdcd8e2fe5..8f2c1e08ed90a 100644
--- a/utils/build_swift/tests/expected_options.py
+++ b/utils/build_swift/tests/expected_options.py
@@ -89,16 +89,19 @@
     'build_swift_static_stdlib': False,
     'build_swift_stdlib_unittest_extra': False,
     'build_swiftpm': False,
+    'build_swift_driver': False,
     'build_swiftsyntax': False,
     'build_tensorflow_swift_apis': False,
     'build_libparser_only': False,
     'build_skstresstester': False,
+    'build_swiftformat': False,
     'build_swiftevolve': False,
     'build_indexstoredb': False,
     'test_indexstoredb_sanitize_all': False,
     'test_sourcekitlsp_sanitize_all': False,
     'build_sourcekitlsp': False,
     'install_swiftpm': False,
+    'install_swift_driver': False,
     'install_swiftsyntax': False,
     'swiftsyntax_verify_generated_files': False,
     'install_playgroundsupport': False,
@@ -230,10 +233,12 @@
     'test_watchos_simulator': False,
     'test_playgroundsupport': True,
     'test_swiftpm': False,
+    'test_swift_driver': False,
     'test_swiftsyntax': False,
     'test_indexstoredb': False,
     'test_sourcekitlsp': False,
     'test_skstresstester': False,
+    'test_swiftformat': False,
     'test_swiftevolve': False,
     'test_toolchainbenchmarks': False,
     'tvos': False,
@@ -473,9 +478,11 @@ class BuildScriptImplOption(_BaseOption):
                   dest='install_tensorflow_swift_apis'),
     SetTrueOption('--skip-build'),
     SetTrueOption('--swiftpm', dest='build_swiftpm'),
+    SetTrueOption('--swift-driver', dest='build_swift_driver'),
     SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
     SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
     SetTrueOption('--skstresstester', dest='build_skstresstester'),
+    SetTrueOption('--swiftformat', dest='build_swiftformat'),
     SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
     SetTrueOption('-B', dest='benchmark'),
     SetTrueOption('-S', dest='skip_build'),
@@ -523,6 +530,7 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--swiftsyntax-verify-generated-files',
                  dest='swiftsyntax_verify_generated_files'),
     EnableOption('--install-swiftpm', dest='install_swiftpm'),
+    EnableOption('--install-swift-driver', dest='install_swift_driver'),
     EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--install-skstresstester', dest='install_skstresstester'),
     EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
@@ -588,10 +596,12 @@ class BuildScriptImplOption(_BaseOption):
     DisableOption('--skip-test-playgroundsupport',
                   dest='test_playgroundsupport'),
     DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
+    DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
     DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),
     DisableOption('--skip-test-indexstore-db', dest='test_indexstoredb'),
     DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'),
     DisableOption('--skip-test-skstresstester', dest='test_skstresstester'),
+    DisableOption('--skip-test-swiftformat', dest='test_swiftformat'),
     DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'),
     DisableOption('--skip-test-toolchain-benchmarks',
                   dest='test_toolchainbenchmarks'),
diff --git a/utils/gyb_sourcekit_support/UIDs.py b/utils/gyb_sourcekit_support/UIDs.py
index eeed7c7f27ba0..e8d1eb947b3c6 100644
--- a/utils/gyb_sourcekit_support/UIDs.py
+++ b/utils/gyb_sourcekit_support/UIDs.py
@@ -99,6 +99,8 @@ def __init__(self, internal_name, external_name):
     KEY('EducationalNotePaths', 'key.educational_note_paths'),
     KEY('FormatOptions', 'key.editor.format.options'),
     KEY('CodeCompleteOptions', 'key.codecomplete.options'),
+    KEY('TypeContextInfoOptions', 'key.typecontextinfo.options'),
+    KEY('ConformingMethodListOptions', 'key.conformingmethods.options'),
     KEY('FilterRules', 'key.codecomplete.filterrules'),
     KEY('NextRequestStart', 'key.nextrequeststart'),
     KEY('Popular', 'key.popular'),
diff --git a/utils/gyb_syntax_support/AttributeNodes.py b/utils/gyb_syntax_support/AttributeNodes.py
index f0d7d9cd8c9d3..7d5bdabaead7d 100644
--- a/utils/gyb_syntax_support/AttributeNodes.py
+++ b/utils/gyb_syntax_support/AttributeNodes.py
@@ -292,6 +292,15 @@
                    '''),
              Child('OriginalDeclName', kind='QualifiedDeclName',
                    description='The referenced original declaration name.'),
+             Child('Period', kind='PeriodToken',
+                   description='''
+                   The period separating the original declaration name and the
+                   accessor name.
+                   ''', is_optional=True),
+             Child('AccessorKind', kind='IdentifierToken',
+                   description='The accessor name.',
+                   text_choices=['get', 'set'],
+                   is_optional=True),
              Child('Comma', kind='CommaToken', is_optional=True),
              Child('DiffParams', kind='DifferentiabilityParamsClause',
                    is_optional=True),
diff --git a/utils/gyb_syntax_support/__init__.py b/utils/gyb_syntax_support/__init__.py
index 1f58d26dbfe67..3795b62d847d6 100644
--- a/utils/gyb_syntax_support/__init__.py
+++ b/utils/gyb_syntax_support/__init__.py
@@ -144,34 +144,36 @@ def dedented_lines(description):
     return textwrap.dedent(description).split('\n')
 
 
-def digest_syntax_node(digest, node):
-    # Hash into the syntax name and serialization code
-    digest.update(node.name)
-    digest.update(str(get_serialization_code(node.syntax_kind)))
-    for child in node.children:
-        # Hash into the expected child syntax
-        digest.update(child.syntax_kind)
-        # Hash into the child name
-        digest.update(child.name)
-        # Hash into whether the child is optional
-        digest.update(str(child.is_optional))
-
-
-def digest_syntax_token(digest, token):
-    # Hash into the token name and serialization code
-    digest.update(token.name)
-    digest.update(str(token.serialization_code))
-
-
-def digest_trivia(digest, trivia):
-    digest.update(trivia.name)
-    digest.update(str(trivia.serialization_code))
-    digest.update(str(trivia.characters))
-
-
 def calculate_node_hash():
     digest = hashlib.sha1()
-    map(lambda node: digest_syntax_node(digest, node), SYNTAX_NODES)
-    map(lambda token: digest_syntax_token(digest, token), SYNTAX_TOKENS)
-    map(lambda trivia: digest_trivia(digest, trivia), TRIVIAS)
+
+    def _digest_syntax_node(node):
+        # Hash into the syntax name and serialization code
+        digest.update(node.name.encode("utf-8"))
+        digest.update(str(get_serialization_code(node.syntax_kind)).encode("utf-8"))
+        for child in node.children:
+            # Hash into the expected child syntax
+            digest.update(child.syntax_kind.encode("utf-8"))
+            # Hash into the child name
+            digest.update(child.name.encode("utf-8"))
+            # Hash into whether the child is optional
+            digest.update(str(child.is_optional).encode("utf-8"))
+
+    def _digest_syntax_token(token):
+        # Hash into the token name and serialization code
+        digest.update(token.name.encode("utf-8"))
+        digest.update(str(token.serialization_code).encode("utf-8"))
+
+    def _digest_trivia(trivia):
+        digest.update(trivia.name.encode("utf-8"))
+        digest.update(str(trivia.serialization_code).encode("utf-8"))
+        digest.update(str(trivia.characters).encode("utf-8"))
+
+    for node in SYNTAX_NODES:
+        _digest_syntax_node(node)
+    for token in SYNTAX_TOKENS:
+        _digest_syntax_token(token)
+    for trivia in TRIVIAS:
+        _digest_trivia(trivia)
+
     return digest.hexdigest()
diff --git a/utils/incrparse/validate_parse.py b/utils/incrparse/validate_parse.py
index 6d62d90fb5a18..8f69591fb8aaa 100755
--- a/utils/incrparse/validate_parse.py
+++ b/utils/incrparse/validate_parse.py
@@ -4,6 +4,7 @@
 
 import argparse
 import difflib
+import io
 import os
 import sys
 
@@ -108,8 +109,10 @@ def main():
         sys.exit(1)
 
     # Check if the two syntax trees are the same
-    lines = difflib.unified_diff(open(incremental_serialized_file).readlines(),
-                                 open(post_edit_serialized_file).readlines(),
+    lines = difflib.unified_diff(io.open(incremental_serialized_file, 'r',
+                                         encoding='utf-8', errors='ignore').readlines(),
+                                 io.open(post_edit_serialized_file, 'r',
+                                         encoding='utf-8', errors='ignore').readlines(),
                                  fromfile=incremental_serialized_file,
                                  tofile=post_edit_serialized_file)
     diff = '\n'.join(line for line in lines)
diff --git a/utils/jobstats/jobstats.py b/utils/jobstats/jobstats.py
index 82c90229fb86d..8a9eae6ee1199 100644
--- a/utils/jobstats/jobstats.py
+++ b/utils/jobstats/jobstats.py
@@ -90,7 +90,7 @@ def merged_with(self, other, merge_by="sum"):
                                     else max(a, b)),
                "max": lambda a, b: max(a, b)}
         op = ops[merge_by]
-        for k, v in self.stats.items() + other.stats.items():
+        for k, v in list(self.stats.items()) + list(other.stats.items()):
             if k in merged_stats:
                 merged_stats[k] = op(v, merged_stats[k])
             else:
@@ -317,8 +317,7 @@ def load_stats_dir(path, select_module=[], select_stat=[],
             jobargs = [mg["input"], mg["triple"], mg["out"], mg["opt"]]
 
             if platform.system() == 'Windows':
-                p = unicode(u"\\\\?\\%s" % os.path.abspath(os.path.join(root,
-                                                                        f)))
+                p = str(u"\\\\?\\%s" % os.path.abspath(os.path.join(root, f)))
             else:
                 p = os.path.join(root, f)
 
diff --git a/utils/process-stats-dir.py b/utils/process-stats-dir.py
index fdfac8b1f0fc5..61ec73410e580 100755
--- a/utils/process-stats-dir.py
+++ b/utils/process-stats-dir.py
@@ -17,6 +17,7 @@
 
 import argparse
 import csv
+import io
 import itertools
 import json
 import os
@@ -25,13 +26,22 @@
 import sys
 import time
 import urllib
-import urllib2
 from collections import namedtuple
 from operator import attrgetter
 
 from jobstats import (list_stats_dir_profiles,
                       load_stats_dir, merge_all_jobstats)
 
+if sys.version_info[0] < 3:
+    import urllib2
+    Request = urllib2.Request
+    URLOpen = urllib2.urlopen
+else:
+    import urllib.request
+    import urllib.parse
+    import urllib.error
+    Request = urllib.request.Request
+    URLOpen = urllib.request.urlopen
 
 MODULE_PAT = re.compile(r'^(\w+)\.')
 
@@ -49,7 +59,8 @@ def stat_name_minus_module(name):
 def vars_of_args(args):
     vargs = vars(args)
     if args.select_stats_from_csv_baseline is not None:
-        b = read_stats_dict_from_csv(args.select_stats_from_csv_baseline)
+        with io.open(args.select_stats_from_csv_baseline, 'r', encoding='utf-8') as f:
+            b = read_stats_dict_from_csv(f)
         # Sniff baseline stat-names to figure out if they're module-qualified
         # even when the user isn't asking us to _output_ module-grouped data.
         all_triples = all(len(k.split('.')) == 3 for k in b.keys())
@@ -105,18 +116,18 @@ def write_lnt_values(args):
             json.dump(j, args.output, indent=4)
         else:
             url = args.lnt_submit
-            print "\nsubmitting to LNT server: " + url
+            print("\nsubmitting to LNT server: " + url)
             json_report = {'input_data': json.dumps(j), 'commit': '1'}
             data = urllib.urlencode(json_report)
-            response_str = urllib2.urlopen(urllib2.Request(url, data))
+            response_str = URLOpen(Request(url, data))
             response = json.loads(response_str.read())
-            print "### response:"
-            print response
+            print("### response:")
+            print(response)
             if 'success' in response:
-                print "server response:\tSuccess"
+                print("server response:\tSuccess")
             else:
-                print "server response:\tError"
-                print "error:\t", response['error']
+                print("server response:\tError")
+                print("error:\t", response['error'])
                 sys.exit(1)
 
 
@@ -187,8 +198,8 @@ def update_epoch_value(d, name, epoch, value):
             epoch = existing_epoch
         else:
             (_, delta_pct) = diff_and_pct(existing_value, value)
-            print ("note: changing value %d -> %d (%.2f%%) for %s" %
-                   (existing_value, value, delta_pct, name))
+            print("note: changing value %d -> %d (%.2f%%) for %s" %
+                  (existing_value, value, delta_pct, name))
             changed = 1
     d[name] = (epoch, value)
     return (epoch, value, changed)
@@ -233,22 +244,28 @@ def set_csv_baseline(args):
     existing = None
     vargs = vars_of_args(args)
     if os.path.exists(args.set_csv_baseline):
-        with open(args.set_csv_baseline, "r") as f:
+        with io.open(args.set_csv_baseline, "r", encoding='utf-8', newline='\n') as f:
             ss = vargs['select_stat']
             existing = read_stats_dict_from_csv(f, select_stat=ss)
-            print ("updating %d baseline entries in %s" %
-                   (len(existing), args.set_csv_baseline))
+            print("updating %d baseline entries in %s" %
+                  (len(existing), args.set_csv_baseline))
     else:
-        print "making new baseline " + args.set_csv_baseline
+        print("making new baseline " + args.set_csv_baseline)
     fieldnames = ["epoch", "name", "value"]
-    with open(args.set_csv_baseline, "wb") as f:
+
+    def _open(path):
+        if sys.version_info[0] < 3:
+            return open(path, 'wb')
+        return io.open(path, "w", encoding='utf-8', newline='\n')
+
+    with _open(args.set_csv_baseline) as f:
         out = csv.DictWriter(f, fieldnames, dialect='excel-tab',
                              quoting=csv.QUOTE_NONNUMERIC)
         m = merge_all_jobstats((s for d in args.remainder
                                 for s in load_stats_dir(d, **vargs)),
                                **vargs)
         if m is None:
-            print "no stats found"
+            print("no stats found")
             return 1
         changed = 0
         newepoch = int(time.time())
@@ -265,7 +282,7 @@ def set_csv_baseline(args):
                               name=name,
                               value=int(value)))
         if existing is not None:
-            print "changed %d entries in baseline" % changed
+            print("changed %d entries in baseline" % changed)
     return 0
 
 
@@ -402,8 +419,8 @@ def keyfunc(e):
 
 def compare_to_csv_baseline(args):
     vargs = vars_of_args(args)
-    old_stats = read_stats_dict_from_csv(args.compare_to_csv_baseline,
-                                         select_stat=vargs['select_stat'])
+    with io.open(args.compare_to_csv_baseline, 'r', encoding='utf-8') as f:
+        old_stats = read_stats_dict_from_csv(f, select_stat=vargs['select_stat'])
     m = merge_all_jobstats((s for d in args.remainder
                             for s in load_stats_dir(d, **vargs)),
                            **vargs)
@@ -585,7 +602,7 @@ def main():
                         action="append",
                         help="Select specific statistics")
     parser.add_argument("--select-stats-from-csv-baseline",
-                        type=argparse.FileType('rb', 0), default=None,
+                        type=str, default=None,
                         help="Select statistics present in a CSV baseline")
     parser.add_argument("--exclude-timers",
                         default=False,
@@ -635,8 +652,7 @@ def main():
                        help="summarize the 'incrementality' of a build")
     modes.add_argument("--set-csv-baseline", type=str, default=None,
                        help="Merge stats from a stats-dir into a CSV baseline")
-    modes.add_argument("--compare-to-csv-baseline",
-                       type=argparse.FileType('rb', 0), default=None,
+    modes.add_argument("--compare-to-csv-baseline", type=str, default=None,
                        metavar="BASELINE.csv",
                        help="Compare stats dir to named CSV baseline")
     modes.add_argument("--compare-stats-dirs",
diff --git a/utils/remote-run b/utils/remote-run
index 50a2181ae8470..effa8ef0d347e 100755
--- a/utils/remote-run
+++ b/utils/remote-run
@@ -41,19 +41,19 @@ class CommandRunner(object):
     def send(self, local_to_remote_files):
         # Prepare the remote directory structure.
         # FIXME: This could be folded into the sftp connection below.
-        dirs_to_make = self._dirnames(local_to_remote_files.viewvalues())
+        dirs_to_make = self._dirnames(local_to_remote_files.values())
         self.run_remote(['/bin/mkdir', '-p'] + dirs_to_make)
 
         # Send the local files.
         sftp_commands = ("-put {0} {1}".format(quote(local_file), 
                                                quote(remote_file))
                          for local_file, remote_file
-                         in local_to_remote_files.viewitems())
+                         in local_to_remote_files.items())
         self.run_sftp(sftp_commands)
 
     def fetch(self, local_to_remote_files):
         # Prepare the local directory structure.
-        dirs_to_make = self._dirnames(local_to_remote_files.viewkeys())
+        dirs_to_make = self._dirnames(local_to_remote_files.keys())
         mkdir_command = ['/bin/mkdir', '-p'] + dirs_to_make
         if self.verbose:
             print(' '.join(mkdir_command), file=sys.stderr)
@@ -64,11 +64,11 @@ class CommandRunner(object):
         sftp_commands = ("-get {0} {1}".format(quote(remote_file), 
                                                quote(local_file))
                          for local_file, remote_file
-                         in local_to_remote_files.viewitems())
+                         in local_to_remote_files.items())
         self.run_sftp(sftp_commands)
 
     def run_remote(self, command, remote_env={}):
-        env_strings = ['{0}={1}'.format(k,v) for k,v in remote_env.viewitems()]
+        env_strings = ['{0}={1}'.format(k,v) for k,v in remote_env.items()]
         remote_invocation = self.remote_invocation(
             ['/usr/bin/env'] + env_strings + command)
         remote_proc = self.popen(remote_invocation, stdin=subprocess.PIPE,
@@ -213,16 +213,16 @@ def main():
         remote_dir = posixpath.join(args.remote_dir, args.remote_input_prefix)
         input_files = find_transfers(args.command, args.input_prefix, 
                                      remote_dir)
-        assert not any(upload_files.has_key(f) for f in input_files)
+        assert not any(f in upload_files for f in input_files)
         upload_files.update(input_files)
     if args.output_prefix:
         assert not args.remote_output_prefix.startswith("..")
         remote_dir = posixpath.join(args.remote_dir, args.remote_output_prefix)
         test_files = find_transfers(args.command, args.output_prefix, 
                                     remote_dir)
-        assert not any(upload_files.has_key(f) for f in test_files)
+        assert not any(f in upload_files for f in test_files)
         upload_files.update(test_files)
-        assert not any(download_files.has_key(f) for f in test_files)
+        assert not any(f in download_files for f in test_files)
         download_files.update(test_files)
         remote_test_specific_dir = remote_dir
 
diff --git a/utils/round-trip-syntax-test b/utils/round-trip-syntax-test
index fc09165211488..18b374544c5a8 100755
--- a/utils/round-trip-syntax-test
+++ b/utils/round-trip-syntax-test
@@ -9,6 +9,7 @@ import os
 import subprocess
 import sys
 import tempfile
+from functools import reduce
 
 logging.basicConfig(format='%(message)s', level=logging.INFO)
 
@@ -17,7 +18,8 @@ class RoundTripTask(object):
     def __init__(self, input_filename, action, swift_syntax_test,
                  skip_bad_syntax):
         assert action == '-round-trip-parse' or action == '-round-trip-lex'
-        assert type(input_filename) == unicode
+        if sys.version_info[0] < 3:
+            assert type(input_filename) == unicode
         assert type(swift_syntax_test) == str
 
         assert os.path.isfile(input_filename), \
@@ -51,9 +53,9 @@ class RoundTripTask(object):
         self.output_file.close()
         self.stderr_file.close()
 
-        with open(self.output_file.name, 'r') as stdout_in:
+        with open(self.output_file.name, 'rb') as stdout_in:
             self.stdout = stdout_in.read()
-        with open(self.stderr_file.name, 'r') as stderr_in:
+        with open(self.stderr_file.name, 'rb') as stderr_in:
             self.stderr = stderr_in.read()
 
         os.remove(self.output_file.name)
@@ -75,7 +77,7 @@ class RoundTripTask(object):
                 raise RuntimeError()
 
         contents = ''.join(map(lambda l: l.decode('utf-8', errors='replace'),
-                               open(self.input_filename).readlines()))
+                               open(self.input_filename, 'rb').readlines()))
         stdout_contents = self.stdout.decode('utf-8', errors='replace')
 
         if contents == stdout_contents:
@@ -92,7 +94,7 @@ def swift_files_in_dir(d):
     swift_files = []
     for root, dirs, files in os.walk(d):
         for basename in files:
-            if not basename.decode('utf-8').endswith('.swift'):
+            if not basename.endswith('.swift'):
                 continue
             abs_file = os.path.abspath(os.path.join(root, basename))
             swift_files.append(abs_file)
@@ -149,7 +151,8 @@ This driver invokes swift-syntax-test using -round-trip-lex and
     all_input_files = [filename for dir_listing in dir_listings
                        for filename in dir_listing]
     all_input_files += args.individual_input_files
-    all_input_files = [f.decode('utf-8') for f in all_input_files]
+    if sys.version_info[0] < 3:
+        all_input_files = [f.decode('utf-8') for f in all_input_files]
 
     if len(all_input_files) == 0:
         logging.error('No input files!')
diff --git a/utils/swift_build_sdk_interfaces.py b/utils/swift_build_sdk_interfaces.py
index 4798cc375adbe..900bae30064e0 100755
--- a/utils/swift_build_sdk_interfaces.py
+++ b/utils/swift_build_sdk_interfaces.py
@@ -105,7 +105,7 @@ def run_command(args, dry_run):
     try:
         out, err = proc.communicate()
         exitcode = proc.returncode
-        return (exitcode, out, err)
+        return (exitcode, out.decode('utf-8'), err.decode('utf-8'))
     except KeyboardInterrupt:
         proc.terminate()
         raise
@@ -416,6 +416,10 @@ def main():
     non_stdlib_module_files = (
         x for x in module_files if x.name != STDLIB_NAME)
     status = process_module_files(pool, non_stdlib_module_files)
+    if os.name == 'nt':
+        import ctypes
+        Kernel32 = ctypes.cdll.LoadLibrary("Kernel32.dll")
+        Kernel32.ExitProcess(ctypes.c_ulong(status))
     sys.exit(status)
 
 
diff --git a/utils/swift_build_support/swift_build_support/host_specific_configuration.py b/utils/swift_build_support/swift_build_support/host_specific_configuration.py
index ad50abbac5213..b13140f10a876 100644
--- a/utils/swift_build_support/swift_build_support/host_specific_configuration.py
+++ b/utils/swift_build_support/swift_build_support/host_specific_configuration.py
@@ -10,6 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
+import re
 import sys
 from argparse import ArgumentError
 
@@ -40,6 +41,11 @@ def __init__(self, host_target, args):
             stdlib_targets_to_configure = [host_target]
             stdlib_targets_to_build = set(stdlib_targets_to_configure)
 
+        if (hasattr(args, 'stdlib_deployment_targets') and
+                args.stdlib_deployment_targets == []):
+            stdlib_targets_to_configure = []
+            stdlib_targets_to_build = []
+
         # Compute derived information from the arguments.
         #
         # FIXME: We should move the platform-derived arguments to be entirely
@@ -155,11 +161,13 @@ def __init__(self, host_target, args):
 
                 # Support for running the macCatalyst tests with
                 # the iOS-like target triple.
-                if name == "macosx-x86_64" and args.maccatalyst \
+                macosx_platform_match = re.search("macosx-(.*)", name)
+                if macosx_platform_match and args.maccatalyst \
                    and args.maccatalyst_ios_tests:
                     (self.swift_test_run_targets
-                     .append("check-swift{}{}-{}".format(
-                         subset_suffix, suffix, "macosx-maccatalyst-x86_64")))
+                     .append("check-swift{}{}-{}-{}".format(
+                         subset_suffix, suffix, "macosx-maccatalyst",
+                         macosx_platform_match.group(1))))
                 else:
                     (self.swift_test_run_targets
                      .append("check-swift{}{}-{}".format(
diff --git a/utils/swift_build_support/swift_build_support/products/__init__.py b/utils/swift_build_support/swift_build_support/products/__init__.py
index 18bbd2b3fe9bc..08fcef92b5e7f 100644
--- a/utils/swift_build_support/swift_build_support/products/__init__.py
+++ b/utils/swift_build_support/swift_build_support/products/__init__.py
@@ -26,7 +26,9 @@
 from .skstresstester import SKStressTester
 from .sourcekitlsp import SourceKitLSP
 from .swift import Swift
+from .swiftdriver import SwiftDriver
 from .swiftevolve import SwiftEvolve
+from .swiftformat import SwiftFormat
 from .swiftinspect import SwiftInspect
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
@@ -48,8 +50,10 @@
     'PlaygroundSupport',
     'PythonKit',
     'Swift',
+    'SwiftFormat',
     'SwiftInspect',
     'SwiftPM',
+    'SwiftDriver',
     'TensorFlowSwiftAPIs',
     'XCTest',
     'SwiftSyntax',
diff --git a/utils/swift_build_support/swift_build_support/products/swiftdriver.py b/utils/swift_build_support/swift_build_support/products/swiftdriver.py
new file mode 100644
index 0000000000000..52ca78d4c00a9
--- /dev/null
+++ b/utils/swift_build_support/swift_build_support/products/swiftdriver.py
@@ -0,0 +1,67 @@
+# swift_build_support/products/swiftdriver.py -------------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+from . import cmark
+from . import foundation
+from . import indexstoredb
+from . import libcxx
+from . import libdispatch
+from . import libicu
+from . import llbuild
+from . import llvm
+from . import product
+from . import swift
+from . import xctest
+
+
+class SwiftDriver(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        return "swift-driver"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    def should_build(self, host_target):
+        return self.args.build_swift_driver
+
+    @classmethod
+    def get_dependencies(cls):
+        return [cmark.CMark,
+                llvm.LLVM,
+                libcxx.LibCXX,
+                libicu.LibICU,
+                swift.Swift,
+                libdispatch.LibDispatch,
+                foundation.Foundation,
+                xctest.XCTest,
+                llbuild.LLBuild]
+
+    def build(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'build', host_target, self, self.args)
+
+    def should_test(self, host_target):
+        return self.args.test_swift_driver
+
+    def test(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'test', host_target, self, self.args,
+            self.args.test_sourcekitlsp_sanitize_all)
+
+    def should_install(self, host_target):
+        return self.args.install_swift_driver
+
+    def install(self, host_target):
+        indexstoredb.run_build_script_helper(
+            'install', host_target, self, self.args)
diff --git a/utils/swift_build_support/swift_build_support/products/swiftformat.py b/utils/swift_build_support/swift_build_support/products/swiftformat.py
new file mode 100644
index 0000000000000..ae6323cddadf8
--- /dev/null
+++ b/utils/swift_build_support/swift_build_support/products/swiftformat.py
@@ -0,0 +1,100 @@
+# swift_build_support/products/swiftformat.py -----------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+import os
+
+from build_swift.build_swift.constants import MULTIROOT_DATA_FILE_PATH
+
+from . import cmark
+from . import foundation
+from . import libcxx
+from . import libdispatch
+from . import libicu
+from . import llbuild
+from . import llvm
+from . import product
+from . import swift
+from . import swiftpm
+from . import swiftsyntax
+from . import xctest
+from .. import shell
+
+
+class SwiftFormat(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        """product_source_name() -> str
+
+        The name of the source code directory of this product.
+        """
+        return "swift-format"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    @classmethod
+    def is_swiftpm_unified_build_product(cls):
+        return True
+
+    def run_build_script_helper(self, action, additional_params=[]):
+        script_path = os.path.join(
+            self.source_dir, 'build-script-helper.py')
+
+        configuration = 'release' if self.is_release() else 'debug'
+
+        helper_cmd = [
+            script_path,
+            action,
+            '--toolchain', self.install_toolchain_path(),
+            '--configuration', configuration,
+            '--build-path', self.build_dir,
+            '--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
+            # There might have been a Package.resolved created by other builds
+            # or by the package being opened using Xcode. Discard that and
+            # reset the dependencies to be local.
+            '--update'
+        ]
+        if self.args.verbose_build:
+            helper_cmd.append('--verbose')
+        helper_cmd.extend(additional_params)
+
+        shell.call(helper_cmd)
+
+    def should_build(self, host_target):
+        return True
+
+    def build(self, host_target):
+        self.run_build_script_helper('build')
+
+    def should_test(self, host_target):
+        return self.args.test_swiftformat
+
+    def test(self, host_target):
+        self.run_build_script_helper('test')
+
+    def should_install(self, host_target):
+        return False
+
+    @classmethod
+    def get_dependencies(cls):
+        return [cmark.CMark,
+                llvm.LLVM,
+                libcxx.LibCXX,
+                libicu.LibICU,
+                swift.Swift,
+                libdispatch.LibDispatch,
+                foundation.Foundation,
+                xctest.XCTest,
+                llbuild.LLBuild,
+                swiftpm.SwiftPM,
+                swiftsyntax.SwiftSyntax]
diff --git a/utils/swift_build_support/swift_build_support/targets.py b/utils/swift_build_support/swift_build_support/targets.py
index 9cb31c6dfe8a4..6bc7abe319fb0 100644
--- a/utils/swift_build_support/swift_build_support/targets.py
+++ b/utils/swift_build_support/swift_build_support/targets.py
@@ -11,6 +11,13 @@
 import os
 import platform
 
+from . import shell
+
+try:
+    from build_swift.build_swift.wrappers import xcrun
+except ImportError:
+    from build_swift.wrappers import xcrun
+
 
 class Platform(object):
     """
@@ -86,6 +93,39 @@ def uses_host_tests(self):
         """
         return self.is_embedded and not self.is_simulator
 
+    def sdk_supports_architecture(self, arch, toolchain):
+        """
+        Convenience function for checking whether the SDK supports the
+        target architecture.
+        """
+
+        # The names match up with the xcrun SDK names.
+        xcrun_sdk_name = self.name
+
+        # 32-bit iOS and iOS simulator are supported, but are not covered
+        # by the SDK settings. Handle this special case here.
+        if (xcrun_sdk_name == 'iphoneos' and
+           (arch == 'armv7' or arch == 'armv7s')):
+            return True
+
+        if (xcrun_sdk_name == 'iphonesimulator' and arch == 'i386'):
+            return True
+
+        sdk_path = xcrun.sdk_path(sdk=xcrun_sdk_name, toolchain=toolchain)
+        if not sdk_path:
+            raise RuntimeError('Cannot find SDK path for %s' % xcrun_sdk_name)
+
+        # Find the SDKSettings.plist for this sdK
+        plistCommand = [
+            '/usr/libexec/PlistBuddy',
+            '-c',
+            'Print :SupportedTargets:%s:Archs' % (self.name),
+            '%s/SDKSettings.plist' % (sdk_path)
+        ]
+
+        sdk_archs = shell.capture(plistCommand, dry_run=False, echo=True)
+        return arch in sdk_archs
+
 
 class AndroidPlatform(Platform):
     @property
@@ -114,12 +154,12 @@ def name(self):
 
 
 class StdlibDeploymentTarget(object):
-    OSX = DarwinPlatform("macosx", archs=["x86_64"],
+    OSX = DarwinPlatform("macosx", archs=["x86_64", "arm64", "arm64e"],
                          sdk_name="OSX")
 
     iOS = DarwinPlatform("iphoneos", archs=["armv7", "armv7s", "arm64", "arm64e"],
                          sdk_name="IOS")
-    iOSSimulator = DarwinPlatform("iphonesimulator", archs=["i386", "x86_64"],
+    iOSSimulator = DarwinPlatform("iphonesimulator", archs=["i386", "x86_64", "arm64"],
                                   sdk_name="IOS_SIMULATOR",
                                   is_simulator=True)
 
@@ -128,13 +168,14 @@ class StdlibDeploymentTarget(object):
 
     AppleTV = DarwinPlatform("appletvos", archs=["arm64"],
                              sdk_name="TVOS")
-    AppleTVSimulator = DarwinPlatform("appletvsimulator", archs=["x86_64"],
+    AppleTVSimulator = DarwinPlatform("appletvsimulator", archs=["x86_64", "arm64"],
                                       sdk_name="TVOS_SIMULATOR",
                                       is_simulator=True)
 
     AppleWatch = DarwinPlatform("watchos", archs=["armv7k"],
                                 sdk_name="WATCHOS")
-    AppleWatchSimulator = DarwinPlatform("watchsimulator", archs=["i386"],
+
+    AppleWatchSimulator = DarwinPlatform("watchsimulator", archs=["i386", "arm64"],
                                          sdk_name="WATCHOS_SIMULATOR",
                                          is_simulator=True)
 
@@ -219,6 +260,10 @@ def host_target():
         elif system == 'Darwin':
             if machine == 'x86_64':
                 return StdlibDeploymentTarget.OSX.x86_64
+            elif machine == 'arm64':
+                return StdlibDeploymentTarget.OSX.arm64
+            elif machine == 'arm64e':
+                return StdlibDeploymentTarget.OSX.arm64e
 
         elif system == 'FreeBSD':
             if machine == 'amd64':
diff --git a/validation-test/SILGen/Inputs/cxx-types.h b/validation-test/SILGen/Inputs/cxx-types.h
new file mode 100644
index 0000000000000..1a883e6f2e126
--- /dev/null
+++ b/validation-test/SILGen/Inputs/cxx-types.h
@@ -0,0 +1,3 @@
+struct HasCustomCopyConst {
+  HasCustomCopyConst(HasCustomCopyConst const&) { }
+};
diff --git a/validation-test/SILGen/Inputs/module.modulemap b/validation-test/SILGen/Inputs/module.modulemap
new file mode 100644
index 0000000000000..cb4d7c21edee3
--- /dev/null
+++ b/validation-test/SILGen/Inputs/module.modulemap
@@ -0,0 +1,3 @@
+module CXXTypes {
+  header "cxx-types.h"
+}
diff --git a/validation-test/SILGen/cxx-address-only-object-init.swift b/validation-test/SILGen/cxx-address-only-object-init.swift
new file mode 100644
index 0000000000000..0d39b9e4a231e
--- /dev/null
+++ b/validation-test/SILGen/cxx-address-only-object-init.swift
@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-silgen | %FileCheck %s
+
+import CXXTypes
+
+// Just make sure we create the object and don't crash.
+// CHECK-LABEL: @$s4main4testyyF
+// CHECK: alloc_stack
+// CHECK: apply
+// CHECK: return %{{[0-9]+}} : $()
+public func test() {
+  let c = HasCustomCopyConst()
+}
diff --git a/validation-test/Sanitizers/tsan-type-metadata.swift b/validation-test/Sanitizers/tsan-type-metadata.swift
index dd4241a6b3d8d..8ea711b79ef9c 100644
--- a/validation-test/Sanitizers/tsan-type-metadata.swift
+++ b/validation-test/Sanitizers/tsan-type-metadata.swift
@@ -1,3 +1,4 @@
+// REQUIRES: rdar64809726
 // RUN: %target-swiftc_driver -target %sanitizers-target-triple -sanitize=thread %import-libdispatch %s -o %t_binary
 // RUN: %env-TSAN_OPTIONS=halt_on_error=1 %target-run %t_binary
 // REQUIRES: executable_test
diff --git a/validation-test/Sanitizers/witness_table_lookup.swift b/validation-test/Sanitizers/witness_table_lookup.swift
index 7883c6a5794ff..cad9f6794a403 100644
--- a/validation-test/Sanitizers/witness_table_lookup.swift
+++ b/validation-test/Sanitizers/witness_table_lookup.swift
@@ -1,3 +1,4 @@
+// REQUIRES: rdar64809726
 // RUN: %target-build-swift -sanitize=thread %import-libdispatch -target %sanitizers-target-triple %s -o %t_binary
 // RUN: %env-TSAN_OPTIONS=halt_on_error=1 %target-run %t_binary
 // REQUIRES: executable_test
diff --git a/validation-test/Sema/type_checker_crashers_fixed/rdar27830834.swift b/validation-test/Sema/type_checker_crashers_fixed/rdar27830834.swift
index 364998bae311b..f7be7a54079b2 100644
--- a/validation-test/Sema/type_checker_crashers_fixed/rdar27830834.swift
+++ b/validation-test/Sema/type_checker_crashers_fixed/rdar27830834.swift
@@ -2,5 +2,5 @@
 
 var d = [String:String]()
 _ = "\(d.map{ [$0 : $0] })"
-// expected-error@-1 {{type 'Dictionary<String, String>.Element' (aka '(key: String, value: String)') cannot conform to 'Hashable'; only struct/enum/class types can conform to protocols}}
+// expected-error@-1 {{type 'Dictionary<String, String>.Element' (aka '(key: String, value: String)') cannot conform to 'Hashable'; only concrete types such as structs, enums and classes can conform to protocols}}
 // expected-note@-2 {{required by generic struct 'Dictionary' where 'Key' = 'Dictionary<String, String>.Element' (aka '(key: String, value: String)')}}
diff --git a/validation-test/Sema/type_checker_perf/slow/rdar53589951.swift b/validation-test/Sema/type_checker_perf/slow/rdar53589951.swift
index 702c92ee62ea9..b2bc3356a2986 100644
--- a/validation-test/Sema/type_checker_perf/slow/rdar53589951.swift
+++ b/validation-test/Sema/type_checker_perf/slow/rdar53589951.swift
@@ -1,5 +1,6 @@
 // RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asan
+// REQUIRES: rdar36854536
 
 class Color {
   init(hue: Double, saturation: Double, brightness: Double, alpha: Double) {}
diff --git a/validation-test/StdlibUnittest/AtomicInt.swift b/validation-test/StdlibUnittest/AtomicInt.swift
index e256d8ab7b87d..00bf5d1c0f8c2 100644
--- a/validation-test/StdlibUnittest/AtomicInt.swift
+++ b/validation-test/StdlibUnittest/AtomicInt.swift
@@ -8,10 +8,9 @@
 
 import SwiftPrivate
 import StdlibUnittest
-
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift
index 7e2e61d64821a..024a88d7f3703 100644
--- a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift
+++ b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildCrashesDuringShutdown.swift
@@ -4,9 +4,9 @@
 // UNSUPPORTED: OS=watchos
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift
index 9c5c5588b744e..888274eb243d9 100644
--- a/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift
+++ b/validation-test/StdlibUnittest/ChildProcessShutdown/FailIfChildExitsDuringShutdown.swift
@@ -2,9 +2,9 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/PassIfChildCrashedDuringTestExecution.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/PassIfChildCrashedDuringTestExecution.swift
index 2d79dd948b498..77af5601fd0be 100644
--- a/validation-test/StdlibUnittest/ChildProcessShutdown/PassIfChildCrashedDuringTestExecution.swift
+++ b/validation-test/StdlibUnittest/ChildProcessShutdown/PassIfChildCrashedDuringTestExecution.swift
@@ -2,9 +2,9 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/StdlibUnittest/ChildProcessShutdown/RequireOwnProcess.swift b/validation-test/StdlibUnittest/ChildProcessShutdown/RequireOwnProcess.swift
index e4af8e3623315..2bfa62c5252bd 100644
--- a/validation-test/StdlibUnittest/ChildProcessShutdown/RequireOwnProcess.swift
+++ b/validation-test/StdlibUnittest/ChildProcessShutdown/RequireOwnProcess.swift
@@ -2,9 +2,9 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/StdlibUnittest/RaceTest.swift b/validation-test/StdlibUnittest/RaceTest.swift
index 81c6d771eac33..b3c296036f371 100644
--- a/validation-test/StdlibUnittest/RaceTest.swift
+++ b/validation-test/StdlibUnittest/RaceTest.swift
@@ -1,3 +1,4 @@
+// REQUIRES: rdar64809498
 // RUN: %target-build-swift -Xfrontend -disable-access-control -module-name a %s -o %t.out
 // RUN: %target-run %t.out | %FileCheck %s
 // REQUIRES: stress_test
@@ -5,9 +6,9 @@
 
 import SwiftPrivate
 import StdlibUnittest
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -15,7 +16,6 @@ import StdlibUnittest
 #error("Unsupported platform")
 #endif
 
-
 _setTestSuiteFailedCallback() { print("abort()") }
 
 struct RaceTest1 : RaceTestWithPerTrialData {
diff --git a/validation-test/StdlibUnittest/RangeSet.swift b/validation-test/StdlibUnittest/RangeSet.swift
index 61bd605f80e4b..e6a2112bea700 100644
--- a/validation-test/StdlibUnittest/RangeSet.swift
+++ b/validation-test/StdlibUnittest/RangeSet.swift
@@ -4,7 +4,7 @@
 import StdlibUnittest
 import StdlibCollectionUnittest
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension RangeSet: ExpressibleByArrayLiteral {
   public init(arrayLiteral elements: Range<Bound>...) {
     self.init(elements)
@@ -21,8 +21,7 @@ extension Collection {
 
 let RangeSetTests = TestSuite("RangeSet")
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
-  
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   let parent = -200..<200
   let source: RangeSet = [1..<5, 8..<10, 20..<22, 27..<29]
 
diff --git a/validation-test/StdlibUnittest/Stdin.swift b/validation-test/StdlibUnittest/Stdin.swift
index 8473776a10f03..056a92c9ca04e 100644
--- a/validation-test/StdlibUnittest/Stdin.swift
+++ b/validation-test/StdlibUnittest/Stdin.swift
@@ -4,9 +4,9 @@
 import StdlibUnittest
 
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/compiler_crashers_2_fixed/0186-rdar46497155.swift b/validation-test/compiler_crashers_2_fixed/0186-rdar46497155.swift
index 753d4086ceb50..6bd3c36e20b46 100644
--- a/validation-test/compiler_crashers_2_fixed/0186-rdar46497155.swift
+++ b/validation-test/compiler_crashers_2_fixed/0186-rdar46497155.swift
@@ -22,7 +22,7 @@ func foo(arr: [E], other: P) -> Bool {
   return arr.compactMap { i in
     var flag = false
     return try? i.getB(&flag)
-  }.compactMap { u -> P? in // expected-error {{nable to infer type of a closure parameter 'u' in the current context}}
+  }.compactMap { u -> P? in // expected-error {{unable to infer type of a closure parameter 'u' in the current context}}
     guard let a = try? u.foo() else { return nil }
     return a.value!
   }.contains {
diff --git a/validation-test/compiler_crashers_2_fixed/0196-rdar48937223.swift b/validation-test/compiler_crashers_2_fixed/0196-rdar48937223.swift
index c8e9979569714..2414c14a4442d 100644
--- a/validation-test/compiler_crashers_2_fixed/0196-rdar48937223.swift
+++ b/validation-test/compiler_crashers_2_fixed/0196-rdar48937223.swift
@@ -6,7 +6,7 @@ func fn<T, U: P>(_ arg1: T, arg2: (T) -> U) {}
 // expected-note@-1 {{required by global function 'fn(_:arg2:)' where 'U' = '()'}}
 
 func test(str: String) {
-  fn(str) { arg in // expected-error {{type '()' cannot conform to 'P'; only struct/enum/class types can conform to protocols}}
+  fn(str) { arg in // expected-error {{type '()' cannot conform to 'P'; only concrete types such as structs, enums and classes can conform to protocols}}
     <#FOO#> // expected-error {{editor placeholder in source file}}
   }
 }
diff --git a/validation-test/compiler_crashers_2_fixed/sr11030.swift b/validation-test/compiler_crashers_2_fixed/sr11030.swift
new file mode 100644
index 0000000000000..97a264766fa47
--- /dev/null
+++ b/validation-test/compiler_crashers_2_fixed/sr11030.swift
@@ -0,0 +1,45 @@
+// RUN: %target-swift-frontend -O -emit-ir %s
+
+public class Coordinator: ConcreteCoordinator {
+    public func coordinate() {
+
+    }
+}
+
+public typealias ConcreteCoordinator = InternalBaseCoordinator & CoordinatorProtocol
+
+public protocol CoordinatorProtocol {
+    func coordinate()
+}
+
+public protocol ViewBridgeProtocol {
+    func createCoordinator() -> ConcreteCoordinator
+}
+
+public class InternalBaseViewBridge {
+
+    public func startCoordinator() {
+        abstract().createCoordinator()
+            .with(success: nil)
+            .coordinate()
+    }
+
+    private func abstract() -> ViewBridgeProtocol {
+        return self as! ViewBridgeProtocol
+    }
+
+}
+
+public class InternalBaseCoordinator: InternalCoordinatorProtocol {
+    
+}
+
+public protocol InternalCoordinatorProtocol: AnyObject {
+    
+}
+
+extension InternalCoordinatorProtocol {
+    public func with(success: ((ConcreteCoordinator) -> Void)?) -> Self {
+        return self
+    }
+}
diff --git a/validation-test/compiler_crashers_2/sr11108.swift b/validation-test/compiler_crashers_2_fixed/sr11108.swift
similarity index 87%
rename from validation-test/compiler_crashers_2/sr11108.swift
rename to validation-test/compiler_crashers_2_fixed/sr11108.swift
index 8c82d6cbc9c9d..14f1ec3e8b8b5 100644
--- a/validation-test/compiler_crashers_2/sr11108.swift
+++ b/validation-test/compiler_crashers_2_fixed/sr11108.swift
@@ -1,6 +1,4 @@
-// RUN: not --crash %target-swift-emit-silgen %s
-
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen %s
 
 protocol Example {
     associatedtype Signed: SignedInteger
diff --git a/validation-test/compiler_crashers_2_fixed/sr12994.swift b/validation-test/compiler_crashers_2_fixed/sr12994.swift
new file mode 100644
index 0000000000000..c203fb5d1be2f
--- /dev/null
+++ b/validation-test/compiler_crashers_2_fixed/sr12994.swift
@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -index-store-path %t/idx -o %t/file.o -typecheck -primary-file %s -verify
+
+protocol MyProto {
+  func compile() throws
+}
+
+func compile(x: MyProto) throws {
+  try x.compile 
+  // expected-error@-1 {{expression resolves to an unused function}}
+  // expected-warning@-2 {{no calls to throwing functions occur within 'try' expression}}
+}
diff --git a/validation-test/compiler_crashers_2_fixed/sr13118.swift b/validation-test/compiler_crashers_2_fixed/sr13118.swift
new file mode 100644
index 0000000000000..34d7fa5445cc7
--- /dev/null
+++ b/validation-test/compiler_crashers_2_fixed/sr13118.swift
@@ -0,0 +1,5 @@
+// RUN: %target-typecheck-verify-swift %s
+
+public struct S<T : Codable> : Codable {
+  var s: [T]!
+}
diff --git a/validation-test/compiler_crashers_2_fixed/sr1329.swift b/validation-test/compiler_crashers_2_fixed/sr1329.swift
new file mode 100644
index 0000000000000..b5fe26d83a9c7
--- /dev/null
+++ b/validation-test/compiler_crashers_2_fixed/sr1329.swift
@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend -emit-ir %s -disable-objc-attr-requires-foundation-module
+// REQUIRES: objc_interop
+
+@objc protocol TestProtocol {
+    func foo(i: Int)
+}
+
+class Test : TestProtocol {
+    @objc func foo(i: Int) {
+    }
+}
+
+func bar(t: TestProtocol?) {
+    let foofunc = t?.foo
+    foofunc?(5)
+}
diff --git a/validation-test/compiler_crashers_fixed/00017-llvm-foldingset-llvm-attributesetnode-nodeequals.swift b/validation-test/compiler_crashers_fixed/00017-llvm-foldingset-llvm-attributesetnode-nodeequals.swift
index d58f6e86f203e..6f574b0e9dcac 100644
--- a/validation-test/compiler_crashers_fixed/00017-llvm-foldingset-llvm-attributesetnode-nodeequals.swift
+++ b/validation-test/compiler_crashers_fixed/00017-llvm-foldingset-llvm-attributesetnode-nodeequals.swift
@@ -20,4 +20,4 @@ extension Bool : BooleanProtocol {
 func f<T : BooleanProtocol>(_ b: T) {}
 // expected-note@-1 {{required by global function 'f' where 'T' = 'BooleanProtocol'}}
 
-f(true as BooleanProtocol) // expected-error {{value of protocol type 'BooleanProtocol' cannot conform to 'BooleanProtocol'; only struct/enum/class types can conform to protocols}}
+f(true as BooleanProtocol) // expected-error {{protocol 'BooleanProtocol' as a type cannot conform to the protocol itself; only concrete types such as structs, enums and classes can conform to protocols}}
diff --git a/validation-test/compiler_crashers/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift b/validation-test/compiler_crashers_fixed/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift
similarity index 83%
rename from validation-test/compiler_crashers/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift
rename to validation-test/compiler_crashers_fixed/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift
index bce90c51bd538..fd641ca3dfa49 100644
--- a/validation-test/compiler_crashers/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift
+++ b/validation-test/compiler_crashers_fixed/28809-isdigit-ident-pos-first-char-of-sub-string-may-not-be-a-digit.swift
@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// REQUIRES: asserts
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+
+// RUN: not %target-swift-frontend %s -emit-ir
 protocol 0{class TextOutputStream
diff --git a/validation-test/execution/interpret-with-dependencies.swift b/validation-test/execution/interpret-with-dependencies.swift
index 330691dfea769..dbec4b8684274 100644
--- a/validation-test/execution/interpret-with-dependencies.swift
+++ b/validation-test/execution/interpret-with-dependencies.swift
@@ -1,8 +1,9 @@
 // REQUIRES: OS=macosx
 // RUN: %empty-directory(%t)
+// REQUIRES: swift_interpreter
 
-// RUN: echo 'int abc = 42;' | %clang -x c - -dynamiclib -Xlinker -install_name -Xlinker libabc.dylib -o %t/libabc.dylib
-// RUN: echo 'int test() { extern int abc; return abc; }' | %clang -x c - -L%t -dynamiclib -labc -o %t/libfoo.dylib
+// RUN: echo 'int abc = 42;' | %clang -x c - -dynamiclib -Xlinker -install_name -Xlinker libabc.dylib -o %t/libabc.dylib -L %sdk/usr/lib
+// RUN: echo 'int test() { extern int abc; return abc; }' | %clang -x c - -L%t -dynamiclib -labc -o %t/libfoo.dylib -L %sdk/usr/lib
 
 // RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | %FileCheck %s
 // CHECK: {{okay}}
diff --git a/validation-test/stdlib/CoreAudio.swift b/validation-test/stdlib/CoreAudio.swift
deleted file mode 100644
index 399cff4b5a459..0000000000000
--- a/validation-test/stdlib/CoreAudio.swift
+++ /dev/null
@@ -1,303 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-import StdlibCollectionUnittest
-
-
-import CoreAudio
-
-// Used in tests below.
-extension AudioBuffer : Equatable {}
-
-public func == (lhs: AudioBuffer, rhs: AudioBuffer) -> Bool {
-  return lhs.mNumberChannels == rhs.mNumberChannels &&
-    lhs.mDataByteSize == rhs.mDataByteSize &&
-    lhs.mData == rhs.mData
-}
-
-var CoreAudioTestSuite = TestSuite("CoreAudio")
-
-// The size of the non-flexible part of an AudioBufferList.
-#if arch(i386) || arch(arm)
-let ablHeaderSize = 4
-#elseif arch(x86_64) || arch(arm64)
-let ablHeaderSize = 8
-#endif
-
-CoreAudioTestSuite.test("UnsafeBufferPointer.init(_: AudioBuffer)") {
-  do {
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 0, mDataByteSize: 0, mData: nil)
-    let result: UnsafeBufferPointer<Float> = UnsafeBufferPointer(audioBuffer)
-    expectEqual(nil, result.baseAddress)
-    expectEqual(0, result.count)
-  }
-
-  do {
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 2, mDataByteSize: 1024,
-      mData: UnsafeMutableRawPointer(bitPattern: 0x1234_5678))
-    let result: UnsafeBufferPointer<Float> = UnsafeBufferPointer(audioBuffer)
-    expectEqual(audioBuffer.mData, UnsafeRawPointer(result.baseAddress!))
-    expectEqual(256, result.count)
-  }
-}
-
-CoreAudioTestSuite.test("UnsafeMutableBufferPointer.init(_: AudioBuffer)") {
-  do {
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 0, mDataByteSize: 0, mData: nil)
-    let result: UnsafeMutableBufferPointer<Float> =
-      UnsafeMutableBufferPointer(audioBuffer)
-    expectEqual(nil, result.baseAddress)
-    expectEqual(0, result.count)
-  }
-
-  do {
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 2, mDataByteSize: 1024,
-      mData: UnsafeMutableRawPointer(bitPattern: 0x1234_5678))
-    let result: UnsafeMutableBufferPointer<Float> =
-      UnsafeMutableBufferPointer(audioBuffer)
-    expectEqual(audioBuffer.mData!, UnsafeMutableRawPointer(result.baseAddress!))
-    expectEqual(256, result.count)
-  }
-}
-
-CoreAudioTestSuite.test(
-  "AudioBuffer.init(_: UnsafeMutableBufferPointer, numberOfChannels: Int)") {
-  do {
-    // NULL pointer.
-    let buffer = UnsafeMutableBufferPointer<Float>(start: nil, count: 0)
-    let result = AudioBuffer(buffer, numberOfChannels: 2)
-    expectEqual(2, result.mNumberChannels)
-    expectEqual(0, result.mDataByteSize)
-    expectEqual(nil, result.mData)
-  }
-  do {
-    // Non-NULL pointer.
-    let buffer = UnsafeMutableBufferPointer<Float>(
-      start: UnsafeMutablePointer<Float>(bitPattern: 0x1234_5678), count: 0)
-    let result = AudioBuffer(buffer, numberOfChannels: 2)
-    expectEqual(2, result.mNumberChannels)
-    expectEqual(0, result.mDataByteSize)
-    expectEqual(buffer.baseAddress, result.mData)
-  }
-}
-
-CoreAudioTestSuite.test(
-  "AudioBuffer.init(_: UnsafeMutableBufferPointer, numberOfChannels: Int)/trap") {
-#if arch(i386) || arch(arm)
-  let overflowingCount = Int.max
-#elseif arch(x86_64) || arch(arm64)
-  let overflowingCount = Int(UInt32.max)
-#endif
-  let buffer = UnsafeMutableBufferPointer<Float>(
-    start: UnsafeMutablePointer<Float>(bitPattern: 0x1234_5678),
-    count: overflowingCount)
-
-  expectCrashLater()
-  // An overflow happens when we try to compute the value for mDataByteSize.
-  _ = AudioBuffer(buffer, numberOfChannels: 2)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.sizeInBytes(maximumBuffers: Int)") {
-  expectEqual(ablHeaderSize + MemoryLayout<AudioBuffer>.stride,
-    AudioBufferList.sizeInBytes(maximumBuffers: 1))
-  expectEqual(ablHeaderSize + 16 * MemoryLayout<AudioBuffer>.stride,
-    AudioBufferList.sizeInBytes(maximumBuffers: 16))
-}
-
-CoreAudioTestSuite.test("AudioBufferList.sizeInBytes(maximumBuffers: Int)/trap/count<0") {
-  expectCrashLater()
-  _ = AudioBufferList.sizeInBytes(maximumBuffers: -1)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.sizeInBytes(maximumBuffers: Int)/trap/count==0") {
-  expectCrashLater()
-  _ = AudioBufferList.sizeInBytes(maximumBuffers: -1)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.sizeInBytes(maximumBuffers: Int)/trap/overflow") {
-  expectCrashLater()
-  _ = AudioBufferList.sizeInBytes(maximumBuffers: Int.max)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.allocate(maximumBuffers: Int)") {
-  do {
-    let ablPtrWrapper = AudioBufferList.allocate(maximumBuffers: 1)
-    expectEqual(1, ablPtrWrapper.count)
-    free(ablPtrWrapper.unsafeMutablePointer)
-  }
-  do {
-    let ablPtrWrapper = AudioBufferList.allocate(maximumBuffers: 16)
-    expectEqual(16, ablPtrWrapper.count)
-    free(ablPtrWrapper.unsafeMutablePointer)
-  }
-}
-
-CoreAudioTestSuite.test("AudioBufferList.allocate(maximumBuffers: Int)/trap/count==0") {
-  expectCrashLater()
-  _ = AudioBufferList.allocate(maximumBuffers: 0)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.allocate(maximumBuffers: Int)/trap/count<0") {
-  expectCrashLater()
-  _ = AudioBufferList.allocate(maximumBuffers: -1)
-}
-
-CoreAudioTestSuite.test("AudioBufferList.allocate(maximumBuffers: Int)/trap/overflow") {
-  expectCrashLater()
-  _ = AudioBufferList.allocate(maximumBuffers: Int.max)
-}
-
-CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer/AssociatedTypes") {
-  typealias Subject = UnsafeMutableAudioBufferListPointer
-  expectRandomAccessCollectionAssociatedTypes(
-    collectionType: Subject.self,
-    iteratorType: IndexingIterator<Subject>.self,
-    subSequenceType: Slice<Subject>.self,
-    indexType: Int.self,
-    indicesType: CountableRange<Int>.self)
-}
-
-CoreAudioTestSuite.test(
-  "UnsafeMutableAudioBufferListPointer.init(_: UnsafeMutablePointer<AudioBufferList>)," +
-  "UnsafeMutableAudioBufferListPointer.unsafePointer," +
-  "UnsafeMutableAudioBufferListPointer.unsafeMutablePointer") {
-  do {
-    let ablPtrWrapper = UnsafeMutableAudioBufferListPointer(nil)
-    expectNil(ablPtrWrapper)
-  }
-
-  do {
-    let ablPtrWrapper = UnsafeMutableAudioBufferListPointer(
-      UnsafeMutablePointer<AudioBufferList>(bitPattern: 0x1234_5678)!)
-    expectEqual(
-      UnsafePointer<AudioBufferList>(bitPattern: 0x1234_5678),
-      ablPtrWrapper.unsafePointer)
-    expectEqual(
-      UnsafePointer<AudioBufferList>(bitPattern: 0x1234_5678),
-      ablPtrWrapper.unsafeMutablePointer)
-  }
-
-  do {
-    let ablPtrWrapper = UnsafeMutableAudioBufferListPointer(
-      UnsafeMutablePointer<AudioBufferList>(bitPattern: 0x1234_5678))
-    expectNotNil(ablPtrWrapper)
-    expectEqual(
-      UnsafePointer<AudioBufferList>(bitPattern: 0x1234_5678),
-      ablPtrWrapper!.unsafePointer)
-    expectEqual(
-      UnsafePointer<AudioBufferList>(bitPattern: 0x1234_5678),
-      ablPtrWrapper!.unsafeMutablePointer)
-  }
-}
-
-CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.count") {
-  let sizeInBytes = AudioBufferList.sizeInBytes(maximumBuffers: 16)
-  let rawPtr = UnsafeMutableRawPointer.allocate(
-    byteCount: sizeInBytes, alignment: MemoryLayout<AudioBufferList>.alignment)
-  let ablPtr = rawPtr.bindMemory(to: AudioBufferList.self,
-    capacity: sizeInBytes / MemoryLayout<AudioBufferList>.stride)
-
-  // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
-  // the 'count' property has a nonmutating setter.
-  let ablPtrWrapper = UnsafeMutableAudioBufferListPointer(ablPtr)
-
-  // Test getter.
-  rawPtr.storeBytes(of: 0x1234_5678, as: UInt32.self)
-  expectEqual(0x1234_5678, ablPtrWrapper.count)
-
-  // Test setter.
-  ablPtrWrapper.count = 0x7765_4321
-  expectEqual(0x7765_4321, rawPtr.load(as: UInt32.self))
-
-  rawPtr.deallocate()
-}
-
-CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.subscript(_: Int)") {
-  let sizeInBytes = AudioBufferList.sizeInBytes(maximumBuffers: 16)
-
-  let rawPtr = UnsafeMutableRawPointer.allocate(
-    byteCount: sizeInBytes, alignment: 1)
-
-  let ablPtr = rawPtr.bindMemory(
-    to: AudioBufferList.self,
-    capacity: sizeInBytes / MemoryLayout<AudioBufferList>.stride)
-
-  // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
-  // the subscript has a nonmutating setter.
-  let ablPtrWrapper = UnsafeMutableAudioBufferListPointer(ablPtr)
-
-  do {
-    // Test getter.
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 2, mDataByteSize: 1024,
-      mData: UnsafeMutableRawPointer(bitPattern: 0x1234_5678))
-
-    let bufPtr = (rawPtr + ablHeaderSize).assumingMemoryBound(
-      to: AudioBuffer.self)
-    bufPtr.pointee = audioBuffer
-    ablPtrWrapper.count = 1
-
-    expectEqual(2, ablPtrWrapper[0].mNumberChannels)
-    expectEqual(1024, ablPtrWrapper[0].mDataByteSize)
-    expectEqual(audioBuffer.mData, ablPtrWrapper[0].mData)
-  }
-
-  do {
-    // Test setter.
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: 5, mDataByteSize: 256,
-      mData: UnsafeMutableRawPointer(bitPattern: 0x8765_4321 as UInt))
-
-    ablPtrWrapper.count = 2
-    ablPtrWrapper[1] = audioBuffer
-
-    let audioBufferPtr = (rawPtr + ablHeaderSize).assumingMemoryBound(
-      to: AudioBuffer.self) + 1
-    expectEqual(5, audioBufferPtr.pointee.mNumberChannels)
-    expectEqual(256, audioBufferPtr.pointee.mDataByteSize)
-    expectEqual(audioBuffer.mData, audioBufferPtr.pointee.mData)
-  }
-
-  ablPtr.deallocate()
-}
-
-CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.subscript(_: Int)/trap") {
-  let ablPtrWrapper = AudioBufferList.allocate(maximumBuffers: 4)
-
-  ablPtrWrapper[0].mNumberChannels = 42
-  ablPtrWrapper[1].mNumberChannels = 42
-  ablPtrWrapper[2].mNumberChannels = 42
-  ablPtrWrapper[3].mNumberChannels = 42
-
-  expectCrashLater()
-  ablPtrWrapper[4].mNumberChannels = 42
-}
-
-CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer/Collection") {
-  var ablPtrWrapper = AudioBufferList.allocate(maximumBuffers: 16)
-  expectType(UnsafeMutableAudioBufferListPointer.self, &ablPtrWrapper)
-
-  var expected: [AudioBuffer] = []
-  for i in 0..<16 {
-    let audioBuffer = AudioBuffer(
-      mNumberChannels: UInt32(2 + i), mDataByteSize: UInt32(1024 * i),
-      mData: UnsafeMutableRawPointer(bitPattern: 0x1234_5678 + i * 10))
-
-    ablPtrWrapper[i] = audioBuffer
-    expected.append(audioBuffer)
-  }
-
-  // FIXME: use checkMutableRandomAccessCollection, when we have that function.
-  checkRandomAccessCollection(expected, ablPtrWrapper)
-  free(ablPtrWrapper.unsafeMutablePointer)
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/CoreData.swift b/validation-test/stdlib/CoreData.swift
deleted file mode 100644
index 9be14aea7037d..0000000000000
--- a/validation-test/stdlib/CoreData.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-// RUN: %empty-directory(%t)
-
-// RUN: %target-clang %S/Inputs/CoreDataHelper/CoreDataHelper.m -c -o %t/CoreDataHelper.o -g -fmodules
-// RUN: %target-build-swift %s -import-objc-header %S/Inputs/CoreDataHelper/CoreDataHelper.h -Xlinker %t/CoreDataHelper.o -o %t/main
-// RUN: %target-codesign %t/main
-// RUN: %target-run %t/main
-
-// REQUIRES: executable_test
-// REQUIRES: objc_interop
-
-import CoreData
-import StdlibUnittest
-
-var CoreDataTests = TestSuite("CoreData")
-
-CoreDataTests.test("conformsToProtocol") {
-  expectTrue(NSDictionary.conforms(to: NSFetchRequestResult.self))
-  expectTrue(NSManagedObject.conforms(to: NSFetchRequestResult.self))
-}
-
-CoreDataTests.test("downcasting") {
-  var dictionaries = NSFetchRequest<NSFetchRequestResult>.testGettingSomeDictionaries()
-  expectType([NSFetchRequestResult].self, &dictionaries)
-
-  let casted = dictionaries as? [[NSObject: AnyObject]]
-  expectNotNil(casted)
-  expectEqual([[:] as NSDictionary, [:] as NSDictionary] as NSArray, casted! as NSArray)
-  expectEqual([[:] as NSDictionary, [:] as NSDictionary] as NSArray, dictionaries as! [[NSObject: AnyObject]] as NSArray)
-}
-
-CoreDataTests.test("bridging") {
-  var dictionaries = NSFetchRequest<NSDictionary>.testGettingSomeDictionaries()
-  expectType([NSDictionary].self, &dictionaries)
-  expectEqual([[:], [:]], dictionaries)
-
-  let casted = dictionaries as? [[NSObject: AnyObject]]
-  expectNotNil(casted)
-  expectEqual([[:] as NSDictionary, [:] as NSDictionary] as NSArray, casted! as NSArray)
-  expectEqual([[:] as NSDictionary, [:] as NSDictionary] as NSArray, dictionaries as! [[NSObject: AnyObject]] as NSArray)
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/CoreGraphics-execute.swift b/validation-test/stdlib/CoreGraphics-execute.swift
index 27ab08b945cd4..35e38a84d52bf 100644
--- a/validation-test/stdlib/CoreGraphics-execute.swift
+++ b/validation-test/stdlib/CoreGraphics-execute.swift
@@ -60,9 +60,9 @@ CoreGraphicsTests.test("CGColor/_ExpressibleByColorLiteral") {
 CoreGraphicsTests.test("CGColor/description") {
   expectTrue(String(describing: makeCGColor(red: 1, green: 0, blue: 0, alpha: 1)).contains("1 0 0 1"))
 #if os(macOS)
-  expectTrue(String(describing: CGColor.black).contains("Generic Gray Profile"))
-  expectTrue(String(describing: CGColor.white).contains("Generic Gray Profile"))
-  expectTrue(String(describing: CGColor.clear).contains("Generic Gray Profile"))
+  expectTrue(String(describing: CGColor.black).contains("Generic Gray"))
+  expectTrue(String(describing: CGColor.white).contains("Generic Gray"))
+  expectTrue(String(describing: CGColor.clear).contains("Generic Gray"))
 #endif
 }
 
diff --git a/validation-test/stdlib/CoreMedia.swift b/validation-test/stdlib/CoreMedia.swift
deleted file mode 100644
index a214952faf693..0000000000000
--- a/validation-test/stdlib/CoreMedia.swift
+++ /dev/null
@@ -1,196 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-
-import CoreMedia
-
-var CoreMediaTests = TestSuite("CoreMedia")
-
-// This is a basic smoke test to check that the overlay works.  It should be
-// replaced with comprehensive tests.
-CoreMediaTests.test("OverlaySmokeTest") {
-  expectTrue(CMTimeMake(1, 10).isValid)
-  expectTrue(CMTimeRangeMake(CMTimeMake(1, 10), CMTimeMake(2, 20)).isValid)
-}
-
-CoreMediaTests.test("CMTime(value:timescale:)") {
-  let time = CMTime(value: 7, timescale: 1)
-  expectTrue(time.isValid)
-  expectEqual(7, time.value)
-  expectEqual(1, time.timescale)
-}
-
-CoreMediaTests.test("CMTime(seconds:preferredTimescale:)") {
-  let time = CMTime(seconds: 7.0, preferredTimescale: 600)
-  expectTrue(time.isValid)
-  expectEqual(7.0, time.seconds)
-}
-
-CoreMediaTests.test("CMTime/Comparable") {
-  let instances: [(Int, CMTime)] = [
-    (-9999, CMTime(seconds: -Double.infinity, preferredTimescale: 600)),
-    (10, CMTime(seconds: 10.0, preferredTimescale: 600)),
-    (10, CMTime(seconds: 10.0, preferredTimescale: 600)),
-    (20, CMTime(seconds: 20.0, preferredTimescale: 600)),
-    (30, CMTime(seconds: 30.0, preferredTimescale: 600)),
-    (9999, CMTime(seconds: Double.infinity, preferredTimescale: 600)),
-  ]
-  func comparisonOracle(i: Int, j: Int) -> ExpectedComparisonResult {
-    return instances[i].0 <=> instances[j].0
-  }
-  checkComparable(instances.map { $0.1 }, oracle: comparisonOracle)
-}
-
-CoreMediaTests.test("CMTimeRange(start:duration:)") {
-  let start = CMTime(seconds: 10.0, preferredTimescale: 600)
-  let duration = CMTime(seconds: 5.0, preferredTimescale: 600)
-  let range = CMTimeRange(start: start, duration: duration)
-  expectEqual(start, range.start)
-  expectEqual(duration, range.duration)
-}
-
-CoreMediaTests.test("CMTimeRange(start:end:)") {
-  let start = CMTime(seconds: 10.0, preferredTimescale: 600)
-  let end = CMTime(seconds: 20.0, preferredTimescale: 600)
-  let range = CMTimeRange(start: start, end: end)
-  expectEqual(start, range.start)
-  expectEqual(end, range.end)
-}
-
-CoreMediaTests.test("CMTimeRange/Equatable") {
-  let time10 = CMTime(seconds: 10.0, preferredTimescale: 600)
-  let time20 = CMTime(seconds: 20.0, preferredTimescale: 600)
-  let timeInf = CMTime(seconds: Double.infinity, preferredTimescale: 600)
-
-  let instances: [(Int, CMTimeRange)] = [
-    (10, CMTimeRangeMake(time10, time10)),
-    (10, CMTimeRangeMake(time10, time10)),
-
-    (20, CMTimeRangeMake(time10, time20)),
-    (20, CMTimeRangeMake(time10, time20)),
-
-    (9999, CMTimeRangeMake(timeInf, time20)),
-    (9999, CMTimeRangeMake(timeInf, time20)),
-  ]
-  func comparisonOracle(i: Int, j: Int) -> Bool {
-    return instances[i].0 == instances[j].0
-  }
-  checkEquatable(instances.map { $0.1 }, oracle: comparisonOracle)
-}
-
-
-var CMTimeTests = TestSuite("CMTime")
-
-let t1 = CMTimeMake(1, 10)
-let t2 = CMTimeMake(2, 10)
-
-CMTimeTests.test("isValid") {
-  expectFalse(kCMTimeInvalid.isValid)
-  expectTrue(t1.isValid)
-}
-
-CMTimeTests.test("isPositiveInfinity") {
-  expectTrue(kCMTimePositiveInfinity.isPositiveInfinity)
-  expectFalse(t1.isPositiveInfinity)
-}
-
-CMTimeTests.test("isNegativeInfinity") {
-  expectTrue(kCMTimeNegativeInfinity.isNegativeInfinity)
-  expectFalse(t1.isNegativeInfinity)
-}
-
-CMTimeTests.test("isIndefinite") {
-  expectTrue(kCMTimeIndefinite.isIndefinite)
-  expectFalse(t1.isIndefinite)
-}
-
-CMTimeTests.test("isNumeric") {
-  expectFalse(kCMTimeInvalid.isNumeric)
-  expectFalse(kCMTimePositiveInfinity.isNumeric)
-  expectFalse(kCMTimeNegativeInfinity.isNumeric)
-  expectFalse(kCMTimeIndefinite.isNumeric)
-  expectTrue(t1.isNumeric)
-
-  expectFalse(t1.hasBeenRounded)
-
-  expectEqual(0.1, t1.seconds)
-
-  t1.convertScale(100, method: CMTimeRoundingMethod.`default`)
-
-  var t1a = t1.convertScale(11, method: CMTimeRoundingMethod.`default`)
-  expectTrue(t1a.hasBeenRounded)
-}
-
-CMTimeTests.test("operators") {
-  expectEqual(CMTimeMake(3, 10), t1 + t2)
-  expectEqual(CMTimeMake(1, 10), t2 - t1)
-
-  expectFalse(t1 < kCMTimeZero)
-  expectFalse(t1 == kCMTimeZero)
-  expectTrue(t1 > kCMTimeZero)
-
-  expectFalse(t1 <= kCMTimeZero)
-  expectTrue(t1 >= kCMTimeZero)
-  expectTrue(t1 != kCMTimeZero)
-}
-
-let r1 = CMTimeRangeMake(kCMTimeZero, CMTimeMake(1, 1))
-let r2 = CMTimeRangeMake(kCMTimeZero, kCMTimeZero)
-let r3 = CMTimeRangeMake(CMTimeMake(1, 1), CMTimeMake(3, 2))
-
-var CMTimeRangeTests = TestSuite("CMTimeRange")
-
-CMTimeRangeTests.test("isValid") {
-  expectTrue(r1.isValid)
-  expectTrue(r2.isValid)
-  expectTrue(r3.isValid)
-  expectFalse(kCMTimeRangeInvalid.isValid)
-}
-
-CMTimeRangeTests.test("isIndefinite") {
-  expectFalse(r1.isIndefinite)
-  expectFalse(r2.isIndefinite)
-  expectFalse(r3.isIndefinite)
-}
-
-CMTimeRangeTests.test("isEmpty") {
-  expectFalse(r1.isEmpty)
-  expectTrue(r2.isEmpty)
-  expectFalse(r3.isEmpty)
-}
-
-CMTimeRangeTests.test("start/end") {
-  expectEqual(CMTimeMake(1, 1), r3.start)
-  expectEqual(CMTimeMake(5, 2), r3.end)
-}
-
-CMTimeRangeTests.test("union") {
-  expectEqual(r1, r1.union(r2))
-  expectEqual(r2, r2.union(r2))
-  expectNotEqual(r3, r2.union(r3))
-}
-
-CMTimeRangeTests.test("intersection") {
-  expectEqual(r2, r1.intersection(r2))
-  expectEqual(r2, r1.intersection(r3))
-}
-
-CMTimeRangeTests.test("contains") {
-  expectTrue(r1.containsTimeRange(r2))
-  expectFalse(r2.containsTimeRange(r2))
-  expectFalse(r2.containsTimeRange(r1))
-  expectFalse(r3.containsTime(kCMTimeZero))
-}
-
-CMTimeRangeTests.test("operators") {
-  expectFalse(r1 == r2)
-  expectTrue(r1 != r2)
-}
-
-runAllTests()
-
diff --git a/validation-test/stdlib/CryptoTokenKitTests.swift b/validation-test/stdlib/CryptoTokenKitTests.swift
deleted file mode 100644
index e3497176c0b12..0000000000000
--- a/validation-test/stdlib/CryptoTokenKitTests.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-// RUN: %target-typecheck-verify-swift
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-// UNSUPPORTED: OS=tvos
-// UNSUPPORTED: OS=ios
-
-import CryptoTokenKit
-import Security
-
-if #available(OSX 10.12, *) {
-  struct TKSmartCardTest {
-    func t1(manager: TKSmartCardSlotManager, name: String) {
-      manager.getSlot(withName: name) { (slot: TKSmartCardSlot?) in
-        let _: TKSmartCardSlot.State = slot!.state
-      }
-    }
-
-    let p1 = TKSmartCardPINFormat.Charset.numeric
-    let p2 = TKSmartCardPINFormat.Encoding.ascii
-    let p3 = TKSmartCardPINFormat.Encoding.bcd
-    let p4 = TKSmartCardPINFormat.Justification.left
-    let p5 = TKSmartCardUserInteractionForPINOperation.Completion.key
-    let p6 = TKSmartCardUserInteractionForSecurePINChange.Confirmation.current
-    let p7 = TKSmartCardProtocol.t0
-    let p8 = TKSmartCardProtocol.t1
-    let p9 = TKSmartCardProtocol.t15
-    let p10 = TKSmartCardATR.InterfaceGroup()
-
-    func t2(card: TKSmartCard) throws {
-      card.isSensitive = card.isValid
-      card.transmit(Data()) { (response: Data?, error: Error?) in
-      }
-
-      card.userInteractionForSecurePINVerification(TKSmartCardPINFormat(),
-          apdu: Data(), pinByteOffset: 0)
-      card.userInteractionForSecurePINChange(TKSmartCardPINFormat(),
-          apdu: Data(), currentPINByteOffset: 0, newPINByteOffset: 0)
-
-      card.send(ins: 0xa4, p1: 0x04, p2: 0x00, data:Data(), le: 0) {
-        (response: Data?, sw: UInt16, error: Error?) in
-      }
-
-      card.send(ins: 0xa4, p1: 0x04, p2: 0x00, le: 0) {
-        (response: Data?, sw: UInt16, error: Error?) in
-      }
-
-      card.send(ins: 0xa4, p1: 0x04, p2: 0x00, data:Data()) {
-        (response: Data?, sw: UInt16, error: Error?) in
-      }
-
-      card.send(ins: 0xa4, p1: 0x04, p2: 0x00) {
-        (response: Data?, sw: UInt16, error: Error?) in
-      }
-
-      let _: Int = try card.withSession() {
-        let (_, _): (UInt16, Data) = try card.send(ins: 0xa4, p1: 0x04,
-            p2: 0x00, data: Data(), le: 0)
-        let (_, _): (UInt16, Data) = try card.send(ins: 0xa4, p1: 0x04,
-            p2: 0x00, le: 0)
-        let (_, _): (UInt16, Data) = try card.send(ins: 0xa4, p1: 0x04,
-            p2: 0x00, data: Data())
-        let (_, _): (UInt16, Data) = try card.send(ins: 0xa4, p1: 0x04,
-            p2: 0x00)
-        return 1
-      }
-    }
-  }
-
-  struct TKTokenTest {
-    func f1(session: TKTokenSession, sessionDelegate: TKTokenSessionDelegate,
-            algorithm: TKTokenKeyAlgorithm,
-            parameters: TKTokenKeyExchangeParameters) throws {
-      let _: Bool = sessionDelegate.tokenSession!(session, supports: .none,
-           keyObjectID: "", algorithm: algorithm)
-      let _: Data = try sessionDelegate.tokenSession!(session, sign: Data(),
-           keyObjectID: "", algorithm: algorithm)
-      let _: Data = try sessionDelegate.tokenSession!(session, decrypt: Data(),
-           keyObjectID: "", algorithm: algorithm)
-      let _: Data = try sessionDelegate.tokenSession!(session,
-           performKeyExchange: Data(), keyObjectID: "", algorithm: algorithm,
-           parameters: parameters)
-      let _: Bool = algorithm.isAlgorithm(.rsaSignatureDigestPKCS1v15SHA1)
-      let _: Bool = algorithm.supportsAlgorithm(.rsaSignatureDigestPKCS1v15SHA1)
-    }
-
-    func f2(token: TKToken, delegate: TKTokenDelegate) throws {
-      let _: TKTokenSession = try delegate.createSession(token)
-    }
-  }
-}
diff --git a/validation-test/stdlib/GameplayKit.swift b/validation-test/stdlib/GameplayKit.swift
deleted file mode 100644
index 767416aec95e6..0000000000000
--- a/validation-test/stdlib/GameplayKit.swift
+++ /dev/null
@@ -1,133 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-
-import GameplayKit
-
-// GameplayKit is only available on iOS 9.0 and above, OS X 10.11 and above, and
-// tvOS 9.0 and above.
-
-var GamePlayKitTests = TestSuite("GameplayKit")
-
-if #available(OSX 10.12, iOS 10.0, tvOS 10.0, *) {
-
-  GamePlayKitTests.test("GKPath_float2") {
-    let vec: [float2] = [float2(3.0), float2(4.0)]
-    let path = GKPath(points: vec, radius: Float(30), cyclical: true)
-    expectEqual(path.numPoints, 2)
-    expectEqual(path.radius, Float(30))
-    expectEqual(path.isCyclical, true)
-  }
-  GamePlayKitTests.test("GKPath_float3") {
-    let vec: [float3] = [float3(3.0), float3(4.0)]
-    let path = GKPath(points: vec, radius: Float(30), cyclical: true)
-    expectEqual(path.numPoints, 2)
-    expectEqual(path.radius, Float(30))
-    expectEqual(path.isCyclical, true)
-  }
-  GamePlayKitTests.test("GKPolygonObstacle") {
-    let vec = [float2(3.0, 3.0), float2(3.0, -3.0), float2(-3.0, 3.0), float2(-3.0, -3.0)]
-    let obstacle = GKPolygonObstacle(points: vec)
-    expectEqual(obstacle.vertexCount, 4)
-  }
-  GamePlayKitTests.test("GKEntity") {
-    @objc(MovementComponent)
-    class MovementComponent: GKComponent {
-      override func update(deltaTime seconds: TimeInterval) {}
-      override func didAddToEntity() {}
-      override func willRemoveFromEntity() {}
-    }
-    let comp = MovementComponent()
-    let entity = GKEntity()
-    entity.addComponent(comp)
-    expectEqual(entity.components.count, 1)
-    let grabbedComp = entity.component(ofType: MovementComponent.self)
-    expectEqual(grabbedComp, comp)
-    entity.removeComponent(ofType: MovementComponent.self)
-    expectEqual(entity.components.count, 0)
-  }
-}
-
-if #available(OSX 10.11, iOS 9.0, tvOS 9.0, *) {
-
-class TestComponent : GKComponent {}
-class OtherTestComponent : GKComponent {}
-
-class TestState1 : GKState {}
-class TestState2 : GKState {}
-
-GamePlayKitTests.test("GKEntity.component(ofType)") {
-  let entity = GKEntity()
-  entity.addComponent(TestComponent())
-
-  do {
-    var componentForTestComponent =
-      entity.component(ofType: TestComponent.self)
-    var componentForOtherTestComponent_nil =
-      entity.component(ofType: OtherTestComponent.self)
-
-    expectNotNil(componentForTestComponent)
-    expectType(Optional<TestComponent>.self, &componentForTestComponent)
-
-    expectNil(componentForOtherTestComponent_nil)
-  }
-
-  entity.removeComponent(ofType: TestComponent.self)
-  entity.addComponent(OtherTestComponent())
-
-  do {
-    var componentForOtherTestComponent =
-      entity.component(ofType: OtherTestComponent.self)
-    var componentForTestComponent_nil =
-      entity.component(ofType: TestComponent.self)
-
-    expectNotNil(componentForOtherTestComponent)
-    expectType(Optional<OtherTestComponent>.self, &componentForOtherTestComponent)
-
-    expectNil(componentForTestComponent_nil)
-  }
-}
-
-GamePlayKitTests.test("GKStateMachine.state(forClass:)") {
-  do {
-    // Construct a state machine with a custom subclass as the only state.
-    let stateMachine = GKStateMachine(
-      states: [TestState1()])
-
-    var stateForTestState1 =
-      stateMachine.state(forClass: TestState1.self)
-    var stateForTestState2_nil =
-      stateMachine.state(forClass: TestState2.self)
-
-    expectNotNil(stateForTestState1)
-    expectType(Optional<TestState1>.self, &stateForTestState1)
-
-    expectNil(stateForTestState2_nil)
-  }
-
-  do {
-    // Construct a state machine with a custom subclass as the only state.
-    let stateMachine = GKStateMachine(
-      states: [TestState2()])
-
-    var stateForTestState2 =
-      stateMachine.state(forClass: TestState2.self)
-    var stateForTestState1_nil =
-      stateMachine.state(forClass: TestState1.self)
-
-    expectNotNil(stateForTestState2)
-    expectType(Optional<TestState2>.self, &stateForTestState2)
-
-    expectNil(stateForTestState1_nil)
-  }
-}
-
-} // if #available(OSX 10.11, iOS 9.0, tvOS 9.0, *)
-
-runAllTests()
-
diff --git a/validation-test/stdlib/IOKitOverlay.swift b/validation-test/stdlib/IOKitOverlay.swift
deleted file mode 100644
index 9c057a71f0da2..0000000000000
--- a/validation-test/stdlib/IOKitOverlay.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: OS=macosx
-
-import IOKit
-import IOKit.hid
-import StdlibUnittest
-
-
-var IOKitTests = TestSuite("IOKit")
-
-IOKitTests.test("IOReturn value") {
-  // Error codes are computed by a helper function so it's enough to test one.
-  // The value is taken from the OS X 10.11 SDK.
-  expectEqual(Int(kIOReturnStillOpen), -536870190)
-}
-
-IOKitTests.test("IOReturn type") {
-  let manager = IOHIDManagerCreate(nil, 0)
-  let result = IOHIDManagerClose(manager, 0)
-  expectTrue(type(of: result) == type(of: kIOReturnNotOpen))
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/ModelIO.swift b/validation-test/stdlib/ModelIO.swift
deleted file mode 100644
index a1bd1f907ec63..0000000000000
--- a/validation-test/stdlib/ModelIO.swift
+++ /dev/null
@@ -1,334 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// UNSUPPORTED: OS=watchos
-// REQUIRES: objc_interop
-
-import StdlibUnittest
-
-import Foundation
-import ModelIO
-
-var ModelIOTests = TestSuite("ModelIO")
-
-if #available(OSX 10.13, iOS 11.0, tvOS 11.0, *) {
-    ModelIOTests.test("MDLAnimatedScalar/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let animatedVal = MDLAnimatedScalar()
-        let testCount = 10
-        let testTimeVal = 5.0
-        let testFloatVal:Float = 1.0
-        let testDoubleVal = Double(testFloatVal)
-        let fArray = [Float](repeating: testFloatVal, count: testCount)
-        let dArray = [Double](repeating: testDoubleVal, count: testCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(floatArray: fArray, atTimes: times)
-        let floats = animatedVal.floatArray
-        animatedVal.reset(doubleArray: dArray, atTimes: times)
-        let doubles = animatedVal.doubleArray
-        times = animatedVal.times
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            expectEqual(floats[idx], testFloatVal)
-            expectEqual(doubles[idx], testDoubleVal)
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedVector2/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let animatedVal = MDLAnimatedVector2()
-        let testCount = 10
-        let testTimeVal = 5.0
-        let testFloatVal = float2(1.0, 2.0)
-        let testDoubleVal = double2(Double(testFloatVal.x), Double(testFloatVal.y))
-        let fArray = [float2](repeating: testFloatVal, count: testCount)
-        let dArray = [double2](repeating: testDoubleVal, count: testCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(float2Array: fArray, atTimes: times)
-
-        let floats = animatedVal.float2Array
-        animatedVal.reset(double2Array: dArray, atTimes: times)
-        let doubles = animatedVal.double2Array
-        times = animatedVal.times
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            expectEqual(floats[idx].x, testFloatVal.x)
-            expectEqual(floats[idx].y, testFloatVal.y)
-            expectEqual(doubles[idx].x, testDoubleVal.x)
-            expectEqual(doubles[idx].y, testDoubleVal.y)
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedVector3/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let animatedVal = MDLAnimatedVector3()
-        let testCount = 10
-        let testTimeVal = 5.0
-        let testFloatVal = float3(1.0, 2.0, 3.0)
-        let testDoubleVal = double3(Double(testFloatVal.x), Double(testFloatVal.y), Double(testFloatVal.z))
-        let fArray = [float3](repeating: testFloatVal, count: testCount)
-        let dArray = [double3](repeating: testDoubleVal, count: testCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(float3Array: fArray, atTimes: times)
-
-        let floats = animatedVal.float3Array
-        animatedVal.reset(double3Array: dArray, atTimes: times)
-        let doubles = animatedVal.double3Array
-        times = animatedVal.times
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            expectEqual(floats[idx].x, testFloatVal.x)
-            expectEqual(floats[idx].y, testFloatVal.y)
-            expectEqual(floats[idx].z, testFloatVal.z)
-            expectEqual(doubles[idx].x, testDoubleVal.x)
-            expectEqual(doubles[idx].y, testDoubleVal.y)
-            expectEqual(doubles[idx].z, testDoubleVal.z)
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedVector4/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let animatedVal = MDLAnimatedVector4()
-        let testCount = 10
-        let testTimeVal = 5.0
-        let testFloatVal = float4(1.0, 2.0, 3.0, 4.0)
-        let testDoubleVal = double4(Double(testFloatVal.x), Double(testFloatVal.y), Double(testFloatVal.z), Double(testFloatVal.w))
-        let fArray = [float4](repeating: testFloatVal, count: testCount)
-        let dArray = [double4](repeating: testDoubleVal, count: testCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(float4Array: fArray, atTimes: times)
-
-        let floats = animatedVal.float4Array
-        animatedVal.reset(double4Array: dArray, atTimes: times)
-        let doubles = animatedVal.double4Array
-        times = animatedVal.times
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            expectEqual(floats[idx].x, testFloatVal.x)
-            expectEqual(floats[idx].y, testFloatVal.y)
-            expectEqual(floats[idx].z, testFloatVal.z)
-            expectEqual(floats[idx].w, testFloatVal.w)
-            expectEqual(doubles[idx].x, testDoubleVal.x)
-            expectEqual(doubles[idx].y, testDoubleVal.y)
-            expectEqual(doubles[idx].z, testDoubleVal.z)
-            expectEqual(doubles[idx].w, testDoubleVal.w)
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedMatrix4x4/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let animatedVal = MDLAnimatedMatrix4x4()
-        let testCount = 10
-        let testTimeVal = 5.0
-        let testFloatVal = matrix_identity_float4x4
-        let testDoubleVal = matrix_identity_double4x4
-        let fArray = [float4x4](repeating: testFloatVal, count: testCount)
-        let dArray = [double4x4](repeating: testDoubleVal, count: testCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(float4x4Array: fArray, atTimes: times)
-
-        let floats = animatedVal.float4x4Array
-        animatedVal.reset(double4Array: dArray, atTimes: times)
-        let doubles = animatedVal.double4x4Array
-        times = animatedVal.times
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            for matIdx in 0..<4 {
-                expectEqual(floats[idx][matIdx].x, testFloatVal[matIdx].x)
-                expectEqual(floats[idx][matIdx].y, testFloatVal[matIdx].y)
-                expectEqual(floats[idx][matIdx].z, testFloatVal[matIdx].z)
-                expectEqual(floats[idx][matIdx].w, testFloatVal[matIdx].w)
-                expectEqual(doubles[idx][matIdx].x, testDoubleVal[matIdx].x)
-                expectEqual(doubles[idx][matIdx].y, testDoubleVal[matIdx].y)
-                expectEqual(doubles[idx][matIdx].z, testDoubleVal[matIdx].z)
-                expectEqual(doubles[idx][matIdx].w, testDoubleVal[matIdx].w)
-            }
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLMatrix4x4Array/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let testCount = 10
-        let matrixArray = MDLMatrix4x4Array(elementCount: testCount)
-        let testFloatVal = float4x4()
-        let testDoubleVal = double4x4()
-        let fArray = [float4x4](repeating: testFloatVal, count: testCount)
-        let dArray = [double4x4](repeating: testDoubleVal, count: testCount)
-        matrixArray.float4x4Array = fArray
-
-        let floats = matrixArray.float4x4Array
-        matrixArray.double4x4Array = dArray
-        let doubles = matrixArray.double4x4Array
-
-        expectEqual(floats.count, testCount)
-        expectEqual(doubles.count, testCount)
-
-        for idx in 0..<testCount {
-            for matIdx in 0..<4 {
-                expectEqual(floats[idx][matIdx].x, testFloatVal[matIdx].x)
-                expectEqual(floats[idx][matIdx].y, testFloatVal[matIdx].y)
-                expectEqual(floats[idx][matIdx].z, testFloatVal[matIdx].z)
-                expectEqual(floats[idx][matIdx].w, testFloatVal[matIdx].w)
-                expectEqual(doubles[idx][matIdx].x, testDoubleVal[matIdx].x)
-                expectEqual(doubles[idx][matIdx].y, testDoubleVal[matIdx].y)
-                expectEqual(doubles[idx][matIdx].z, testDoubleVal[matIdx].z)
-                expectEqual(doubles[idx][matIdx].w, testDoubleVal[matIdx].w)
-            }
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedScalarArray/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let elementCount = 10
-        let animatedVal = MDLAnimatedScalarArray(elementCount: elementCount)
-        let subCount = 2
-        let testCount = 10
-        let totalCount = elementCount * testCount
-        let testTimeVal = 5.0
-        let testFloatVal:Float = 10.0
-        let testSubFloatVal:Float = 5.0
-        let testDoubleVal = Double(testFloatVal)
-        let testSubDoubleVal = Double(testSubFloatVal)
-        let fArray = [Float](repeating: testFloatVal, count: totalCount)
-        let _ = [Float](repeating: testSubFloatVal, count: subCount)
-        let dArray = [Double](repeating: testDoubleVal, count: totalCount)
-        let _ = [Double](repeating: testSubDoubleVal, count: subCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(floatArray: fArray, atTimes: times)
-
-        let floats = animatedVal.floatArray
-        // reset is currently appending instead of resetting the time sampled data
-        //animatedVal.reset(doubleArray: dArray, atTimes: times)
-        let doubles = animatedVal.doubleArray
-        let sampledFloatArray = animatedVal.floatArray(atTime: 5.0)
-        let sampledDoubleArray = animatedVal.doubleArray(atTime: 5.0)
-        times = animatedVal.times
-
-        expectEqual(floats.count, totalCount)
-        expectEqual(doubles.count, totalCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            // -- test a sampled time
-            expectEqual(sampledFloatArray[idx], testFloatVal)
-            expectEqual(sampledDoubleArray[idx], testDoubleVal)
-
-            // -- for each time test the arrays
-            for arrIdx in 0..<elementCount {
-                expectEqual(floats[idx * elementCount + arrIdx], testFloatVal)
-                expectEqual(doubles[idx * elementCount + arrIdx], testDoubleVal)
-            }
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedQuaternionArray/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let elementCount = 10
-        let testCount = 10
-        let totalCount = elementCount * testCount
-        let animatedVal = MDLAnimatedQuaternionArray(elementCount: elementCount)
-        let testTimeVal = 5.0;
-        let testFloatVal = simd_quatf(ix: 1.0, iy: 2.0, iz: 3.0, r: 4.0)
-        let testDoubleVal = simd_quatd(ix: 1.0, iy: 2.0, iz: 3.0, r: 4.0)
-        let fArray = [simd_quatf](repeating: testFloatVal, count: totalCount)
-        let dArray = [simd_quatd](repeating: testDoubleVal, count: totalCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(floatQuaternionArray: fArray, atTimes: times)
-
-        let quatFloats = animatedVal.floatQuaternionArray
-        // reset is appending instead of reseting the time sampled data
-        //animatedVal.reset(doubleQuaternionArray: dArray, atTimes: times)
-        let quatDoubles = animatedVal.doubleQuaternionArray
-        let sampledFloatQuaternionArray = animatedVal.floatQuaternionArray(atTime: 5.0)
-        let sampledDoubleQuaternionArray = animatedVal.doubleQuaternionArray(atTime: 5.0)
-        times = animatedVal.times
-
-        expectEqual(quatFloats.count, totalCount)
-        expectEqual(quatDoubles.count, totalCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            // -- test a sampled time
-            // -- data gets swizzled somewhere between getting and setting so we just
-            // -- check to make sure we can at least access the data
-            sampledFloatQuaternionArray[idx]
-            sampledDoubleQuaternionArray[idx]
-            /*expectEqual(sampledFloatQuaternionArray[idx], testFloatVal)
-            expectEqual(sampledDoubleQuaternionArray[idx], testDoubleVal)
-
-            // -- for each time test the arrays
-            for arrIdx in 0..<elementCount {
-                expectEqual(quatFloats[idx * elementCount + arrIdx], testFloatVal)
-                expectEqual(quatDoubles[idx * elementCount + arrIdx], testDoubleVal)
-            }*/
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-
-    ModelIOTests.test("MDLAnimatedVector3Array/accessors")
-    .skip(.always("rdar://problem/50449570")).code {
-        let elementCount = 10
-        let animatedVal = MDLAnimatedVector3Array(elementCount: elementCount)
-        let testCount = 10
-        let totalCount = elementCount * testCount
-        let testTimeVal = 5.0
-        let testFloatVal = float3(1.0, 2.0, 3.0)
-        let testDoubleVal = double3(1.0, 2.0, 3.0)
-        let fArray = [float3](repeating: testFloatVal, count: totalCount)
-        let dArray = [double3](repeating: testDoubleVal, count: totalCount)
-        var times = [TimeInterval](repeating: testTimeVal, count: testCount)
-        animatedVal.reset(float3Array: fArray, atTimes: times)
-
-        let vector3Floats = animatedVal.float3Array
-        // reset is appending  instead reseting the time sampled data
-        //animatedVal.reset(double3Array: dArray, atTimes: times)
-        let vector3Doubles = animatedVal.double3Array
-        let sampledFloatVector3Array = animatedVal.float3Array(atTime: 5.0)
-        let sampledDoubleVector3Array = animatedVal.double3Array(atTime: 5.0)
-        times = animatedVal.times
-
-        expectEqual(vector3Floats.count, totalCount)
-        expectEqual(vector3Doubles.count, totalCount)
-        expectEqual(times.count, testCount)
-
-        for idx in 0..<testCount {
-            // -- test a sampled time
-            expectEqual(sampledFloatVector3Array[idx], testFloatVal)
-            expectEqual(sampledDoubleVector3Array[idx], testDoubleVal)
-
-            // -- for each time test the arrays
-            for arrIdx in 0..<elementCount {
-                expectEqual(vector3Floats[idx * elementCount + arrIdx], testFloatVal)
-                expectEqual(vector3Doubles[idx * elementCount + arrIdx], testDoubleVal)
-            }
-            expectEqual(times[idx], testTimeVal)
-        }
-    }
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/OpenCLSDKOverlay.swift b/validation-test/stdlib/OpenCLSDKOverlay.swift
deleted file mode 100644
index e877aeb5b25c8..0000000000000
--- a/validation-test/stdlib/OpenCLSDKOverlay.swift
+++ /dev/null
@@ -1,266 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-// REQUIRES: OS=macosx
-
-// Translated from standard OpenCL hello.c program
-
-// Abstract:   A simple "Hello World" compute example showing basic usage of OpenCL which
-//             calculates the mathematical square (X[i] = pow(X[i],2)) for a buffer of
-//             floating point values.
-//             
-//
-// Version:    <1.0>
-//
-// Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc. ("Apple")
-//             in consideration of your agreement to the following terms, and your use,
-//             installation, modification or redistribution of this Apple software
-//             constitutes acceptance of these terms.  If you do not agree with these
-//             terms, please do not use, install, modify or redistribute this Apple
-//             software.
-//
-//             In consideration of your agreement to abide by the following terms, and
-//             subject to these terms, Apple grants you a personal, non - exclusive
-//             license, under Apple's copyrights in this original Apple software (the
-//             "Apple Software"), to use, reproduce, modify and redistribute the Apple
-//             Software, with or without modifications, in source and / or binary forms
-//             provided that if you redistribute the Apple Software in its entirety and
-//             without modifications, you must retain this notice and the following text
-//             and disclaimers in all such redistributions of the Apple Software. Neither
-//             the name, trademarks, service marks or logos of Apple Inc. may be used to
-//             endorse or promote products derived from the Apple Software without specific
-//             prior written permission from Apple.  Except as expressly stated in this
-//             notice, no other rights or licenses, express or implied, are granted by
-//             Apple herein, including but not limited to any patent rights that may be
-//             infringed by your derivative works or by other works in which the Apple
-//             Software may be incorporated.
-//
-//             The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-//             WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-//             WARRANTIES OF NON - INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A
-//             PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION
-//             ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-//
-//             IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-//             CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-//             SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//             INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION
-//             AND / OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER
-//             UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
-//             OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (C) 2008 Apple Inc. All Rights Reserved.
-//
-
-
-import OpenCL
-import StdlibUnittest
-
-
-import Foundation
-import Darwin
-
-let KernelSource = "\n" +
-"__kernel void square(                                                       \n" +
-"   __global float* input,                                              \n" +
-"   __global float* output,                                             \n" +
-"   const unsigned int count)                                           \n" +
-"{                                                                      \n" +
-"   int i = get_global_id(0);                                           \n" +
-"   if (i < count)                                                      \n" +
-"       output[i] = input[i] * input[i];                                \n" +
-"}                                                                      \n" +
-"\n"
-
-
-let DATA_SIZE = 1024
-
-var tests = TestSuite("MiscSDKOverlay")
-
-tests.test("clSetKernelArgsListAPPLE") {
-  var err: cl_int                            // error code returned from api calls
-  
-  var data = [Float](repeating: 0, count: DATA_SIZE)    // original data set given to device
-  var results = [Float](repeating: 0, count: DATA_SIZE) // results returned from device
-  var correct: Int               // number of correct results returned
-
-  var global: size_t                      // global domain size for our calculation
-  var local: size_t = 0                       // local domain size for our calculation
-
-  var device_id: cl_device_id? = nil             // compute device id
-  var context: cl_context?                 // compute context
-  var commands: cl_command_queue?          // compute command queue
-  var program: cl_program?                 // compute program
-  var kernel: cl_kernel?                   // compute kernel
-  
-  // Fill our data set with random float values
-  //
-  var count = DATA_SIZE
-  for i in 0..<count {
-    data[i] = 0.0
-  }
-  
-  // Connect to a compute device
-  //
-  err = clGetDeviceIDs(nil, cl_device_type(CL_DEVICE_TYPE_ALL), 1, &device_id, nil)
-  if (err != CL_SUCCESS)
-  {
-    print("Error: Failed to create a device group!")
-    exit(EXIT_FAILURE)
-  }
-  
-  // Create a compute context 
-  //
-  context = clCreateContext(nil, 1, &device_id, nil, nil, &err)
-  if (context == nil)
-  {
-    print("Error: Failed to create a compute context!")
-    exit(EXIT_FAILURE)
-  }
-
-  // Create a command commands
-  //
-  commands = clCreateCommandQueue(context, device_id, 0, &err)
-  if (commands == nil)
-  {
-    print("Error: Failed to create a command commands!")
-    exit(EXIT_FAILURE)
-  }
-
-  // Create the compute program from the source buffer
-  //
-  program = KernelSource.withCString {
-    (p: UnsafePointer<CChar>) -> cl_program in
-    var s: UnsafePointer? = p
-    return withUnsafeMutablePointer(to: &s) {
-      return clCreateProgramWithSource(context, 1, $0, nil, &err)
-    }
-  }
-  if (program == nil)
-  {
-    print("Error: Failed to create compute program!")
-    exit(EXIT_FAILURE)
-  }
-
-  // Build the program executable
-  //
-  err = clBuildProgram(program, 0, nil, nil, nil, nil)
-  if (err != CL_SUCCESS)
-  {
-    var len: Int = 0
-    
-    var buffer = [CChar](repeating: 0, count: 2048)
-
-    print("Error: Failed to build program executable!")
-    clGetProgramBuildInfo(
-      program, device_id, cl_program_build_info(CL_PROGRAM_BUILD_LOG), 2048, &buffer, &len)
-    print("\(String(cString: buffer))")
-    exit(1)
-  }
-
-  // Create the compute kernel in the program we wish to run
-  //
-  kernel = clCreateKernel(program, "square", &err)
-  if (kernel == nil || err != cl_int(CL_SUCCESS))
-  {
-    print("Error: Failed to create compute kernel!")
-    exit(1)
-  }
-
-  // Create the input and output arrays in device memory for our calculation
-  //
-  guard var input = clCreateBuffer(context,  cl_mem_flags(CL_MEM_READ_ONLY),  MemoryLayout<Float>.size * count, nil, nil),
-        var output = clCreateBuffer(context, cl_mem_flags(CL_MEM_WRITE_ONLY), MemoryLayout<Float>.size * count, nil, nil) else {
-    print("Error: Failed to allocate device memory!")
-    exit(1)
-  }
-  
-  // Write our data set into the input array in device memory 
-  //
-  err = clEnqueueWriteBuffer(commands, input, cl_bool(CL_TRUE), 0, MemoryLayout<Float>.size * count, data, 0, nil, nil)
-  if (err != CL_SUCCESS)
-  {
-    print("Error: Failed to write to source array!")
-    exit(1)
-  }
-
-  // Set the arguments to our compute kernel
-  //
-  err = 0
-  err = withUnsafePointer(to: &input) {
-    inputPtr in withUnsafePointer(to: &output) {
-      outputPtr in withUnsafePointer(to: &count) {
-        countPtr in
-        clSetKernelArgsListAPPLE(
-          kernel!, 3,
-          0, MemoryLayout<cl_mem>.size, inputPtr,
-          1, MemoryLayout<cl_mem>.size, outputPtr,
-          2, MemoryLayout.size(ofValue: countPtr.pointee), countPtr)
-      }
-    }
-  }
-
-  
-  if (err != CL_SUCCESS)
-  {
-    print("Error: Failed to set kernel arguments! \(err)")
-    exit(1)
-  }
-
-  // Get the maximum work group size for executing the kernel on the device
-  //
-  err = clGetKernelWorkGroupInfo(kernel, device_id, cl_kernel_work_group_info(CL_KERNEL_WORK_GROUP_SIZE), MemoryLayout.size(ofValue: local), &local, nil)
-  if (err != CL_SUCCESS)
-  {
-    print("Error: Failed to retrieve kernel work group info! \(err)")
-    exit(1)
-  }
-
-  // Execute the kernel over the entire range of our 1d input data set
-  // using the maximum number of work group items for this device
-  //
-  global = count
-  err = clEnqueueNDRangeKernel(commands, kernel, 1, nil, &global, &local, 0, nil, nil)
-  if (err != 0)
-  {
-    print("Error: Failed to execute kernel!")
-    exit(EXIT_FAILURE)
-  }
-
-  // Wait for the command commands to get serviced before reading back results
-  //
-  clFinish(commands)
-
-  // Read back the results from the device to verify the output
-  //
-  err = clEnqueueReadBuffer(commands, output, cl_bool(CL_TRUE), 0, MemoryLayout<Float>.size * count, &results, cl_uint(0), nil, nil)
-  if (err != CL_SUCCESS)
-  {
-    print("Error: Failed to read output array! \(err)")
-    exit(1)
-  }
-  
-  // Validate our results
-  //
-  correct = 0
-  for i in 0..<count
-  {
-    if (results[i] == data[i] * data[i]) {
-      correct += 1
-    }
-  }
-  
-  // Print a brief summary detailing the results
-  //
-  print("Computed '\(correct)/\(count)' correct values!")
-  
-  // Shutdown and cleanup
-  //
-  clReleaseMemObject(input)
-  clReleaseMemObject(output)
-  clReleaseProgram(program)
-  clReleaseKernel(kernel)
-  clReleaseCommandQueue(commands)
-  clReleaseContext(context)
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/POSIXErrorCode.swift b/validation-test/stdlib/POSIXErrorCode.swift
index fe60b0c33cf74..af6f72f9d31d0 100644
--- a/validation-test/stdlib/POSIXErrorCode.swift
+++ b/validation-test/stdlib/POSIXErrorCode.swift
@@ -1,14 +1,13 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
-//
-// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-androideabi || OS=linux-android || OS=linux-gnu
+// REQUIRES: VENDOR=apple || OS=linux-androideabi || OS=linux-android || OS=linux-gnu
 
 import Swift
 import StdlibUnittest
 
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #else
 #error("Unsupported platform")
@@ -16,7 +15,7 @@ import StdlibUnittest
 
 var POSIXErrorCodeTestSuite = TestSuite("POSIXErrorCode")
 
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+#if canImport(Darwin)
 
 POSIXErrorCodeTestSuite.test("Darwin POSIX error codes constants") {
   expectEqual(EPERM, POSIXErrorCode.EPERM.rawValue)
diff --git a/validation-test/stdlib/PhotosTests.swift b/validation-test/stdlib/PhotosTests.swift
deleted file mode 100644
index 17e0479e83d9f..0000000000000
--- a/validation-test/stdlib/PhotosTests.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-// RUN: %target-swift-frontend -typecheck %s
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import Photos
-
-#if os(iOS) || os(tvOS)
-
-if #available(iOS 8.0, tvOS 10.0, *) {
-  // compile time only validation test for the SDK overlay,
-  // because PHChange pretty much requires a GUI app
-  struct GenericPHChangeTest {
-    let asset: PHAsset!
-    let collection: PHAssetCollection!
-    let list: PHCollectionList!
-    let assetsFetch: PHFetchResult<PHAsset>!
-    let collectionsFetch: PHFetchResult<PHAssetCollection>!
-    let listsFetch: PHFetchResult<PHCollectionList>!
-
-    func testPHChange(change: PHChange) {
-      let assetDetails: PHObjectChangeDetails<PHAsset>?
-        = change.changeDetails(for: asset)
-      let collectionDetails: PHObjectChangeDetails<PHAssetCollection>?
-        = change.changeDetails(for: collection)
-      let listDetails: PHObjectChangeDetails<PHCollectionList>?
-        = change.changeDetails(for: list)
-
-      let assetsFetchDetails: PHFetchResultChangeDetails<PHAsset>?
-        = change.changeDetails(for: assetsFetch)
-      let collectionsFetchDetails: PHFetchResultChangeDetails<PHAssetCollection>?
-        = change.changeDetails(for: collectionsFetch)
-      let listsFetchDetails: PHFetchResultChangeDetails<PHCollectionList>?
-        = change.changeDetails(for: listsFetch)
-      assert(assetDetails != nil)
-      assert(collectionDetails != nil)
-      assert(listDetails != nil)
-      assert(assetsFetchDetails != nil)
-      assert(collectionsFetchDetails != nil)
-      assert(listsFetchDetails != nil)
-    }
-  }
-}
-
-#elseif os(macOS)
-
-if #available(macOS 10.14, *) {
-  // compile time only validation test for the SDK overlay,
-  // because PHProjectChangeRequest pretty much requires a GUI app
-  struct GenericPHProjectChangeRequest {
-    let asset: PHAsset!
-    let assetsFetch: PHFetchResult<PHAsset>!
-    
-    func testPHProjectChangeRequest(changeRequest: PHProjectChangeRequest) {
-        changeRequest.removeAssets(assetsFetch)
-        changeRequest.removeAssets([asset])
-    }
-  }
-  
-}
-
-#endif
diff --git a/validation-test/stdlib/SafariServices.swift b/validation-test/stdlib/SafariServices.swift
deleted file mode 100644
index 22b03765ad137..0000000000000
--- a/validation-test/stdlib/SafariServices.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: OS=macosx
-// REQUIRES: objc_interop
-
-import StdlibUnittest
-
-import Foundation
-import SafariServices
-
-var SafariServicesTests = TestSuite("SafariServices")
-if #available(OSX 10.12, *) {
-  SafariServicesTests.test("API") {
-	_ = SFSafariServicesAvailable()
-	_ = SFSafariServicesAvailable(.version10_0)
-    _ = SFSafariServicesAvailable(.version10_1)
-  }
-}
-runAllTests()
diff --git a/validation-test/stdlib/SceneKit.swift b/validation-test/stdlib/SceneKit.swift
deleted file mode 100644
index 7ac2955afaa6f..0000000000000
--- a/validation-test/stdlib/SceneKit.swift
+++ /dev/null
@@ -1,429 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// UNSUPPORTED: OS=watchos
-
-import StdlibUnittest
-
-
-import SceneKit
-
-// SceneKit is only available on iOS 8.0 and above and on OS X 10.8 and above.
-
-var SceneKitTests = TestSuite("SceneKit")
-
-func bytesFromNSData(_ data: NSData) -> [UInt8] {
-  let bytePtr = data.bytes.bindMemory(to: UInt8.self, capacity: data.length)
-  return Array(UnsafeBufferPointer(start: bytePtr, count: data.length))
-}
-
-func floatsFromNSData(_ data: NSData) -> [Float] {
-  let floatPtr = data.bytes.bindMemory(to: Float.self, capacity: data.length)
-  return Array(UnsafeBufferPointer(start: floatPtr, count: data.length / MemoryLayout<Float>.size))
-}
-
-if #available(iOS 8.0, *) {
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/Int") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, Int.max, 4, 5, 6 ],
-      primitiveType: .triangles)
-
-    expectEqual(.triangles, element.primitiveType)
-    expectEqual(2, element.primitiveCount)
-  #if arch(i386) || arch(arm)
-    expectEqual(
-      [
-        1,0,0,0,
-        2,0,0,0,
-        0xff,0xff,0xff,0x7f,
-        4,0,0,0,
-        5,0,0,0,
-        6,0,0,0,
-      ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(4, element.bytesPerIndex)
-  #elseif arch(x86_64) || arch(arm64)
-    expectEqual(
-      [
-        1,0,0,0, 0,0,0,0,
-        2,0,0,0, 0,0,0,0,
-        0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0x7f,
-        4,0,0,0, 0,0,0,0,
-        5,0,0,0, 0,0,0,0,
-        6,0,0,0, 0,0,0,0,
-      ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(8, element.bytesPerIndex)
-  #else
-    _portThisCode()
-  #endif
-  }
-
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/Int16") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, Int16.max, Int16.max/2, 5, 6 ] as [Int16],
-      primitiveType: .triangles)
-
-    expectEqual(.triangles, element.primitiveType)
-    expectEqual(2, element.primitiveCount)
-    expectEqual(
-      [
-        1, 0,
-        2, 0,
-        0xff, 0x7f,
-        0xff, 0x3f,
-        5, 0,
-        6, 0
-      ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(2, element.bytesPerIndex)
-  }
-
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/Triangles") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, UInt8.max, UInt8.max/2, 5, 6 ] as [UInt8],
-      primitiveType: .triangles)
-
-    expectEqual(.triangles, element.primitiveType)
-    expectEqual(2, element.primitiveCount)
-    expectEqual(
-      [ 1, 2, UInt8.max, UInt8.max/2, 5, 6 ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(1, element.bytesPerIndex)
-  }
-
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/TriangleStrip") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, 3, 4, 5, 6 ] as [UInt8],
-      primitiveType: .triangleStrip)
-
-    expectEqual(.triangleStrip, element.primitiveType)
-    expectEqual(4, element.primitiveCount)
-    expectEqual(
-      [ 1, 2, 3, 4, 5, 6 ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(1, element.bytesPerIndex)
-  }
-
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/Line") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, 3, 4, 5, 6 ] as [UInt8],
-      primitiveType: .line)
-
-    expectEqual(.line, element.primitiveType)
-    expectEqual(3, element.primitiveCount)
-    expectEqual(
-      [ 1, 2, 3, 4, 5, 6 ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(1, element.bytesPerIndex)
-  }
-
-  SceneKitTests.test("SCNGeometryElement.init(indices:primitiveType:)/Point") {
-    let element = SCNGeometryElement(
-      indices: [ 1, 2, 3, 4, 5, 6 ] as [UInt8],
-      primitiveType: .point)
-
-    expectEqual(.point, element.primitiveType)
-    expectEqual(6, element.primitiveCount)
-    expectEqual(
-      [ 1, 2, 3, 4, 5, 6 ],
-      bytesFromNSData(element.data as NSData))
-    expectEqual(1, element.bytesPerIndex)
-  }
-
-  SceneKitTests.test("SCNGeometrySource.init(vertices:)") {
-    let source = SCNGeometrySource(vertices: [SCNVector3(1, 2, 3),
-                                              SCNVector3(4, 5, 6)])
-
-    expectEqual(source.semantic, SCNGeometrySource.Semantic.vertex)
-    expectEqual(source.vectorCount, 2)
-    expectEqual(source.componentsPerVector, 3)
-
-    expectEqual(source.bytesPerComponent, MemoryLayout<Float>.size)
-    let positions = floatsFromNSData(source.data as NSData)
-    expectEqual(positions[2], 3)
-    expectEqual(positions[4], 5)
-  }
-
-  SceneKitTests.test("SCNGeometrySource.init(normals:)") {
-    let source = SCNGeometrySource(normals: [SCNVector3(1, 2, 3),
-                                             SCNVector3(4, 5, 6)])
-
-    expectEqual(source.semantic, SCNGeometrySource.Semantic.normal)
-    expectEqual(source.vectorCount, 2)
-    expectEqual(source.componentsPerVector, 3)
-
-    expectEqual(source.bytesPerComponent, MemoryLayout<Float>.size)
-    let normals = floatsFromNSData(source.data as NSData)
-    expectEqual(normals[2], 3)
-    expectEqual(normals[4], 5)
-  }
-
-  SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)") {
-    let source = SCNGeometrySource(textureCoordinates: [CGPoint(x: 1, y: 2),
-                                                        CGPoint(x: 4, y: 5)])
-
-    expectEqual(source.semantic, SCNGeometrySource.Semantic.texcoord)
-    expectEqual(source.vectorCount, 2)
-    expectEqual(source.componentsPerVector, 2)
-
-    let uvs = floatsFromNSData(source.data as NSData)
-    expectEqual(uvs[1], 2)
-    expectEqual(uvs[3], 5)
-  }
-
-  SceneKitTests.test("SCNSceneSource.entryWithIdentifier(uid:withClass:)")
-    .skip(.iOSAny("does not support COLLADA files"))
-    .skip(.iOSSimulatorAny("does not support COLLADA files"))
-    .skip(.tvOSAny("does not support COLLADA files"))
-    .skip(.tvOSSimulatorAny("does not support COLLADA files"))
-    .skip(.watchOSAny("does not support COLLADA files"))
-    .skip(.watchOSSimulatorAny("does not support COLLADA files"))
-    .code {
-    let sceneDescription =
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-      "<COLLADA xmlns=\"http://www.collada.org/2005/11/COLLADASchema\" version=\"1.4.1\">" +
-      " <library_materials>" +
-      "  <material id=\"material1\">" +
-      "   <instance_effect url=\"#effect_material1\"/>" +
-      "  </material>" +
-      "  <material id=\"material2\">" +
-      "   <instance_effect url=\"#effect_material2\"/>" +
-      "  </material>" +
-      " </library_materials>" +
-      " <library_effects>" +
-      "  <effect id=\"effect_material1\">" +
-      "   <profile_COMMON>" +
-      "    <technique sid=\"common\">" +
-      "     <blinn>" +
-      "      <shininess>" +
-      "       <float>0.022516</float>" +
-      "      </shininess>" +
-      "      <transparency>" +
-      "       <float>1</float>" +
-      "      </transparency>" +
-      "      <index_of_refraction>" +
-      "       <float>1</float>" +
-      "      </index_of_refraction>" +
-      "     </blinn>" +
-      "    </technique>" +
-      "   </profile_COMMON>" +
-      "  </effect>" +
-      "  <effect id=\"effect_material2\">" +
-      "   <profile_COMMON>" +
-      "    <technique sid=\"common\">" +
-      "     <blinn>" +
-      "      <shininess>" +
-      "       <float>0.022516</float>" +
-      "      </shininess>" +
-      "      <transparency>" +
-      "       <float>1</float>" +
-      "      </transparency>" +
-      "      <index_of_refraction>" +
-      "       <float>1</float>" +
-      "      </index_of_refraction>" +
-      "     </blinn>" +
-      "    </technique>" +
-      "   </profile_COMMON>" +
-      "  </effect>" +
-      " </library_effects>" +
-      " <library_geometries>" +
-      "  <geometry id=\"plane\">" +
-      "   <mesh>" +
-      "    <source id=\"geometrySource4\">" +
-      "     <float_array id=\"ID5-array\" count=\"12\">-5 -5 0 5 -5 0 -5 5 0 5 5 0 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID5-array\" count=\"4\" stride=\"3\">" +
-      "       <param name=\"X\" type=\"float\"/>" +
-      "       <param name=\"Y\" type=\"float\"/>" +
-      "       <param name=\"Z\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <source id=\"geometrySource6\">" +
-      "     <float_array id=\"ID7-array\" count=\"12\">0 0 1 0 0 1 0 0 1 0 0 1 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID7-array\" count=\"4\" stride=\"3\">" +
-      "       <param name=\"X\" type=\"float\"/>" +
-      "       <param name=\"Y\" type=\"float\"/>" +
-      "       <param name=\"Z\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <source id=\"geometrySource8\">" +
-      "     <float_array id=\"ID9-array\" count=\"8\">0 0 1 0 0 1 1 1 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID9-array\" count=\"4\" stride=\"2\">" +
-      "       <param name=\"S\" type=\"float\"/>" +
-      "       <param name=\"T\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <vertices id=\"geometrySource4-vertices\">" +
-      "     <input semantic=\"POSITION\" source=\"#geometrySource4\"/>" +
-      "     <input semantic=\"NORMAL\" source=\"#geometrySource6\"/>" +
-      "    </vertices>" +
-      "    <triangles count=\"2\" material=\"geometryElement10\">" +
-      "     <input semantic=\"VERTEX\" offset=\"0\" source=\"#geometrySource4-vertices\"/>" +
-      "     <input semantic=\"NORMAL\" offset=\"0\" source=\"#geometrySource6\"/>" +
-      "     <input semantic=\"TEXCOORD\" offset=\"0\" source=\"#geometrySource8\" set=\"1\"/>" +
-      "     <p>0 1 3 0 3 2 </p>" +
-      "    </triangles>" +
-      "   </mesh>" +
-      "  </geometry>" +
-      "  <geometry id=\"box\">" +
-      "   <mesh>" +
-      "    <source id=\"geometrySource12\">" +
-      "     <float_array id=\"ID13-array\" count=\"72\">-2.5 -2.5 2.5 -2.5 2.5 2.5 2.5 -2.5 2.5 2.5 2.5 2.5 2.5 -2.5 2.5 2.5 2.5 2.5 2.5 -2.5 -2.5 2.5 2.5 -2.5 2.5 -2.5 -2.5 2.5 2.5 -2.5 -2.5 -2.5 -2.5 -2.5 2.5 -2.5 -2.5 -2.5 -2.5 -2.5 2.5 -2.5 -2.5 -2.5 2.5 -2.5 2.5 2.5 -2.5 2.5 2.5 -2.5 2.5 -2.5 2.5 2.5 2.5 2.5 2.5 -2.5 -2.5 -2.5 -2.5 -2.5 -2.5 2.5 2.5 -2.5 -2.5 2.5 -2.5 2.5 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID13-array\" count=\"24\" stride=\"3\">" +
-      "       <param name=\"X\" type=\"float\"/>" +
-      "       <param name=\"Y\" type=\"float\"/>" +
-      "       <param name=\"Z\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <source id=\"geometrySource14\">" +
-      "     <float_array id=\"ID15-array\" count=\"72\">0 0 1 0 0 1 0 0 1 0 0 1 1 0 -4.37114e-08 1 0 -4.37114e-08 1 0 -4.37114e-08 1 0 -4.37114e-08 -8.74228e-08 0 -1 -8.74228e-08 0 -1 -8.74228e-08 0 -1 -8.74228e-08 0 -1 -1 0 1.19249e-08 -1 0 1.19249e-08 -1 0 1.19249e-08 -1 0 1.19249e-08 0 1 -4.37114e-08 0 1 -4.37114e-08 0 1 -4.37114e-08 0 1 -4.37114e-08 0 -1 -4.37114e-08 0 -1 -4.37114e-08 0 -1 -4.37114e-08 0 -1 -4.37114e-08 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID15-array\" count=\"24\" stride=\"3\">" +
-      "       <param name=\"X\" type=\"float\"/>" +
-      "       <param name=\"Y\" type=\"float\"/>" +
-      "       <param name=\"Z\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <source id=\"geometrySource16\">" +
-      "     <float_array id=\"ID17-array\" count=\"48\">0 0 0 1 1 0 1 1 0 0 0 1 1 0 1 1 0 0 0 1 1 0 1 1 0 0 0 1 1 0 1 1 0 0 0 1 1 0 1 1 0 0 0 1 1 0 1 1 </float_array>" +
-      "     <technique_common>" +
-      "      <accessor source=\"#ID17-array\" count=\"24\" stride=\"2\">" +
-      "       <param name=\"S\" type=\"float\"/>" +
-      "       <param name=\"T\" type=\"float\"/>" +
-      "      </accessor>" +
-      "     </technique_common>" +
-      "    </source>" +
-      "    <vertices id=\"geometrySource12-vertices\">" +
-      "     <input semantic=\"POSITION\" source=\"#geometrySource12\"/>" +
-      "     <input semantic=\"NORMAL\" source=\"#geometrySource14\"/>" +
-      "    </vertices>" +
-      "    <triangles count=\"12\" material=\"geometryElement18\">" +
-      "     <input semantic=\"VERTEX\" offset=\"0\" source=\"#geometrySource12-vertices\"/>" +
-      "     <input semantic=\"NORMAL\" offset=\"0\" source=\"#geometrySource14\"/>" +
-      "     <input semantic=\"TEXCOORD\" offset=\"0\" source=\"#geometrySource16\" set=\"1\"/>" +
-      "     <p>0 3 1 0 2 3 4 7 5 4 6 7 8 11 9 8 10 11 12 15 13 12 14 15 16 19 17 16 18 19 20 23 21 20 22 23 </p>" +
-      "    </triangles>" +
-      "   </mesh>" +
-      "  </geometry>" +
-      " </library_geometries>" +
-      " <library_visual_scenes>" +
-      "  <visual_scene id=\"scene19\">" +
-      "   <node id=\"plane_node\" name=\"plane\">" +
-      "    <instance_geometry url=\"#plane\">" +
-      "     <bind_material>" +
-      "      <technique_common>" +
-      "       <instance_material symbol=\"geometryElement10\" target=\"#material1\"/>" +
-      "      </technique_common>" +
-      "     </bind_material>" +
-      "    </instance_geometry>" +
-      "   </node>" +
-      "   <node id=\"box-node\" name=\"box-node\">" +
-      "    <instance_geometry url=\"#box\">" +
-      "     <bind_material>" +
-      "      <technique_common>" +
-      "       <instance_material symbol=\"geometryElement18\" target=\"#material2\"/>" +
-      "      </technique_common>" +
-      "     </bind_material>" +
-      "    </instance_geometry>" +
-      "   </node>" +
-      "  </visual_scene>" +
-      " </library_visual_scenes>" +
-      " <scene>" +
-      "  <instance_visual_scene url=\"#scene19\"/>" +
-      " </scene>" +
-      "</COLLADA>"
-
-    let sceneData = sceneDescription.data(
-      using: .utf8,
-      allowLossyConversion: true)!
-    let sceneSource = SCNSceneSource(data: sceneData as Data, options: nil)!
-
-    do {
-      var unarchivedPlaneGeometry =
-        sceneSource.entryWithIdentifier("plane", withClass: SCNGeometry.self)
-      var unarchivedPlaneNode_nil =
-        sceneSource.entryWithIdentifier("plane-node", withClass: SCNNode.self)
-
-      expectNotNil(unarchivedPlaneGeometry)
-      expectType(Optional<SCNGeometry>.self, &unarchivedPlaneGeometry)
-
-      expectNil(unarchivedPlaneNode_nil)
-    }
-
-    do {
-      var unarchivedBoxGeometry =
-        sceneSource.entryWithIdentifier("box", withClass: SCNGeometry.self)
-      var unarchivedBoxGeometry_nil =
-        sceneSource.entryWithIdentifier("box-node", withClass: SCNGeometry.self)
-
-      expectNotNil(unarchivedBoxGeometry)
-      expectType(Optional<SCNGeometry>.self, &unarchivedBoxGeometry)
-
-      expectNil(unarchivedBoxGeometry_nil)
-    }
-
-    do {
-      var unarchivedBoxNode =
-        sceneSource.entryWithIdentifier("box-node", withClass: SCNNode.self)
-      var unarchivedBoxNode_nil =
-        sceneSource.entryWithIdentifier("box", withClass: SCNNode.self)
-
-      expectNotNil(unarchivedBoxNode)
-      expectType(Optional<SCNNode>.self, &unarchivedBoxNode)
-
-      expectNil(unarchivedBoxNode_nil)
-    }
-  }
-
-  if #available(OSX 10.10, *) {
-    SceneKitTests.test("SCNBoundingVolume.boundingBox/getter") {
-      let box = SCNBox(width: 42, height: 0.5, length: 1337, chamferRadius: 0)
-      let boundingBox = box.boundingBox
-
-      expectEqual(boundingBox.max.x, 21)
-      expectEqual(boundingBox.max.x, -boundingBox.min.x)
-      expectEqual(boundingBox.max.y, 0.25)
-      expectEqual(boundingBox.max.y, -boundingBox.min.y)
-      expectEqual(boundingBox.max.z, 668.5)
-      expectEqual(boundingBox.max.z, -boundingBox.min.z)
-    }
-
-    SceneKitTests.test("SCNBoundingVolume.boundingBox/setter") {
-      let max = SCNVector3(42, 0.414, 1337)
-      let min = SCNVector3(-42, -0.414, -1337)
-      let box = SCNBox(width: 1, height: 2, length: 3, chamferRadius: 0)
-      let boxNode = SCNNode(geometry: box)
-
-      boxNode.boundingBox = (min, max)
-      let nodeBoundingBox = boxNode.boundingBox
-
-      expectEqual(nodeBoundingBox.max.x, max.x)
-      expectEqual(nodeBoundingBox.min.x, -max.x)
-      expectEqual(nodeBoundingBox.max.y, max.y)
-      expectEqual(nodeBoundingBox.min.y, -max.y)
-      expectEqual(nodeBoundingBox.max.z, max.z)
-      expectEqual(nodeBoundingBox.min.z, -max.z)
-    }
-
-    SceneKitTests.test("SCNBoundingVolume.boundingSphere/getter") {
-      let box = SCNBox(width: 2 * 2, height: 3 * 2, length: 6 * 2, chamferRadius: 0)
-      let boundingSphere = box.boundingSphere
-
-      // 2^2 + 3^2 + 6^2 = 7^2
-      expectEqual(boundingSphere.radius, 7.0)
-    }
-  }
-}
-
-runAllTests()
-
diff --git a/validation-test/stdlib/SpriteKit.swift b/validation-test/stdlib/SpriteKit.swift
deleted file mode 100644
index a90e91a3e919c..0000000000000
--- a/validation-test/stdlib/SpriteKit.swift
+++ /dev/null
@@ -1,87 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-
-import StdlibUnittest
-
-import Foundation
-import SpriteKit
-
-var SpriteKitTests = TestSuite("SpriteKit")
-
-// Check that the subscript is there.
-@available(OSX,introduced: 10.10)
-@available(iOS,introduced: 8.0)
-@available(tvOS,introduced: 8.0)
-@available(watchOS,introduced: 2.0)
-func testSubscript(_ node: SKNode) {
-  var result = node["me"]
-  expectType(Array<SKNode>.self, &result)
-}
-
-SpriteKitTests.test("SKColor/TypeEquivalence") {
-  // SKColor is NSColor on OS X and UIColor on iOS.
-#if os(OSX)
-  expectEqualType(NSColor.self, SKColor.self)
-#elseif os(iOS) || os(tvOS) || os(watchOS)
-  expectEqualType(UIColor.self, SKColor.self)
-#else
-  _UnknownOSError()
-#endif
-}
-
-SpriteKitTests.test("getRed(_:green:blue:alpha:)") {
-  var r: CGFloat = 0.0
-  var g: CGFloat = 0.0
-  var b: CGFloat = 0.0
-  var a: CGFloat = 0.0
-  let color = SKColor.red
-  color.getRed(&r, green: &g, blue: &b, alpha: &a)
-  expectEqual(1.0, r)
-  expectEqual(0.0, g)
-  expectEqual(0.0, b)
-  expectEqual(1.0, a)
-}
-
-if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
-  SpriteKitTests.test("SKNode.setValue(_:forAttribute:)") {
-    let node = SKSpriteNode()
-    let attrVal = SKAttributeValue(float: 2.0)
-    node.setValue(attrVal, forAttribute: "test")
-    expectEqual(node.attributeValues["test"], attrVal)
-  }
-
-  SpriteKitTests.test("SKWarpGeometryGrid/init") {
-    var warpGrid = SKWarpGeometryGrid(columns: 1, rows: 1)
-
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 0.0)
-    warpGrid = warpGrid.replacingBySourcePositions(positions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 1.0)
-
-    expectEqual(warpGrid.destPosition(at: 0).x, 0.0)
-    warpGrid = warpGrid.replacingByDestinationPositions(positions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
-    expectEqual(warpGrid.destPosition(at: 0).x, 1.0)
-
-    warpGrid = SKWarpGeometryGrid(columns: 1, rows: 1, destinationPositions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
-    expectEqual(warpGrid.destPosition(at: 0).x, 1.0)
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 0.0)
-
-    warpGrid = SKWarpGeometryGrid(columns: 1, rows: 1, sourcePositions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
-    expectEqual(warpGrid.destPosition(at: 0).x, 0.0)
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 1.0)
-
-    warpGrid = SKWarpGeometryGrid(columns: 1, rows: 1, sourcePositions: [float2(2.0), float2(1.0), float2(3.0), float2(4.0)], destinationPositions: [float2(1.0), float2(2.0), float2(3.0), float2(4.0)])
-    expectEqual(warpGrid.destPosition(at: 0).x, 1.0)
-    expectEqual(warpGrid.sourcePosition(at: 0).x, 2.0)
-  }
-
-  SpriteKitTests.test("SKWarpGeometryGrid/properties") {
-    func checkTheAPIsAreAvailable(grid: SKWarpGeometryGrid) {
-      _ = grid.replacingBySourcePositions(positions: [])
-      _ = grid.replacingByDestinationPositions(positions: [])
-    }
-  }
-}
-
-runAllTests()
diff --git a/validation-test/stdlib/String.swift b/validation-test/stdlib/String.swift
index a5ee3c8112e88..d2e35647dca44 100644
--- a/validation-test/stdlib/String.swift
+++ b/validation-test/stdlib/String.swift
@@ -1227,7 +1227,7 @@ StringTests.test("Conversions") {
 }
 
 
-#if os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#if canImport(Glibc)
   import Glibc
 #endif
 
diff --git a/validation-test/stdlib/StringSlicesConcurrentAppend.swift b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
index 942449e9dfdc8..432910a39aefb 100644
--- a/validation-test/stdlib/StringSlicesConcurrentAppend.swift
+++ b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
@@ -4,9 +4,9 @@
 
 import StdlibUnittest
 import SwiftPrivateThreadExtras
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+#if canImport(Darwin)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif canImport(Glibc)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
diff --git a/validation-test/stdlib/UnsafeBufferPointer.swift.gyb b/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
index 2ed995338afec..fc20dfb6bd2a6 100644
--- a/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
+++ b/validation-test/stdlib/UnsafeBufferPointer.swift.gyb
@@ -362,7 +362,7 @@ UnsafeMutableBufferPointerTestSuite.test("withContiguous(Mutable)StorageIfAvaila
 }
 
 UnsafeMutableBufferPointerTestSuite.test("Slice.withContiguousStorageIfAvailable") {
-  guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
+  guard #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) else {
     return
   }
 
diff --git a/validation-test/stdlib/WatchKit.swift b/validation-test/stdlib/WatchKit.swift
deleted file mode 100644
index 59076305ed24b..0000000000000
--- a/validation-test/stdlib/WatchKit.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %target-run-simple-swift
-// REQUIRES: executable_test
-
-// REQUIRES: objc_interop
-// REQUIRES: OS=watchos
-
-import StdlibUnittest
-
-
-import WatchKit
-
-var WatchKitTests = TestSuite("WatchKit")
-
-if #available(iOS 8.2, *) {
-// This is a very weak test, but we can't do better without spawning a GUI app.
-WatchKitTests.test("WKInterfaceController/reloadRootControllers(_:)") {
-  WKInterfaceController.reloadRootControllers(withNamesAndContexts: [])
-}
-
-// This is a very weak test, but we can't do better without spawning a GUI app.
-WatchKitTests.test("WKInterfaceController/presentController(_:)") {
-  let curried = WKInterfaceController.presentController(withNamesAndContexts:)
-  typealias ExpectedType =
-    (WKInterfaceController) -> ([(name: String, context: AnyObject)]) -> Void
-  let checkType: ExpectedType = curried
-  _blackHole(checkType)
-
-  // FIXME: can't write the following line: rdar://20985062
-  // expectType(ExpectedType.self, &curried)
-
-  let curried2 = WKInterfaceController.presentController(withNamesAndContexts:) as ExpectedType
-}
-
-} // #available(iOS 8.2, *)
-
-runAllTests()
-