bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

miri: fix ICE when running out of address space

Browse source
This commit is contained in:
Ralf Jung 2023-02-07 11:39:07 +01:00
parent 7ff69b49df
commit 2900ba15b3
9 changed files with 54 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_const_eval/src/interpret/machine.rs
View file

@ -291,7 +291,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
fn adjust_alloc_base_pointer(
ecx: &InterpCx<'mir, 'tcx, Self>,
ptr: Pointer,
) -> Pointer<Self::Provenance>;
) -> InterpResult<'tcx, Pointer<Self::Provenance>>;
/// "Int-to-pointer cast"
fn ptr_from_addr_cast(
@ -505,8 +505,8 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) {
fn adjust_alloc_base_pointer(
_ecx: &InterpCx<$mir, $tcx, Self>,
ptr: Pointer<AllocId>,
) -> Pointer<AllocId> {
ptr
) -> InterpResult<$tcx, Pointer<AllocId>> {
Ok(ptr)
}
#[inline(always)]