Merge branch 'master' of https://github.com/apple/swift

Author: kstaring

README.md

@@ -4,8 +4,6 @@
 || **Swift** | **Package** |
 |---|---|---|
 |**macOS**         |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-osx/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-osx)|[![Build Status](https://ci.swift.org/job/oss-swift-package-osx/badge/icon)](https://ci.swift.org/job/oss-swift-package-osx)|
-|**Ubuntu 14.04** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-14_04/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-14_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-14_04/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-14_04)|
-|**Ubuntu 15.10** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-15_10/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-15_10)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-15_10/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-15_10)|
 |**Ubuntu 16.04** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04)|
 |**Ubuntu 16.10** |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_10/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_10)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_10/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_10)|
 
@@ -63,12 +61,7 @@ For Ubuntu, you'll need the following development dependencies:
 **Note:** LLDB currently requires at least `swig-1.3.40` but will successfully build
 with version 2 shipped with Ubuntu.
 
-If you are building on Ubuntu 14.04 LTS, you'll need to upgrade your clang
-compiler for C++14 support and create a symlink:
-
-    sudo apt-get install clang-3.6
-    sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
-    sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
+Ubuntu 14.04 LTS is no longer supported. Unsupported build instructions for Ubuntu 14.04 LTS can be found [here](docs/Ubuntu14.md)
 
 ### Getting Sources for Swift and Related Projects
 

apinotes/Foundation.apinotes

@@ -1254,8 +1254,6 @@ Tags:
 - Name: NSURLHandleStatus
   SwiftName: NSURLHandle.Status
 Typedefs:
-- Name: NSAffineTransformStruct
-  SwiftName: AffineTransform
 - Name: NSComparator
   SwiftName: Comparator
 - Name: NSDecimal
@@ -1740,3 +1738,13 @@ Enumerators:
   SwiftName: regularExpression
 - Name: NSStringEnumerationByLines
   SwiftName: byLines
+SwiftVersions:
+- Version: 3
+  Protocols:
+  - Name: NSFastEnumeration
+    Methods:
+    - Selector: 'countByEnumeratingWithState:objects:count:'
+      MethodKind: Instance
+      Parameters:
+      - Position: 1
+        Nullability: U

benchmark/CMakeLists.txt

@@ -64,6 +64,10 @@ set(SWIFT_BENCH_MODULES
     single-source/NSStringConversion
     single-source/NopDeinit
     single-source/ObjectAllocation
+    single-source/ObserverClosure
+    single-source/ObserverForwarderStruct
+    single-source/ObserverPartiallyAppliedMethod 
+    single-source/ObserverUnappliedMethod 
     single-source/OpenClose
     single-source/Phonebook
     single-source/PolymorphicCalls

benchmark/single-source/ObserverClosure.swift

@@ -0,0 +1,29 @@
+
+class Observer {
+  @inline(never)
+  func receive(_ value: Int) {
+  }
+}
+
+class Signal {
+  var observers: [(Int) -> ()] = []
+
+  func subscribe(_ observer: @escaping (Int) -> ()) {
+    observers.append(observer)
+  }
+
+  func send(_ value: Int) {
+    for observer in observers {
+      observer(value)
+    }
+  }
+}
+
+public func run_ObserverClosure(_ iterations: Int) {
+  let signal = Signal()
+  let observer = Observer()
+  for _ in 0 ..< 10_000 * iterations {
+    signal.subscribe { i in observer.receive(i) }
+  }
+  signal.send(1)
+}

benchmark/single-source/ObserverForwarderStruct.swift

@@ -0,0 +1,41 @@
+
+class Observer {
+  @inline(never)
+  func receive(_ value: Int) {
+  }
+}
+
+protocol Sink {
+  func receive(_ value: Int)
+}
+
+struct Forwarder: Sink {
+  let object: Observer
+
+  func receive(_ value: Int) {
+    object.receive(value)
+  }
+}
+
+class Signal {
+  var observers: [Sink] = []
+
+  func subscribe(_ sink: Sink) {
+    observers.append(sink)
+  }
+
+  func send(_ value: Int) {
+    for observer in observers {
+      observer.receive(value)
+    }
+  }
+}
+
+public func run_ObserverForwarderStruct(_ iterations: Int) {
+  let signal = Signal()
+  let observer = Observer()
+  for _ in 0 ..< 10_000 * iterations {
+    signal.subscribe(Forwarder(object: observer))
+  }
+  signal.send(1)
+}

benchmark/single-source/ObserverPartiallyAppliedMethod.swift

@@ -0,0 +1,29 @@
+
+class Observer {
+  @inline(never)
+  func receive(_ value: Int) {
+  }
+}
+
+class Signal {
+  var observers: [(Int) -> ()] = []
+
+  func subscribe(_ observer: @escaping (Int) -> ()) {
+    observers.append(observer)
+  }
+
+  func send(_ value: Int) {
+    for observer in observers {
+      observer(value)
+    }
+  }
+}
+
+public func run_ObserverPartiallyAppliedMethod(_ iterations: Int) {
+  let signal = Signal()
+  let observer = Observer()
+  for _ in 0 ..< 10_000 * iterations {
+    signal.subscribe(observer.receive)
+  }
+  signal.send(1)
+}

benchmark/single-source/ObserverUnappliedMethod.swift

@@ -0,0 +1,43 @@
+
+class Observer {
+  @inline(never)
+  func receive(_ value: Int) {
+  }
+}
+
+protocol Sink {
+  func receive(_ value: Int)
+}
+
+struct Forwarder<Object>: Sink {
+  let object: Object
+  let method: (Object) -> (Int) -> ()
+
+  func receive(_ value: Int) {
+    method(object)(value)
+  }
+}
+
+class Signal {
+  var observers: [Sink] = []
+
+  func subscribe(_ sink: Sink) {
+    observers.append(sink)
+  }
+
+  func send(_ value: Int) {
+    for observer in observers {
+      observer.receive(value)
+    }
+  }
+}
+
+public func run_ObserverUnappliedMethod(_ iterations: Int) {
+  let signal = Signal()
+  let observer = Observer()
+  for _ in 0 ..< 10_000 * iterations {
+    let forwarder = Forwarder(object: observer, method: Observer.receive)
+    signal.subscribe(forwarder)
+  }
+  signal.send(1)
+}

benchmark/single-source/Prims.swift

@@ -191,7 +191,7 @@ func Prims(_ graph : Array<GraphNode>, _ fun : (Int, Int) -> Double) -> Array<In
   queue.insert(EdgeCost(to: 0, cost: 0.0, from: 0))
 
   // Take an element with the smallest cost from the queue and add its
-  // neighbours to the queue if their cost was updated
+  // neighbors to the queue if their cost was updated
   while !queue.isEmpty() {
     // Add an edge with minimum cost to the spanning tree
     let e = queue.pop()!

benchmark/single-source/SortStrings.swift

@@ -976,7 +976,7 @@ var stringBenchmarkWords: [String] = [
   "heterospory",
   "Turkeydom",
   "anteprandial",
-  "neighbourship",
+  "neighborship",
   "thatchless",
   "drepanoid",
   "lusher",
@@ -1994,7 +1994,7 @@ var stringBenchmarkWordsUnicode: [String] = [
   "❄️heterospory",
   "❄️Turkeydom",
   "❄️anteprandial",
-  "❄️neighbourship",
+  "❄️neighborship",
   "❄️thatchless",
   "❄️drepanoid",
   "❄️lusher",

benchmark/utils/main.swift

@@ -68,6 +68,10 @@ import ObjectAllocation
 import ObjectiveCBridging
 import ObjectiveCBridgingStubs
 import ObjectiveCNoBridgingStubs
+import ObserverClosure
+import ObserverForwarderStruct
+import ObserverPartiallyAppliedMethod
+import ObserverUnappliedMethod
 import OpenClose
 import Phonebook
 import PolymorphicCalls
@@ -197,6 +201,10 @@ precommitTests = [
   "ObjectiveCBridgeToNSDictionary": run_ObjectiveCBridgeToNSDictionary,
   "ObjectiveCBridgeToNSSet": run_ObjectiveCBridgeToNSSet,
   "ObjectiveCBridgeToNSString": run_ObjectiveCBridgeToNSString,
+  "ObserverClosure": run_ObserverClosure,
+  "ObserverForwarderStruct": run_ObserverForwarderStruct,
+  "ObserverPartiallyAppliedMethod": run_ObserverPartiallyAppliedMethod,
+  "ObserverUnappliedMethod": run_ObserverUnappliedMethod,
   "OpenClose": run_OpenClose,
   "Phonebook": run_Phonebook,
   "PolymorphicCalls": run_PolymorphicCalls,