Skip to content
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

trans: callee: normalize trait_ref before use #33478

Merged
merged 1 commit into from
May 9, 2016

Conversation

xen0n
Copy link
Contributor

@xen0n xen0n commented May 7, 2016

This fixes #33436 and #33461. Ran the tests and nothing else seems to be affected.

P.S. How to write the regression test for this fix? Does this qualify as run-pass or run-make, as the test only needs to be successfully compiled to be considered passed? Will add the testcase (the minimal example in #33461 seems fit) after clarifying this.

@rust-highfive
Copy link
Collaborator

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.

@eddyb
Copy link
Member

eddyb commented May 7, 2016

r? @eddyb

Thanks for doing this 😄. As for the test, run-pass that compiles without ICE is enough.

@rust-highfive rust-highfive assigned eddyb and unassigned pnkfelix May 7, 2016
@eddyb eddyb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 7, 2016
@xen0n xen0n force-pushed the normalize-callee-trait-ref branch from 7dce338 to 4f22878 Compare May 7, 2016 14:03
@xen0n xen0n changed the title trans: callee: normalize trait_ref before using trans: callee: normalize trait_ref before use May 7, 2016
@xen0n xen0n force-pushed the normalize-callee-trait-ref branch from 4f22878 to dcdf761 Compare May 7, 2016 14:05
@eddyb
Copy link
Member

eddyb commented May 7, 2016

@bors r+

@bors
Copy link
Contributor

bors commented May 7, 2016

📌 Commit dcdf761 has been approved by eddyb

@xen0n
Copy link
Contributor Author

xen0n commented May 7, 2016

Added testcase and pushed.

(Reason why the Travis CI status is gone: I made a mistake of allowing 2 blank lines after copyright header in the testcase, which I summarily fixed and re-pushed; however Travis is quick enough to create a build for the replaced commit, and haven't created one for the current commit. As the difference is only one blank line the outcome shouldn't matter, but sorry for the extra noise.)

Manishearth added a commit to Manishearth/rust that referenced this pull request May 8, 2016
…=eddyb

trans: callee: normalize trait_ref before use

This fixes rust-lang#33436 and rust-lang#33461. Ran the tests and nothing else seems to be affected.

P.S. How to write the regression test for this fix? Does this qualify as run-pass or run-make, as the test only needs to be successfully compiled to be considered passed? Will add the testcase (the minimal example in rust-lang#33461 seems fit) after clarifying this.
bors added a commit that referenced this pull request May 8, 2016
Rollup of 9 pull requests

- Successful merges: #32900, #33129, #33365, #33383, #33474, #33478, #33480, #33484, #33493
- Failed merges: #33360
@bors
Copy link
Contributor

bors commented May 9, 2016

⌛ Testing commit dcdf761 with merge 32683ce...

bors added a commit that referenced this pull request May 9, 2016
trans: callee: normalize trait_ref before use

This fixes #33436 and #33461. Ran the tests and nothing else seems to be affected.

P.S. How to write the regression test for this fix? Does this qualify as run-pass or run-make, as the test only needs to be successfully compiled to be considered passed? Will add the testcase (the minimal example in #33461 seems fit) after clarifying this.
@bors bors merged commit dcdf761 into rust-lang:master May 9, 2016
@xen0n xen0n deleted the normalize-callee-trait-ref branch May 12, 2016 05:19
@nikomatsakis
Copy link
Contributor

cc @rust-lang/compiler

@nikomatsakis
Copy link
Contributor

approving for backport because this fixes a regression and is very simple

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 17, 2016
nikomatsakis added a commit that referenced this pull request May 19, 2016
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE in recent rustc version
7 participants