prep work for using timely dataflow with NLL #49836
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
rust-highfive
added
the
S-waiting-on-review
|
NB. Not 100% tested yet =) will fix as needed. |
pnkfelix
reviewed
Apr 10, 2018
| @@ -303,28 +303,28 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { | |||
| ) { | |||
| debug!("report_region_errors(): {} errors to start", errors.len()); | |||
|
|
|||
| if will_later_be_reported_by_nll && self.tcx.nll() { | |||
| if will_later_be_reported_by_nll && self.tcx.use_mir() { | |||
There was a problem hiding this comment.
eek; while I understand collapsing -Z nll into -Z borrowck=mir, you've chosen the method name "use_mir" to represent this collapsed flag? I would have expected you to either reuse "nll" again, or to include something about borrow-checking in the method name... "use_mir" just seems very broad and easy to misinterpret...
There was a problem hiding this comment.
indeed I should rename it =)
nikomatsakis
force-pushed
the
nll-facts-prep
branch
from
019d8a2 to
9ccd28f
Compare
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@pnkfelix ok addressed your nit :) |
pnkfelix
reviewed
Apr 11, 2018
| @@ -26,10 +26,12 @@ fn foo(a: &mut i32) { | |||
| inside_closure(a) | |||
| }; | |||
| outside_closure_1(a); //[ast]~ ERROR cannot borrow `*a` as mutable because previous closure requires unique access | |||
| //[mir]~^ ERROR cannot borrow `*a` as mutable because previous closure requires unique access | |||
There was a problem hiding this comment.
Of course, there was a reason that these comments were indented so much: To allow ease of comparison with the line above.
Having said that, we all hope that compare-mode=nll will provide a much better path forward, so I don't really care to try to preserve details like this here.
|
This all seems fine. If I were writing this I might have changed the |
|
@bors r+ |
|
📌 Commit 9ccd28f has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #49808) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Also: - Extract common helper functions into a helper trait. - Kill a bit of dead code.
nikomatsakis
force-pushed
the
nll-facts-prep
branch
from
9ccd28f to
96dba93
Compare
|
Rebased. That was a bit of a tricky rebase (git diffs were pretty messed up). =) But I think I got it right. |
|
@bors r=pnkfelix |
|
📌 Commit 96dba93 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 17, 2018
prep work for using timely dataflow with NLL Two major changes: **Two-phase borrows are overhauled.** We no longer have two bits per borrow. Instead, we track -- for each borrow -- an (optional) "activation point". Then, for each point P where the borrow is in scope, we check where P falls relative to the activation point. If P is between the reservation point and the activation point, then this is the "reservation" phase of the borrow, else the borrow is considered active. This is simpler and means that the dataflow doesn't have to care about 2-phase at all, at last not yet. **We no longer support using the MIR borrow checker without NLL.** It is going to be increasingly untenable to support lexical mode as we go forward, I think, and also of increasingly little value. This also exposed a few bugs in NLL mode due to increased testing. r? @pnkfelix cc @bobtwinkles
|
☀️ Test successful - status-appveyor, status-travis |
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.
Two major changes:
Two-phase borrows are overhauled. We no longer have two bits per borrow. Instead, we track -- for each borrow -- an (optional) "activation point". Then, for each point P where the borrow is in scope, we check where P falls relative to the activation point. If P is between the reservation point and the activation point, then this is the "reservation" phase of the borrow, else the borrow is considered active. This is simpler and means that the dataflow doesn't have to care about 2-phase at all, at last not yet.
We no longer support using the MIR borrow checker without NLL. It is going to be increasingly untenable to support lexical mode as we go forward, I think, and also of increasingly little value. This also exposed a few bugs in NLL mode due to increased testing.
r? @pnkfelix
cc @bobtwinkles