Skip to content

Fix mis-merge #20856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2018
Merged

Fix mis-merge #20856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion stdlib/public/core/StringStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 }
}
Expand Down