Skip to content

mir: drop temps outside-in by scheduling the drops inside-out. - #33239

Merged
bors merged 1 commit into
rust-lang:masterfrom
eddyb:mir-temp-drops
May 11, 2016
Merged

mir: drop temps outside-in by scheduling the drops inside-out.#33239
bors merged 1 commit into
rust-lang:masterfrom
eddyb:mir-temp-drops

Conversation

@eddyb

Copy link
Copy Markdown
Contributor

It was backwards all along, but only noticeable with multiple drops in one rvalue scope. Fixes#32433.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @arielb1

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

@arielb1

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 27, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit d569228 has been approved by arielb1

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 27, 2016
mir: drop temps outside-in by scheduling the drops inside-out.
It was backwards all along, but only noticeable with multiple drops in one rvalue scope. Fixesrust-lang#32433.
@Manishearth

Copy link
Copy Markdown
Member

@eddyb

Copy link
Copy Markdown
ContributorAuthor

Ahh right, I forgot to check it locally as I had two other PRs to work on. And Travis doesn't help with MIR.

@eddyb

Copy link
Copy Markdown
ContributorAuthor

@bors r-

bors added a commit that referenced this pull request Apr 29, 2016
Rollup of 4 pull requests
- Successful merges: #33239, #33248, #33253, #33258
- Failed merges:
@eddyb

eddyb commented May 7, 2016

Copy link
Copy Markdown
ContributorAuthor

I went back and checked my testcases from #32433. They're fixed, but the issue-23338-ensure-param-drop-order test still has a different case which MIR gets wrong, 6 needs to be dropped earlier, just after Make D(de_6, 7).

@eddybeddyb mentioned this pull request May 7, 2016
@bors

bors commented May 8, 2016

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #33130) made this pull request unmergeable. Please resolve the merge conflicts.

@eddyb

Copy link
Copy Markdown
ContributorAuthor

@bors r=arielb1

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit e940de6 has been approved by arielb1

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e940de6 with merge c049541...

bors added a commit that referenced this pull request May 11, 2016
mir: drop temps outside-in by scheduling the drops inside-out.
It was backwards all along, but only noticeable with multiple drops in one rvalue scope. Fixes#32433.
@bors
bors merged commit e940de6 into rust-lang:masterMay 11, 2016
@eddyb
eddyb deleted the mir-temp-drops branch May 11, 2016 15:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@eddyb@rust-highfive@arielb1@bors@Manishearth