---

yaml
---
r: 294331
b: refs/heads/tensorflow
c: b903f71
h: refs/heads/master
i:
  294329: 70915c6
  294327: 7847c08

Author: rintaro

[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: 7b7c320bd59cb9b4954fef79ae67700dbee6c4e5
+refs/heads/tensorflow: b903f7191dde1e8e5b52281d78297d0f69b5d172
 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/CMakeLists.txt

@@ -123,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")

branches/tensorflow/stdlib/private/StdlibCollectionUnittest/CheckCollectionInstance.swift

@@ -467,7 +467,7 @@ public func checkOneLevelOfForwardCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {
@@ -693,7 +693,7 @@ public func checkOneLevelOfBidirectionalCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {
@@ -978,7 +978,7 @@ public func checkOneLevelOfRandomAccessCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {
@@ -1237,7 +1237,7 @@ public func checkOneLevelOfForwardCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {
@@ -1463,7 +1463,7 @@ public func checkOneLevelOfBidirectionalCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {
@@ -1748,7 +1748,7 @@ public func checkOneLevelOfRandomAccessCollection<
       }
     }
 
-    var allIndices = Array(collection.indices)
+    let allIndices = Array(collection.indices)
 
     if expectedArray.count >= 2 {
       for i in 0..<allIndices.count-1 {

branches/tensorflow/stdlib/public/Darwin/Foundation/JSONEncoder.swift

@@ -1128,7 +1128,7 @@ open class JSONDecoder {
             let leadingUnderscoreRange = stringKey.startIndex..<firstNonUnderscore
             let trailingUnderscoreRange = stringKey.index(after: lastNonUnderscore)..<stringKey.endIndex
 
-            var components = stringKey[keyRange].split(separator: "_")
+            let components = stringKey[keyRange].split(separator: "_")
             let joinedString : String
             if components.count == 1 {
                 // No underscores in key, leave the word as is - maybe already camel cased

branches/tensorflow/stdlib/public/Platform/tgmath.swift.gyb

@@ -14,7 +14,7 @@ import SwiftShims
 
 // Generic functions implementable directly on FloatingPoint.
 @_transparent
-@available(swift, deprecated: 4.2, obsoleted: 5.1, renamed: "abs")
+@available(swift, deprecated: 4.2/*, obsoleted: 5.1*/, renamed: "abs")
 public func fabs<T: FloatingPoint>(_ x: T) -> T {
   return x.magnitude
 }
@@ -112,7 +112,7 @@ public func isnan<T: FloatingPoint>(_ value: T) -> Bool { fatalError() }
 @available(*, unavailable, message: "use the sign property.")
 public func signbit<T: FloatingPoint>(_ value: T) -> Int { fatalError() }
 
-@available(swift, deprecated: 4.2, obsoleted: 5.1, message: "use the exponent property.")
+@available(swift, deprecated: 4.2/*, obsoleted: 5.1*/, message: "use the exponent property.")
 public func ilogb<T: BinaryFloatingPoint>(_ x: T) -> Int {
   return Int(x.exponent)
 }
@@ -352,7 +352,7 @@ public func remquo(_ x: ${T}, _ y: ${T}) -> (${T}, Int) {
 %  if T == 'Float80':
 #if (arch(i386) || arch(x86_64)) && !os(Windows)
 %  end
-@available(swift, deprecated: 4.2, obsoleted: 5.1, message:
+@available(swift, deprecated: 4.2/*, obsoleted: 5.1*/, message:
            "use ${T}(nan: ${T}.RawSignificand).")
 @_transparent
 public func nan(_ tag: String) -> ${T} {

branches/tensorflow/stdlib/public/core/ClosedRange.swift

@@ -444,7 +444,12 @@ extension ClosedRange where Bound: Strideable, Bound.Stride : SignedInteger {
 extension ClosedRange {
   @inlinable
   public func overlaps(_ other: ClosedRange<Bound>) -> Bool {
-    return self.contains(other.lowerBound) || other.contains(lowerBound)
+    // Disjoint iff the other range is completely before or after our range.
+    // Unlike a `Range`, a `ClosedRange` can *not* be empty, so no check for
+    // that case is needed here.
+    let isDisjoint = other.upperBound < self.lowerBound
+      || self.upperBound < other.lowerBound
+    return !isDisjoint
   }
 
   @inlinable

branches/tensorflow/stdlib/public/core/Integers.swift

@@ -716,6 +716,8 @@ public protocol BinaryInteger :
   ///     let x = Int8(bitPattern: 0b1111_1000)
   ///     // x == -8
   ///     // x.trailingZeroBitCount == 3
+  ///
+  /// If the value is zero, then `trailingZeroBitCount` is equal to `bitWidth`.
   var trailingZeroBitCount: Int { get }
 
   /// Returns the quotient of dividing the first value by the second.
@@ -2081,6 +2083,8 @@ where Magnitude : FixedWidthInteger & UnsignedInteger,
   ///     let x: Int8 = 0b0001_1111
   ///     // x == 31
   ///     // x.leadingZeroBitCount == 3
+  ///
+  /// If the value is zero, then `leadingZeroBitCount` is equal to `bitWidth`.
   var leadingZeroBitCount: Int { get }
 
   /// Creates an integer from its big-endian representation, changing the byte

branches/tensorflow/stdlib/public/core/MigrationSupport.swift

@@ -535,7 +535,7 @@ extension UnsafeMutableRawBufferPointer {
 // Note that the second overload is declared on a more specific protocol.
 // See: test/stdlib/StringFlatMap.swift for tests.
 extension Sequence {
-  @available(swift, deprecated: 4.1, obsoleted: 5.1, renamed: "compactMap(_:)",
+  @available(swift, deprecated: 4.1/*, obsoleted: 5.1 */, renamed: "compactMap(_:)",
     message: "Please use compactMap(_:) for the case where closure returns an optional value")
   public func flatMap<ElementOfResult>(
     _ transform: (Element) throws -> ElementOfResult?

branches/tensorflow/stdlib/public/core/Range.swift

@@ -943,14 +943,26 @@ extension Range {
   ///   common; otherwise, `false`.
   @inlinable
   public func overlaps(_ other: Range<Bound>) -> Bool {
-    return (!other.isEmpty && self.contains(other.lowerBound))
-        || (!self.isEmpty && other.contains(self.lowerBound))
+    // Disjoint iff the other range is completely before or after our range.
+    // Additionally either `Range` (unlike a `ClosedRange`) could be empty, in
+    // which case it is disjoint with everything as overlap is defined as having
+    // an element in common.
+    let isDisjoint = other.upperBound <= self.lowerBound
+      || self.upperBound <= other.lowerBound
+      || self.isEmpty || other.isEmpty
+    return !isDisjoint
   }
 
   @inlinable
   public func overlaps(_ other: ClosedRange<Bound>) -> Bool {
-    return self.contains(other.lowerBound)
-        || (!self.isEmpty && other.contains(self.lowerBound))
+    // Disjoint iff the other range is completely before or after our range.
+    // Additionally the `Range` (unlike the `ClosedRange`) could be empty, in
+    // which case it is disjoint with everything as overlap is defined as having
+    // an element in common.
+    let isDisjoint = other.upperBound < self.lowerBound
+      || self.upperBound <= other.lowerBound
+      || self.isEmpty
+    return !isDisjoint
   }
 }
 

branches/tensorflow/test/IRGen/objc.swift

@@ -147,7 +147,7 @@ class WeakObjC {
 // CHECK:  i32 1, !"Objective-C Version", i32 2}
 // CHECK:  i32 1, !"Objective-C Image Info Version", i32 0}
 // CHECK:  i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
-//   83887872 == (5 << 24) | (0 << 16) | (7 << 8). 
+//   83953408 == (5 << 24) | (1 << 16) | (7 << 8). 
 //     5 and 0 is the current major.minor version. 7 is the Swift ABI version.
-// CHECK:  i32 4, !"Objective-C Garbage Collection", i32 83887872}
+// CHECK:  i32 4, !"Objective-C Garbage Collection", i32 83953408}
 // CHECK:  i32 1, !"Swift Version", i32 7}

branches/tensorflow/test/Interpreter/SDK/SwiftNativeNSXXXCoding.swift

@@ -31,28 +31,30 @@ private func test<T: NSObject & NSCoding>(type: T.Type) {
 // Test all the classes listed in SwiftNativeNSXXXBase.mm.gyb except for
 // NSEnumerator (which doesn't conform to NSCoding).
 
-testSuite.test("NSArray") {
-  test(type: NSArray.self)
-}
+if #available(iOS 9999, macOS 9999, tvOS 9999, watchOS 9999, *) {
+  testSuite.test("NSArray") {
+    test(type: NSArray.self)
+  }
 
-testSuite.test("NSDictionary") {
-  test(type: NSDictionary.self)
-}
+  testSuite.test("NSDictionary") {
+    test(type: NSDictionary.self)
+  }
 
-testSuite.test("NSSet") {
-  test(type: NSSet.self)
-}
+  testSuite.test("NSSet") {
+    test(type: NSSet.self)
+  }
 
-testSuite.test("NSString") {
-  test(type: NSString.self)
-}
+  testSuite.test("NSString") {
+    test(type: NSString.self)
+  }
 
-testSuite.test("NSData") {
-  test(type: NSData.self)
-}
+  testSuite.test("NSData") {
+    test(type: NSData.self)
+  }
 
-testSuite.test("NSIndexSet") {
-  test(type: NSIndexSet.self)
+  testSuite.test("NSIndexSet") {
+    test(type: NSIndexSet.self)
+  }
 }
 
 runAllTests()

branches/tensorflow/test/Serialization/Recovery/types-5-to-4.swift

@@ -16,8 +16,8 @@ import Lib
 func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
 func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
 
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.0) because it has overridable members that could not be loaded in Swift 4.1.50}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.0) because it has requirements that could not be loaded in Swift 4.1.50}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.1) because it has overridable members that could not be loaded in Swift 4.1.50}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.1) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 

branches/tensorflow/test/SourceKit/Misc/compiler_version.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s
 
 // CHECK: key.version_major: 5
-// CHECK: key.version_minor: 0
+// CHECK: key.version_minor: 1
 // CHECK: key.version_patch: 0

branches/tensorflow/utils/build_swift/defaults.py

@@ -40,7 +40,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.0')
+SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1')
 CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'