Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

[beta] backports #37239

Merged
merged 4 commits into from
Oct 18, 2016
Merged

[beta] backports #37239

merged 4 commits into from
Oct 18, 2016

Conversation

brson
Copy link
Contributor

@brson brson commented Oct 18, 2016

pnkfelix and others added 4 commits October 18, 2016 00:10
@pnkfelix @brson
Fix ICE by injecting bitcasts if types mismatch when building invokes…
2fbf70b 
… or calls.
@pnkfelix @brson
Inject bitcast if types mismatch when building a store instruction.
7bd6f5c
@pnkfelix @brson
Some tests to check that lifetime parametric fn's do not trip up LLVM.
1a46a02
@arielb1 @brson
normalize types every time HR regions are erased
b477047 
Associated type normalization is inhibited by higher-ranked regions.
Therefore, every time we erase them, we must re-normalize.

I was meaning to introduce this change some time ago, but we used
to erase regions in generic context, which broke this terribly (because
you can't always normalize in a generic context). That seems to be gone
now.

Ensure this by having a `erase_late_bound_regions_and_normalize`
function.

Fixes rust-lang#37109 (the missing call was in mir::block).
@rust-highfive
Copy link
Contributor

r? @Aatch

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

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@brson
Copy link
Contributor Author

brson commented Oct 18, 2016

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned Aatch Oct 18, 2016
@brson
Copy link
Contributor Author

brson commented Oct 18, 2016

cc @rust-lang/compiler can you review the linked PRs and see if they are appropriate for beta? If so I will also include them in the stable backport.

@nrc
Copy link
Member

nrc commented Oct 18, 2016

@brson why do these need backporting to stable? It looks like they should only get backported to beta.

I've been meaning to backport this PR too: #36995 I'd be super happy if someone beats me to it.

@brson
Copy link
Contributor Author

brson commented Oct 18, 2016

@nrc They both fix issues tagged as stable regressions, and we're going to do a stable point release.

That doesn't mean they must be backported to stable. We can decide not to. To that end I would love feedback on #37173, where I am trying to prepare the point release.

@nikomatsakis
Copy link
Contributor

@brson r+ looks good to me, should I just merge?

@brson
Copy link
Contributor Author

brson commented Oct 18, 2016

@nikomatsakis thanks, yeah just merge, but i'll get it

@brson brson merged commit ba70db9 into rust-lang:beta Oct 18, 2016
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@brson @rust-highfive @nrc @nikomatsakis @alexcrichton @Aatch @pnkfelix @arielb1