bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Sometimes return the same AllocId for a ConstAllocation

Browse source
This commit is contained in:
Ben Kimock 2023-11-26 17:06:13 -05:00
parent 2b399b5275
commit 245afd7896
4 changed files with 117 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_const_eval/src/interpret/eval_context.rs
View file

@ -1138,13 +1138,15 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
span: Option<Span>,
layout: Option<TyAndLayout<'tcx>>,
) -> InterpResult<'tcx, OpTy<'tcx, M::Provenance>> {
let const_val = val.eval(*self.tcx, self.param_env, span).map_err(|err| {
// FIXME: somehow this is reachable even when POST_MONO_CHECKS is on.
// Are we not always populating `required_consts`?
err.emit_note(*self.tcx);
err
})?;
self.const_val_to_op(const_val, val.ty(), layout)
M::eval_mir_constant(self, *val, span, layout, |ecx, val, span, layout| {
let const_val = val.eval(*ecx.tcx, ecx.param_env, span).map_err(|err| {
// FIXME: somehow this is reachable even when POST_MONO_CHECKS is on.
// Are we not always populating `required_consts`?
err.emit_note(*ecx.tcx);
err
})?;
ecx.const_val_to_op(const_val, val.ty(), layout)
})
}
#[must_use]