nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Immediately evaluate and validate constants when we want them as operands

Browse Source
This commit is contained in:
Oliver Scherer 2019-12-20 12:31:52 +01:00
parent 0e969b73f6
commit a7a011d2fa
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc_mir/interpret/operand.rs
View File

@ -578,9 +578,16 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
ty::ConstKind::Param(_) => throw_inval!(TooGeneric),
ty::ConstKind::Unevaluated(def_id, substs) => {
let instance = self.resolve(def_id, substs)?;
// FIXME: don't use `const_eval_raw` for regular constants, instead use `const_eval`
// which immediately validates the result before we continue with it here.
return Ok(OpTy::from(self.const_eval_raw(GlobalId { instance, promoted: None })?));
let param_env = if self.tcx.is_static(def_id) {
ty::ParamEnv::reveal_all()
} else {
self.param_env
};
let val =
self.tcx.const_eval(param_env.and(GlobalId { instance, promoted: None }))?;
// "recurse". This is only ever going into a recusion depth of 1, because after
// `const_eval` we don't have `Unevaluated` anymore.
return self.eval_const_to_op(val, layout);
}
ty::ConstKind::Value(val_val) => val_val,
};