Skip to content

MIR: should not inline trait method #44383

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 4 commits into from
Sep 11, 2017

Conversation

qmx
Copy link
Member

@qmx qmx commented Sep 7, 2017

Fixes #40473.

The idea here is bailing out of inlining if we're talking about a trait method.

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@qmx
Copy link
Member Author

qmx commented Sep 7, 2017

r? @nikomatsakis

@oli-obk
Copy link
Contributor

oli-obk commented Sep 7, 2017

Shouldn't this rather be inlining the actual method if it exists?

@nikomatsakis
Copy link
Contributor

@oli-obk babysteps =) I encouraged @qmx to first stem the bleeding, then we can repair the functionality. That said, there is some minor refactoring required in order to (nicely, at least) expose and generalize the helper methods that will do the method resolution. (The existing ones are mostly targeted at trans, where everything is monomorphized.)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 7, 2017

📌 Commit 72c92b3 has been approved by nikomatsakis

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 7, 2017
bb,
location: terminator.source_info
});
let should_inline = match self.tcx.opt_associated_item(callee_def_id) {
Copy link
Contributor

@nikomatsakis nikomatsakis Sep 8, 2017

Choose a reason for hiding this comment

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

I realize now we could do this instead:

let should_inline = self.tcx.trait_of_item(callee_def_id).is_none();

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 8, 2017

📌 Commit 10a5b53 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Sep 11, 2017

⌛ Testing commit 10a5b53 with merge 9097332...

bors added a commit that referenced this pull request Sep 11, 2017
…sakis

MIR: should not inline trait method

Fixes #40473.

The idea here is bailing out of inlining if we're talking about a trait method.
@bors
Copy link
Collaborator

bors commented Sep 11, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 9097332 to master...

@bors bors merged commit 10a5b53 into rust-lang:master Sep 11, 2017
@qmx qmx deleted the gh/40473/no-inline-trait-method branch September 11, 2017 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants