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

[Stdlib][Overlays] Rename various classes to avoid conflicting ObjC names.

Browse Source 
Old Swift and new Swift runtimes and overlays need to coexist in the same process. This means there must not be any classes which have the same ObjC runtime name in old and new, because the ObjC runtime doesn't like name collisions.

When possible without breaking source compatibility, classes were renamed in Swift, which results in a different ObjC name.

Public classes were renamed only on the ObjC side using the @_objcRuntimeName attribute.

This is similar to the work done in pull request #19295. That only renamed @objc classes. This renames all of the others, since even pure Swift classes still get an ObjC name.

rdar://problem/46646438
This commit is contained in:
Mike Ash
2018-12-14 16:21:04 -05:00
parent f348fb133e
commit fa5888fb3f
40 changed files with 658 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/public/core/StringObject.swift
View File

@@ -838,13 +838,13 @@ extension _StringObject {
}
}
internal var nativeStorage: _StringStorage {
internal var nativeStorage: __StringStorage {
@inline(__always) get {
#if arch(i386) || arch(arm)
guard case .native(let storage) = _variant else {
_internalInvariantFailure()
}
return _unsafeUncheckedDowncast(storage, to: _StringStorage.self)
return _unsafeUncheckedDowncast(storage, to: __StringStorage.self)
#else
_internalInvariant(hasNativeStorage)
return Builtin.reinterpretCast(largeAddressBits)
@@ -852,13 +852,13 @@ extension _StringObject {
}
}
internal var sharedStorage: _SharedStringStorage {
internal var sharedStorage: __SharedStringStorage {
@inline(__always) get {
#if arch(i386) || arch(arm)
guard case .native(let storage) = _variant else {
_internalInvariantFailure()
}
return _unsafeUncheckedDowncast(storage, to: _SharedStringStorage.self)
return _unsafeUncheckedDowncast(storage, to: __SharedStringStorage.self)
#else
_internalInvariant(largeFastIsShared && !largeIsCocoa)
_internalInvariant(hasSharedStorage)
@@ -982,7 +982,7 @@ extension _StringObject {
}
@inline(__always)
internal init(_ storage: _StringStorage) {
internal init(_ storage: __StringStorage) {
#if arch(i386) || arch(arm)
self.init(
variant: .native(storage),
@@ -996,7 +996,7 @@ extension _StringObject {
#endif
}
internal init(_ storage: _SharedStringStorage) {
internal init(_ storage: __SharedStringStorage) {
#if arch(i386) || arch(arm)
self.init(
variant: .native(storage),
@@ -1100,7 +1100,7 @@ extension _StringObject {
}
if _countAndFlags.isNativelyStored {
let anyObj = Builtin.reinterpretCast(largeAddressBits) as AnyObject
_internalInvariant(anyObj is _StringStorage)
_internalInvariant(anyObj is __StringStorage)
}
}