mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make PlaceholderConst not store the type of the const

Browse source
This commit is contained in:
Ellen 2022-08-01 15:42:38 +01:00
parent 1f5d8d49eb
commit 825a7cc65c
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_infer/src/infer/canonical/canonicalizer.rs
View file

@ -511,7 +511,7 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
}
ty::ConstKind::Placeholder(placeholder) => {
return self.canonicalize_const_var(
CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderConst(placeholder) },
CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderConst(placeholder, ct.ty()) },
ct,
);
}
@ -695,11 +695,11 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
..placeholder
})
}
CanonicalVarKind::PlaceholderConst(placeholder) => {
CanonicalVarKind::PlaceholderConst(placeholder, t) => {
CanonicalVarKind::PlaceholderConst(ty::Placeholder {
universe: reverse_universe_map[&placeholder.universe],
..placeholder
})
}, t)
}
},
})

4
compiler/rustc_infer/src/infer/canonical/mod.rs
View file

@ -144,13 +144,13 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
)
.into(),
CanonicalVarKind::PlaceholderConst(ty::PlaceholderConst { universe, name }) => {
CanonicalVarKind::PlaceholderConst(ty::PlaceholderConst { universe, name }, ty) => {
let universe_mapped = universe_map(universe);
let placeholder_mapped = ty::PlaceholderConst { universe: universe_mapped, name };
self.tcx
.mk_const(ty::ConstS {
kind: ty::ConstKind::Placeholder(placeholder_mapped),
ty: name.ty,
ty,
})
.into()
}

2
compiler/rustc_infer/src/infer/higher_ranked/mod.rs
View file

@ -97,7 +97,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
self.tcx.mk_const(ty::ConstS {
kind: ty::ConstKind::Placeholder(ty::PlaceholderConst {
universe: next_universe,
name: ty::BoundConst { var: bound_var, ty },
name: bound_var,
}),
ty,
})

2
compiler/rustc_infer/src/infer/mod.rs
View file

@ -2069,7 +2069,7 @@ fn replace_param_and_infer_substs_with_placeholder<'tcx>(
ty,
kind: ty::ConstKind::Placeholder(ty::PlaceholderConst {
universe: ty::UniverseIndex::ROOT,
name: ty::BoundConst { ty, var: ty::BoundVar::from_usize(idx) },
name: ty::BoundVar::from_usize(idx),
}),
})
.into()

6
compiler/rustc_middle/src/infer/canonical.rs
View file

@ -105,7 +105,7 @@ impl<'tcx> CanonicalVarInfo<'tcx> {
CanonicalVarKind::Region(_) => true,
CanonicalVarKind::PlaceholderRegion(..) => false,
CanonicalVarKind::Const(..) => true,
CanonicalVarKind::PlaceholderConst(_) => false,
CanonicalVarKind::PlaceholderConst(_, _) => false,
}
}
}
@ -133,7 +133,7 @@ pub enum CanonicalVarKind<'tcx> {
Const(ty::UniverseIndex, Ty<'tcx>),
/// A "placeholder" that represents "any const".
PlaceholderConst(ty::PlaceholderConst<'tcx>),
PlaceholderConst(ty::PlaceholderConst<'tcx>, Ty<'tcx>),
}
impl<'tcx> CanonicalVarKind<'tcx> {
@ -148,7 +148,7 @@ impl<'tcx> CanonicalVarKind<'tcx> {
CanonicalVarKind::Region(ui) => ui,
CanonicalVarKind::PlaceholderRegion(placeholder) => placeholder.universe,
CanonicalVarKind::Const(ui, _) => ui,
CanonicalVarKind::PlaceholderConst(placeholder) => placeholder.universe,
CanonicalVarKind::PlaceholderConst(placeholder, _) => placeholder.universe,
}
}
}

2
compiler/rustc_middle/src/ty/mod.rs
View file

@ -1200,7 +1200,7 @@ pub struct BoundConst<'tcx> {
pub ty: Ty<'tcx>,
}
pub type PlaceholderConst<'tcx> = Placeholder<BoundConst<'tcx>>;
pub type PlaceholderConst<'tcx> = Placeholder<BoundVar>;
/// A `DefId` which, in case it is a const argument, is potentially bundled with
/// the `DefId` of the generic parameter it instantiates.

2
compiler/rustc_trait_selection/src/traits/project.rs
View file

@ -746,7 +746,7 @@ impl<'tcx> TypeFolder<'tcx> for BoundVarReplacer<'_, 'tcx> {
let universe = self.universe_for(debruijn);
let p = ty::PlaceholderConst {
universe,
name: ty::BoundConst { var: bound_const, ty: ct.ty() },
name: bound_const,
};
self.mapped_consts.insert(p, bound_const);
self.infcx

2
compiler/rustc_traits/src/chalk/mod.rs
View file

@ -76,7 +76,7 @@ pub(crate) fn evaluate_goal<'tcx>(
chalk_ir::UniverseIndex { counter: ui.index() },
),
CanonicalVarKind::Const(_ui, _ty) => unimplemented!(),
CanonicalVarKind::PlaceholderConst(_pc) => unimplemented!(),
CanonicalVarKind::PlaceholderConst(_pc, _ty) => unimplemented!(),
}),
),
value: obligation.value.lower_into(interner),