---

yaml
---
r: 274911
b: refs/heads/master
c: 6d9f532
h: refs/heads/master
i:
  274909: ec413fb
  274907: 9aa7e3b
  274903: 438575a
  274895: f1e51a2
  274879: 3ae15bf

Author: Raj Barik

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8732287cab3e5e437241db4453a91d5c1287f5cc
+refs/heads/master: 6d9f5327bf1ff4a49dfb3d2b93b431c255771e72
 refs/heads/master-next: 75552d2b66023907022c17dfd899aae8b198add5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/CHANGELOG.md

@@ -21,33 +21,9 @@ CHANGELOG
 
 </details>
 
-Swift 5.1
----------
-
-* Key path expressions can now include references to tuple elements.
-
 Swift 5.0
 ---------
 
-* [SE-0235][]:
-
-  The standard library now contains a `Result` type for manually propagating errors.
-  
-  ```swift
-  enum Result<Success, Failure: Error> {
-      case success(Success)
-      case failure(Failure)
-  }
-  ```
-  
-  This type serves a complementary role to that of throwing functions and initializers. 
-  Use `Result` in situations where automatic error propagation or `try`-`catch` 
-  blocks are undesirable, such as in asynchronous code or when accumulating the 
-  results of successive error-producing operations.
-  
-* `Error` now conforms to itself. This allows for the use of `Error` itself as 
-  the argument for a generic parameter constrained to `Error`.
-
 * Swift 3 mode has been removed. Supported values for the `-swift-version`
   flag are `4`, `4.2`, and `5`.
 
@@ -7430,7 +7406,6 @@ Swift 1.0
 [SE-0227]: <https://github.com/apple/swift-evolution/blob/master/proposals/0227-identity-keypath.md>
 [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>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>

trunk/CMakeLists.txt

@@ -413,24 +413,13 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     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)
 endif()
 option(SWIFT_BUILD_SYNTAXPARSERLIB
     "Build the Swift Syntax Parser library"
     ${SWIFT_BUILD_SYNTAXPARSERLIB_default})
-option(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB
-    "Only build the Swift Syntax Parser library" FALSE)
 option(SWIFT_BUILD_SOURCEKIT
     "Build SourceKit"
     ${SWIFT_BUILD_SOURCEKIT_default})
@@ -507,11 +496,15 @@ include(SwiftSharedCMakeConfig)
 # Support building Swift as a standalone project, using LLVM as an
 # external library.
 if(SWIFT_BUILT_STANDALONE)
-  swift_common_standalone_build_config(SWIFT)
+  swift_common_standalone_build_config(SWIFT SWIFT_CROSS_COMPILING)
 else()
   swift_common_unified_build_config(SWIFT)
 endif()
 
+if(NOT EXISTS "${CLANG_MAIN_INCLUDE_DIR}/clang/AST/Decl.h")
+  message(FATAL_ERROR "Clang is missing from llvm/tools subdirectory.")
+endif()
+
 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")
@@ -909,18 +902,8 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
     set(SWIFT_LIBDISPATCH_C_COMPILER ${CMAKE_C_COMPILER})
     set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})
   elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})
-    get_target_property(CLANG_LOCATION clang LOCATION)
-    get_filename_component(CLANG_LOCATION ${CLANG_LOCATION} DIRECTORY)
-
-    if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-      set(SWIFT_LIBDISPATCH_C_COMPILER
-          ${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
-      set(SWIFT_LIBDISPATCH_CXX_COMPILER
-          ${CLANG_LOCATION}/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
-    else()
-      set(SWIFT_LIBDISPATCH_C_COMPILER ${CLANG_LOCATION}/clang)
-      set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CLANG_LOCATION}/clang++)
-    endif()
+    set(SWIFT_LIBDISPATCH_C_COMPILER ${PATH_TO_CLANG_BUILD}/bin/clang)
+    set(SWIFT_LIBDISPATCH_CXX_COMPILER ${PATH_TO_CLANG_BUILD}/bin/clang++)
   else()
     message(SEND_ERROR "libdispatch requires a newer clang compiler (${CMAKE_C_COMPILER_VERSION} < 3.9)")
   endif()

trunk/README.md

@@ -19,8 +19,7 @@
 |**[Ubuntu 16.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04)|
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le)|
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/aarch64_ubuntu_16.04.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64)|
-|**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
-|**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64)|
+|**[Ubuntu 16.04 (Android)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
 |**[Ubuntu 16.04 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow)|
 |**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
 |**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|

trunk/benchmark/CMakeLists.txt

@@ -77,6 +77,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
+    single-source/DoubleWidthDivision
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile

trunk/benchmark/single-source/ArrayInClass.swift

@@ -17,12 +17,11 @@ public let ArrayInClass = [
     runFunction: run_ArrayInClass,
     tags: [.validation, .api, .Array],
     setUpFunction: { ac = ArrayContainer() },
-    tearDownFunction: { ac = nil },
-    legacyFactor: 5),
+    tearDownFunction: { ac = nil }),
   BenchmarkInfo(name: "DistinctClassFieldAccesses",
     runFunction: run_DistinctClassFieldAccesses,
-    tags: [.validation, .api, .Array],
-    setUpFunction: { workload = ClassWithArrs(N: 10_000) },
+    tags: [.unstable, .api, .Array],
+    setUpFunction: { workload = ClassWithArrs(N: 100_000) },
     tearDownFunction: { workload = nil }),
 ]
 
@@ -32,7 +31,7 @@ class ArrayContainer {
   final var arr : [Int]
 
   init() {
-    arr = [Int] (repeating: 0, count: 20_000)
+    arr = [Int] (repeating: 0, count: 100_000)
   }
 
   func runLoop(_ N: Int) {

trunk/benchmark/single-source/DictionaryOfAnyHashableStrings.swift

@@ -21,15 +21,18 @@ public var DictionaryOfAnyHashableStrings = [
     name: "DictionaryOfAnyHashableStrings_insert",
     runFunction: run_DictionaryOfAnyHashableStrings_insert,
     tags: [.abstraction, .runtime, .cpubench],
-    setUpFunction: { keys = buildKeys(50) },
-    legacyFactor: 14
+    setUpFunction: {
+      keys = buildKeys(500)
+    }
   ),
   BenchmarkInfo(
     name: "DictionaryOfAnyHashableStrings_lookup",
     runFunction: run_DictionaryOfAnyHashableStrings_lookup,
     tags: [.abstraction, .runtime, .cpubench],
-    setUpFunction: { keys = buildKeys(50); workload = buildWorkload() },
-    legacyFactor: 24
+    setUpFunction: {
+      keys = buildKeys(500)
+      workload = buildWorkload()
+    }
   ),
 ]
 
@@ -62,7 +65,7 @@ func buildWorkload() -> [AnyHashable: Any] {
 @inline(never)
 public func run_DictionaryOfAnyHashableStrings_insert(_ n: Int) {
   precondition(keys.count > 0)
-  for _ in 1...n {
+  for _ in 0 ... n {
     blackHole(buildWorkload())
   }
 }
@@ -71,7 +74,7 @@ public func run_DictionaryOfAnyHashableStrings_insert(_ n: Int) {
 public func run_DictionaryOfAnyHashableStrings_lookup(_ n: Int) {
   precondition(workload.count > 0)
   precondition(keys.count > 0)
-  for _ in 1...n {
+  for _ in 0 ... n {
     for i in 0 ..< keys.count {
       let key = keys[i]
       CheckResults((workload[key] as! Int) == i)

trunk/benchmark/single-source/DoubleWidthDivision.swift

@@ -0,0 +1,63 @@
+//===--- DoubleWidthDivision.swift ----------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+// This test checks performance of division using DoubleWidth.
+
+// FIXME: This needs to be disabled with an #if because it runs into pathological
+// compile time and code size problems.
+// [SR-6947] DoubleWidth compile time.
+// import Foundation
+import TestsUtils
+
+public let DoubleWidthDivision = BenchmarkInfo(
+  name: "DoubleWidthDivision",
+  runFunction: disabled,
+  tags: [.validation, .algorithm]
+)
+public func disabled(_ N: Int) {}
+
+#if false
+
+private typealias Int128 = DoubleWidth<Int64>
+private typealias Int256 = DoubleWidth<Int128>
+private typealias Int512 = DoubleWidth<Int256>
+private typealias Int1024 = DoubleWidth<Int512>
+
+@inline(never)
+public func run_DoubleWidthDivision(_ N: Int) {
+  var sum = 0
+  for _ in 1...5*N {
+    let (q, r) =
+      (Int128(Int64.max) * 16)
+        .quotientAndRemainder(dividingBy: numericCast(getInt(16)))
+    sum += Int(q * r)
+
+    let (q1, r1) =
+      (40 as Int128).dividingFullWidth(
+        (high: numericCast(getInt(0)), low: numericCast(getInt(240))))
+    sum += Int(q1 * r1)
+
+    let x =
+      DoubleWidth<DoubleWidth<DoubleWidth<Int8>>>(
+        Int64.max / numericCast(getInt(4)))
+    let y = DoubleWidth<DoubleWidth<Int8>>(Int32.max)
+    let (q2, r2) = y.dividingFullWidth((x.high, x.low))
+    sum += Int(q2 - r2)
+
+    let xx = Int1024(x)
+    let yy = Int512(y)
+    let (q3, r3) = yy.dividingFullWidth((xx.high, xx.low))
+    sum -= Int(q3 - r3)
+  }
+  CheckResults(sum == 0)
+}
+#endif