NLL should identify and respect the lifetime annotations that the user wrote

@nikomatsakis

We have made some progress on this issue.

Here's a list of everywhere within function bodies where we annotate types, with check boxes on the ones that are currently getting checked by the MIR-borrowck / NLL.

Let bindings
- Simple local variable declarations, eg. let x: u32 = 3;
- More complicated let bindings. eg. let (x, y): (u32, u32) = (33, 54);
  - support ascription for patterns in NLL #53873 made these mostly work, but there are some edge cases where we still have problems. See the FIXME in the patterns.rs UI test.
  - remainder is broken out into handle user type annotations in NLL for complex patterns #54570
- "Ignored" bindings, eg. let _: Foo<'long> = c_is_short_oops; (support ascription for patterns in NLL #53873)
- Simple bindings with no initializer, e.g., let x: T; (support ascription for patterns in NLL #53873)
- Complex bindings with no initializer, e.g., let (x, y): (u32, u32);
  - broken out into handle user type annotations in NLL for complex patterns #54570
- ref bindings: e.g. let ref x: u32 = 3;, broken out into handle user type annotations in NLL for ref bindings #55401
Turbofish
- Function calls. eg. "2048".parse::<u32>() -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Fully qualified paths. eg. <T as Trait<_>>::method -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Fully qualified paths. eg. <_ as Trait<T>>::method -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Fully qualified paths. eg. <_ as Trait<_>>::method<T> -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Multi-segment paths. e.g. Foo::<X>::method -- broken out into nll should respect lifetime annotations from multi-segment paths #54574
- Value references. eg. let x = foo::<...>; -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Struct names. eg. let x = SomeStruct::<'static> { field: u32 }; -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Associated constants in expressions: <T as Foo>::BAR ? (broken out to nll: respect user type annotations with constants in expressions #54571)
- Associated constants in patterns: <T as Foo>::BAR ? (nll: respect user type annotations with constants in patterns #55511)
- Lifetimes in patterns: let A::<'static>(r) = ... ? -- broken out into nll should respect lifetime annotations from patterns #54573
- Calls to enum variants / struct ctors: Enum::Variant::<...>(...) -- MIR: support user-given type annotations on fns, structs, and enums #53225
- Reference to nullary structs / variants: None::<&'static u32> -- MIR: support user-given type annotations on fns, structs, and enums #53225
Casts: x as T (broken out into NLL should respect lifetimes in as expressions #54332)
Type ascription: x: &'static u32 (broken out into nll should preserve user types in type ascription #54331)
Method call disambiguation. eg. <Type as Trait>::method(args); -- MIR: support user-given type annotations on fns, structs, and enums #53225
Lifetimes defined but not used, this currently only occurs in the yield-subtype.rs test but that will also need resolved.
Normalization code is probably wrong (the user types need, I suspect, to be normalized? Not sure, have to look.)

(We should update this list as we think of more.)

Original bug report follows:

This code compiles with 1.24.0-nightly (2018-01-03 0a3761e):

#![feature(nll)]

fn main() {
    let vec: Vec<&'static String> = vec![&String::new()];

    // fn only_static(_: Vec<&'static String>) {}
    // only_static(vec);
}

This is confusing as the Vec almost certainly cannot contain a reference of a 'static lifetime. If you uncomment the call to only_static, you get the expected error that the String does not live long enough.

@nikomatsakis said:

NLL currently ignores hand-written type annotations, in particular, those that appear in local variables.

@pnkfelix

I'm tagging this with E-hard because @pnkfelix and I established that as the "have to figure out how to do this" convention. That said, I don't know that it's that hard. My rough plan was something like this:

Extend HAIR/MIR with some sort of extra operations, that assert equality between types.
- The region renumbering code would know that the types in such operations come from the user, and should not be renumbered.
- Example: ASSERT_HAS_TY<T>(_1) would assert that the variable _1 has the given type T
- We also have to handle foo::<T>() style annotations though
The HIR -> HAIR lowering would insert these operations when there are explicit Ty nodes
The HAIR -> MIR would produce ASSERT.
Similar strategy could be used for casts and things.

However, it might also be best to have some other way to indicate which types are from user -- for example, maybe instead of a Ty, MIR could embed a newtype that also carries a boolean whether it was inferred or explicit.

But I sort of prefer to have the "explicit annotations" come from somewhere else, seems easier overall to me.

@Aaron1011

cc @Aaron1011 -- btw, since you're on a roll lately, this would be a good one to get done at some point. It'll require a bit of experimentation though. =) Happy to discuss it sometime.

I'll tackle this one.

@davidtwco

@davidtwco ok, so I think my prior directions were the right path still. It probably makes sense to tackle different kinds of annotations independently. Let's start with the most basic sort of annotation, that placed on local variables:

let x: T = ...

To handle this, I think we want to add a new form of MIR statement, a type assertion. That would be done by editing the StorageKind enum:

rust/src/librustc/mir/mod.rs

Line 1163 in 27a046e

pub enum StatementKind<'tcx> {

I would call it something like UserAssertTy. It might look like:

/// Encodes a user's type assertion. These need to be preserved
/// intact so that NLL can respect them. For example:
///
///     let (a, b): (T, U) = y;
///
/// Here, we would insert a `UserAssertTy<(T, U)>(y)` instruction to check
/// that the type of `y` is the right thing.
UserAssertTy(Ty<'tcx>, Local),

We would then want to special-case these statements in the renumberer, so that it skips the embedded type within:

rust/src/librustc_mir/borrow_check/nll/renumber.rs

Lines 121 to 131 in 27a046e

    
           fn visit_statement( 
        
               &mut self, 
        
               block: BasicBlock, 
        
               statement: &mut Statement<'tcx>, 
        
               location: Location, 
        
           ) { 
        
               if let StatementKind::EndRegion(_) = statement.kind { 
        
                   statement.kind = StatementKind::Nop; 
        
               } 
        
               self.super_statement(block, statement, location); 
        
           }

But actually I realize there is a bit more complexity here than I initially considered. For example:

let x: &u32 = ...;

needs to be distinguished from

let x: &'static u32 = ...;

The current code doesn't have give you a good way to do that. But let's ignore that complication for a moment -- I have some ideas there for later =). For now, let's just test it with &'static u32 =)

Anyway, once we have this MIR, we also need to generate it. This could presumably mean instrumenting the HAIR, which is the intermediate IR that we use to transition from HIR to MIR.

I think we would want to extend the Let variant in HAIR to include the type annotation (if any):

rust/src/librustc_mir/hair/mod.rs

Lines 87 to 104 in 27a046e

    
               Let { 
        
                   /// scope for variables bound in this let; covers this and 
        
                   /// remaining statements in block 
        
                   remainder_scope: region::Scope, 
        
                   /// scope for the initialization itself; might be used as 
        
                   /// lifetime of temporaries 
        
                   init_scope: region::Scope, 
        
                   /// let <PAT> = ... 
        
                   pattern: Pattern<'tcx>, 
        
                   /// let pat = <INIT> ... 
        
                   initializer: Option<ExprRef<'tcx>>, 
        
                   /// the lint level for this let-statement 
        
                   lint_level: LintLevel, 
        
               },

These are converted to MIR here:

rust/src/librustc_mir/build/block.rs

Lines 101 to 107 in 27a046e

    
           StmtKind::Let { 
        
               remainder_scope, 
        
               init_scope, 
        
               pattern, 
        
               initializer, 
        
               lint_level 
        
           } => {

Hmm. As you can see from the comment, I initially thought we would apply the type to the initializer -- this would probably mean threading the user's type to expr_into_pattern here:

rust/src/librustc_mir/build/block.rs

Line 124 in 27a046e

this.expr_into_pattern(block, pattern, init)

So it can add the appropriate assertions. But I guess that wouldn't cover a case like

let (a, b): (T, U);

Maybe we want to do things slightly differently. Mostly I wanted to avoid having the need to "match up" the patterns on the LHS (e.g., the (_, _) pattern) with the type on the RHS, which sounds annoying.

Oh, I neglected to add that we will want to kill those new statements, presumably through a pass roughly like clean_end_regions. In fact, I think I would want to generalize that existing pass to something like cleanup_post_borrowck.

@nikomatsakis

@nikomatsakis I've submitted a PR with what I've got so far: #48482.

Auto merge of #53873 - nikomatsakis:nll-universe-subtyping-and-patter…

Spun out to sub-issues.

Demoting to Rust 2018 release. However, we should go ahead and convert all remaining items to sub-issues, I think, and close this

Auto merge of #55274 - pnkfelix:issue-54570-proj-path-into-pats-with-…

I'm going to close this bug now -- we're down to just a handful of "subbullets", each of which has their own tracking issues.

Navigation Menu

Repository navigation

NLL should identify and respect the lifetime annotations that the user wrote #47184

51 remaining items

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

	fn visit_statement(
	&mut self,
	block: BasicBlock,
	statement: &mut Statement<'tcx>,
	location: Location,
	) {
	if let StatementKind::EndRegion(_) = statement.kind {
	statement.kind = StatementKind::Nop;
	}
	self.super_statement(block, statement, location);
	}

	Let {
	/// scope for variables bound in this let; covers this and
	/// remaining statements in block
	remainder_scope: region::Scope,

	/// scope for the initialization itself; might be used as
	/// lifetime of temporaries
	init_scope: region::Scope,

	/// let <PAT> = ...
	pattern: Pattern<'tcx>,

	/// let pat = <INIT> ...
	initializer: Option<ExprRef<'tcx>>,

	/// the lint level for this let-statement
	lint_level: LintLevel,
	},

	StmtKind::Let {
	remainder_scope,
	init_scope,
	pattern,
	initializer,
	lint_level
	} => {

NLL should identify and respect the lifetime annotations that the user wrote #47184

Description

Activity

nikomatsakis commented on Jan 10, 2018

nikomatsakis commented on Feb 1, 2018

davidtwco commented on Feb 8, 2018

nikomatsakis commented on Feb 21, 2018

nikomatsakis commented on Feb 21, 2018

davidtwco commented on Feb 23, 2018

51 remaining items

nikomatsakis commented on Sep 18, 2018

nikomatsakis commented on Oct 18, 2018

nikomatsakis commented on Oct 30, 2018

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions