user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify eval_mir_constant

Browse source
This commit is contained in:
Bastian Kauschke 2020-03-22 11:53:13 +01:00
parent 0c5c3bbdab
commit ed4885359a
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_codegen_ssa/mir/constant.rs
View file

@ -40,17 +40,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
&mut self,
constant: &mir::Constant<'tcx>,
) -> Result<ConstValue<'tcx>, ErrorHandled> {
let const_ = match constant.literal.val {
ty::ConstKind::Unevaluated(def_id, substs, promoted) => {
let substs = self.monomorphize(&substs);
ty::ConstKind::Unevaluated(def_id, substs, promoted)
}
ty::ConstKind::Value(value) => ty::ConstKind::Value(value),
ty::ConstKind::Param(_) => self.monomorphize(&constant.literal).val,
_ => span_bug!(constant.span, "encountered bad Const in codegen: {:?}", constant),
};
match const_ {
match self.monomorphize(&constant.literal).val {
ty::ConstKind::Unevaluated(def_id, substs, promoted) => self
.cx
.tcx()
@ -65,10 +55,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
err
}),
ty::ConstKind::Value(value) => Ok(value),
_ => span_bug!(
err => span_bug!(
constant.span,
"encountered bad ConstKind after monomorphizing: {:?}",
const_
err
),
}
}