---

yaml
---
r: 313215
b: refs/heads/tensorflow-merge
c: ba597a0
h: refs/heads/master
i:
  313213: 2e26a5f
  313211: 460a614
  313207: 7f77975
  313199: 876c009
  313183: c342668
  313151: e001a2e
  313087: 0deff4b

Author: LucianoPAlmeida

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 51fbf0c34d2f06c5f898bd9f06e0d661082e1dea
+refs/heads/tensorflow-merge: ba597a02b9d96f54c429266bf6b348e671ed0d24
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/CHANGELOG.md

@@ -26,24 +26,27 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-4206][]:
+* [SR-8974][]:
 
-  A method override is no longer allowed to have a generic signature with 
-  requirements not imposed by the base method. For example:
+  Duplicate tuple element labels are no longer allowed, because it leads
+  to incorrect behavior. For example:
 
   ```
-  protocol P {}
-  
-  class Base {
-    func foo<T>(arg: T) {}
-  }
-  
-  class Derived: Base {
-    override func foo<T: P>(arg: T) {}
-  }
+  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.
+  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 {}
+  ```
 
 * [SR-6118][]:
 
@@ -65,28 +68,6 @@ 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
@@ -7727,7 +7708,6 @@ 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>

branches/tensorflow-merge/README.md

@@ -76,7 +76,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 4](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta](https://developer.apple.com/xcode/downloads/).
 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.

branches/tensorflow-merge/benchmark/Package.swift

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