Ensure this patch can be landed independently of the Swift Foundation patch.

millenomi · millenomi · commit 6b8f910c1797 · 2019-01-22T09:47:41.000-08:00
diff --git a/stdlib/public/core/BridgeObjectiveC.swift b/stdlib/public/core/BridgeObjectiveC.swift
@@ -658,7 +658,7 @@ extension Optional: _Unwrappable {
   }
 }
 
-private let _foundationSwiftValueType = _typeByName("FoundationBase.__SwiftValue") as? _NSSwiftValue.Type
+private let _foundationSwiftValueType = (_typeByName("FoundationBase.__SwiftValue") as? _NSSwiftValue.Type) ?? (_typeByName("Foundation.__SwiftValue") as? _NSSwiftValue.Type)
 
 @usableFromInline
 internal var _nullPlaceholder: AnyObject {

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ extension Optional: _Unwrappable {`
`658`	`658`	`}`
`659`	`659`	`}`
`660`	`660`
`661`		`-private let _foundationSwiftValueType = _typeByName("FoundationBase.__SwiftValue") as? _NSSwiftValue.Type`
	`661`	`+private let _foundationSwiftValueType = (_typeByName("FoundationBase.__SwiftValue") as? _NSSwiftValue.Type) ?? (_typeByName("Foundation.__SwiftValue") as? _NSSwiftValue.Type)`
`662`	`662`
`663`	`663`	`@usableFromInline`
`664`	`664`	`internal var _nullPlaceholder: AnyObject {`