fix promotion of MIR terminators #38833
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
promotion of MIR terminators used to try to promote the destination it is trying to promote, leading to stack overflow. Fixes rust-lang#37991.
arielb1
added
the
beta-nominated
|
Hah, I'm glad I checked first, I finally had some time to spend on this (I'll go do #38074 instead). |
eddyb
approved these changes
Jan 4, 2017
|
@bors r+ Nice rewrite! |
|
📌 Commit 99aa48d has been approved by |
eddyb
added
the
T-compiler
|
After discussing in @rust-lang/compiler meeting, decided to approve for backport. Fixes a regression, minimal risk. |
nikomatsakis
added
the
beta-accepted
|
@bors: p=1 This is a backport |
|
⌛ Testing commit 99aa48d with merge aa0c250... |
|
💔 Test failed - status-appveyor |
|
… On Thu, Jan 5, 2017 at 10:41 PM, bors ***@***.***> wrote:
💔 Test failed - status-appveyor
<https://ci.appveyor.com/project/rust-lang/rust/build/1.0.1422>
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#38833 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAD95LIdjBmSEMd2AFOljiU07s2Y7RuBks5rPeICgaJpZM4LbLZ0>
.
|
|
⌛ Testing commit 99aa48d with merge 0728b71... |
bors
added a commit
that referenced
this pull request
Jan 6, 2017
fix promotion of MIR terminators promotion of MIR terminators used to try to promote the destination it is trying to promote, leading to stack overflow. Also clean up the code in `promote_temp` a bit to make it more understandable. Fixes #37991. cc @nikomatsakis r? @eddyb
|
☀️ Test successful - status-appveyor, status-travis |
|
@bors r- |
|
oh, never mind :) |
alexcrichton
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Jan 11, 2017
fix function arguments in constant promotion we can't create the target block until *after* we promote the arguments - otherwise the arguments will be promoted into the target block. oops. Fixes #38985. This is a regression introduced in the beta-nominated #38833, so beta-nominating this one too (sorry @brson). r? @eddyb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
promotion of MIR terminators used to try to promote the destination it
is trying to promote, leading to stack overflow.
Also clean up the code in
promote_tempa bit to make it more understandable.Fixes #37991.
cc @nikomatsakis
r? @eddyb