Don't track local_needs_drop separately in qualify_consts. #47306
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
eddyb
reviewed
Jan 10, 2018
| @@ -538,7 +538,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> { | |||
|
|
|||
| // Mark the consumed locals to indicate later drops are noops. | |||
| if let Place::Local(local) = *place { | |||
| self.local_needs_drop[local] = None; | |||
| self.local_needs_drop.remove(local.index()); | |||
There was a problem hiding this comment.
Hmm, I feel like this shouldn't happen unless we have a Move. Also, we can probably "just" remove NEEDS_DROP here from self.temp_qualif[local], and check that later, instead of having a separate bitvec.
kennytm
added
the
S-waiting-on-review
alexreg
force-pushed
the
dataflow-analysis
branch
4 times, most recently
from
0ac224b
to
7f866a2
Compare
alexreg
changed the title
alexreg
force-pushed
the
dataflow-analysis
branch
from
7f866a2
to
27aee25
Compare
eddyb
reviewed
Jan 11, 2018
| @@ -844,12 +845,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> { | |||
|
|
|||
| // Deny *any* live drops anywhere other than functions. | |||
| if self.mode != Mode::Fn { | |||
| // HACK(eddyb) Emulate a bit of dataflow analysis, | |||
| // conservatively, that drop elaboration will do. | |||
There was a problem hiding this comment.
Need to keep this comment around because this is still emulated until we use something more like what drop elaboration does.
alexreg
force-pushed
the
dataflow-analysis
branch
from
27aee25
to
3695278
Compare
eddyb
reviewed
Jan 11, 2018
| pub const fn drop<T>(_: T) {} | ||
|
|
||
| pub const fn drop2<T>(x: T) { | ||
| (x, ()).1 |
There was a problem hiding this comment.
You need to add //~^ ERROR comments (assuming they get caught now).
alexreg
force-pushed
the
dataflow-analysis
branch
2 times, most recently
from
dab557d
to
5038760
Compare
|
Tests passing. LGTM, @eddyb! |
alexreg
force-pushed
the
dataflow-analysis
branch
from
19a71a8
to
e2c1a93
Compare
|
@bors r+ |
|
📌 Commit e2c1a93 has been approved by |
kennytm
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jan 12, 2018
Don't track local_needs_drop separately in qualify_consts. None
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.
No description provided.