bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

treat all mir::Constant values as ConstantKind::Val

Browse source
This commit is contained in:
b-naber 2022-02-16 10:54:36 +01:00
parent 6045c34f15
commit 40e4bd2d02
6 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_middle/src/mir/mod.rs
View file

@ -2554,7 +2554,14 @@ impl<'tcx> Constant<'tcx> {
impl<'tcx> From<ty::Const<'tcx>> for ConstantKind<'tcx> {
#[inline]
fn from(ct: ty::Const<'tcx>) -> Self {
Self::Ty(ct)
match ct.val() {
ty::ConstKind::Value(cv) => {
// FIXME Once valtrees are introduced we need to convert those
// into `ConstValue` instances here
Self::Val(cv, ct.ty())
}
_ => Self::Ty(ct),
}
}
}
@ -2635,6 +2642,27 @@ impl<'tcx> ConstantKind<'tcx> {
Self::Val(val, _) => val.try_to_machine_usize(tcx),
}
}
pub fn from_bool(tcx: TyCtxt<'tcx>, v: bool) -> Self {
let cv = ConstValue::from_bool(v);
Self::Val(cv, tcx.types.bool)
}
pub fn from_zero_sized(ty: Ty<'tcx>) -> Self {
let cv = ConstValue::Scalar(Scalar::ZST);
Self::Val(cv, ty)
}
pub fn from_usize(tcx: TyCtxt<'tcx>, n: u64) -> Self {
let ty = tcx.types.usize;
let size = tcx
.layout_of(ty::ParamEnv::empty().and(ty))
.unwrap_or_else(|e| bug!("could not compute layout for {:?}: {:?}", ty, e))
.size;
let cv = ConstValue::Scalar(Scalar::from_uint(n as u128, size));
Self::Val(cv, ty)
}
}
/// A collection of projections into user types.