Skip to content

Always try to call the most-derived ObjC protocol method #9681

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

Jump to bottom
Merged
merged 1 commit into from
May 17, 2017
Merged

Always try to call the most-derived ObjC protocol method #9681

merged 1 commit into from
May 17, 2017

Conversation

rjmccall
Copy link
Contributor

Don't mirror-import a protocol method if there's another method in the class's protocol hierarchy that overrides it.

rdar://31471034

@rjmccall rjmccall force-pushed the mirror-import-overrides branch from 7879b53 to 4a869b3 Compare May 17, 2017 02:25
@rjmccall
Copy link
Contributor Author

@swift-ci Please test.

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 4a869b3028768ca963b80d18d7085ae34611765d
Test requested by - @rjmccall

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 4a869b3028768ca963b80d18d7085ae34611765d
Test requested by - @rjmccall

@rjmccall
Don't mirror-import a protocol method if there's another method in
7725e38 
the class's protocol hierarchy that overrides it.

rdar://31471034
@rjmccall rjmccall force-pushed the mirror-import-overrides branch from 4a869b3 to 7725e38 Compare May 17, 2017 04:25
@rjmccall
Copy link
Contributor Author

@swift-ci Please test.

DougGregor
DougGregor approved these changes May 17, 2017
View reviewed changes
Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

This LGTM, thank you!

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 4a869b3028768ca963b80d18d7085ae34611765d
Test requested by - @rjmccall

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 4a869b3028768ca963b80d18d7085ae34611765d
Test requested by - @rjmccall

@shahmishal
Copy link
Member

@swift-ci Please test

@rjmccall
Copy link
Contributor Author

@swift-ci Please test OS X.

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 7725e38
Test requested by - @rjmccall

@rjmccall
Copy link
Contributor Author

Okay, those i386 simulator test failures are present on the main bots, which means this patch is actually clean, barring weirdness.

@rjmccall
Copy link
Contributor Author

@swift-ci Please smoke test os x.

@rjmccall rjmccall merged commit ea01d39 into swiftlang:master May 17, 2017
@rjmccall rjmccall deleted the mirror-import-overrides branch May 17, 2017 19:56
@rjmccall rjmccall mentioned this pull request May 17, 2017
Merged
@jrose-apple jrose-apple mentioned this pull request Nov 28, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DougGregor DougGregor DougGregor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rjmccall @swift-ci @shahmishal @DougGregor