---

yaml
---
r: 343671
b: refs/heads/master-rebranch
c: 5decec2
h: refs/heads/master
i:
  343669: 783d421
  343667: 9732f67
  343663: 20ecf57

Author: mikeash

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: f543d334f4345fe5fcd62394f1fe74bb48db2e60
+refs/heads/master-rebranch: 5decec24e7821071922b6829c7ddcf40120f386a
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/CHANGELOG.md

@@ -26,29 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SE-0253][]:
-
-  Values of types that declare `func callAsFunction` methods can be called
-  like functions. The call syntax is shorthand for applying
-  `func callAsFunction` methods.
-
-  ```swift
-  struct Adder {
-    var base: Int
-    func callAsFunction(_ x: Int) -> Int {
-      return x + base
-    }
-  }
-  var adder = Adder(base: 3)
-  adder(10) // returns 13, same as `adder.callAsFunction(10)`
-  ```
-
-  * `func callAsFunction` argument labels are required at call sites.
-  * Multiple `func callAsFunction` methods on a single type are supported.
-  * `mutating func callAsFunction` is supported.
-  * `func callAsFunction` works with `throws` and `rethrows`.
-  * `func callAsFunction` works with trailing closures.
-
 * [SR-4206][]:
 
   A method override is no longer allowed to have a generic signature with 
@@ -7734,7 +7711,6 @@ Swift 1.0
 [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-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.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>

branches/master-rebranch/benchmark/CMakeLists.txt

@@ -87,7 +87,6 @@ set(SWIFT_BENCH_MODULES
     single-source/Exclusivity
     single-source/ExistentialPerformance
     single-source/Fibonacci
-    single-source/FindStringNaive
     single-source/FlattenList
     single-source/FloatingPointParsing
     single-source/FloatingPointPrinting

branches/master-rebranch/benchmark/single-source/FindStringNaive.swift

@@ -75,7 +75,6 @@ import ErrorHandling
 import Exclusivity
 import ExistentialPerformance
 import Fibonacci
-import FindStringNaive
 import FlattenList
 import FloatingPointParsing
 import FloatingPointPrinting
@@ -254,7 +253,6 @@ registerBenchmark(ErrorHandling)
 registerBenchmark(Exclusivity)
 registerBenchmark(ExistentialPerformance)
 registerBenchmark(Fibonacci)
-registerBenchmark(FindStringNaive)
 registerBenchmark(FlattenListLoop)
 registerBenchmark(FlattenListFlatMap)
 registerBenchmark(FloatingPointParsing)

branches/master-rebranch/benchmark/utils/main.swift

@@ -2370,7 +2370,7 @@ function(_add_swift_executable_single name)
   # NOTE(compnerd) use the C linker language to invoke `clang` rather than
   # `clang++` as we explicitly link against the C++ runtime.  We were previously
   # actually passing `-nostdlib++` to avoid the C++ runtime linkage.
-  if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)
+  if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
     set_property(TARGET "${name}" PROPERTY
       LINKER_LANGUAGE "C")
   else()

branches/master-rebranch/cmake/modules/AddSwift.cmake

@@ -551,11 +551,6 @@ Types
   type ::= assoc-type-name 'Qz'                      // shortcut for 'Qyz'
   type ::= assoc-type-list 'QY' GENERIC-PARAM-INDEX  // associated type at depth
   type ::= assoc-type-list 'QZ'                      // shortcut for 'QYz'
-  
-  #if SWIFT_RUNTIME_VERSION >= 5.2
-    type ::= type assoc-type-name 'Qx' // associated type relative to base `type`
-    type ::= type assoc-type-list 'QX' // associated type relative to base `type`
-  #endif
 
   protocol-list ::= protocol '_' protocol*
   protocol-list ::= empty-list