---

yaml
---
r: 347057
b: refs/heads/master
c: 75552d2
h: refs/heads/master
i:
  347055: 8d0dded

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 02672a01fadeb8476d31c9dc737a0e397c592966
+refs/heads/master: 75552d2b66023907022c17dfd899aae8b198add5
 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

@@ -77,7 +77,6 @@ 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/DoubleWidthDivision.swift

@@ -65,7 +65,6 @@ import DictionaryOfAnyHashableStrings
 import DictionaryRemove
 import DictionarySubscriptDefault
 import DictionarySwap
-import DoubleWidthDivision
 import DropFirst
 import DropLast
 import DropWhile
@@ -235,7 +234,6 @@ registerBenchmark(DictionaryOfAnyHashableStrings)
 registerBenchmark(DictionaryRemove)
 registerBenchmark(DictionarySubscriptDefault)
 registerBenchmark(DictionarySwap)
-registerBenchmark(DoubleWidthDivision)
 registerBenchmark(DropFirst)
 registerBenchmark(DropLast)
 registerBenchmark(DropWhile)

trunk/benchmark/utils/main.swift

@@ -60,6 +60,13 @@ module ucrt [system] {
     module stdio {
       header "stdio.h"
       export *
+
+      // NOTE(compnerd) this is a horrible workaround for the fact that
+      // Microsoft has fully inlined nearly all of the printf family of
+      // functions in the headers which results in the definitions being elided
+      // resulting in undefined symbols.  The legacy_stdio_definitions provides
+      // out-of-line definitions for these functions.
+      link "legacy_stdio_definitions"
     }
 
     module stdlib {

trunk/stdlib/public/Platform/ucrt.modulemap

@@ -419,7 +419,7 @@ extension Float80 : CVarArg, _CVarArgAligned {
 }
 #endif
 
-#if arch(x86_64) || arch(s390x) || (arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows)))
+#if (arch(x86_64) && !os(Windows)) || arch(s390x) || (arch(arm64) && !(os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Windows)))
 
 /// An object that can manage the lifetime of storage backing a
 /// `CVaListPointer`.

trunk/stdlib/public/core/VarArgs.swift

@@ -54,5 +54,3 @@ class R<K: Hashable, V> {
 infix operator +=+ : AdditionPrecedence
 func +=+(_ lhs: Int, _ rhs: Int) -> Bool { return lhs == rhs }
 func +=+<T: BinaryInteger>(_ lhs: T, _ rhs: Int) -> Bool { return lhs == rhs }
-// FIXME: DoubleWidth is no longer part of the standard library
-// let _ = DoubleWidth<Int>(Int.min) - 1 +=+ Int.min // Ok

trunk/test/Constraints/diagnostics_swift4.swift

@@ -4,6 +4,10 @@
 
 import StdlibUnittest
 
+// XXX: Auxiliary tests & benchmark for DoubleWidth were removed in PR #23024.
+// When the DoubleWidth makes comeback, revert the commits from there to
+// ressurect what was just a dead code in the meantime…
+
 /// A fixed-width integer that has twice the bit width of its base type.
 ///
 /// You can use the `DoubleWidth` type to continue calculations with the result

trunk/test/Prototypes/DoubleWidth.swift.gyb

@@ -112,14 +112,6 @@ FloatingPoint.test("BinaryFloatingPoint/genericIntegerConversion") {
   expectEqual(Float._convert(from: Int64.max).value, Float(Int64.max))
   expectEqual(Float._convert(from: Int64.min).value, Float(Int64.min))
 
-// FIXME: DoubleWidth is no longer part of the standard library
-#if false
-  expectEqual(Float._convert(from: DoubleWidth<UInt64>.max).value, .infinity)
-  expectEqual(
-    Float._convert(from: DoubleWidth<DoubleWidth<Int64>>.max).value, .infinity)
-  expectEqual(
-    Float._convert(from: DoubleWidth<DoubleWidth<Int64>>.min).value, -.infinity)
-#endif
 }
 
 FloatingPoint.test("BinaryFloatingPoint/genericFloatingPointConversion") {

trunk/test/stdlib/FloatingPoint.swift.gyb

@@ -914,18 +914,6 @@ tests.test("binaryLogarithm/generic") {
   expectEqual(
     (42 as MockBinaryInteger<UInt>)._binaryLogarithm(),
     (42 as UInt)._binaryLogarithm())
-// FIXME: DoubleWidth is no longer part of the standard library
-#if false
-  expectEqual(
-    (42 as MockBinaryInteger<DoubleWidth<Int>>)._binaryLogarithm(),
-    (42 as DoubleWidth<Int>)._binaryLogarithm())
-  expectEqual(
-    (42 as MockBinaryInteger<DoubleWidth<UInt>>)._binaryLogarithm(),
-    (42 as DoubleWidth<UInt>)._binaryLogarithm())
-  expectEqual(
-    (42 as MockBinaryInteger<DoubleWidth<DoubleWidth<Int>>>)._binaryLogarithm(),
-    (42 as DoubleWidth<DoubleWidth<Int>>)._binaryLogarithm())
-#endif
 }
 
 runAllTests()