Skip to content

[mir-inlining] Don't inline virtual calls - #55046

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:no_virtual_call_inlining
Oct 15, 2018
Merged

[mir-inlining] Don't inline virtual calls#55046
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:no_virtual_call_inlining

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Oct 13, 2018

Copy link
Copy Markdown
Member

No description provided.

@rust-highfive

rust-highfive commented Oct 13, 2018

Copy link
Copy Markdown
Contributor

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2018
varkor
varkor reviewed Oct 14, 2018
View reviewed changes
Comment threadsrc/librustc_mir/transform/inline.rs Outdated

@varkorvarkorOct 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit: false should be on its own line.

varkor
varkor reviewed Oct 14, 2018
View reviewed changes
Comment threadsrc/test/mir-opt/inline-trait-method.rs Outdated

@varkorvarkorOct 14, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copyright is no longer needed.

varkor
varkor reviewed Oct 14, 2018
View reviewed changes
Comment threadsrc/test/mir-opt/inline-trait-method.rs Outdated

@varkorvarkorOct 14, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Prefer &dyn X over &X.

@varkor

varkor commented Oct 14, 2018

Copy link
Copy Markdown
Contributor

Was it inlining the default function implementation, or the implementation for () previously? Either way, r=me after the comments are addressed.

@wesleywiser

wesleywiser commented Oct 14, 2018

Copy link
Copy Markdown
MemberAuthor

It was inlining the default implementation so prior to the patch, the test would output 1 instead of 2 like it should.

@wesleywiser
wesleywiserforce-pushed the no_virtual_call_inlining branch from bc47afd to 6c2daceCompareOctober 14, 2018 17:43
@wesleywiser

wesleywiser commented Oct 14, 2018

Copy link
Copy Markdown
MemberAuthor

Feedback resolved. Thanks @varkor!

@wesleywiser
[mir-inlining] Don't inline virtual calls
69eaa11
Prior to this change, the test case would output `1` instead of `2` like
it should.
@wesleywiser
wesleywiserforce-pushed the no_virtual_call_inlining branch from 6c2dace to 69eaa11CompareOctober 14, 2018 17:46
@wesleywiser

wesleywiser commented Oct 14, 2018

Copy link
Copy Markdown
MemberAuthor

@bors r=varkor

@bors

bors commented Oct 14, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 69eaa11 has been approved by varkor

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2018
@bors

bors commented Oct 14, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 69eaa11 with merge 0c665e2...

bors added a commit that referenced this pull request Oct 14, 2018
@bors
Auto merge of#55046- wesleywiser:no_virtual_call_inlining, r=varkor
0c665e2
[mir-inlining] Don't inline virtual calls
@bors

bors commented Oct 15, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: varkor
Pushing 0c665e2 to master...

@bors
bors merged commit 69eaa11 into rust-lang:masterOct 15, 2018
@RalfJungRalfJung mentioned this pull request Oct 15, 2018
Closed
@RalfJung

RalfJung commented Oct 15, 2018•
edited
Loading

Copy link
Copy Markdown
Member

I think this fixed #50411, and running the miri test suite with MIR optimizations. :)

Would be great if the reproducer from #50411 could be added as a test case.

EDIT: Ah nvm, I'll just quickly do that. So happy that this works, I don't want to see it regressing again :)

@RalfJungRalfJung mentioned this pull request Oct 15, 2018
Closed
@RalfJung

RalfJung commented Oct 15, 2018

Copy link
Copy Markdown
Member

Just, something strange is going on, and while the tests pass locally they fail on CI?!? See #55086.

@wesleywiser

wesleywiser commented Oct 15, 2018

Copy link
Copy Markdown
MemberAuthor

@RalfJung Is there anything that needs to be done related to this bug fix? I see you closed the other pull request.

@RalfJung

RalfJung commented Oct 15, 2018

Copy link
Copy Markdown
Member

Yeah, turns out I was wrong when I thought that the ICE got fixed. :( Sorry for the noise.

@wesleywiser

wesleywiser commented Oct 15, 2018

Copy link
Copy Markdown
MemberAuthor

No worries :)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@varkorvarkorvarkor left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@varkorvarkor

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@wesleywiser@rust-highfive@varkor@bors@RalfJung