Skip to content

Commit e7b1107

Browse files
authored
Merge pull request #26374 from Catfish-Man/unindex-set
Remove unused Foundation subclasses
2 parents 25c38fc + 48266a6 commit e7b1107

File tree

4 files changed

+2
-14
lines changed

4 files changed

+2
-14
lines changed

stdlib/public/core/Runtime.swift.gyb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,6 @@ internal class __SwiftNativeNSEnumerator {
305305
deinit {}
306306
}
307307

308-
// FIXME(ABI)#60 : move into the Foundation overlay and remove 'open'
309-
@_fixed_layout
310-
@objc @_swift_native_objc_runtime_base(__SwiftNativeNSDataBase)
311-
open class __SwiftNativeNSData {
312-
@inlinable
313-
@objc public init() {}
314-
@objc public init(coder: AnyObject) {}
315-
@inlinable
316-
deinit {}
317-
}
318-
319308
//===----------------------------------------------------------------------===//
320309
// Support for reliable testing of the return-autoreleased optimization
321310
//===----------------------------------------------------------------------===//

stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ using namespace swift;
5050
// NOTE: older runtimes called these _SwiftNativeNSXXXBase. The two must
5151
// coexist, so these were renamed. The old names must not be used in the new
5252
// runtime.
53-
% for Class in ('Array', 'Dictionary', 'Set', 'String', 'Enumerator', 'Data', 'IndexSet'):
53+
% for Class in ('Array', 'Dictionary', 'Set', 'String', 'Enumerator'):
5454
SWIFT_RUNTIME_STDLIB_API
5555
@interface __SwiftNativeNS${Class}Base : NS${Class}
5656
{

test/api-digester/Outputs/stability-stdlib-abi.asserts.additional.swift.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Class __SwiftNativeNSData has been removed
12
Func _collectReferencesInsideObject(_:) is a new API without @available attribute
23
Func _loadDestroyTLSCounter() is a new API without @available attribute
34
Protocol _RuntimeFunctionCountersStats is a new API without @available attribute

test/stdlib/Inputs/SwiftNativeNSBase/SwiftNativeNSBase.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ BOOL TestSwiftNativeNSBase_UnwantedCdtors()
6969
@"__SwiftNativeNSSetBase",
7070
@"__SwiftNativeNSStringBase",
7171
@"__SwiftNativeNSEnumeratorBase",
72-
@"__SwiftNativeNSDataBase",
73-
@"__SwiftNativeNSIndexSetBase",
7472
nil];
7573

7674
for (unsigned int i = 0; i < classCount; i++) {

0 commit comments

Comments
 (0)