averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mis-merge

Browse Source
This commit is contained in:
David Smith
2018-11-28 21:13:33 -08:00
parent e012655e57
commit ee02182c28
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdlib/public/core/StringStorage.swift
View File

@@ -132,8 +132,10 @@ extension _AbstractStringStorage {
return _nativeIsEqual(_unsafeUncheckedDowncast(other, to: _StringStorage.self))
case .shared:
return _nativeIsEqual(_unsafeUncheckedDowncast(other, to: _SharedStringStorage.self))
#if !(arch(i386) || arch(arm))
case .tagged:
fallthrough
#endif
case .cocoa:
//we're allowed to crash, but for compatibility reasons NSCFString allows non-strings here
if _isNSString(other) != 1 {
@@ -188,7 +190,7 @@ final internal class _StringStorage: __SwiftNativeNSString, _AbstractStringStora
internal var _reserved: UInt16
override internal var count: Int {
internal var count: Int {
@inline(__always) get { return _count }
@inline(__always) set { _count = newValue }
}