Skip to content

[IRGen] Don't use extended encoding for async @objc protocol methods. #36827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2021
Merged

[IRGen] Don't use extended encoding for async @objc protocol methods. #36827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/IRGen/GenObjC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,10 +1185,11 @@ irgen::emitObjCMethodDescriptorParts(IRGenModule &IGM,
/// with numbers that used to represent stack offsets for each of these
/// elements.
CanSILFunctionType methodType = getObjCMethodType(IGM, method);
descriptor.typeEncoding =
getObjCEncodingForMethod(IGM, methodType, /*extended*/ method->hasAsync(),
method);

bool useExtendedEncoding =
method->hasAsync() && !isa<ProtocolDecl>(method->getDeclContext());
descriptor.typeEncoding = getObjCEncodingForMethod(
IGM, methodType, /*extended*/ useExtendedEncoding, method);
/// The third element is the method implementation pointer.
if (!concrete) {
descriptor.impl = nullptr;
Expand Down
13 changes: 13 additions & 0 deletions test/IRGen/objc_async_metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,16 @@ class MyClass: NSObject {
@objc func method() async -> String { "" }
@objc func throwingMethod() async throws -> String { "" }
}

// CHECK: [[ENCODE_ASYNC_STRING_PROTO:@.*]] = private unnamed_addr constant [15 x i8] c"v32@0:8@16@?24\00"
// CHECK-LABEL: @_PROTOCOL_INSTANCE_METHODS__TtP19objc_async_metadata7MyProto_ = internal constant
// CHECK-SAME: _selector_data(myProtoRequirement:completionHandler:)
// CHECK-SAME: [15 x i8]* [[ENCODE_ASYNC_STRING_PROTO]]

// CHECK: [[ENCODE_ASYNC_STRING_PROTO_TYPE:@.*]] = private unnamed_addr constant [41 x i8] c"v32@0:8@\22NSString\2216@?<v@?@\22NSString\22>24\00"
// CHECK-LABEL: @_PROTOCOL_METHOD_TYPES__TtP19objc_async_metadata7MyProto_ = internal constant
// CHECK-SAME: [41 x i8]* [[ENCODE_ASYNC_STRING_PROTO_TYPE]]

@objc protocol MyProto {
@objc func myProtoRequirement(_ x: String) async -> String
}