---

yaml
---
r: 346084
b: refs/heads/master
c: 24755cc
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift

@@ -120,15 +120,15 @@ public func _stdlib_thread_join<Result>(
   let result = WaitForSingleObject(thread, 0xffffffff);
   // TODO(compnerd) modularize WinBase.h for WAIT_OBJECT_0 (0)
   if result == 0 {
-    let threadResult: DWORD = 0
+    var threadResult: DWORD = 0
     GetExitCodeThread(thread, &threadResult)
     CloseHandle(thread)
 
-    return (result,
+    return (CInt(result),
             UnsafeMutablePointer<DWORD>(&threadResult)
                 .withMemoryRebound(to: Result.self, capacity: 1){ $0.pointee })
   } else {
-    return (result, nil)
+    return (CInt(result), nil)
   }
 #else
   var threadResultRawPtr: UnsafeMutableRawPointer?

trunk/stdlib/public/core/DictionaryCasting.swift

@@ -21,12 +21,12 @@
 public func _dictionaryUpCast<DerivedKey, DerivedValue, BaseKey, BaseValue>(
     _ source: Dictionary<DerivedKey, DerivedValue>
 ) -> Dictionary<BaseKey, BaseValue> {
-  var result = Dictionary<BaseKey, BaseValue>(minimumCapacity: source.count)
+  var builder = _DictionaryBuilder<BaseKey, BaseValue>(count: source.count)
 
   for (k, v) in source {
-    result[k as! BaseKey] = (v as! BaseValue)
+    builder.add(key:k as! BaseKey, value: v as! BaseValue)
   }
-  return result
+  return builder.take()
 }
 
 /// Called by the casting machinery.
@@ -98,11 +98,11 @@ public func _dictionaryDownCastConditional<
   _ source: Dictionary<BaseKey, BaseValue>
 ) -> Dictionary<DerivedKey, DerivedValue>? {
 
-  var result = Dictionary<DerivedKey, DerivedValue>()
+  var builder = _DictionaryBuilder<DerivedKey, DerivedValue>(count: source.count)
   for (k, v) in source {
     guard let k1 = k as? DerivedKey, let v1 = v as? DerivedValue
     else { return nil }
-    result[k1] = v1
+    builder.add(key: k1, value: v1)
   }
-  return result
+  return builder.take()
 }