feat: implement lifetime elision - #22927
Conversation
|
Not sure why this fails in CI and passes in my system? |
You need to set an extra env var to run slow tests |
|
Oh I didn't know, we ran slow tests. My bad 😅 |
06a014c to
88e02b3
Compare
| lc world &WorldSnapshot [type_could_unify+name+local] | ||
| ex world [type_could_unify] |
There was a problem hiding this comment.
Interesting, so we lose a lot of type equality now which I guess makes sense. Worth to keep in mind if we want t o have something like type-equal modulo lifetimes
|
Very excited for this, I've been wanting this for so long! |
|
Two tests will be failing, one of which I think value in expect is correct but after infer it gets turned into a |
|
Const eval doesn't care about lifetimes, as long as you only have lifetimes there you can pass erased or identity. |
|
I'm not sure what you mean? |
|
If all args are lifetime, you can pass a dummy |
|
Passing the |
|
Found out why we get error region on other test, when we resolve the types, we fold the |
This comment has been minimized.
This comment has been minimized.
e4832ca to
6526ecd
Compare
This comment has been minimized.
This comment has been minimized.
| fn elide_return_lifetime(&mut self) { | ||
| let old_elision_kind = | ||
| mem::replace(&mut self.lifetime_elision_kind, LifetimeElisionKind::Error); | ||
|
|
||
| let new_elision_kind = | ||
| if let LifetimeElisionKind::NewLifetimeParam { return_lt, total_created, .. } = | ||
| old_elision_kind | ||
| { | ||
| let lifetime_param_id = | ||
| return_lt.and_then(|(lifetime_param_id, elided_source)| match elided_source { | ||
| ArgumentElisionContext::Self_ => Some(lifetime_param_id), | ||
| ArgumentElisionContext::Param if total_created == 1 => { | ||
| Some(lifetime_param_id) | ||
| } | ||
| ArgumentElisionContext::Param => None, | ||
| }); | ||
| LifetimeElisionKind::Lifetime(lifetime_param_id) | ||
| } else { | ||
| unreachable!("Method should not be called with other lifetime_elision_kind") | ||
| }; | ||
| self.lifetime_elision_kind = new_elision_kind; | ||
| } |
There was a problem hiding this comment.
This setup doesn't quite handle these correctly i think
fn get<'a>(&'a self) -> &str
fn identity<'a>(value: &'a str) -> &str
type Callback = for<'a> fn(&'a str) -> &str;These are valid signatures that participate in elision. The return types here all have 'a as their elided lifetimes.
And for this it incorrectly elides to y's lifetime.
fn bad<'a>(x: &'a str, y: &str) -> &str
That signature is an error, return type elision only happens if the args have exactly one lifetime (or if there is a self param).
Reason being that lower_lifetime_ref doesn't participate (from what I can tell in lifetime_elision_kind).
There was a problem hiding this comment.
I have done the return type elision very haphazardly, I should take a look at it and fix it.
There was a problem hiding this comment.
I think I should introduce a new LifetimeRef for elided lifetimes or designate LifetimeRef:::Param and LifetimeRef::HrtbParam only to be used for elided (by renaming or something). Because with the fix I'm doing for this, a function like this:
fn identity<'a>(value: &'a str) -> &str
// would be lowered and printed as
fn identity<'a>(value: &'a str) -> &'a strBecause I use the LifetimeRef itself, since this is also a valid elision:
fn identity(value: &'static str) -> &str
// it would lower and print
fn identity(value: &'static str) -> &'static strNote that the LifetimeRefId are different in argument and return but the LifetimeRef itself will be same.
There was a problem hiding this comment.
The way elision works, is that first you lowered the args. Then you take all lifetimes defined from the args and for<...> in the fn, in other words all HRTB lifetimes in the last HRTB stack entry for fn ptrs or all lifetime params in a fn definition. If there is exactly one, all elided lifetimes in the return type get it. Otherwise, eliding lifetimes in the return type is an error.
There was a problem hiding this comment.
Yeah I understand that now and is somewhat similar to what I have done, but as you can see from question above since I re-use the LifetimeRef of the lifetime (be it elided or named or static) that can be used for return type, it would result in lowering and analysis that comes after HIR lowering to think, the lifetime in return type was actually provided.
There was a problem hiding this comment.
What is the problem that the code will think that the lifetimes were provided? What does it matter for?
Like for the two test we ignored in ide-diagnostic.
Not sure what the actual behavior is, need to check rustc.
Well I didn't check the rustc code itself, but I printed out the HIR tree for some of the functions discussed here and it seems it's all input lifetimes.
There was a problem hiding this comment.
Like for the two test we ignored in ide-diagnostic.
The end-goal is to remove the elision in hir-ty.
Well I didn't check the rustc code itself, but I printed out the HIR tree for some of the functions discussed here and it seems it's all input lifetimes.
But what is an input lifetime? Any lifetime mentioned in the input?
There was a problem hiding this comment.
Input lifetimes are lifetimes used in the parameters, output are the ones in the return type
- Each elided lifetime in the parameters becomes a distinct lifetime parameter.
- If there is exactly one lifetime used in the parameters (elided or not), that lifetime is assigned to all elided output lifetimes.
In method signatures there is another rule
- If the receiver has type &Self or &mut Self, then the lifetime of that reference to Self is assigned to all elided output lifetime parameters.
There was a problem hiding this comment.
So this is the function in rustc that retrieves the candidate for return elision: resolve_fn_params
It records distinct lifetime usages separately for each input type. I think I make some refactors based on this. But I think my current implementation (unpushed) is very similar.
There was a problem hiding this comment.
Also based on this: https://github.com/rust-lang/rust/blob/main/compiler/rustc_hir/src/def.rs#L932-L964
We can consider LifetimeRef::Param to be elided always?
| is_lowering_coroutine: bool, | ||
|
|
||
| for_type_binder: Option<ThinVec<Name>>, | ||
| lifetime_arena: Option<&'a mut Arena<LifetimeParamData>>, |
There was a problem hiding this comment.
This should be in LifetimeElisionKind::NewLifetime. This way we avoid the Option and unwrap().
There was a problem hiding this comment.
I added this as separate field so that I could do this https://github.com/rust-lang/rust-analyzer/blob/master/crates/hir-def/src/expr_store/lower.rs#L399 and not have two mutable borrows to lifetime arena.
It's now on ExprCollector: https://github.com/dfireBird/rust-analyzer/blob/lifetime_elision/crates/hir-def/src/expr_store/lower.rs#L422
There was a problem hiding this comment.
This does not prevent it from being a field on LifetimeElisionKind::NewLifetime, this is the active variant when that function is called.
There was a problem hiding this comment.
It's not an active variant, since we call it after the lowering the return type, LifetimeElisionKind::Lifetime for the return type lifetime and we need the named lifetime in return as well for the method to work.
There was a problem hiding this comment.
Not sure what you talk about (and the links have rotten now), but this is certainly possible, see how I implemented that in https://github.com/ChayimFriedman2/rust-analyzer/tree/lt-arena-in-variant.
There was a problem hiding this comment.
So when the update_to_late_bound_lifetimes is called, the lifetime_elision_kind is Lifetime variant not the NewGenericLifetime because the variant is changed before lowering the return type.
Yes I think we should |
|
Also I really appreciate you tackling this complex task up @dfireBird! (whether you knew how much work this was gonna end up being or not 😄) |
I did not know it would be this much but this is fun compared to my day-to-day work :) Also, sorry I've been ignoring @ChayimFriedman2 round 2 Review, will get to it, once I finish the return elision correctly. |
a9955b7 to
dccc657
Compare
|
Now that we merged two |
d1a5d86 to
232fe69
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
232fe69 to
e0c2aff
Compare
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Review round 3, focusing on after-hir-def changes and answering your previous question. I will review the rest of the changes but didn't want to delay the rest for that.
This is now feeling close to merge-able! Excited for this, and thank you for all the hard work!
| "{name}[{}]\n", | ||
| generics(&db, def) | ||
| .iter(false) | ||
| .iter(true) |
There was a problem hiding this comment.
Actually this is not correct: late bound parameters have no variance. We can still solve for them (it's just meaningless), but displaying them here is confusing.
There was a problem hiding this comment.
So if have to change it to false here, I'll have to change to false here as well, would that be fine?
There was a problem hiding this comment.
It should be but only if you verify that this does not cause bugs due to wrong generic param indices.
There was a problem hiding this comment.
I can check rustc once and see what they do.
| is_lowering_coroutine: bool, | ||
|
|
||
| for_type_binder: Option<ThinVec<Name>>, | ||
| lifetime_arena: Option<&'a mut Arena<LifetimeParamData>>, |
There was a problem hiding this comment.
Not sure what you talk about (and the links have rotten now), but this is certainly possible, see how I implemented that in https://github.com/ChayimFriedman2/rust-analyzer/tree/lt-arena-in-variant.
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub enum LifetimeElisionKind { |
There was a problem hiding this comment.
Placeholder, which means we cannot remove it...
| let mod_path = Interned::new(ModPath::from_segments(kind, segments)); | ||
|
|
||
| let (resolved_module_def_id, is_trait_assoc_item) = { | ||
| let (per_ns, remaining_idx) = collector.def_map.resolve_path( |
There was a problem hiding this comment.
Wait a minute... This resolves every path, even in the body. You should absolutely not do that.
There was a problem hiding this comment.
Perhaps we can put this under the same conditions that happen below like: collector.lifetime_elision_kind.can_elide() || old_lifetimes_constrained_by_input.is_some()?
This comment has been minimized.
This comment has been minimized.
e0c2aff to
0f7fce7
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
minor fixes related to review comments
fix: should elide lifetime in impl trait and its tests
refactor: collect_path_elided lifetimes function
0f7fce7 to
d12f863
Compare
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
No description provided.