For box expressions, use NZ drop instead of a free block#43772
Merged
bors merged 1 commit intorust-lang:masterfrom Aug 12, 2017
Merged
For box expressions, use NZ drop instead of a free block#43772bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
This falls naturally out of making drop elaboration work with `box` expressions, which is probably required for sane MIR borrow-checking. This is a pure refactoring with no intentional functional effects.
nagisa
approved these changes
Aug 10, 2017
| } | ||
|
|
||
| fn build_diverge_scope<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>, | ||
| fn build_diverge_scope<'a, 'gcx, 'tcx>(_tcx: TyCtxt<'a, 'gcx, 'tcx>, |
Member
There was a problem hiding this comment.
I would go ahead and remove this parameter.
Member
|
@bors r+ Feel free to bors r=nagisa if you fix the nit yourself. |
Collaborator
|
📌 Commit 17d2bcd has been approved by |
Collaborator
bors
added a commit
that referenced
this pull request
Aug 12, 2017
For box expressions, use NZ drop instead of a free block This falls naturally out of making drop elaboration work with `box` expressions, which is probably required for sane MIR borrow-checking. This is a pure refactoring with no intentional functional effects. r? @nagisa
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
Contributor
|
I think this caused Is this intended? |
Contributor
Author
No. |
Contributor
Author
|
I think the difference is that we started emitting StorageDead, rather than stopping emitting StorageLive. |
bors
added a commit
that referenced
this pull request
Aug 15, 2017
emit StorageLive for box temporaries We started emitting StorageDead, so we better emit the corrseponding StorageLive to avoid problems. cc #43772 rust-lang/miri#303
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Aug 17, 2017
refactor(mir): remove unused argument Small cleanup that shouldn't have any impact, as it's a small thing introduced in rust-lang#43772
This file contains hidden or 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
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.
This falls naturally out of making drop elaboration work with
boxexpressions, which is probably required for sane MIR borrow-checking.
This is a pure refactoring with no intentional functional effects.
r? @nagisa