bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rebase

Browse source
This commit is contained in:
b-naber 2022-07-28 11:06:16 +02:00
parent db9a2d2fbe
commit 29c0364c37
22 changed files with 25 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -583,7 +583,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
pub fn uneval_to_op(
&self,
uneval: &ty::Unevaluated<'tcx>,
) -> InterpResult<'tcx, OpTy<'tcx, M::PointerTag>> {
) -> InterpResult<'tcx, OpTy<'tcx, M::Provenance>> {
let instance = self.resolve(uneval.def, uneval.substs)?;
Ok(self.eval_to_allocation(GlobalId { instance, promoted: uneval.promoted })?.into())
}