Merge pull request #1797 from Kaiede/conditionalBridgeFor4.2

Author: swift-ci

Foundation/NSNumber.swift

@@ -541,13 +541,16 @@ extension Bool : _ObjectiveCBridgeable {
 }
 
 publicstaticfunc _conditionallyBridgeFromObjectiveC(_ x:NSNumber, result:inoutBool?)->Bool{
-if x.intValue ==0 || x.intValue ==1{
- result = x.boolValue
+if x === kCFBooleanTrue || NSNumber(value:1)== x {
+ result =true
+returntrue
+}elseif x === kCFBooleanFalse || NSNumber(value:0)== x {
+ result =false
 returntrue
-}else{
- result =nil
-returnfalse
 }
+
+ result =nil
+returnfalse
 }
 
 publicstaticfunc _unconditionallyBridgeFromObjectiveC(_ source:NSNumber?)->Bool{

TestFoundation/TestNSNumberBridging.swift

@@ -642,6 +642,16 @@ class TestNSNumberBridging : XCTestCase {
 XCTAssertNotNil(b3)
 XCTAssertEqual(b3,true)
 
+letb4=NSNumber(value:0.0)as?Bool
+XCTAssertNotNil(b4)
+XCTAssertEqual(b4,false)
+
+letb5=NSNumber(value:1.0)as?Bool
+XCTAssertNotNil(b5)
+XCTAssertEqual(b5,true)
+
+XCTAssertNil(NSNumber(value:0.25)as?Bool)
+XCTAssertNil(NSNumber(value:1.25)as?Bool)
 XCTAssertNil(NSNumber(value:-1)as?Bool)
 XCTAssertNil(NSNumber(value:2)as?Bool)
 XCTAssertNil(NSNumber(value:Int8.min)as?Bool)