---

yaml
---
r: 346079
b: refs/heads/master
c: ae9b8f8
h: refs/heads/master
i:
  346077: 87559d0
  346075: 1fdd26b
  346071: 29da27d
  346063: d42446b
  346047: 5e38dee

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0fa8ddc44476c6adf1aa127629fc4b92307bc1af
+refs/heads/master: ae9b8f8a942921909e4d343839cbafd5136cc81f
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/benchmark/CMakeLists.txt

@@ -94,6 +94,7 @@ set(SWIFT_BENCH_MODULES
     single-source/InsertCharacter  
     single-source/Integrate
     single-source/IterateData
+    single-source/JSON
     single-source/Join
     single-source/LazyFilter
     single-source/LinkedList

trunk/benchmark/single-source/JSON.swift

@@ -0,0 +1,88 @@
+//===--- JSON.swift -------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 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
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+import Foundation
+
+public let JSON = [
+  BenchmarkInfo(name: "JSONPerfEncode", runFunction: run_JSONPerfEncode, tags: [.validation, .bridging], setUpFunction: setup_coder),
+  BenchmarkInfo(name: "JSONPerfDecode", runFunction: run_JSONPerfDecode, tags: [.validation, .bridging], setUpFunction: setup_coder),
+]
+
+
+struct Tove: Codable {
+  var slithy: Bool = true
+  var gyreInRadians: Double = 0.3
+}
+
+struct Borogove : Codable {
+  var mimsyness: Int = Int.max
+}
+
+struct Wabe : Codable {
+  var toves: [Tove]
+  var borogoves: [Borogove]?
+  static var canonical: Wabe {
+    return Wabe(toves: [Tove(), Tove(), Tove(), Tove(),
+                        Tove(slithy: false, gyreInRadians: 1.8)],
+                borogoves: [Borogove(mimsyness: 18), Borogove(mimsyness: 74),
+                            Borogove(), Borogove()])
+  }
+}
+
+struct Beast : Codable {
+  var name: String
+}
+
+
+struct Jabberwocky : Codable {
+  var time = "brillig"
+  var wabe = Wabe.canonical
+  var beware: [Beast] = [ Beast(name: "Jabberwock"), Beast(name: "Bandersnatch"), Beast(name: "Jubjub Bird")]
+  var swordType = "vörpal"
+}
+
+struct JSONPerfTester {
+  var poems = Array(repeating: Jabberwocky(), count: 6)
+  var encoder: JSONEncoder = JSONEncoder()
+  var decoder: JSONDecoder = JSONDecoder()
+  var data: Data! = nil
+  
+  init() {
+    data = try! encoder.encode(Array(poems.prefix(3)))
+    //pre-warm everything to try to reduce variance
+    let _ = try! encoder.encode(poems)
+    let _ = try! decoder.decode(Array<Jabberwocky>.self,
+                                       from: data)
+  }
+}
+
+var tester: JSONPerfTester! = nil
+
+public func setup_coder() {
+  tester = JSONPerfTester()
+}
+
+@inline(never)
+public func run_JSONPerfEncode(_ N: Int) {
+  for _ in 0 ..< N {
+    let _ = try! tester.encoder.encode(tester.poems)
+  }
+}
+
+@inline(never)
+public func run_JSONPerfDecode(_ N: Int) {
+  for _ in 0 ..< N {
+    let _ = try! tester.decoder.decode(Array<Jabberwocky>.self,
+                                       from: tester.data)
+  }
+}

trunk/benchmark/utils/main.swift

@@ -82,6 +82,7 @@ import Histogram
 import InsertCharacter
 import Integrate
 import IterateData
+import JSON
 import Join
 import LazyFilter
 import LinkedList
@@ -254,6 +255,7 @@ registerBenchmark(Histogram)
 registerBenchmark(InsertCharacter)
 registerBenchmark(IntegrateTest)
 registerBenchmark(IterateData)
+registerBenchmark(JSON)
 registerBenchmark(Join)
 registerBenchmark(LazyFilter)
 registerBenchmark(LinkedList)

trunk/cmake/modules/AddSwift.cmake

@@ -1619,6 +1619,7 @@ function(add_swift_target_library name)
         SWIFT_MODULE_DEPENDS_OSX
         SWIFT_MODULE_DEPENDS_TVOS
         SWIFT_MODULE_DEPENDS_WATCHOS
+        SWIFT_MODULE_DEPENDS_WINDOWS
         TARGET_SDKS)
 
   cmake_parse_arguments(SWIFTLIB
@@ -1742,6 +1743,9 @@ function(add_swift_target_library name)
     elseif(${sdk} STREQUAL HAIKU)
       list(APPEND swiftlib_module_depends_flattened
            ${SWIFTLIB_SWIFT_MODULE_DEPENDS_HAIKU})
+    elseif(${sdk} STREQUAL WINDOWS)
+      list(APPEND swiftlib_module_depends_flattened
+           ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WINDOWS})
     endif()
 
     # Collect architecture agnostic SDK framework dependencies

trunk/stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt

@@ -12,6 +12,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
   SWIFT_MODULE_DEPENDS_FREEBSD Glibc
   SWIFT_MODULE_DEPENDS_CYGWIN Glibc
   SWIFT_MODULE_DEPENDS_HAIKU Glibc
+  SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
   SWIFT_COMPILE_FLAGS
   INSTALL_IN_COMPONENT stdlib-experimental)