Skip to content

[iOS] Fixed method invoke when both nullable and __unused exist #23726

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

Closed
zhongwuzw wants to merge 1 commit into from
+23 −6
Closed

[iOS] Fixed method invoke when both nullable and __unused exist #23726

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
29 changes: 23 additions & 6 deletions React/Base/RCTModuleMethod.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ static BOOL RCTParseSelectorPart(const char **input, NSMutableString *selector)

static BOOL RCTParseUnused(const char **input)
{
return RCTReadString(input, "__unused") ||
RCTReadString(input, "__attribute__((unused))");
return RCTReadString(input, "__attribute__((unused))") ||
RCTReadString(input, "__unused");
Copy link
Copy Markdown
Contributor Author

@zhongwuzw zhongwuzw Mar 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually __unused may not happen, because __unused macro would be expanded to __attribute__((unused)) by compiler automatically.

}

static RCTNullability RCTParseNullability(const char **input)
Expand Down Expand Up @@ -142,17 +142,34 @@ static BOOL checkCallbackMultipleInvocations(BOOL *didInvoke) {
// Parse type
if (RCTReadChar(&input, '(')) {
RCTSkipWhitespace(&input);

BOOL unused = RCTParseUnused(&input);
RCTSkipWhitespace(&input);


// 5 cases that both nullable and __unused exist
// 1: foo:(nullable __unused id)foo 2: foo:(nullable id __unused)foo
// 3: foo:(__unused id _Nullable)foo 4: foo:(id __unused _Nullable)foo
// 5: foo:(id _Nullable __unused)foo
RCTNullability nullability = RCTParseNullability(&input);
RCTSkipWhitespace(&input);

BOOL unused = RCTParseUnused(&input);
RCTSkipWhitespace(&input);

NSString *type = RCTParseType(&input);
RCTSkipWhitespace(&input);

if (nullability == RCTNullabilityUnspecified) {
nullability = RCTParseNullabilityPostfix(&input);
RCTSkipWhitespace(&input);
if (!unused) {
unused = RCTParseUnused(&input);
RCTSkipWhitespace(&input);
if (unused && nullability == RCTNullabilityUnspecified) {
nullability = RCTParseNullabilityPostfix(&input);
RCTSkipWhitespace(&input);
}
}
} else if (!unused) {
unused = RCTParseUnused(&input);
RCTSkipWhitespace(&input);
}
[args addObject:[[RCTMethodArgument alloc] initWithType:type
nullability:nullability
Expand Down