bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #78742 - vn-ki:fix-issue-78655, r=oli-obk

Browse source 
make intern_const_alloc_recursive return error

fix #78655

r? ``@oli-obk``
This commit is contained in:
Mara Bos 2020-11-05 10:29:59 +01:00 • committed by GitHub
commit 5ffccc4dfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_mir/src/interpret/operand.rs
View file

@ -544,7 +544,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// Early-return cases.
let val_val = match val.val {
ty::ConstKind::Param(_) | ty::ConstKind::Bound(..) => throw_inval!(TooGeneric),
ty::ConstKind::Error(_) => throw_inval!(TypeckError(ErrorReported)),
ty::ConstKind::Error(_) => throw_inval!(AlreadyReported(ErrorReported)),
ty::ConstKind::Unevaluated(def, substs, promoted) => {
let instance = self.resolve(def, substs)?;
return Ok(self.eval_to_allocation(GlobalId { instance, promoted })?.into());