Skip to content

[ObjC] Only Diagnose Selector Conflicts From Classes #30274

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.

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
Mar 7, 2020
Merged
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions lib/Sema/TypeCheckDeclObjC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2035,6 +2035,11 @@ bool swift::diagnoseUnintendedObjCMethodOverrides(SourceFile &sf) {
continue;
}

// Require the declaration to actually come from a class. Selectors that
// come from protocol requirements are not actually overrides.
if (!overriddenMethod->getDeclContext()->getSelfClassDecl())
continue;

// Diagnose the override.
auto methodDiagInfo = getObjCMethodDiagInfo(method);
auto overriddenDiagInfo = getObjCMethodDiagInfo(overriddenMethod);
Expand Down