bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove a machine hook that is no longer used

Browse source
This commit is contained in:
Ralf Jung 2024-03-09 18:15:56 +01:00
parent 2005c2e54d
commit b888e895de
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -221,9 +221,6 @@ impl<'tcx, Prov: Provenance> LocalState<'tcx, Prov> {
/// Overwrite the local. If the local can be overwritten in place, return a reference /// Overwrite the local. If the local can be overwritten in place, return a reference
/// to do so; otherwise return the `MemPlace` to consult instead. /// to do so; otherwise return the `MemPlace` to consult instead.
///
/// Note: Before calling this, call the `before_access_local_mut` machine hook! You may be
/// invalidating machine invariants otherwise!
#[inline(always)] #[inline(always)]
pub(super) fn access_mut(&mut self) -> InterpResult<'tcx, &mut Operand<Prov>> { pub(super) fn access_mut(&mut self) -> InterpResult<'tcx, &mut Operand<Prov>> {
match &mut self.value { match &mut self.value {

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

@ -260,24 +260,6 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
F2::NAN F2::NAN
} }
/// Called before writing the specified `local` of the `frame`.
/// Since writing a ZST is not actually accessing memory or locals, this is never invoked
/// for ZST reads.
///
/// Due to borrow checker trouble, we indicate the `frame` as an index rather than an `&mut
/// Frame`.
#[inline(always)]
fn before_access_local_mut<'a>(
_ecx: &'a mut InterpCx<'mir, 'tcx, Self>,
_frame: usize,
_local: mir::Local,
) -> InterpResult<'tcx>
where
'tcx: 'mir,
{
Ok(())
}
/// Called before a basic block terminator is executed. /// Called before a basic block terminator is executed.
#[inline] #[inline]
fn before_terminator(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> { fn before_terminator(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {

3
compiler/rustc_const_eval/src/interpret/place.rs
View file

@ -624,7 +624,6 @@ where
dest.force_mplace(self)? dest.force_mplace(self)?
} else { } else {
debug_assert_eq!(locals_addr, self.frame().locals_addr()); debug_assert_eq!(locals_addr, self.frame().locals_addr());
M::before_access_local_mut(self, self.frame_idx(), local)?;
match self.frame_mut().locals[local].access_mut()? { match self.frame_mut().locals[local].access_mut()? {
Operand::Immediate(local_val) => { Operand::Immediate(local_val) => {
// Local can be updated in-place. // Local can be updated in-place.
@ -740,7 +739,6 @@ where
dest.force_mplace(self)? dest.force_mplace(self)?
} else { } else {
debug_assert_eq!(locals_addr, self.frame().locals_addr()); debug_assert_eq!(locals_addr, self.frame().locals_addr());
M::before_access_local_mut(self, self.frame_idx(), local)?;
match self.frame_mut().locals[local].access_mut()? { match self.frame_mut().locals[local].access_mut()? {
Operand::Immediate(local) => { Operand::Immediate(local) => {
*local = Immediate::Uninit; *local = Immediate::Uninit;
@ -921,7 +919,6 @@ where
let mplace = match place.place { let mplace = match place.place {
Place::Local { local, offset, locals_addr } => { Place::Local { local, offset, locals_addr } => {
debug_assert_eq!(locals_addr, self.frame().locals_addr()); debug_assert_eq!(locals_addr, self.frame().locals_addr());
M::before_access_local_mut(self, self.frame_idx(), local)?;
let whole_local = match self.frame_mut().locals[local].access_mut()? { let whole_local = match self.frame_mut().locals[local].access_mut()? {
&mut Operand::Immediate(local_val) => { &mut Operand::Immediate(local_val) => {
// We need to make an allocation. // We need to make an allocation.