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

handle unevaluated consts after monomophize

Browse source
This commit is contained in:
Bastian Kauschke 2020-03-22 11:34:42 +01:00
parent 98803c182b
commit 0c5c3bbdab
5 changed files with 77 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,31 +40,36 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
&mut self,
constant: &mir::Constant<'tcx>,
) -> Result<ConstValue<'tcx>, ErrorHandled> {
match constant.literal.val {
let const_ = match constant.literal.val {
ty::ConstKind::Unevaluated(def_id, substs, promoted) => {
let substs = self.monomorphize(&substs);
self.cx
.tcx()
.const_eval_resolve(ty::ParamEnv::reveal_all(), def_id, substs, promoted, None)
.map_err(|err| {
if promoted.is_none() {
self.cx
.tcx()
.sess
.span_err(constant.span, "erroneous constant encountered");
}
err
})
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_ {
ty::ConstKind::Unevaluated(def_id, substs, promoted) => self
.cx
.tcx()
.const_eval_resolve(ty::ParamEnv::reveal_all(), def_id, substs, promoted, None)
.map_err(|err| {
if promoted.is_none() {
self.cx
.tcx()
.sess
.span_err(constant.span, "erroneous constant encountered");
}
err
}),
ty::ConstKind::Value(value) => Ok(value),
_ => {
let const_ = self.monomorphize(&constant.literal);
if let ty::ConstKind::Value(value) = const_.val {
Ok(value)
} else {
span_bug!(constant.span, "encountered bad ConstKind in codegen: {:?}", const_);
}
}
_ => span_bug!(
constant.span,
"encountered bad ConstKind after monomorphizing: {:?}",
const_
),
}
}