nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-05 11:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make PlaceholderReplacer shallow_resolver when folding const and ty and recur if contain infer vars

Browse Source
This commit is contained in:
Santiago Pastorino 2023-11-24 09:56:55 -03:00
parent f74f700952
commit f57e1843f3
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_trait_selection/src/traits/project.rs
View File

@ -1001,7 +1001,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for PlaceholderReplacer<'_, 'tcx> {
&mut self, &mut self,
t: ty::Binder<'tcx, T>, t: ty::Binder<'tcx, T>,
) -> ty::Binder<'tcx, T> { ) -> ty::Binder<'tcx, T> {
if !t.has_placeholders() && !t.has_infer_regions() { if !t.has_placeholders() && !t.has_infer() {
return t; return t;
} }
self.current_index.shift_in(1); self.current_index.shift_in(1);
@ -1048,6 +1048,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for PlaceholderReplacer<'_, 'tcx> {
} }
fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> { fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
let ty = self.infcx.shallow_resolve(ty);
match *ty.kind() { match *ty.kind() {
ty::Placeholder(p) => { ty::Placeholder(p) => {
let replace_var = self.mapped_types.get(&p); let replace_var = self.mapped_types.get(&p);
@ -1063,16 +1064,23 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for PlaceholderReplacer<'_, 'tcx> {
); );
Ty::new_bound(self.infcx.tcx, db, *replace_var) Ty::new_bound(self.infcx.tcx, db, *replace_var)
} }
None => ty, None => {
if ty.has_infer() {
ty.super_fold_with(self)
} else {
ty
}
}
} }
} }
_ if ty.has_placeholders() || ty.has_infer_regions() => ty.super_fold_with(self), _ if ty.has_placeholders() || ty.has_infer() => ty.super_fold_with(self),
_ => ty, _ => ty,
} }
} }
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> { fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
let ct = self.infcx.shallow_resolve(ct);
if let ty::ConstKind::Placeholder(p) = ct.kind() { if let ty::ConstKind::Placeholder(p) = ct.kind() {
let replace_var = self.mapped_consts.get(&p); let replace_var = self.mapped_consts.get(&p);
match replace_var { match replace_var {
@ -1087,7 +1095,13 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for PlaceholderReplacer<'_, 'tcx> {
); );
ty::Const::new_bound(self.infcx.tcx, db, *replace_var, ct.ty()) ty::Const::new_bound(self.infcx.tcx, db, *replace_var, ct.ty())
} }
None => ct, None => {
if ct.has_infer() {
ct.super_fold_with(self)
} else {
ct
}
}
} }
} else { } else {
ct.super_fold_with(self) ct.super_fold_with(self)