diff --git a/benchmark/utils/ObjectiveCTests/ObjectiveCTests.h b/benchmark/utils/ObjectiveCTests/ObjectiveCTests.h index 0465b15e1dd..bd6a9b7f737 100644 --- a/benchmark/utils/ObjectiveCTests/ObjectiveCTests.h +++ b/benchmark/utils/ObjectiveCTests/ObjectiveCTests.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN NSArray *bridgedStrings; } -- (id)init; +- (instancetype)init NS_DESIGNATED_INITIALIZER; - (void)setUpStringTests:(NSArray *)bridgedStrings; - (void)testFromString:(NSString *) str; - (NSString *)testToString; diff --git a/benchmark/utils/ObjectiveCTests/ObjectiveCTests.m b/benchmark/utils/ObjectiveCTests/ObjectiveCTests.m index 348d26d4572..fca0e7b8020 100644 --- a/benchmark/utils/ObjectiveCTests/ObjectiveCTests.m +++ b/benchmark/utils/ObjectiveCTests/ObjectiveCTests.m @@ -102,7 +102,7 @@ @implementation BridgeTester -- (id)init { +- (instancetype)init { self = [super init]; if (!self) return self; diff --git a/stdlib/public/stubs/SwiftNativeNSObject.mm b/stdlib/public/stubs/SwiftNativeNSObject.mm index 2742f7e2230..0b008e726f8 100644 --- a/stdlib/public/stubs/SwiftNativeNSObject.mm +++ b/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(result); } -- (id)initWithCoder: (NSCoder *)coder { +- (instancetype)initWithCoder: (NSCoder *)coder { return [super init]; } diff --git a/stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb b/stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb index d08792ff802..412b5b73e53 100644 --- a/stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb +++ b/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]; }