bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert const_eval call to use const_eval_raw to avoid const validation cycles

Browse source
This commit is contained in:
Santiago Pastorino 2019-12-31 11:47:33 -03:00 • committed by Oliver Scherer
parent 2d8d559bbe
commit a59abfa450
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_mir/interpret/operand.rs
View file

@ -542,7 +542,12 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// happening. // happening.
// FIXME(oli-obk): eliminate all the `const_eval_raw` usages when we get rid of // FIXME(oli-obk): eliminate all the `const_eval_raw` usages when we get rid of
// `StaticKind` once and for all. // `StaticKind` once and for all.
return self.const_eval(GlobalId { instance, promoted: None }); // FIXME the following line should have been:
// return self.const_eval(GlobalId { instance, promoted });
// but since the addition of Promoteds being Constants is causing const validation
// cycles. Promoteds being Constants exercise const validation more often and it
// may have made show up a pre-existing bug.
return Ok(OpTy::from(self.const_eval_raw(GlobalId { instance, promoted })?));
} }
ty::ConstKind::Infer(..) ty::ConstKind::Infer(..)
| ty::ConstKind::Bound(..) | ty::ConstKind::Bound(..)