---

yaml
---
r: 293247
b: refs/heads/tensorflow
c: 9639bce
h: refs/heads/master
i:
  293245: d51ef7a
  293243: 85259d0
  293239: 3493e1b
  293231: c7da613
  293215: 0e148c6
  293183: 70b89fb
  293119: fc1ba1e

Author: Nathan Hawes

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 778f0f82f41145bb8c65c51d36df3c6b1c855804
+refs/heads/tensorflow: 9639bcededc22085b66dfa031a085ac80f04bb71
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CHANGELOG.md

@@ -6,7 +6,6 @@ CHANGELOG
 
 | Contents               |
 | :--------------------- |
-| [Swift Next](#swift-next) |
 | [Swift 5.1](#swift-51) |
 | [Swift 5.0](#swift-50) |
 | [Swift 4.2](#swift-42) |
@@ -23,160 +22,12 @@ CHANGELOG
 
 </details>
 
-Swift Next
-----------
-
-* [SR-6118][]:
-
-  Subscripts can now declare default arguments:
-
-  ```swift
-  struct Subscriptable {
-    subscript(x: Int, y: Int = 0) {
-      ...
-    }
-  }
-
-  let s = Subscriptable()
-  print(s[0])
-  ```
-
 Swift 5.1
 ---------
 
-* [SE-0244][]:
-
-  Functions can now hide their concrete return type by declaring what protocols
-  it conforms to instead of specifying the exact return type:
-
-  ```
-  func makeMeACollection() -> some Collection {
-    return [1, 2, 3]
-  }
-  ```
-
-  Code that calls the function can use the interface of the protocol, but
-  does not have visibility into the underlying type.
-
-* [SE-0256][]:
-
-  Subscripts can now be declared `static` or (inside classes) `class`.
-
-* [SE-0252][]:
-
-  The existing `@dynamicMemberLookup` attribute has been extended with a
-  support for strongly-typed keypath implementations:
-
-  ```swift
-  @dynamicMemberLookup
-  struct Lens<T> {
-    let getter: () -> T
-    let setter: (T) -> Void
-
-    var value: T {
-      get {
-        return getter()
-      }
-      set {
-        setter(newValue)
-      }
-    }
-
-    subscript<U>(dynamicMember keyPath: WritableKeyPath<T, U>) -> Lens<U> {
-      return Lens<U>(
-          getter: { self.value[keyPath: keyPath] },
-          setter: { self.value[keyPath: keyPath] = $0 })
-    }
-  }
-  ```
-
-* [SR-8546][], [SR-9043][]:
-
-  More thorough checking has been implemented for restrictions around
-  escaping closures capturing `inout` parameters or values of noescape type.
-  While most code should not be affected, there are edge cases where
-  the Swift 5.0 compiler would accept code violating these restrictions.
-  This could result in runtime crashes or silent data corruption.
-  
-  An example of invalid code which was incorrectly accepted by the Swift 5.0
-  compiler is an `@escaping` closure calling a local function which
-  references an `inout` parameter from an outer scope:
-
-  ```swift
-  struct BadCaptureExample {
-    var escapingClosure: () -> ()
-
-    mutating func takesInOut(_ x: inout Int) {
-      func localFunction() {
-        x += 1
-      }
-
-      escapingClosure = { localFunction() }
-    }
-  }
-  ```
-
-  The compiler now correctly diagnoses the above code by pointing out that
-  the capture of `x` by `localFunction()` is invalid, since `localFunction()`
-  is referenced from an `@escaping` closure.
-
-  This also addresses certain cases where the compiler incorrectly diagnosed
-  certain code as invalid, when in fact no violation of restrictions had
-  taken place. For example,
-
-  ```swift
-  func takesNoEscape(_ fn: () -> ()) {
-    func localFunction() {
-      fn()
-    }
-
-    { localFunction() }()
-  }
-  ```
-
-* [SR-2672][]:
-
-  Conversions between tuple types are now fully implemented.
-  Previously, the following would diagnose an error:
-
-  ```swift
-  let values: (Int, Int) = (10, 15)
-  let converted: (Int?, Any) = values
-
-* [SE-0242][]:
-
-  The memberwise initializer for structures now provide default values for variables that hold default expressions.
-
-  ```swift
-  struct Dog {
-    var name = "Generic dog name"
-    var age = 0
-
-    // The synthesized memberwise initializer
-    init(name: String = "Generic dog name", age: Int = 0)
-  }
-
-  let sparky = Dog(name: "Sparky") // Dog(name: "Sparky", age: 0)
-  ```
-
 * [SE-0068][]:
 
-  It is now possible to use `Self` to refer to the innermost nominal
-  type inside struct, enum and class declarations. For example, the
-  two method declarations inside this struct are equivalent:
-  
-  ```swift
-  struct Box<Value> {
-    func transform1() -> Self { return self }
-    func transform2() -> Box<Value> { return self }
-  }
-  ```
-
-  In classes, `Self` is the dynamic type of the `self` value, as before.
-  Existing restrictions on `Self` in declaration types still apply;
-  that is, `Self` can only appear as the return type of a method.
-  However, `Self` can now be used inside the body of a method
-  without limitation.
+  `Self` can now be used inside member functions and for function arguments of structs and enums to refer to the containing type.
 
 * [SR-7799][]:
 
@@ -195,12 +46,12 @@ Swift 5.1
   }
   ```
 
-* `weak` and `unowned` stored properties no longer inhibit the
-   automatic synthesis of `Equatable` or `Hashable` conformance.
+* `weak` and `unowned` variables can now be used inside types that
+   declare `Equatable` or `Hashable` conformance.
 
 * [SR-2688][]:
 
-  An `@autoclosure` parameter can now be declared with a typealias type.
+  An `@autoclosure` closure can now be a typealias.
 
   ```swift
   class Foo {
@@ -211,12 +62,10 @@ Swift 5.1
 
 * [SR-7601][]:
 
-  Methods declared `@objc` inside a class can now return `Self`:
+  Functions marked with `@objc` can now return `Self`
 
   ```swift
-  class MyClass : NSObject {
-    @objc func clone() -> Self { return self }
-  }
+  @objc func returnDynamicSelf() -> Self { return self }
   ```
 
 * [SR-2176][]:
@@ -7662,7 +7511,6 @@ Swift 1.0
 [SE-0228]: <https://github.com/apple/swift-evolution/blob/master/proposals/0228-fix-expressiblebystringinterpolation.md>
 [SE-0230]: <https://github.com/apple/swift-evolution/blob/master/proposals/0230-flatten-optional-try.md>
 [SE-0235]: <https://github.com/apple/swift-evolution/blob/master/proposals/0235-add-result.md>
-[SE-0242]: <https://github.com/apple/swift-evolution/blob/master/proposals/0242-default-values-memberwise.md>
 [SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
@@ -7677,7 +7525,6 @@ Swift 1.0
 [SR-2388]: <https://bugs.swift.org/browse/SR-2388>
 [SR-2394]: <https://bugs.swift.org/browse/SR-2394>
 [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-4248]: <https://bugs.swift.org/browse/SR-4248>
 [SR-5581]: <https://bugs.swift.org/browse/SR-5581>
@@ -7687,5 +7534,3 @@ Swift 1.0
 [SR-7601]: <https://bugs.swift.org/browse/SR-7601>
 [SR-7799]: <https://bugs.swift.org/browse/SR-7799>
 [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>

branches/tensorflow/CMakeLists.txt

@@ -497,7 +497,7 @@ else()
   swift_common_unified_build_config(SWIFT)
 endif()
 
-get_filename_component(SWIFT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} REALPATH)
+set(SWIFT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(SWIFT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include")

branches/tensorflow/benchmark/single-source/SetTests.swift

@@ -98,47 +98,6 @@ public let SetTests = [
     tags: [.validation, .api, .Set],
     setUpFunction: { blackHole([setP, setQ]) }),
 
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Empty.Int",
-    runFunction: { n in run_SetIsStrictSubsetInt(setE, setAB, true, 5000 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setE, setAB]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Int.Empty",
-    runFunction: { n in run_SetIsStrictSubsetInt(setAB, setE, false, 5000 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setAB, setE]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Int0",
-    runFunction: { n in run_SetIsStrictSubsetInt(setAB, setCD, false, 5000 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setAB, setCD]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Box0",
-    runFunction: { n in run_SetIsStrictSubsetBox(setOAB, setOCD, false, 5000 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setOAB, setOCD]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Int25",
-    runFunction: { n in run_SetIsStrictSubsetInt(setB, setAB, true, 50 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setB, setAB]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Box25",
-    runFunction: { n in run_SetIsStrictSubsetBox(setOB, setOAB, true, 50 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setOB, setOAB]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Int50",
-    runFunction: { n in run_SetIsStrictSubsetInt(setY, setXY, true, 50 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setY, setXY]) }),
-  BenchmarkInfo(
-    name: "Set.isStrictSubset.Int100",
-    runFunction: { n in run_SetIsStrictSubsetInt(setP, setQ, false, 50 * n) },
-    tags: [.validation, .api, .Set],
-    setUpFunction: { blackHole([setP, setQ]) }),
-
   BenchmarkInfo(
     name: "Set.isDisjoint.Empty.Int",
     runFunction: { n in run_SetIsDisjointInt(setE, setAB, true, 5000 * n) },
@@ -374,18 +333,6 @@ public func run_SetIsSubsetInt(
   }
 }
 
-@inline(never)
-public func run_SetIsStrictSubsetInt(
-  _ a: Set<Int>,
-  _ b: Set<Int>,
-  _ r: Bool,
-  _ n: Int) {
-  for _ in 0 ..< n {
-    let isStrictSubset = a.isStrictSubset(of: identity(b))
-    CheckResults(isStrictSubset == r)
-  }
-}
-
 @inline(never)
 public func run_SetSymmetricDifferenceInt(
   _ a: Set<Int>,
@@ -474,18 +421,6 @@ func run_SetIsSubsetBox(
   }
 }
 
-@inline(never)
-func run_SetIsStrictSubsetBox(
-  _ a: Set<Box<Int>>,
-  _ b: Set<Box<Int>>,
-  _ r: Bool,
-  _ n: Int) {
-  for _ in 0 ..< n {
-    let isStrictSubset = a.isStrictSubset(of: identity(b))
-    CheckResults(isStrictSubset == r)
-  }
-}
-
 @inline(never)
 func run_SetSymmetricDifferenceBox(
   _ a: Set<Box<Int>>,

branches/tensorflow/cmake/modules/SwiftConfig.cmake.in

@@ -5,7 +5,7 @@
 set(SWIFT_VERSION @SWIFT_VERSION@)
 set(SWIFT_MAIN_SRC_DIR @SWIFT_SOURCE_DIR@)
 
-set(SWIFT_INCLUDE_DIRS "@SWIFT_INCLUDE_DIRS@")
+set(SWIFT_INCLUDE_DIRS "@SWIFT_INCLUDE_DIR@")
 set(SWIFT_LIBRARY_DIRS "@SWIFT_CONFIG_LIBRARY_DIRS@")
 
 # These variables are duplicated, but they must match the LLVM variables of the
@@ -25,4 +25,4 @@ endif()
 if(NOT TARGET swift)
   set(SWIFT_EXPORTED_TARGETS "@SWIFT_CONFIG_EXPORTS@")
   include("@SWIFT_EXPORTS_FILE@")
-endif()
+endif()