Merge remote-tracking branch 'origin/master' into master-next

Author: bob-wilson

CMakeLists.txt

@@ -506,20 +506,20 @@ if(XCODE)
 endif()
 
 # FIXME: the parameters we specify in SWIFT_SDKS are lacking architecture specifics,
-# so we need to hard-code it. For example, the SDK for Android is just 'ANDROID', 
-# which we assume below to be armv7. 
+# so we need to hard-code it. For example, the SDK for Android is just 'ANDROID',
+# which we assume below to be armv7.
 # The iOS SDKs all have their architectures hardcoded because they are just specified by name (e.g. 'IOS' or 'WATCHOS').
 # We can't cross-compile the standard library for another linux architecture,
 # because the SDK list would just be 'LINUX' and we couldn't disambiguate it from the host.
-# 
+#
 # To fix it, we would need to append the architecture to the SDKs,
 # for example: 'OSX-x86_64;IOS-armv7;...etc'.
 # We could easily do that - we have all of that information in build-script-impl.
 # Also, we would need to be provided with the sysroot for each SDK (see SWIFT_ANDROID_SDK_PATH/SWIFT_SDK_ANDROID_PATH).
 # Darwin targets cheat and use `xcrun`.
 
 if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
-  
+
   set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "linux" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [linux].")
@@ -550,7 +550,7 @@ if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
   endif()
 
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "FREEBSD")
-  
+
   set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "freebsd" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [freebsd].")
@@ -563,13 +563,13 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "FREEBSD")
     "x86_64-unknown-freebsd${FREEBSD_SYSTEM_VERSION}" "/")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
-  
+
 elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "CYGWIN")
-  
+
   # set(CMAKE_EXECUTABLE_FORMAT "ELF")
   set(SWIFT_HOST_VARIANT "windows" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [windows].")
-  
+
   configure_sdk_unix(CYGWIN "Cygwin" "windows" "cygwin" "windows" "x86_64-unknown-windows-cygnus" "/")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
@@ -579,7 +579,7 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
   set(SWIFT_HOST_VARIANT "macosx" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [macosx, iphoneos].")
 
-  # Display Xcode toolchain version. 
+  # Display Xcode toolchain version.
   # The SDK configuration below prints each SDK version.
   execute_process(
     COMMAND "xcodebuild" "-version"

LICENSE.txt

@@ -200,8 +200,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-   
-   
+
+
 ## Runtime Library Exception to the Apache 2.0 License: ##
 
 

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/CoreGraphics.apinotes

@@ -90,7 +90,7 @@ Functions:
   # replaced by Equatable / ==
   SwiftName: CGAffineTransform.__equalTo(self:_:)
   SwiftPrivate: true
-  
+
 # CGBitmapContext
 - Name: CGBitmapContextCreateWithData
   SwiftName: CGContext.init(data:width:height:bitsPerComponent:bytesPerRow:space:bitmapInfo:releaseCallback:releaseInfo:)
@@ -114,7 +114,7 @@ Functions:
   SwiftName: getter:CGContext.alphaInfo(self:)
 - Name: CGBitmapContextCreateImage
   SwiftName: CGContext.makeImage(self:)
-  
+
 # CGColor
 #
 - Name: CGColorCreate
@@ -409,7 +409,7 @@ Functions:
 - Name: CGGetLastMouseDelta
   # replaced by a version that returns CGVector instead of using out-pointers
   SwiftPrivate: true
-  
+
 # CGEvent
 - Name: CGEventCreateFromData
   SwiftName: CGEvent.init(withDataAllocator:data:)
@@ -421,7 +421,7 @@ Functions:
   SwiftName: CGEvent.postToPid(_:self:)
 - Name: CGEventCreateSourceFromEvent
   SwiftName: CGEventSource.init(event:)
-  
+
 # CGFont
 - Name: CGFontCreateWithDataProvider
   SwiftName: CGFont.init(_:)
@@ -443,7 +443,7 @@ Functions:
   SwiftName: CGFont.table(self:for:)
 - Name: CGFontCreateCopyWithVariations
   SwiftName: CGFont.copy(self:withVariations:)
-  
+
 # CGGeometry
 - Name: CGPointCreateDictionaryRepresentation
   SwiftName: getter:CGPoint.dictionaryRepresentation(self:)
@@ -474,7 +474,7 @@ Functions:
   # hide in favor of an init (can't map to initializer because out-pointer)
   SwiftName: CGRect.__setFromDictionaryRepresentation(_:_:)
   SwiftPrivate: true
-  
+
 # CGGradient
 - Name: CGGradientCreateWithColorComponents
   SwiftName: CGGradient.init(colorSpace:colorComponents:locations:count:)
@@ -557,7 +557,7 @@ Functions:
 # CGPSConverter
 - Name: CGPSConverterIsConverting
   SwiftName: getter:CGPSConverter.isConverting(self:)
-  
+
 # CGPath
 - Name: CGPathCreateCopy
   SwiftName: CGPath.copy(self:)

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

apinotes/GameplayKit.apinotes

@@ -206,7 +206,7 @@ Classes:
   - Selector: 'shuffledArrayWithRandomSource:'
     SwiftName: shuffled(using:)
     MethodKind: Instance
-- Name: GKARC4RandomSource 
+- Name: GKARC4RandomSource
   Methods:
   - Selector: 'dropValuesWithCount:'
     SwiftName: dropValues(_:)

apinotes/README.md

@@ -11,7 +11,7 @@ API notes are organized into a set of `.apinotes` files. Each
 written in YAML (FIXME: to be) described below. These YAML sources
 must be manually compiled into a binary representation (`.apinotesc`)
 that the Swift compiler will lazily load when it builds code, also
-described below. 
+described below.
 
 # API Notes YAML Format
 
@@ -42,7 +42,7 @@ When updating API notes for a system module, recompile the API notes
 and place the result in the appropriate directories listed above. The
 Swift compiler itself need not be recompiled except in rare cases
 where the changes affect how the SDK overlays are built. To recompile
-API notes for a given module `$MODULE` and place them into their 
+API notes for a given module `$MODULE` and place them into their
 
 ### OS X
 ```

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/ArrayAppend.swift

@@ -42,15 +42,14 @@ public func run_ArrayAppendReserved(_ N: Int) {
 }
 
 // Append a sequence. Length of sequence unknown so
-// can't pre-reserve capacity. Should be comparable
-// to append single elements.
+// can't pre-reserve capacity. 
 @inline(never)
 public func run_ArrayAppendSequence(_ N: Int) {
   let seq = stride(from: 0, to: 10_000, by: 1)
   for _ in 0..<N {
     for _ in 0..<10 {
       var nums = [Int]()
-      for _ in 0..<4 {
+      for _ in 0..<8 {
         nums.append(contentsOf: seq)
       }
     }
@@ -60,16 +59,102 @@ public func run_ArrayAppendSequence(_ N: Int) {
 // Append another array. Length of sequence known so
 // can pre-reserve capacity.
 @inline(never)
-public func run_ArrayAppendArray(_ N: Int) {
+public func run_ArrayAppendArrayOfInt(_ N: Int) {
   let other = Array(repeating: 1, count: 10_000)
   for _ in 0..<N {
     for _ in 0..<10 {
       var nums = [Int]()
+      for _ in 0..<8 {
+        nums += other
+      }
+    }
+  }
+}
+
+// Append another array. Length of sequence known so
+// can pre-reserve capacity.
+@inline(never)
+public func run_ArrayAppendStrings(_ N: Int) {
+  let other = stride(from: 0, to: 10_000, by: 1).map { "\($0)" }
+  for _ in 0..<N {
+    for _ in 0..<10 {
+      var nums = [String]()
+      // lower inner count due to string slowness
       for _ in 0..<4 {
-        // note, this uses += rather than append(contentsOf:),
-        // to ensure operator doesn't introduce inefficiency
         nums += other
       }
     }
   }
 }
+
+struct S<T,U> {
+  var x: T
+  var y: U
+}
+
+// Append another array. Length of sequence known so
+// can pre-reserve capacity.
+@inline(never)
+public func run_ArrayAppendGenericStructs(_ N: Int) {
+  let other = Array(repeating: S(x: 3, y: 4.2), count: 10_000)
+  for _ in 0..<N {
+    for _ in 0..<10 {
+      var nums = [S<Int,Double>]()
+      for _ in 0..<8 {
+        nums += other
+      }
+    }
+  }
+}
+
+// Append another array. Length of sequence known so
+// can pre-reserve capacity.
+@inline(never)
+public func run_ArrayAppendOptionals(_ N: Int) {
+  let other: [Int?] = Array(repeating: 1, count: 10_000)
+
+  for _ in 0..<N {
+    for _ in 0..<10 {
+      var nums = [Int?]()
+      for _ in 0..<8 {
+        nums += other
+      }
+    }
+  }
+}
+
+
+// Append a lazily-mapped array. Length of sequence known so
+// can pre-reserve capacity, but no optimization points used.
+@inline(never)
+public func run_ArrayAppendLazyMap(_ N: Int) {
+  let other = Array(0..<10_000).lazy.map { $0 * 2 }
+
+  for _ in 0..<N {
+    for _ in 0..<10 {
+      var nums = [Int]()
+      for _ in 0..<8 {
+        nums += other
+      }
+    }
+  }
+}
+
+
+// Append a Repeat collection. Length of sequence known so
+// can pre-reserve capacity, but no optimization points used.
+@inline(never)
+public func run_ArrayAppendRepeatCol(_ N: Int) {
+  let other = repeatElement(1, count: 10_000)
+
+  for _ in 0..<N {
+    for _ in 0..<10 {
+      var nums = [Int]()
+      for _ in 0..<8 {
+        nums += other
+      }
+    }
+  }
+}
+
+

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)
+}