Merge branch 'master' into fix/duplicate-tuple-labels

Author: theblixguy

.mailmap

@@ -29,12 +29,11 @@ Daniel Duan <[email protected]> <[email protected]>
 Dante Broggi <[email protected]>
 Dave <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
-Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]>
+David Rönnqvist <[email protected]> <[email protected]>
+David Rönnqvist <[email protected]>
 David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
@@ -43,10 +42,8 @@ Davide Italiano <[email protected]> <[email protected]>
 Davide Italiano <[email protected]> <[email protected]>
 Dmitri Gribenko <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
-Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Erik Eckstein <[email protected]>
-Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
@@ -130,15 +127,13 @@ Ross Bayer <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>
-Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
 Stephen Canon <[email protected]>
 Stephen Canon <[email protected]> <[email protected]>
 Sukolsak Sakshuwong <[email protected]>
 Todd Fiala <[email protected]> <[email protected]>
 Toni Suter <[email protected]> <[email protected]>
 Vedant Kumar <[email protected]> <[email protected]>
-Xi Ge <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Yuka Ezura <[email protected]> <[email protected]>

CHANGELOG.md

@@ -197,7 +197,9 @@ Swift 5.1
   }
   ```
 
-* `weak` and `unowned` stored properties no longer inhibit the
+* [SR-9827][]:
+
+  `weak` and `unowned` stored properties no longer inhibit the
    automatic synthesis of `Equatable` or `Hashable` conformance.
 
 * [SR-2688][]:
@@ -7695,3 +7697,4 @@ Swift 1.0
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>
 [SR-8546]: <https://bugs.swift.org/browse/SR-8546>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
+[SR-9827]: <https://bugs.swift.org/browse/SR-9827>

CMakeLists.txt

@@ -93,6 +93,15 @@ option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)
 
+set(_swift_include_apinotes_default FALSE)
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(_swift_include_apinotes_default TRUE)
+endif()
+
+option(SWIFT_INCLUDE_APINOTES
+  "Create targets for installing the remaining apinotes in the built toolchain."
+  ${_swift_include_apinotes_default})
+
 #
 # Miscellaneous User-configurable options.
 #
@@ -114,7 +123,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.0")
+set(SWIFT_VERSION "5.1")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
@@ -253,9 +262,15 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")
 
-set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "@rpath" CACHE STRING
+set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "/usr/lib/swift" CACHE STRING
     "The directory of the install_name for standard library dylibs")
 
+# We don't want to use the same install_name_dir as the standard library which
+# will be installed in /usr/lib/swift. These private libraries should continue
+# to use @rpath for now.
+set(SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR "@rpath" CACHE STRING
+    "The directory of the install_name for the private standard library dylibs")
+
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
     "Minimum deployment target version for OS X")
 
@@ -598,7 +613,7 @@ else()
   # FIXME: Only matches v6l/v7l - by far the most common variants
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
     set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
@@ -998,17 +1013,17 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
   else()
     set(SOURCEKIT_RUNTIME_DIR lib)
   endif()
-  swift_install_in_component(sourcekit-inproc
-                             FILES
+  swift_install_in_component(FILES
                                $<TARGET_FILE:dispatch>
                                $<TARGET_FILE:BlocksRuntime>
-                             DESTINATION ${SOURCEKIT_RUNTIME_DIR})
+                             DESTINATION ${SOURCEKIT_RUNTIME_DIR}
+                             COMPONENT sourcekit-inproc)
   if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
-    swift_install_in_component(sourcekit-inproc
-                               FILES
+    swift_install_in_component(FILES
                                  $<TARGET_LINKER_FILE:dispatch>
                                  $<TARGET_LINKER_FILE:BlocksRuntime>
-                               DESTINATION lib)
+                               DESTINATION lib
+                               COMPONENT sourcekit-inproc)
   endif()
 
 
@@ -1040,16 +1055,20 @@ endif()
 # created. This then will cause SwiftSyntax to fail to build.
 #
 # https://bugs.swift.org/browse/SR-5975
-add_subdirectory(stdlib)
-
-if(SWIFT_BUILD_SDK_OVERLAY)
-  list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}"
-                 building_darwin_sdks)
-  if(building_darwin_sdks)
-    add_subdirectory(apinotes)
+if(SWIFT_BUILD_STDLIB)
+  add_subdirectory(stdlib)
+else()
+  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
+  # ensure we build that when building tools.
+  if(SWIFT_INCLUDE_TOOLS)
+    add_subdirectory(stdlib/public/Reflection)
   endif()
 endif()
 
+if(SWIFT_INCLUDE_APINOTES)
+  add_subdirectory(apinotes)
+endif()
+
 add_subdirectory(include)
 
 if(SWIFT_INCLUDE_TOOLS)
@@ -1083,9 +1102,9 @@ endif()
 
 add_subdirectory(cmake/modules)
 
-swift_install_in_component(license
-  FILES "LICENSE.txt"
-  DESTINATION "share/swift")
+swift_install_in_component(FILES "LICENSE.txt"
+                           DESTINATION "share/swift"
+                           COMPONENT license)
 
 # Add a documentation target so that documentation shows up in the
 # Xcode project.

README.md

@@ -25,6 +25,7 @@
 |**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
 |**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
 |**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
+|**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
 
 
 ## Welcome to Swift

apinotes/CMakeLists.txt

@@ -23,15 +23,11 @@ add_custom_command(
     COMMAND
       "${CMAKE_COMMAND}" "-E" "copy_if_different" ${inputs} "${output_dir}/")
 
-add_custom_target("copy_apinotes"
+add_custom_target("copy_apinotes" ALL
     DEPENDS "${outputs}" "${output_dir}"
     COMMENT "Copying API notes to ${output_dir}"
     SOURCES "${sources}")
 
-# This is treated as an OPTIONAL target because if we don't build the SDK
-# overlay, the files will be missing anyway. It also allows us to build
-# single overlays without installing the API notes.
-swift_install_in_component(sdk-overlay
-    DIRECTORY "${output_dir}"
-    DESTINATION "lib/swift/"
-    OPTIONAL)
+swift_install_in_component(DIRECTORY "${output_dir}"
+                           DESTINATION "lib/swift/"
+                           COMPONENT compiler)

benchmark/CMakeLists.txt

@@ -92,6 +92,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Hash
     single-source/Histogram
     single-source/InsertCharacter  
+    single-source/IntegerParsing
     single-source/Integrate
     single-source/IterateData
     single-source/Join
@@ -107,6 +108,7 @@ set(SWIFT_BENCH_MODULES
     single-source/NSError
     single-source/NSStringConversion
     single-source/NibbleSort
+    single-source/NIOChannelPipeline
     single-source/NopDeinit
     single-source/ObjectAllocation
     single-source/ObjectiveCBridging

benchmark/single-source/AngryPhonebook.swift

@@ -21,7 +21,7 @@ public let AngryPhonebook = BenchmarkInfo(
   tags: [.validation, .api, .String],
   legacyFactor: 7)
 
-var words = [
+let words = [
   "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph",
   "Charles", "Thomas", "Christopher", "Daniel", "Matthew", "Donald", "Anthony",
   "Paul", "Mark", "George", "Steven", "Kenneth", "Andrew", "Edward", "Brian",

benchmark/single-source/AnyHashableWithAClass.swift

@@ -22,7 +22,7 @@ import TestsUtils
 // 11% _swift_stdlib_makeAnyHashableUpcastingToHashableBaseType
 // 16% _swift_retain_[n]
 //  5% swift_conformsToProtocol
-public var AnyHashableWithAClass = BenchmarkInfo(
+public let AnyHashableWithAClass = BenchmarkInfo(
   name: "AnyHashableWithAClass",
   runFunction: run_AnyHashableWithAClass,
   tags: [.abstraction, .runtime, .cpubench],

benchmark/single-source/ArrayOfGenericPOD.swift

@@ -76,7 +76,7 @@ public func run_ArrayOfGenericPOD(_ N: Int) {
 
 // --- ArrayInitFromSlice
 
-var globalArray = Array<UInt8>(repeating: 0, count: 4096)
+let globalArray = Array<UInt8>(repeating: 0, count: 4096)
 
 func createArrayOfPOD() {
   blackHole(globalArray)

benchmark/single-source/ArraySetElement.swift

@@ -15,7 +15,7 @@ import TestsUtils
 // 33% isUniquelyReferenced
 //   15% swift_rt_swift_isUniquelyReferencedOrPinned_nonNull_native
 //   18% swift_isUniquelyReferencedOrPinned_nonNull_native
-public var ArraySetElement = BenchmarkInfo(
+public let ArraySetElement = BenchmarkInfo(
   name: "ArraySetElement",
   runFunction: run_ArraySetElement,
   tags: [.runtime, .cpubench]

benchmark/single-source/Breadcrumbs.swift

@@ -45,23 +45,6 @@ extension String {
   }
 }
 
-let seed = 0x12345678
-
-/// A linear congruential PRNG.
-struct LCRNG: RandomNumberGenerator {
-  private var state: UInt64
-
-  init(seed: Int) {
-    state = UInt64(truncatingIfNeeded: seed)
-    for _ in 0..<10 { _ = next() }
-  }
-
-  mutating func next() -> UInt64 {
-    state = 2862933555777941757 &* state &+ 3037000493
-    return state
-  }
-}
-
 extension Collection {
   /// Returns a randomly ordered array of random non-overlapping index ranges
   /// that cover this collection entirely.
@@ -254,7 +237,7 @@ class UTF16ToIdx: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     let range = 0 ..< inputString.utf16.count
     inputOffsets = Array(range.shuffled(using: &rng).prefix(count))
   }
@@ -286,7 +269,7 @@ class IdxToUTF16: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = Array(inputString.indices.shuffled(using: &rng).prefix(count))
   }
 
@@ -318,7 +301,7 @@ class UTF16ToIdxRange: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputOffsets = (
       0 ..< inputString.utf16.count
     ).randomIndexRanges(count: count, using: &rng)
@@ -352,7 +335,7 @@ class IdxToUTF16Range: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = self.inputString.randomIndexRanges(count: count, using: &rng)
   }
 
@@ -384,7 +367,7 @@ class CopyUTF16CodeUnits: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = (
       0 ..< inputString.utf16.count
     ).randomIndexRanges(count: count, using: &rng)
@@ -425,7 +408,7 @@ class MutatedUTF16ToIdx: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var generator = LCRNG(seed: seed)
+    var generator = SplitMix64(seed: 42)
     let range = 0 ..< inputString.utf16.count
     inputOffsets = Array(range.shuffled(using: &generator).prefix(count))
   }
@@ -469,7 +452,7 @@ class MutatedIdxToUTF16: BenchmarkBase {
 
   override func setUp() {
     super.setUp()
-    var rng = LCRNG(seed: seed)
+    var rng = SplitMix64(seed: 42)
     inputIndices = Array(inputString.indices.shuffled(using: &rng).prefix(count))
   }