Merge tag 'DEVELOPMENT-SNAPSHOT-2019-05-15-a' to 'tensorflow'

.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

@@ -97,6 +97,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.
 #
@@ -118,7 +127,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")
@@ -257,9 +266,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")
 
@@ -1062,16 +1077,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)

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(DIRECTORY "${output_dir}"
                            DESTINATION "lib/swift/"
-                           COMPONENT sdk-overlay
-                           OPTIONAL)
+                           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/ChainedFilterMap.swift

@@ -1,6 +1,6 @@
 import TestsUtils
 
-public var ChainedFilterMap = [
+public let ChainedFilterMap = [
   BenchmarkInfo(name: "ChainedFilterMap", runFunction: run_ChainedFilterMap,
     tags: [.algorithm], setUpFunction: { blackHole(first100k) },
     legacyFactor: 9),

benchmark/single-source/Chars.swift

@@ -20,7 +20,7 @@ public let Chars = BenchmarkInfo(
   setUpFunction: { blackHole(alphabetInput) },
   legacyFactor: 50)
 
-var alphabetInput: [Character] = [
+let alphabetInput: [Character] = [
     "A", "B", "C", "D", "E", "F", "G",
     "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R",
     "S", "T", "U",

benchmark/single-source/ExistentialPerformance.swift

@@ -264,17 +264,6 @@ func caRef1() { ca(Ref1.self) }
 func caRef2() { ca(Ref2.self) }
 func caRef3() { ca(Ref3.self) }
 func caRef4() { ca(Ref4.self) }
-@inline(never)
-func grabArray() -> [Existential] { // transfer array ownership to caller
-  // FIXME: This is causing Illegal Instruction: 4 crash
-  // defer { array = nil }
-  // return array
-  // This doesn't work either:
-  // let a = array!
-  // array = nil
-  // return a
-  return array!
-}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!
@@ -540,7 +529,7 @@ func run_Array_init(_ N: Int) {
 }
 
 func run_Array_method1x(_ N: Int) {
-  let existentialArray = grabArray()
+  let existentialArray = array!
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt()  {
@@ -551,7 +540,7 @@ func run_Array_method1x(_ N: Int) {
 }
 
 func run_Array_method2x(_ N: Int) {
-  let existentialArray = grabArray()
+  let existentialArray = array!
   for _ in 0 ..< N * 100 {
     for elt in existentialArray {
       if !elt.doIt() || !elt.reallyDoIt() {
@@ -562,8 +551,8 @@ func run_Array_method2x(_ N: Int) {
 }
 
 func run_ArrayMutating(_ N: Int) {
-  var existentialArray = grabArray()
-  for _ in 0 ..< N * 100 {
+  var existentialArray = array!
+  for _ in 0 ..< N * 500 {
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -573,7 +562,7 @@ func run_ArrayMutating(_ N: Int) {
 }
 
 func run_ArrayShift(_ N: Int) {
-  var existentialArray = grabArray()
+  var existentialArray = array!
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       existentialArray.swapAt(i, i+1)
@@ -582,7 +571,7 @@ func run_ArrayShift(_ N: Int) {
 }
 
 func run_ArrayConditionalShift(_ N: Int) {
-  var existentialArray = grabArray()
+  var existentialArray = array!
   for _ in 0 ..< N * 25 {
     for i in 0 ..< existentialArray.count-1 {
       let curr = existentialArray[i]

benchmark/single-source/ExistentialPerformance.swift.gyb

@@ -36,8 +36,8 @@ Setup = """
   let existential = existentialType.init()
   let existential2 = existentialType.init()
   var existential = existentialType.init()
-  let existentialArray = grabArray()
-  var existentialArray = grabArray()
+  let existentialArray = array!
+  var existentialArray = array!
 """.splitlines()
 Setup = [Setup[0], Setup[1], '\n'.join(Setup[1:3]), Setup[3], Setup[4], Setup[5]]
 
@@ -90,7 +90,7 @@ Workloads = [
       }
     }
 """),
-  ('Array.Mutating', Setup[5], '100', """
+  ('Array.Mutating', Setup[5], '500', """
     for i in 0 ..< existentialArray.count {
       if !existentialArray[i].mutateIt()  {
         fatalError("expected true")
@@ -151,17 +151,6 @@ func ca<T: Existential>(_: T.Type) {
 % for Variant in Vals + Refs:
 func ca${Variant}() { ca(${Variant}.self) }
 % end
-@inline(never)
-func grabArray() -> [Existential] { // transfer array ownership to caller
-  // FIXME: This is causing Illegal Instruction: 4 crash
-  // defer { array = nil }
-  // return array
-  // This doesn't work either:
-  // let a = array!
-  // array = nil
-  // return a
-  return array!
-}
 
 // `setUpFunctions` that determine which existential type will be tested
 var existentialType: Existential.Type!

benchmark/single-source/Hash.swift

@@ -127,7 +127,7 @@ class Hash {
 final
 class MD5 : Hash {
   // Integer part of the sines of integers (in radians) * 2^32.
-  var k : [UInt32] = [0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee ,
+  let k : [UInt32] = [0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee ,
                       0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501 ,
                       0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be ,
                       0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 ,
@@ -145,7 +145,7 @@ class MD5 : Hash {
                       0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 ]
 
   // Per-round shift amounts
-  var r : [UInt32] = [7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
+  let r : [UInt32] = [7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
                       5,  9, 14, 20, 5,  9, 14, 20, 5,  9, 14, 20, 5,  9, 14, 20,
                       4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
                       6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]
@@ -433,7 +433,7 @@ class SHA256 :  Hash {
   var h6: UInt32 = 0
   var h7: UInt32 = 0
 
-  var k : [UInt32] = [
+  let k : [UInt32] = [
    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,