Merge pull request #24534 from mikeash/swiftnativexxx-warnings-fix

[Stdlib] Fix warnings about designated initializers in SwiftNativeXXX classes.

Author: mikeash

stdlib/public/core/DictionaryBridging.swift

@@ -71,6 +71,7 @@ final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
     self.bridgedKeys = nil
     self.nextBucket = base.hashTable.startBucket
     self.endBucket = base.hashTable.endBucket
+    super.init()
   }
 
   @nonobjc
@@ -80,6 +81,7 @@ final internal class _SwiftDictionaryNSEnumerator<Key: Hashable, Value>
     self.bridgedKeys = deferred.bridgeKeys()
     self.nextBucket = base.hashTable.startBucket
     self.endBucket = base.hashTable.endBucket
+    super.init()
   }
 
   private func bridgedKey(at bucket: _HashTable.Bucket) -> AnyObject {

stdlib/public/core/Hashing.swift

@@ -76,7 +76,7 @@ internal struct _UnmanagedAnyObjectArray {
 // renamed. The old name must not be used in the new runtime.
 final internal class __SwiftEmptyNSEnumerator
   : __SwiftNativeNSEnumerator, _NSEnumerator {
-  internal override required init() {}
+  internal override required init() { super.init() }
 
   @objc
   internal func nextObject() -> AnyObject? {

stdlib/public/core/Runtime.swift.gyb

@@ -271,6 +271,7 @@ internal class __SwiftNativeNSArray {
   @inlinable
   @nonobjc
   internal init() {}
+//  @objc public init(coder: AnyObject) {}
   @inlinable
   deinit {}
 }
@@ -281,6 +282,7 @@ internal class __SwiftNativeNSArray {
 internal class __SwiftNativeNSDictionary {
   @nonobjc
   internal init() {}
+  @objc public init(coder: AnyObject) {}
   deinit {}
 }
 
@@ -290,6 +292,7 @@ internal class __SwiftNativeNSDictionary {
 internal class __SwiftNativeNSSet {
   @nonobjc
   internal init() {}
+  @objc public init(coder: AnyObject) {}
   deinit {}
 }
 
@@ -298,6 +301,7 @@ internal class __SwiftNativeNSSet {
 internal class __SwiftNativeNSEnumerator {
   @nonobjc
   internal init() {}
+  @objc public init(coder: AnyObject) {}
   deinit {}
 }
 
@@ -307,6 +311,7 @@ internal class __SwiftNativeNSEnumerator {
 open class __SwiftNativeNSData {
   @inlinable
   @objc public init() {}
+  @objc public init(coder: AnyObject) {}
   @inlinable
   deinit {}
 }

stdlib/public/core/SetBridging.swift

@@ -74,6 +74,7 @@ final internal class _SwiftSetNSEnumerator<Element: Hashable>
     self.bridgedElements = nil
     self.nextBucket = base.hashTable.startBucket
     self.endBucket = base.hashTable.endBucket
+    super.init()
   }
 
   @nonobjc
@@ -83,6 +84,7 @@ final internal class _SwiftSetNSEnumerator<Element: Hashable>
     self.bridgedElements = deferred.bridgeElements()
     self.nextBucket = base.hashTable.startBucket
     self.endBucket = base.hashTable.endBucket
+    super.init()
   }
 
   private func bridgedElement(at bucket: _HashTable.Bucket) -> AnyObject {

stdlib/public/core/SwiftNativeNSArray.swift

@@ -47,7 +47,7 @@ internal class __SwiftNativeNSArrayWithContiguousStorage
   : __SwiftNativeNSArray { // Provides NSArray inheritance and native refcounting
 
   @inlinable
-  @nonobjc internal override init() {}
+  @nonobjc internal override init() { super.init() }
 
   @inlinable
   deinit {}

stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb

@@ -63,7 +63,7 @@ SWIFT_RUNTIME_STDLIB_API
 @implementation __SwiftNativeNS${Class}Base
 
 - (id)initWithCoder: (NSCoder *)coder {
-  return [self init];
+  return [super init];
 }
 - (id)retain {
   auto SELF = reinterpret_cast<HeapObject *>(self);

test/Interpreter/SDK/SwiftNativeNSXXXCoding.swift

@@ -8,14 +8,12 @@ import StdlibUnittest
 
 let testSuite = TestSuite("SwiftNativeNSXXXCoding")
 
-// Ensure that T gracefully handles being decoded. It doesn't have to
-// work, just not crash.
-private func test<T: NSObject & NSCoding>(type: T.Type) {
+// Ensure that the class named `name`, subclass of T, gracefully handles
+// being decoded. It doesn't have to work, just not crash.
+private func test<T: NSObject & NSCoding>(type: T.Type, name: String) {
   if #available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) {
-    let swiftClassName = "__SwiftNative\(type)Base"
-    print(swiftClassName)
     let archiver = NSKeyedArchiver(requiringSecureCoding: true)
-    archiver.setClassName(swiftClassName, for: T.self)
+    archiver.setClassName(name, for: T.self)
     archiver.encode(T(), forKey: "key")
     archiver.finishEncoding()
     let d = archiver.encodedData
@@ -24,6 +22,10 @@ private func test<T: NSObject & NSCoding>(type: T.Type) {
     _ = unarchiver.decodeObject(of: T.self, forKey: "key")
   }
 }
+private func test<T: NSObject & NSCoding>(type: T.Type) {
+  test(type: type, name: "__SwiftNative\(type)Base")
+  test(type: type, name: "Swift.__SwiftNative\(type)")
+}
 
 
 // Test all the classes listed in SwiftNativeNSXXXBase.mm.gyb except for