---

yaml
---
r: 294303
b: refs/heads/tensorflow
c: 04976e1
h: refs/heads/master
i:
  294301: 6c56a19
  294299: b71f7a5
  294295: d5aef70
  294287: 3b610e7
  294271: 6cb8350

Author: mundaym

[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: 174323516a0b5f4e590a3f59be5c5bebe2107e35
+refs/heads/tensorflow: 04976e1a75d37592d6d6d688de07a210d0c046ef
 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,14 +46,12 @@ Swift 5.1
   }
   ```
 
-* [SR-9827][]:
-
-  `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 {
@@ -215,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][]:
@@ -264,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.
@@ -526,6 +369,8 @@ Swift 5.0
   }
   ```
 
+**Add new entries to the top of this section, not here!**
+
 Swift 4.2
 ---------
 
@@ -7666,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>
@@ -7684,17 +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>
-[SR-9827]: <https://bugs.swift.org/browse/SR-9827>

branches/tensorflow/CMakeLists.txt

@@ -93,15 +93,6 @@ option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)
 
-set(_swift_include_apinotes_default FALSE)
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  set(_swift_include_apinotes_default TRUE)
-endif()
-
-option(SWIFT_INCLUDE_APINOTES
-  "Create targets for installing the remaining apinotes in the built toolchain."
-  ${_swift_include_apinotes_default})
-
 #
 # Miscellaneous User-configurable options.
 #
@@ -506,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")
@@ -607,7 +598,7 @@ else()
   # FIXME: Only matches v6l/v7l - by far the most common variants
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
     set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
@@ -1007,17 +998,17 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
   else()
     set(SOURCEKIT_RUNTIME_DIR lib)
   endif()
-  swift_install_in_component(FILES
+  swift_install_in_component(sourcekit-inproc
+                             FILES
                                $<TARGET_FILE:dispatch>
                                $<TARGET_FILE:BlocksRuntime>
-                             DESTINATION ${SOURCEKIT_RUNTIME_DIR}
-                             COMPONENT sourcekit-inproc)
+                             DESTINATION ${SOURCEKIT_RUNTIME_DIR})
   if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
-    swift_install_in_component(FILES
+    swift_install_in_component(sourcekit-inproc
+                               FILES
                                  $<TARGET_LINKER_FILE:dispatch>
                                  $<TARGET_LINKER_FILE:BlocksRuntime>
-                               DESTINATION lib
-                               COMPONENT sourcekit-inproc)
+                               DESTINATION lib)
   endif()
 
 
@@ -1049,18 +1040,14 @@ endif()
 # created. This then will cause SwiftSyntax to fail to build.
 #
 # https://bugs.swift.org/browse/SR-5975
-if(SWIFT_BUILD_STDLIB)
-  add_subdirectory(stdlib)
-else()
-  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
-  # ensure we build that when building tools.
-  if(SWIFT_INCLUDE_TOOLS)
-    add_subdirectory(stdlib/public/Reflection)
-  endif()
-endif()
+add_subdirectory(stdlib)
 
-if(SWIFT_INCLUDE_APINOTES)
-  add_subdirectory(apinotes)
+if(SWIFT_BUILD_SDK_OVERLAY)
+  list_intersect("${SWIFT_APPLE_PLATFORMS}" "${SWIFT_SDKS}"
+                 building_darwin_sdks)
+  if(building_darwin_sdks)
+    add_subdirectory(apinotes)
+  endif()
 endif()
 
 add_subdirectory(include)
@@ -1096,9 +1083,9 @@ endif()
 
 add_subdirectory(cmake/modules)
 
-swift_install_in_component(FILES "LICENSE.txt"
-                           DESTINATION "share/swift"
-                           COMPONENT license)
+swift_install_in_component(license
+  FILES "LICENSE.txt"
+  DESTINATION "share/swift")
 
 # Add a documentation target so that documentation shows up in the
 # Xcode project.

branches/tensorflow/apinotes/CMakeLists.txt

@@ -23,11 +23,15 @@ add_custom_command(
     COMMAND
       "${CMAKE_COMMAND}" "-E" "copy_if_different" ${inputs} "${output_dir}/")
 
-add_custom_target("copy_apinotes" ALL
+add_custom_target("copy_apinotes"
     DEPENDS "${outputs}" "${output_dir}"
     COMMENT "Copying API notes to ${output_dir}"
     SOURCES "${sources}")
 
-swift_install_in_component(DIRECTORY "${output_dir}"
-                           DESTINATION "lib/swift/"
-                           COMPONENT compiler)
+# This is treated as an OPTIONAL target because if we don't build the SDK
+# overlay, the files will be missing anyway. It also allows us to build
+# single overlays without installing the API notes.
+swift_install_in_component(sdk-overlay
+    DIRECTORY "${output_dir}"
+    DESTINATION "lib/swift/"
+    OPTIONAL)