---

yaml
---
r: 341359
b: refs/heads/rxwei-patch-1
c: af0291b
h: refs/heads/master
i:
  341357: ce32009
  341355: 27c2a3f
  341351: 3192829
  341343: 737adad

Author: jckarter

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: c02787d291db70800b40cdc3bbddb8dfcf950eaf
+refs/heads/rxwei-patch-1: af0291b072cea232f35c603b9ea181b7fd8cb93a
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/CMakeLists.txt

@@ -621,9 +621,9 @@ endif()
 if(SWIFT_HOST_VARIANT_ARCH)
   set(SWIFT_HOST_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 else()
-  if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
     set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
     set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
@@ -636,8 +636,6 @@ else()
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
-  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
-    set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
     set(SWIFT_HOST_VARIANT_ARCH_default "itanium")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|i686)")
@@ -1080,10 +1078,13 @@ endif()
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
 else()
+  add_subdirectory(stdlib/public/legacy_layouts)
+
   # 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)
+    add_subdirectory(stdlib/public/SwiftShims)
   endif()
 endif()
 

branches/rxwei-patch-1/benchmark/CMakeLists.txt

@@ -78,6 +78,7 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionaryRemove
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
+    single-source/Diffing
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile
@@ -104,6 +105,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Memset
     single-source/MonteCarloE
     single-source/MonteCarloPi
+    single-source/Myers
     single-source/NSDictionaryCastToSwift
     single-source/NSError
     single-source/NSStringConversion

branches/rxwei-patch-1/benchmark/single-source/AngryPhonebook.swift

@@ -13,7 +13,6 @@
 // This test is based on single-source/Phonebook, with
 // to test uppercase and lowercase ASCII string fast paths.
 import TestsUtils
-import Foundation
 
 public let AngryPhonebook = BenchmarkInfo(
   name: "AngryPhonebook",

branches/rxwei-patch-1/benchmark/single-source/BinaryFloatingPointConversionFromBinaryInteger.swift

@@ -13,7 +13,6 @@
 // This test checks performance of generic binary floating-point conversion from
 // a binary integer.
 
-import Foundation
 import TestsUtils
 
 #if swift(>=4.2)
@@ -110,7 +109,7 @@ extension MockBinaryInteger : BinaryInteger {
   var trailingZeroBitCount: Int {
     return _value.trailingZeroBitCount
   }
-  
+
   func isMultiple(of other: MockBinaryInteger<T>) -> Bool {
     return _value.isMultiple(of: other._value)
   }
@@ -211,4 +210,3 @@ public func run_BinaryFloatingPointConversionFromBinaryInteger(_ N: Int) {
 }
 
 #endif
-

branches/rxwei-patch-1/benchmark/single-source/BinaryFloatingPointProperties.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TestsUtils
 
 public let BinaryFloatingPointPropertiesBinade = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/BitCount.swift

@@ -13,7 +13,6 @@
 // This test checks performance of Swift bit count.
 // and mask operator.
 // rdar://problem/22151678
-import Foundation
 import TestsUtils
 
 public let BitCount = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/BucketSort.swift

@@ -16,17 +16,16 @@
 // https://github.com/raywenderlich/swift-algorithm-club/tree/master/Bucket%20Sort
 //
 // It sorts an array of generic `SortableItem`s. If the type of `sortingAlgo`
-// is not known to the call site at line 90, the `sort` method can not be
+// is not known to the call site at line 89, the `sort` method can not be
 // specialized to integer array sorting, which will lead to a huge performance
 // loss. Since `SortingAlgorithm` and `InsertionSort` are declared to be
-// `public` and the lines 89-91 can not be inlined in `bucketSort` (due to
+// `public` and the lines 88-90 can not be inlined in `bucketSort` (due to
 // inlining heuristic limitations), compiler without ExistentialSpecializer
 // optimization can not achieve this feat. With ExistentialSpecializer which
 // enables generic specialization recursively in a call chain, we're able to
-// specialize line 90 for `InsertionSort` on integers.
+// specialize line 89 for `InsertionSort` on integers.
 
 import TestsUtils
-import Foundation
 
 public let BucketSort = BenchmarkInfo(
   name: "BucketSort",
@@ -117,7 +116,8 @@ let items: [Int] = {
 let buckets: [Bucket<Int>] = {
   let bucketCount = 10
   let maxValue = items.max()!.convertToInt()
-  let maxCapacity = Int(ceil(Double(maxValue + 1) / Double(bucketCount)))
+  let maxCapacity = Int(
+    (Double(maxValue + 1) / Double(bucketCount)).rounded(.up))
   return (0..<bucketCount).map { _ in Bucket<Int>(capacity: maxCapacity) }
 }()
 

branches/rxwei-patch-1/benchmark/single-source/ByteSwap.swift

@@ -13,7 +13,6 @@
 // This test checks performance of Swift byte swap.
 // rdar://problem/22151907
 
-import Foundation
 import TestsUtils
 
 public let ByteSwap = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/CString.swift

@@ -13,6 +13,8 @@
 import TestsUtils
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif

branches/rxwei-patch-1/benchmark/single-source/Calculator.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import TestsUtils
-import Foundation
 
 public let Calculator = BenchmarkInfo(
   name: "Calculator",
@@ -53,4 +52,3 @@ public func run_Calculator(_ N: Int) {
   }
   CheckResults(c == 0)
 }
-

branches/rxwei-patch-1/benchmark/single-source/Diffing.swift

@@ -0,0 +1,125 @@
+//===--- Diffing.swift ----------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 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
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+
+let t: [BenchmarkCategory] = [.api]
+public let Diffing = [
+  BenchmarkInfo(
+    name: "DiffSame",
+    runFunction: run_DiffSame,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffPangramToAlphabet",
+    runFunction: run_DiffPangramToAlphabet,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffPangrams",
+    runFunction: run_DiffPangrams,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffReversedAlphabets",
+    runFunction: run_DiffReversedAlphabets,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffReversedLorem",
+    runFunction: run_DiffReversedLorem,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffDisparate",
+    runFunction: run_DiffDisparate,
+    tags: t,
+    legacyFactor: 10),
+  BenchmarkInfo(
+    name: "DiffSimilar",
+    runFunction: run_DiffSimilar,
+    tags: t,
+    legacyFactor: 10),
+]
+
+let numbersAndSymbols = Array("0123456789`~!@#$%^&*()+=_-\"'?/<,>.\\{}'")
+let alphabets = Array("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+let alphabetsReversed = Array("ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba")
+let longPangram = Array("This pangram contains four As, one B, two Cs, one D, thirty Es, six Fs, five Gs, seven Hs, eleven Is, one J, one K, two Ls, two Ms, eighteen Ns, fifteen Os, two Ps, one Q, five Rs, twenty-seven Ss, eighteen Ts, two Us, seven Vs, eight Ws, two Xs, three Ys, & one Z")
+let typingPangram = Array("The quick brown fox jumps over the lazy dog")
+let loremIpsum = Array("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
+let unabridgedLorem = Array("Lorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliqua.")
+let loremReverse = Array(".auqila angam erolod te erobal tu tnudidicni ropmet domsuie od des ,tile gnicsipida rutetcesnoc ,tema tis rolod muspi meroL")
+
+
+@inline(never)
+public func run_DiffSame(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: longPangram)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffPangramToAlphabet(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: alphabets)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffPangrams(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: typingPangram)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffReversedAlphabets(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = alphabets.difference(from: alphabetsReversed)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffReversedLorem(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = loremIpsum.difference(from: loremReverse)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffDisparate(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = alphabets.difference(from: numbersAndSymbols)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffSimilar(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = loremIpsum.difference(from: unabridgedLorem)
+    }
+  }
+}

branches/rxwei-patch-1/benchmark/single-source/Hanoi.swift

@@ -12,7 +12,6 @@
 
 // This test checks performance of Swift hanoi tower.
 // <rdar://problem/22151932>
-import Foundation
 import TestsUtils
 
 public let Hanoi = BenchmarkInfo(