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

swift-ci · swift-ci · commit 7d0ac1f8e1de · 2019-07-31T16:38:01.000-07:00
diff --git a/Foundation/NSCFDictionary.swift b/Foundation/NSCFDictionary.swift
@@ -147,7 +147,11 @@ internal func _CFSwiftDictionaryGetCountOfValue(_ dictionary: AnyObject, value:
 }
 
 internal func _CFSwiftDictionaryContainsValue(_ dictionary: AnyObject, value: AnyObject) -> Bool {
-    NSUnimplemented()
+    if let value = value as? AnyHashable {
+        return (dictionary as! NSDictionary).allValues.lazy.compactMap { $0 as? AnyHashable }.contains(value)
+    } else {
+        return false
+    }
 }
 
 // HAZARD! WARNING!

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,11 @@ internal func _CFSwiftDictionaryGetCountOfValue(_ dictionary: AnyObject, value:`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`internal func _CFSwiftDictionaryContainsValue(_ dictionary: AnyObject, value: AnyObject) -> Bool {`
`150`		`- NSUnimplemented()`
	`150`	`+ if let value = value as? AnyHashable {`
	`151`	`+ return (dictionary as! NSDictionary).allValues.lazy.compactMap { $0 as? AnyHashable }.contains(value)`
	`152`	`+ } else {`
	`153`	`+ return false`
	`154`	`+ }`
`151`	`155`	`}`
`152`	`156`
`153`	`157`	`// HAZARD! WARNING!`