Merge branch 'release/5.4' of github.com:apple/swift into swiftwasm-release/5.4

# Conflicts:
#	stdlib/private/CMakeLists.txt
#	test/CMakeLists.txt

Author: MaxDesiatov

.mailmap

@@ -1,7 +1,7 @@
 Adrian-Constantin Popescu <epsilon.gamma@gmail.com> <adrian-constantin.popescu@outlook.com>
 Alex Blewitt <alblue@apple.com> <alex.blewitt@gmail.com>
 Alex Hoppen <alex@alexhoppen.de> <alex@ateamer.de>
-Alex Hoppen <alex@alexhoppen.de> <ahoppen@apple.com>>
+Alex Hoppen <alex@alexhoppen.de> <ahoppen@apple.com>
 Alexis Beingessner <abeingessner@apple.com> <a.beingessner@gmail.com>
 Alper Çugun <github@alper.nl> <alper@users.noreply.github.com>
 Amr Aboelela <amraboelela@gmail.com> <amraboelela@users.noreply.github.com>
@@ -79,6 +79,7 @@ Joe Shajrawi <shajrawi@apple.com> <joeshajrawi@Joes-iMac-Pro.local>
 Johannes Weiß <johannesweiss@apple.com> <github@tux4u.de>
 John Regner <john@johnregner.com> <regnerjr@gmail.com>
 Karoy Lorentey <klorentey@apple.com> <karoly@lorentey.hu>
+Kavon Farvardin <kfarvardin@apple.com> <kavon@farvard.in>
 Keith Smiley <k@keith.so> <keithbsmiley@gmail.com>
 Kevin Ballard <kevin@sb.org> <kevin.ballard@postmates.com>
 Kevin Saldaña <ksaldana1@gmail.com>

CHANGELOG.md

@@ -1989,7 +1989,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
   doSomething(x: 0, y: 0)     // argument labels are required
   ```
 
- Unapplied references to functions or initializers no longer carry argument labels. For example:
+  Unapplied references to functions or initializers no longer carry argument labels. For example:
 
   ```swift
   let f = doSomething(x:y:)     // inferred type is now (Int, Int) -> Void

CMakeLists.txt

@@ -440,10 +440,24 @@ option(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB "Only build the Swift Syntax Parser libr
 option(SWIFT_BUILD_SOURCEKIT "Build SourceKit" TRUE)
 option(SWIFT_ENABLE_SOURCEKIT_TESTS "Enable running SourceKit tests" ${SWIFT_BUILD_SOURCEKIT})
 
+# Use dispatch as the system scheduler by default.
+# For convenience, we set this to false when concurrency is disabled.
+set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)
+if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND NOT SWIFT_STDLIB_SINGLE_THREADED_RUNTIME)
+  set(SWIFT_CONCURRENCY_USES_DISPATCH TRUE)
+endif()
+
+set(SWIFT_BUILD_HOST_DISPATCH FALSE)
 if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
+  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    set(SWIFT_BUILD_HOST_DISPATCH TRUE)
+  endif()
+endif()
+
+if(SWIFT_BUILD_HOST_DISPATCH OR SWIFT_CONCURRENCY_USES_DISPATCH)
   if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     if(NOT EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
-      message(SEND_ERROR "SyntaxParserLib and SourceKit require libdispatch on non-Darwin hosts.  Please specify SWIFT_PATH_TO_LIBDISPATCH_SOURCE")
+      message(SEND_ERROR "SyntaxParserLib, SourceKit, and concurrency require libdispatch on non-Darwin hosts.  Please specify SWIFT_PATH_TO_LIBDISPATCH_SOURCE")
     endif()
   endif()
 endif()
@@ -976,7 +990,7 @@ if (LLVM_ENABLE_DOXYGEN)
   message(STATUS "Doxygen: enabled")
 endif()
 
-if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
+if(SWIFT_BUILD_HOST_DISPATCH)
   if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     if(CMAKE_C_COMPILER_ID STREQUAL Clang AND
        CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8

benchmark/CMakeLists.txt

@@ -80,6 +80,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
+    single-source/Differentiation
     single-source/Diffing
     single-source/DiffingMyers
     single-source/DropFirst

benchmark/single-source/Differentiation.swift

@@ -0,0 +1,73 @@
+//===--- Differentiation.swift -------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#if canImport(_Differentiation)
+
+import TestsUtils
+import _Differentiation
+
+public let Differentiation = [
+  BenchmarkInfo(
+    name: "DifferentiationIdentity",
+    runFunction: run_DifferentiationIdentity,
+    tags: [.regression, .differentiation]
+  ),
+  BenchmarkInfo(
+    name: "DifferentiationSquare",
+    runFunction: run_DifferentiationSquare,
+    tags: [.regression, .differentiation]
+  ),
+  BenchmarkInfo(
+    name: "DifferentiationArraySum",
+    runFunction: run_DifferentiationArraySum,
+    tags: [.regression, .differentiation],
+    setUpFunction: { blackHole(onesArray) }
+  ),
+]
+
+@inline(never)
+public func run_DifferentiationIdentity(N: Int) {
+  func f(_ x: Float) -> Float {
+    x
+  }
+  for _ in 0..<1000*N {
+    blackHole(valueWithGradient(at: 1, in: f))
+  }
+}
+
+@inline(never)
+public func run_DifferentiationSquare(N: Int) {
+  func f(_ x: Float) -> Float {
+    x * x
+  }
+  for _ in 0..<1000*N {
+    blackHole(valueWithGradient(at: 1, in: f))
+  }
+}
+
+let onesArray: [Float] = Array(repeating: 1, count: 50)
+
+@inline(never)
+public func run_DifferentiationArraySum(N: Int) {
+  func sum(_ array: [Float]) -> Float {
+    var result: Float = 0
+    for i in withoutDerivative(at: 0..<array.count) {
+      result += array[i]
+    }
+    return result
+  }
+  for _ in 0..<N {
+    blackHole(valueWithGradient(at: onesArray, in: sum))
+  }
+}
+
+#endif

benchmark/utils/TestsUtils.swift

@@ -28,7 +28,7 @@ public enum BenchmarkCategory : String {
   case runtime, refcount, metadata
   // Other general areas of compiled code validation.
   case abstraction, safetychecks, exceptions, bridging, concurrency, existential
-  case exclusivity
+  case exclusivity, differentiation
 
   // Algorithms are "micro" that test some well-known algorithm in isolation:
   // sorting, searching, hashing, fibonaci, crypto, etc.

benchmark/utils/main.swift

@@ -69,6 +69,9 @@ import DictionaryOfAnyHashableStrings
 import DictionaryRemove
 import DictionarySubscriptDefault
 import DictionarySwap
+#if canImport(_Differentiation)
+import Differentiation
+#endif
 import Diffing
 import DiffingMyers
 import DropFirst
@@ -258,6 +261,9 @@ registerBenchmark(DictionaryOfAnyHashableStrings)
 registerBenchmark(DictionaryRemove)
 registerBenchmark(DictionarySubscriptDefault)
 registerBenchmark(DictionarySwap)
+#if canImport(_Differentiation)
+registerBenchmark(Differentiation)
+#endif
 registerBenchmark(Diffing)
 registerBenchmark(DiffingMyers)
 registerBenchmark(DropFirst)

cmake/modules/SwiftConfigureSDK.cmake

@@ -297,9 +297,9 @@ macro(configure_sdk_unix name architectures)
         else()
           message(SEND_ERROR "Couldn't find SWIFT_SDK_ANDROID_ARCH_armv7_PATH")
         endif()
-        set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "armv7-none-linux-androideabi")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "armv7-unknown-linux-androideabi")
         # The Android ABI isn't part of the module triple.
-        set(SWIFT_SDK_ANDROID_ARCH_${arch}_MODULE "armv7-none-linux-android")
+        set(SWIFT_SDK_ANDROID_ARCH_${arch}_MODULE "armv7-unknown-linux-android")
       elseif("${arch}" STREQUAL "aarch64")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "aarch64-linux-android")
         set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "aarch64")

cmake/modules/SwiftManpage.cmake

@@ -39,8 +39,12 @@ function(manpage)
       ALL)
 
   add_dependencies(${MP_INSTALL_IN_COMPONENT} ${manpage_target})
+  set(MANPAGE_DEST "share/")
+  if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "OPENBSD")
+    set(MANPAGE_DEST "")
+  endif()
   swift_install_in_component(FILES "${output_file_name}"
-                             DESTINATION "share/man/man${MP_MAN_SECTION}"
+                             DESTINATION "${MANPAGE_DEST}man/man${MP_MAN_SECTION}"
                              COMPONENT "${MP_INSTALL_IN_COMPONENT}")
 endfunction()
 

docs/ABI/Mangling.rst

@@ -492,9 +492,11 @@ Types
 
   type ::= 'Bb'                              // Builtin.BridgeObject
   type ::= 'BB'                              // Builtin.UnsafeValueBuffer
+  type ::= 'Bc'                              // Builtin.RawUnsafeContinuation
   type ::= 'Bf' NATURAL '_'                  // Builtin.Float<n>
   type ::= 'Bi' NATURAL '_'                  // Builtin.Int<n>
   type ::= 'BI'                              // Builtin.IntLiteral
+  type ::= 'Bj'                              // Builtin.Job
   type ::= 'BO'                              // Builtin.UnknownObject (no longer a distinct type, but still used for AnyObject)
   type ::= 'Bo'                              // Builtin.NativeObject
   type ::= 'Bp'                              // Builtin.RawPointer
@@ -1006,6 +1008,8 @@ Function Specializations
 ::
 
   specialization ::= type '_' type* 'Tg' SPEC-INFO     // Generic re-abstracted specialization
+  specialization ::= type '_' type* 'TB' SPEC-INFO     // Alternative mangling for generic re-abstracted specializations,
+                                                       // used for functions with re-abstracted resilient parameter types.
   specialization ::= type '_' type* 'Ts' SPEC-INFO     // Generic re-abstracted prespecialization
   specialization ::= type '_' type* 'TG' SPEC-INFO     // Generic not re-abstracted specialization
   specialization ::= type '_' type* 'Ti' SPEC-INFO     // Inlined function with generic substitutions.