Merge pull request #26341 from apple/tensorflow-merge

Merge `swift-DEVELOPMENT-SNAPSHOT-2019-07-22-a` into tensorflow.

Author: bgogul

CHANGELOG.md

@@ -26,27 +26,24 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-8974][]:
+* [SR-4206][]:
 
-  Duplicate tuple element labels are no longer allowed, because it leads
-  to incorrect behavior. For example:
+  A method override is no longer allowed to have a generic signature with 
+  requirements not imposed by the base method. For example:
 
   ```
-  let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
-
-  enum Foo { case bar(x: Int, x: Int) }
-  let f: Foo = .bar(x: 0, x: 1)
+  protocol P {}
+  
+  class Base {
+    func foo<T>(arg: T) {}
+  }
+  
+  class Derived: Base {
+    override func foo<T: P>(arg: T) {}
+  }
   ```
 
-  will now be diagnosed as an error. 
-
-  Note: You can still use duplicate labels when declaring functions and
-  subscripts, as long as the internal labels are different. For example:
-
-  ```
-  func foo(bar x: Int, bar y: Int) {}
-  subscript(a x: Int, a y: Int) -> Int {}
-  ```
+  will now be diagnosed as an error.
 
 * [SR-6118][]:
 
@@ -68,6 +65,28 @@ Swift Next
 Swift 5.1
 ---------
 
+* [SR-8974][]:
+
+  Duplicate tuple element labels are no longer allowed, because it leads
+  to incorrect behavior. For example:
+
+  ```
+  let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
+
+  enum Foo { case bar(x: Int, x: Int) }
+  let f: Foo = .bar(x: 0, x: 1)
+  ```
+
+  will now be diagnosed as an error. 
+
+  Note: You can still use duplicate argument labels when declaring functions and
+  subscripts, as long as the internal parameter names are different. For example:
+
+  ```
+  func foo(bar x: Int, bar y: Int) {}
+  subscript(a x: Int, a y: Int) -> Int {}
+  ```
+
 * [SE-0244][]:
 
   Functions can now hide their concrete return type by declaring what protocols
@@ -7708,6 +7727,7 @@ Swift 1.0
 [SR-2608]: <https://bugs.swift.org/browse/SR-2608>
 [SR-2672]: <https://bugs.swift.org/browse/SR-2672>
 [SR-2688]: <https://bugs.swift.org/browse/SR-2688>
+[SR-4206]: <https://bugs.swift.org/browse/SR-4206>
 [SR-4248]: <https://bugs.swift.org/browse/SR-4248>
 [SR-5581]: <https://bugs.swift.org/browse/SR-5581>
 [SR-5719]: <https://bugs.swift.org/browse/SR-5719>

README.md

@@ -30,7 +30,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 beta](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta 4](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document for the current required version.
 

benchmark/CMakeLists.txt

@@ -79,6 +79,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
     single-source/Diffing
+    single-source/DiffingMyers
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile
@@ -105,7 +106,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Memset
     single-source/MonteCarloE
     single-source/MonteCarloPi
-    single-source/Myers
     single-source/NSDictionaryCastToSwift
     single-source/NSError
     single-source/NSStringConversion

benchmark/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 import Foundation
@@ -9,10 +9,15 @@ unsupportedTests.insert("ObjectiveCBridging")
 unsupportedTests.insert("ObjectiveCBridgingStubs")
 #endif
 
-// This is a stop gap hack so we can edit benchmarks in Xcode.
-let singleSourceLibraries: [String] = {
+//===---
+// Single Source Libraries
+//
+
+/// Return the source files in subDirectory that we will translate into
+/// libraries. Each source library will be compiled as its own module.
+func getSingleSourceLibraries(subDirectory: String) -> [String] {
   let f = FileManager.`default`
-  let dirURL = URL(fileURLWithPath: "single-source").absoluteURL
+  let dirURL = URL(fileURLWithPath: subDirectory)
   let fileURLs = try! f.contentsOfDirectory(at: dirURL,
                                             includingPropertiesForKeys: nil)
   return fileURLs.compactMap { (path: URL) -> String? in
@@ -25,27 +30,45 @@ let singleSourceLibraries: [String] = {
       return nil
     }
 
-    let s = String(c[0])
+    let name = String(c[0])
 
     // We do not support this test.
-    if unsupportedTests.contains(s) {
+    if unsupportedTests.contains(name) {
       return nil
     }
 
-    assert(s != "PrimsSplit")
-    return s
+    return name
   }
-}()
+}
+
+var singleSourceLibraryDirs: [String] = []
+singleSourceLibraryDirs.append("single-source")
+
+var singleSourceLibraries: [String] = singleSourceLibraryDirs.flatMap {
+  getSingleSourceLibraries(subDirectory: $0)
+}
 
-let multiSourceLibraries: [String] = {
+//===---
+// Multi Source Libraries
+//
+
+func getMultiSourceLibraries(subDirectory: String) -> [(String, String)] {
   let f = FileManager.`default`
-  let dirURL = URL(fileURLWithPath: "multi-source").absoluteURL
-  let fileURLs = try! f.contentsOfDirectory(at: dirURL,
-                                            includingPropertiesForKeys: nil)
-  return fileURLs.map { (path: URL) -> String in
-    return path.lastPathComponent
-  }
-}()
+  let dirURL = URL(string: subDirectory)!
+  let subDirs = try! f.contentsOfDirectory(at: dirURL, includingPropertiesForKeys: nil)
+  return subDirs.map { (subDirectory, $0.lastPathComponent) }
+}
+
+var multiSourceLibraryDirs: [String] = []
+multiSourceLibraryDirs.append("multi-source")
+
+var multiSourceLibraries: [(parentSubDir: String, name: String)] = multiSourceLibraryDirs.flatMap {
+  getMultiSourceLibraries(subDirectory: $0)
+}
+
+//===---
+// Products
+//
 
 var products: [Product] = []
 products.append(.library(name: "TestsUtils", type: .static, targets: ["TestsUtils"]))
@@ -54,9 +77,15 @@ products.append(.library(name: "DriverUtils", type: .static, targets: ["DriverUt
 products.append(.library(name: "ObjectiveCTests", type: .static, targets: ["ObjectiveCTests"]))
 #endif
 products.append(.executable(name: "SwiftBench", targets: ["SwiftBench"]))
-products.append(.library(name: "PrimsSplit", type: .static, targets: ["PrimsSplit"]))
+
 products += singleSourceLibraries.map { .library(name: $0, type: .static, targets: [$0]) }
-products += multiSourceLibraries.map { .library(name: $0, type: .static, targets: [$0]) }
+products += multiSourceLibraries.map {
+  return .library(name: $0.name, type: .static, targets: [$0.name])
+}
+
+//===---
+// Targets
+//
 
 var targets: [Target] = []
 targets.append(.target(name: "TestsUtils", path: "utils", sources: ["TestsUtils.swift"]))
@@ -73,7 +102,7 @@ swiftBenchDeps.append(.target(name: "ObjectiveCTests"))
 #endif
 swiftBenchDeps.append(.target(name: "DriverUtils"))
 swiftBenchDeps += singleSourceLibraries.map { .target(name: $0) }
-swiftBenchDeps += multiSourceLibraries.map { .target(name: $0) }
+swiftBenchDeps += multiSourceLibraries.map { .target(name: $0.name) }
 
 targets.append(
     .target(name: "SwiftBench",
@@ -92,20 +121,27 @@ var singleSourceDeps: [Target.Dependency] = [.target(name: "TestsUtils")]
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 singleSourceDeps.append(.target(name: "ObjectiveCTests"))
 #endif
-targets += singleSourceLibraries.map { x in
-    return .target(name: x,
+
+targets += singleSourceLibraries.map { name in
+  return .target(name: name,
       dependencies: singleSourceDeps,
       path: "single-source",
-      sources: ["\(x).swift"])
+      sources: ["\(name).swift"])
 }
-targets += multiSourceLibraries.map { x in
-  return .target(name: x,
+
+targets += multiSourceLibraries.map { lib in
+  return .target(
+    name: lib.name,
     dependencies: [
       .target(name: "TestsUtils")
     ],
-    path: "multi-source/\(x)")
+    path: lib.parentSubDir)
 }
 
+//===---
+// Top Level Definition
+//
+
 let p = Package(
   name: "swiftbench",
   products: products,