bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Erase regions better in promote_candidate

Browse source
This commit is contained in:
Michael Goulet 2022-08-12 03:48:40 +00:00
parent 2ed0f29168
commit f94220f68e
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_const_eval/src/transform/promote_consts.rs
View file

@ -839,17 +839,12 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
let mut promoted_operand = |ty, span| {
promoted.span = span;
promoted.local_decls[RETURN_PLACE] = LocalDecl::new(ty, span);
let substs = tcx.erase_regions(InternalSubsts::identity_for_item(tcx, def.did));
let _const = tcx.mk_const(ty::ConstS {
ty,
kind: ty::ConstKind::Unevaluated(ty::Unevaluated {
def,
substs: InternalSubsts::for_item(tcx, def.did, |param, _| {
if let ty::GenericParamDefKind::Lifetime = param.kind {
tcx.lifetimes.re_erased.into()
} else {
tcx.mk_param_from_def(param)
}
}),
substs,
promoted: Some(promoted_id),
}),
});