Merge remote-tracking branch 'origin/master' into swift-4.1-branch

Author: swift-ci

CoreFoundation/NumberDate.subproj/CFNumber.c

@@ -1056,6 +1056,9 @@ CF_PRIVATE void __CFNumberInitialize(void) {
     _CFRuntimeSetInstanceTypeIDAndIsa(& __kCFNumberFloat32One, __kCFNumberTypeID);
     __CFBitfieldSetValue(__kCFNumberFloat32One._base._cfinfo[CF_INFO_BITS], 4, 0, kCFNumberFloat32Type);
     __kCFNumberFloat32One._pad = BITSFORFLOATONE;
+#if __BIG_ENDIAN__
+    __kCFNumberFloat32One._pad = __kCFNumberFloat32One._pad << 32;
+#endif
 
     _CFRuntimeSetInstanceTypeIDAndIsa(& __kCFNumberFloat64Zero, __kCFNumberTypeID);
     __CFBitfieldSetValue(__kCFNumberFloat64Zero._base._cfinfo[CF_INFO_BITS], 4, 0, kCFNumberFloat64Type);

TestFoundation/TestNSNumber.swift

@@ -830,6 +830,15 @@ class TestNSNumber : XCTestCase {
         XCTAssertEqual(NSNumber(value: Float(0)).uint32Value, UInt32(0))
         XCTAssertEqual(NSNumber(value: Float(0)).int64Value, Int64(0))
         XCTAssertEqual(NSNumber(value: Float(0)).uint64Value, UInt64(0))
+        XCTAssertEqual(NSNumber(value: Float(1)).boolValue, true)
+        XCTAssertEqual(NSNumber(value: Float(1)).int8Value, Int8(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).uint8Value, UInt8(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).int16Value, Int16(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).uint16Value, UInt16(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).int32Value, Int32(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).uint32Value, UInt32(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).int64Value, Int64(1))
+        XCTAssertEqual(NSNumber(value: Float(1)).uint64Value, UInt64(1))
         XCTAssertEqual(NSNumber(value: Float(-37)).boolValue, true)
         XCTAssertEqual(NSNumber(value: Float(-37)).int8Value, Int8(-37))
         XCTAssertEqual(NSNumber(value: Float(-37)).int16Value, Int16(-37))
@@ -845,9 +854,11 @@ class TestNSNumber : XCTestCase {
         XCTAssertEqual(NSNumber(value: Float(42)).int64Value, Int64(42))
         XCTAssertEqual(NSNumber(value: Float(42)).uint64Value, UInt64(42))
         XCTAssertEqual(NSNumber(value: Float(0)).floatValue, Float(0))
+        XCTAssertEqual(NSNumber(value: Float(1)).floatValue, Float(1))
         XCTAssertEqual(NSNumber(value: Float(-37.5)).floatValue, Float(-37.5))
         XCTAssertEqual(NSNumber(value: Float(42.1)).floatValue, Float(42.1))
         XCTAssertEqual(NSNumber(value: Float(0)).doubleValue, Double(0))
+        XCTAssertEqual(NSNumber(value: Float(1)).doubleValue, Double(1))
         XCTAssertEqual(NSNumber(value: Float(-37.5)).doubleValue, Double(-37.5))
         XCTAssertEqual(NSNumber(value: Float(42.5)).doubleValue, Double(42.5))
     }