Merge pull request #76257 from AreaZR/e

Use instancetype for the benchmark and SwiftNativeNSObject

benchmark/utils/ObjectiveCTests/ObjectiveCTests.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
   NSArray<NSString *> *bridgedStrings;
 }
 
-- (id)init;
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
 - (void)setUpStringTests:(NSArray<NSString *> *)bridgedStrings;
 - (void)testFromString:(NSString *) str;
 - (NSString *)testToString;

benchmark/utils/ObjectiveCTests/ObjectiveCTests.m

@@ -102,7 +102,7 @@
 
 @implementation BridgeTester
 
-- (id)init {
+- (instancetype)init {
   self = [super init];
   if (!self)
     return self;

stdlib/public/stubs/SwiftNativeNSObject.mm

@@ -39,7 +39,7 @@ SWIFT_RUNTIME_STDLIB_API
 
 @implementation SwiftNativeNSObject
 
-+ (id)allocWithZone: (NSZone *)zone {
++ (instancetype)allocWithZone: (NSZone *)zone {
   // Allocate the object with swift_allocObject().
   // Note that this doesn't work if called on SwiftNativeNSObject itself,
   // which is not a Swift class.
@@ -50,7 +50,7 @@ SWIFT_RUNTIME_STDLIB_API
   return reinterpret_cast<id>(result);
 }
 
-- (id)initWithCoder: (NSCoder *)coder {
+- (instancetype)initWithCoder: (NSCoder *)coder {
   return [super init];
 }
 

stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb

@@ -62,7 +62,7 @@ SWIFT_RUNTIME_STDLIB_API
 
 @implementation __SwiftNativeNS${Class}Base
 
-- (id)initWithCoder: (NSCoder *)coder {
+- (instancetype)initWithCoder: (NSCoder *)coder {
   return [super init];
 }