Skip to content

/rust

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable non-lexical lifetimes in the MIR borrow checker #45538

Merged
merged 33 commits into from Nov 1, 2017

Conversation

Reviewers

@spastorino spastorino

@kennytm kennytm

@pnkfelix pnkfelix

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
9 participants
@nikomatsakis @rust-highfive @aturon @pnkfelix @spastorino @bors @badboy @mgattozzi @kennytm
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Oct 25, 2017 •
edited

This PR, joint work with @spastorino, fills out the NLL infrastructure and integrates it with the borrow checker. Don't get too excited: it includes still a number of hacks (the subtyping code is particularly hacky). However, it does kinda' work. =)

The final commit demonstrates this by including a test that -- with both the AST borrowck and MIR borrowck -- reports an error by default. But if you pass -Znll, you only get an error from the AST borrowck, demonstrating that the integration succeeds:

struct MyStruct {
    field: String
}

fn main() {
    let mut my_struct = MyStruct { field: format!("Hello") };

    let value = &my_struct.field;
    if value.is_empty() {
        my_struct.field.push_str("Hello, world!");
        //~^ ERROR cannot borrow (Ast)
    }
}

@rust-highfive rust-highfive assigned pnkfelix Oct 25, 2017

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Oct 25, 2017

r? @pnkfelix

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

This comment has been minimized.

Sign in to view
Copy link
Member

aturon commented Oct 26, 2017

Congrats, both of you! Been awesome seeing you power through this.

@kennytm kennytm added the S-waiting-on-author label Oct 26, 2017

@kennytm

kennytm reviewed Oct 26, 2017
View changes

src/librustc_mir/transform/nll/subtype.rs
@@ -0,0 +1,89 @@
use super::RegionIndex;

This comment has been minimized.

Sign in to view
Copy link
@kennytm

kennytm Oct 26, 2017

Member

Tidy error 😏

[00:03:02] tidy error: /checkout/src/librustc_mir/transform/nll/subtype.rs: incorrect license
[00:03:02] tidy error: /checkout/src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs:48: line longer than 100 chars
[00:03:03] some tidy checks failed

This comment has been minimized.

Sign in to view
Copy link
@spastorino

spastorino Oct 26, 2017

Member

Thanks @kennytm I've already fixed this in my local machine, will push in a while :)
src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs Outdated

// END RUST SOURCE
// START rustc.node12.nll.0.mir
// | R4: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1], bb2[2], bb3[0], bb4[0], bb4[1], bb4[2], bb6[0], bb7[0], bb7[1], bb8[0]}

This comment has been minimized.

Sign in to view
Copy link
@kennytm

kennytm Oct 26, 2017

Member

This needs // ignore-tidy-linelength.

This comment has been minimized.

Sign in to view
Copy link
@spastorino

spastorino Oct 26, 2017

Member

Also this.

@Manishearth Manishearth referenced this pull request Oct 26, 2017

Closed

Tracking issue for RFC #2094: non-lexical lifetimes #44928

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:nll-liveness branch 3 times, most recently from 708476a to 5d0992c Oct 26, 2017

@pnkfelix

pnkfelix reviewed Oct 26, 2017
View changes

src/librustc_mir/util/liveness.rs Outdated
LvalueContext::Store |

// We let Call defined the result in both the success and unwind cases.
// This may not be right.
// We let Call defined the result in both the success and

This comment has been minimized.

Sign in to view
Copy link
@pnkfelix

pnkfelix Oct 26, 2017

Member

typo: should be "we let Call define the result"

@kennytm kennytm added S-waiting-on-review and removed S-waiting-on-author labels Oct 26, 2017

@pnkfelix

pnkfelix reviewed Oct 26, 2017
View changes

src/librustc_mir/util/liveness.rs Outdated
}

///////////////////////////////////////////////////////////////////////////
// DROP USES

// We consider drops to always be uses of locals.
// Drop eloboration should be run before this analysis otherwise

This comment has been minimized.

Sign in to view
Copy link
@pnkfelix

pnkfelix Oct 26, 2017

Member

This note about when drop "eloboration" should run (which came from cbdb186) ... it applied to @Zoxc's move analysis, but does it apply to our uses here for NLL? I ask because I am pretty sure we want borrowck to run before drop elaboration ...?

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Oct 26, 2017

Author Contributor

The comment is really kind of outdated. We do not want to run drop elaboration before the check -- and we are ok with drops being considered uses.
@pnkfelix

pnkfelix reviewed Oct 26, 2017
View changes

src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs Outdated

// END RUST SOURCE
// START rustc.node12.nll.0.mir
// | R0: {bb1[1], bb2[0], bb2[1]}

This comment has been minimized.

Sign in to view
Copy link
@pnkfelix

pnkfelix Oct 26, 2017 •
edited

Member

would it be better to print the region identifiers here as: _#0r:, _#2r:, _#3r: (or some uniform suffix of those) to make more clear the correspondence with their appearances in the borrows?

This comment has been minimized.

Sign in to view
Copy link
@spastorino

spastorino Oct 26, 2017

Member

To be honest, at the beginning I have a hard time figuring this output out, so ... maybe going through this and making it more clear is a good things to do. /cc @nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Oct 26, 2017

Author Contributor

I thought about that. I guess we might as well adopt the existing _#0r, even though it's horrible.
@pnkfelix

pnkfelix reviewed Oct 26, 2017
View changes

src/test/mir-opt/nll/region-subtyping-basic.rs Outdated

// END RUST SOURCE
// START rustc.node12.nll.0.mir
// | R0: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}

This comment has been minimized.

Sign in to view
Copy link
@pnkfelix

pnkfelix Oct 26, 2017 •
edited

Member

hmm, do we not have an explicit notation for where R0 (aka '_#0r, right?) arises, somewhere in the MIR dump?
@pnkfelix

pnkfelix reviewed Oct 26, 2017
View changes

src/librustc_mir/borrow_check.rs
}

#[allow(dead_code)]
pub struct MirBorrowckCtxt<'c, 'b, 'a: 'b+'c, 'gcx: 'a+'tcx, 'tcx: 'a> {
tcx: TyCtxt<'a, 'gcx, 'gcx>,
mir: &'b Mir<'gcx>,
tcx: TyCtxt<'a, 'gcx, 'tcx>,

This comment has been minimized.

Sign in to view
Copy link
@pnkfelix

pnkfelix Oct 26, 2017

Member

niko can i bribe you with some halloween candy to break out this semi-mechanical lifetime-parameter refactoring (or generalization, if you prefer) into a separate commit? This commt is pretty hard to digest the way it is currently set up...

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Oct 26, 2017

Author Contributor

Twix.

This comment has been minimized.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Oct 31, 2017

Author Contributor

Done btw.
@pnkfelix

This comment has been minimized.

Sign in to view
Copy link
Member

pnkfelix commented Oct 26, 2017

This is epic!

🥇

@pnkfelix pnkfelix added S-waiting-on-author and removed S-waiting-on-review labels Oct 26, 2017

@pnkfelix

This comment has been minimized.

Sign in to view
Copy link
Member

pnkfelix commented Oct 26, 2017

my questions and nits are all pretty minor.

It might be a good idea to see if @arielb1 wants to take a look too, but he might be on vacation

@kennytm kennytm added S-waiting-on-review and removed S-waiting-on-author labels Oct 27, 2017

@spastorino spastorino force-pushed the nikomatsakis:nll-liveness branch from 738180d to 14a078d Oct 27, 2017

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:nll-liveness branch from 4573191 to 34ebd74 Oct 30, 2017

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Oct 30, 2017

@pnkfelix addressed feedback. I also rebased and cleaned up the history, incorporating a number of changes from @spastorino. Have to figure out those travis failures though.

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:nll-liveness branch from 34ebd74 to fd2bdeb Oct 30, 2017

@spastorino

This comment has been minimized.

Sign in to view
Copy link
Member

spastorino commented Oct 30, 2017

@nikomatsakis some of my commits are lost, related to the tests and fixes we were doing last night. Is that included in the code you've pushed? should I push that again?.
@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Oct 30, 2017

@spastorino I don't believe they were lost, rather I merged them into the appropriate places.

@nikomatsakis nikomatsakis referenced this pull request Oct 30, 2017

Merged

Add derive and doc comment capabilities to newtype_index macro #45605

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Oct 30, 2017

Those travis failures are curious. I don't see them locally, on mac or linux. :/

nikomatsakis added some commits Oct 26, 2017

@nikomatsakis
make `MirSource::from_local_def_id` invokable with 'gcx and 'tcx
5aa1cbf
@nikomatsakis
make `closure_self_ty` invokable with `'gcx` and `'tcx`
29cdd73
@nikomatsakis
reorder 'gcx and 'tcx in `BorrowckErrors` impl
b2c248e
@nikomatsakis
test "needs drop" on region-erased, lifted types 
This will be important in next commit, since the input types will be
tagged not with `'gcx` but rather `'tcx`. Also, using the region-erased,
lifted types enables better caching.
82b287a
@nikomatsakis
make the dataflow / mir-borrowck types carry a `'tcx` lifetime 
Also, factor out `do_mir_borrowck`, which is the code that actually
performs the MIR borrowck from within the scope of an inference context.

This change should be a pure refactoring.
8144917
@nikomatsakis
connect MIR borrowck with NLL
a94b01a
@nikomatsakis
change region display to `'_#Nr`, update the `newtype_index!` macro 
The macro now takes a format string. It no longer defaults to using the
type name. Didn't seem worth going through contortions to maintain.  I
also changed most of the debug formats to be `foo[N]` instead of `fooN`.
f27eb1e
@nikomatsakis
WIP patch `compile-fail/nll/region-ends-after-if-condition.rs`
bf57a23
@nikomatsakis
remove the NLL pass (it is now invoked by mir borrowck)
7675ea9
@nikomatsakis
runtest: fix mir directory and delete outdated MIR files
99aa313
@nikomatsakis
treat -Znll as implying -Zborrowck-mir
d9fb792
@nikomatsakis
rewrite `write_mir_fn_graphviz` to cope with non-global tcx
Loading status checks…
9b3af6c

@nikomatsakis nikomatsakis force-pushed the nikomatsakis:nll-liveness branch from bf7e83d to 9b3af6c Oct 31, 2017

@nikomatsakis
patch mir-opt reference files
Loading status checks…
aae3e74

@nikomatsakis nikomatsakis referenced this pull request Oct 31, 2017

Closed

NLL: refine liveness with "maybe initialized" analysis #45665

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

nikomatsakis commented Oct 31, 2017

@bors r=pnkfelix

I'm going to go ahead and land this so as to unblock further work. It ought not to deeply interact with any "enabled by default" code, so it's low risk.
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 31, 2017

📌 Commit aae3e74 has been approved by pnkfelix

@nikomatsakis nikomatsakis referenced this pull request Oct 31, 2017

Merged

extend NLL with preliminary support for free regions on functions #45668

@badboy

This comment has been minimized.

Sign in to view
Copy link
Member

badboy commented Oct 31, 2017

@spastorino Wuhu! Congrats on pushing this through!

@kennytm kennytm added S-waiting-on-bors and removed S-waiting-on-author labels Nov 1, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 1, 2017

⌛️ Testing commit aae3e74 with merge 2be4cc0...

bors added a commit that referenced this pull request Nov 1, 2017

@bors
Auto merge of #45538 - nikomatsakis:nll-liveness, r=pnkfelix 
enable non-lexical lifetimes in the MIR borrow checker

This PR, joint work with @spastorino, fills out the NLL infrastructure and integrates it with the borrow checker. **Don't get too excited:** it includes still a number of hacks (the subtyping code is particularly hacky). However, it *does* kinda' work. =)

The final commit demonstrates this by including a test that -- with both the AST borrowck and MIR borrowck -- reports an error by default. But if you pass `-Znll`, you only get an error from the AST borrowck, demonstrating that the integration succeeds:

```
struct MyStruct {
    field: String
}

fn main() {
    let mut my_struct = MyStruct { field: format!("Hello") };

    let value = &my_struct.field;
    if value.is_empty() {
        my_struct.field.push_str("Hello, world!");
        //~^ ERROR cannot borrow (Ast)
    }
}
```
Loading status checks…
2be4cc0
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 2be4cc0 to master...

@bors bors merged commit aae3e74 into rust-lang:master Nov 1, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

This was referenced Nov 1, 2017

Closed
Merged
@mgattozzi

This comment has been minimized.

Sign in to view
Copy link
Member

mgattozzi commented Nov 2, 2017

It's finally here! :D Well part of it but still! :D

bors added a commit that referenced this pull request Nov 6, 2017

@bors
Auto merge of #45668 - nikomatsakis:nll-free-region, r=arielb1 
extend NLL with preliminary support for free regions on functions

This PR extends #45538 with support for free regions. This is pretty preliminary and will no doubt want to change in various ways, particularly as we add support for closures, but it's enough to get the basic idea in place:

- We now create specific regions to represent each named lifetime declared on the function.
- Region values can contain references to these regions (represented for now as a `BTreeSet<RegionIndex>`).
- If we wind up trying to infer that `'a: 'b` must hold, but no such relationship was declared, we report an error.

It also does a number of drive-by refactorings.

r? @arielb1

cc @spastorino
Loading status checks…
785643a

@pnkfelix pnkfelix referenced this pull request Jul 18, 2018

Closed

Problem with borrow checker and AddAssign #52126

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.