nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 11:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new usage of old api

Browse Source
This commit is contained in:
Gary Guo 2022-11-15 18:27:21 +00:00
parent 5cbda2a55e
commit bf6b84b10a
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_mir_dataflow/src/value_analysis.rs
View File

@ -238,7 +238,7 @@ pub trait ValueAnalysis<'tcx> {
TerminatorKind::Goto { .. } TerminatorKind::Goto { .. }
| TerminatorKind::SwitchInt { .. } | TerminatorKind::SwitchInt { .. }
| TerminatorKind::Resume | TerminatorKind::Resume
| TerminatorKind::Abort | TerminatorKind::Terminate
| TerminatorKind::Return | TerminatorKind::Return
| TerminatorKind::Unreachable | TerminatorKind::Unreachable
| TerminatorKind::Assert { .. } | TerminatorKind::Assert { .. }

2
compiler/rustc_mir_transform/src/check_alignment.rs
View File

@ -221,7 +221,7 @@ fn insert_alignment_check<'tcx>(
required: Operand::Copy(alignment), required: Operand::Copy(alignment),
found: Operand::Copy(addr), found: Operand::Copy(addr),
}, },
cleanup: None, unwind: UnwindAction::Terminate,
}, },
}); });
} }

6
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View File

@ -567,7 +567,7 @@ impl<'mir, 'tcx> rustc_const_eval::interpret::Machine<'mir, 'tcx> for DummyMachi
_args: &[rustc_const_eval::interpret::OpTy<'tcx, Self::Provenance>], _args: &[rustc_const_eval::interpret::OpTy<'tcx, Self::Provenance>],
_destination: &rustc_const_eval::interpret::PlaceTy<'tcx, Self::Provenance>, _destination: &rustc_const_eval::interpret::PlaceTy<'tcx, Self::Provenance>,
_target: Option<BasicBlock>, _target: Option<BasicBlock>,
_unwind: rustc_const_eval::interpret::StackPopUnwind, _unwind: UnwindAction,
) -> interpret::InterpResult<'tcx, Option<(&'mir Body<'tcx>, ty::Instance<'tcx>)>> { ) -> interpret::InterpResult<'tcx, Option<(&'mir Body<'tcx>, ty::Instance<'tcx>)>> {
unimplemented!() unimplemented!()
} }
@ -578,7 +578,7 @@ impl<'mir, 'tcx> rustc_const_eval::interpret::Machine<'mir, 'tcx> for DummyMachi
_args: &[rustc_const_eval::interpret::OpTy<'tcx, Self::Provenance>], _args: &[rustc_const_eval::interpret::OpTy<'tcx, Self::Provenance>],
_destination: &rustc_const_eval::interpret::PlaceTy<'tcx, Self::Provenance>, _destination: &rustc_const_eval::interpret::PlaceTy<'tcx, Self::Provenance>,
_target: Option<BasicBlock>, _target: Option<BasicBlock>,
_unwind: rustc_const_eval::interpret::StackPopUnwind, _unwind: UnwindAction,
) -> interpret::InterpResult<'tcx> { ) -> interpret::InterpResult<'tcx> {
unimplemented!() unimplemented!()
} }
@ -586,7 +586,7 @@ impl<'mir, 'tcx> rustc_const_eval::interpret::Machine<'mir, 'tcx> for DummyMachi
fn assert_panic( fn assert_panic(
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _ecx: &mut InterpCx<'mir, 'tcx, Self>,
_msg: &rustc_middle::mir::AssertMessage<'tcx>, _msg: &rustc_middle::mir::AssertMessage<'tcx>,
_unwind: Option<BasicBlock>, _unwind: UnwindAction,
) -> interpret::InterpResult<'tcx> { ) -> interpret::InterpResult<'tcx> {
unimplemented!() unimplemented!()
} }

2
compiler/rustc_smir/src/rustc_smir/mod.rs
View File

@ -143,7 +143,7 @@ fn rustc_terminator_to_terminator(
otherwise: targets.otherwise().as_usize(), otherwise: targets.otherwise().as_usize(),
}, },
Resume => Terminator::Resume, Resume => Terminator::Resume,
Abort => Terminator::Abort, Terminate => Terminator::Abort,
Return => Terminator::Return, Return => Terminator::Return,
Unreachable => Terminator::Unreachable, Unreachable => Terminator::Unreachable,
Drop { .. } => todo!(), Drop { .. } => todo!(),

5
src/tools/miri/src/shims/panic.rs
View File

@ -237,10 +237,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
None, None,
StackPopCleanup::Goto { StackPopCleanup::Goto {
ret: None, ret: None,
unwind: match unwind { unwind,
Some(cleanup) => StackPopUnwind::Cleanup(cleanup),
None => StackPopUnwind::Skip,
},
}, },
)?; )?;
} }