mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not generate lifetime_mapping for RPIT no in_trait

Browse Source
This commit is contained in:
Santiago Pastorino 2023-06-23 10:15:27 -03:00
parent 4925b57782
commit 6f4a51e80e
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -1568,7 +1568,7 @@ fn lower_opaque_impl_trait(
// This creates HIR lifetime arguments as `hir::GenericArg`, in the given example `type // This creates HIR lifetime arguments as `hir::GenericArg`, in the given example `type
// TestReturn<'a, T, 'x> = impl Debug + 'x`, it creates a collection containing `&['x]`. // TestReturn<'a, T, 'x> = impl Debug + 'x`, it creates a collection containing `&['x]`.
let lifetime_mapping: Vec<_> = collected_lifetimes let collected_lifetime_mapping: Vec<_> = collected_lifetimes
.iter() .iter()
.map(|(node_id, lifetime)| { .map(|(node_id, lifetime)| {
let id = self.next_node_id(); let id = self.next_node_id();
@ -1577,7 +1577,7 @@ fn lower_opaque_impl_trait(
(lifetime, def_id) (lifetime, def_id)
}) })
.collect(); .collect();
debug!(?lifetime_mapping); debug!(?collected_lifetime_mapping);
self.with_hir_id_owner(opaque_ty_node_id, |lctx| { self.with_hir_id_owner(opaque_ty_node_id, |lctx| {
// Install the remapping from old to new (if any): // Install the remapping from old to new (if any):
@ -1618,6 +1618,16 @@ fn lower_opaque_impl_trait(
let hir_bounds = lctx.lower_param_bounds(bounds, itctx); let hir_bounds = lctx.lower_param_bounds(bounds, itctx);
debug!(?hir_bounds); debug!(?hir_bounds);
let lifetime_mapping = if in_trait {
self.arena.alloc_from_iter(
collected_lifetime_mapping
.iter()
.map(|(lifetime, def_id)| (**lifetime, *def_id)),
)
} else {
&mut []
};
let opaque_ty_item = hir::OpaqueTy { let opaque_ty_item = hir::OpaqueTy {
generics: self.arena.alloc(hir::Generics { generics: self.arena.alloc(hir::Generics {
params: lifetime_defs, params: lifetime_defs,
@ -1628,9 +1638,7 @@ fn lower_opaque_impl_trait(
}), }),
bounds: hir_bounds, bounds: hir_bounds,
origin, origin,
lifetime_mapping: self.arena.alloc_from_iter( lifetime_mapping,
lifetime_mapping.iter().map(|(lifetime, def_id)| (**lifetime, *def_id)),
),
in_trait, in_trait,
}; };
debug!(?opaque_ty_item); debug!(?opaque_ty_item);
@ -1643,7 +1651,9 @@ fn lower_opaque_impl_trait(
hir::TyKind::OpaqueDef( hir::TyKind::OpaqueDef(
hir::ItemId { owner_id: hir::OwnerId { def_id: opaque_ty_def_id } }, hir::ItemId { owner_id: hir::OwnerId { def_id: opaque_ty_def_id } },
self.arena.alloc_from_iter( self.arena.alloc_from_iter(
lifetime_mapping.iter().map(|(lifetime, _)| hir::GenericArg::Lifetime(*lifetime)), collected_lifetime_mapping
.iter()
.map(|(lifetime, _)| hir::GenericArg::Lifetime(*lifetime)),
), ),
in_trait, in_trait,
) )
@ -2010,7 +2020,7 @@ fn lower_async_fn_ret_ty(
// TestReturn<'a, T, 'x> = impl Debug + 'x`, it creates a collection containing the // TestReturn<'a, T, 'x> = impl Debug + 'x`, it creates a collection containing the
// new lifetime of the RPIT 'x and the def_id of the lifetime 'x corresponding to // new lifetime of the RPIT 'x and the def_id of the lifetime 'x corresponding to
// `TestReturn`. // `TestReturn`.
let lifetime_mapping: Vec<_> = collected_lifetimes let collected_lifetime_mapping: Vec<_> = collected_lifetimes
.iter() .iter()
.map(|(node_id, lifetime, res)| { .map(|(node_id, lifetime, res)| {
let id = self.next_node_id(); let id = self.next_node_id();
@ -2022,7 +2032,7 @@ fn lower_async_fn_ret_ty(
(lifetime, def_id) (lifetime, def_id)
}) })
.collect(); .collect();
debug!(?lifetime_mapping); debug!(?collected_lifetime_mapping);
self.with_hir_id_owner(opaque_ty_node_id, |this| { self.with_hir_id_owner(opaque_ty_node_id, |this| {
// Install the remapping from old to new (if any): // Install the remapping from old to new (if any):
@ -2079,6 +2089,16 @@ fn lower_async_fn_ret_ty(
)); ));
debug!("lower_async_fn_ret_ty: generic_params={:#?}", generic_params); debug!("lower_async_fn_ret_ty: generic_params={:#?}", generic_params);
let lifetime_mapping = if in_trait {
self.arena.alloc_from_iter(
collected_lifetime_mapping
.iter()
.map(|(lifetime, def_id)| (**lifetime, *def_id)),
)
} else {
&mut []
};
let opaque_ty_item = hir::OpaqueTy { let opaque_ty_item = hir::OpaqueTy {
generics: this.arena.alloc(hir::Generics { generics: this.arena.alloc(hir::Generics {
params: generic_params, params: generic_params,
@ -2089,9 +2109,7 @@ fn lower_async_fn_ret_ty(
}), }),
bounds: arena_vec![this; future_bound], bounds: arena_vec![this; future_bound],
origin: hir::OpaqueTyOrigin::AsyncFn(fn_def_id), origin: hir::OpaqueTyOrigin::AsyncFn(fn_def_id),
lifetime_mapping: self.arena.alloc_from_iter( lifetime_mapping,
lifetime_mapping.iter().map(|(lifetime, def_id)| (**lifetime, *def_id)),
),
in_trait, in_trait,
}; };
@ -2116,7 +2134,9 @@ fn lower_async_fn_ret_ty(
// For the "output" lifetime parameters, we just want to // For the "output" lifetime parameters, we just want to
// generate `'_`. // generate `'_`.
let generic_args = self.arena.alloc_from_iter( let generic_args = self.arena.alloc_from_iter(
lifetime_mapping.iter().map(|(lifetime, _)| hir::GenericArg::Lifetime(*lifetime)), collected_lifetime_mapping
.iter()
.map(|(lifetime, _)| hir::GenericArg::Lifetime(*lifetime)),
); );
// Create the `Foo<...>` reference itself. Note that the `type // Create the `Foo<...>` reference itself. Note that the `type