---

yaml
---
r: 293626
b: refs/heads/tensorflow
c: b14cd91
h: refs/heads/master

Author: benlangmuir

[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: 4fa916bc2cf8044ce74739d86fe6fadaabf15a6a
+refs/heads/tensorflow: b14cd916a32029ba9eb98dee003f6be8291f1df4
 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,162 +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])
-  ```
-
-**Add new entries to the top of this section, not here!**
-
 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-0254][]:
-
-  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][]:
 
@@ -197,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 {
@@ -213,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][]:
@@ -262,8 +109,6 @@ Swift 5.1
 Swift 5.0
 ---------
 
-### 2019-03-25 (Xcode 10.2)
-
 * [SE-0235][]:
 
   The standard library now contains a `Result` type for manually propagating errors.
@@ -524,6 +369,8 @@ Swift 5.0
   }
   ```
 
+**Add new entries to the top of this section, not here!**
+
 Swift 4.2
 ---------
 
@@ -7664,11 +7511,7 @@ 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-0244]: <https://github.com/apple/swift-evolution/blob/master/proposals/0244-opaque-result-types.md>
 [SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
-[SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
-[SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>
@@ -7682,16 +7525,12 @@ 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>
 [SR-5719]: <https://bugs.swift.org/browse/SR-5719>
-[SR-6118]: <https://bugs.swift.org/browse/SR-6118>
 [SR-7139]: <https://bugs.swift.org/browse/SR-7139>
 [SR-7251]: <https://bugs.swift.org/browse/SR-7251>
 [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

@@ -409,13 +409,30 @@ if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)
   include(ClangClCompileRules)
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR
-    EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
+precondition(CMAKE_SYSTEM_NAME)
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
   set(SWIFT_BUILD_SOURCEKIT_default TRUE)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  if(EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
+    set(SWIFT_BUILD_SOURCEKIT_default TRUE)
+  else()
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
+    set(SWIFT_BUILD_SOURCEKIT_default FALSE)
+  endif()
+elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
+  if(EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE} AND
+     CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
+    set(SWIFT_BUILD_SOURCEKIT_default TRUE)
+  else()
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
+    set(SWIFT_BUILD_SOURCEKIT_default FALSE)
+  endif()
 else()
-  set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
-  set(SWIFT_BUILD_SOURCEKIT_default FALSE)
+    set(SWIFT_BUILD_SYNTAXPARSERLIB_default FALSE)
+    set(SWIFT_BUILD_SOURCEKIT_default FALSE)
 endif()
 option(SWIFT_BUILD_SYNTAXPARSERLIB
     "Build the Swift Syntax Parser library"
@@ -477,6 +494,12 @@ if(NOT SWIFT_LIPO)
   find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
 endif()
 
+if("${SWIFT_NATIVE_LLVM_TOOLS_PATH}" STREQUAL "")
+  set(SWIFT_CROSS_COMPILING FALSE)
+else()
+  set(SWIFT_CROSS_COMPILING TRUE)
+endif()
+
 # Reset CMAKE_SYSTEM_PROCESSOR if not cross-compiling.
 # CMake refuses to use `uname -m` on OS X
 # http://public.kitware.com/Bug/view.php?id=10326
@@ -497,7 +520,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")
@@ -572,8 +595,6 @@ else()
     set(SWIFT_HOST_VARIANT_SDK_default "WINDOWS")
   elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Haiku")
     set(SWIFT_HOST_VARIANT_SDK_default "HAIKU")
-  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
-    set(SWIFT_HOST_VARIANT_SDK_default "ANDROID")
   elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     set(SWIFT_HOST_VARIANT_SDK_default "OSX")
   else()
@@ -698,15 +719,6 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "HAIKU")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 
-elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "ANDROID")
-
-  set(SWIFT_HOST_VARIANT "android" CACHE STRING
-      "Deployment OS for Swift host tools (the compiler) [android].")
-
-  configure_sdk_unix("Android" "${SWIFT_HOST_VARIANT_ARCH}")
-  set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
-  set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
-
 elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
 
   set(SWIFT_HOST_VARIANT "macosx" CACHE STRING
@@ -751,10 +763,7 @@ endif()
 
 # Should we cross-compile the standard library for Android?
 is_sdk_requested(ANDROID swift_build_android)
-if(swift_build_android AND NOT "${SWIFT_HOST_VARIANT_SDK}" STREQUAL "ANDROID")
-  if ("${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
-    message(FATAL_ERROR "You must set SWIFT_ANDROID_NDK_PATH to cross-compile the Swift runtime for Android")
-  endif()
+if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
   if (NOT ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin" OR "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux"))
     message(FATAL_ERROR "A Darwin or Linux host is required to build the Swift runtime for Android")
   endif()

branches/tensorflow/benchmark/CMakeLists.txt

@@ -253,10 +253,6 @@ set(BENCHOPTS_MULTITHREADED
     "-whole-module-optimization" "-num-threads" "4")
 set(BENCHOPTS_SINGLEFILE "")
 
-option(SWIFT_BENCHMARK_USE_OS_LIBRARIES
-  "Runtime link against the Swift libraries on the target (/usr/lib/swift)."
-  FALSE)
-
 configure_build()
 
 #===-----------------------------------------------------------------------===#
@@ -272,18 +268,10 @@ configure_sdks()
 message("--")
 message("-- Swift Benchmark Suite:")
 message("--   SWIFT_BENCHMARK_BUILT_STANDALONE = ${SWIFT_BENCHMARK_BUILT_STANDALONE}")
-message("--   SWIFT_BENCHMARK_USE_OS_LIBRARIES = ${SWIFT_BENCHMARK_USE_OS_LIBRARIES}")
-message("--   SWIFT_EXEC         = ${SWIFT_EXEC}")
-message("--   SWIFT_LIBRARY_PATH = ${SWIFT_LIBRARY_PATH}")
-if (SWIFT_RPATH_BASE)
-message("--   SWIFT_RPATH_BASE   = ${SWIFT_RPATH_BASE}")
-endif()
-if (SWIFT_RPATH)
-message("--   SWIFT_RPATH        = ${SWIFT_RPATH}")
-message("---  ** WARNING ** Benchmarking against Swift-in-the-OS")
-endif()
-message("--   CLANG_EXEC         = ${CLANG_EXEC}")
+message("--   SWIFT_EXEC = ${SWIFT_EXEC}")
 message("--   SWIFT_BENCHMARK_EXTRA_FLAGS = ${SWIFT_BENCHMARK_EXTRA_FLAGS}")
+message("--   SWIFT_LIBRARY_PATH = ${SWIFT_LIBRARY_PATH}")
+message("--   CLANG_EXEC = ${CLANG_EXEC}")
 message("--   SWIFT_OPTIMIZATION_LEVELS = ${SWIFT_OPTIMIZATION_LEVELS}")
 message("--   ONLY_PLATFORMS = ${ONLY_PLATFORMS}")
 message("--   PAGE_ALIGNMENT_OPTION = ${PAGE_ALIGNMENT_OPTION}")

branches/tensorflow/benchmark/Naming.md

@@ -89,7 +89,7 @@ relative comparison across the different axis of variation.
 
 </details><p><!-- spacer --></p></li>
 <li>
-<strong>Groups, variants and types are <code>UpperCase</code>, methods are
+<strong>Groups and types are <code>UpperCase</code>, methods are
 <code>lowerCase</code>.</strong>
 <details>