Skip to content

Commit 0bd2727

Browse files
committed
Remove an unused parameter
1 parent 98c1f0f commit 0bd2727

File tree

5 files changed

+1
-5
lines changed

5 files changed

+1
-5
lines changed

compiler/rustc_const_eval/src/const_eval/machine.rs

-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
394394
fn find_mir_or_extra_fn(
395395
ecx: &mut InterpCx<'mir, 'tcx, Self>,
396396
instance: ty::Instance<'tcx>,
397-
_abi: CallAbi,
398397
) -> InterpResult<'tcx, Either<&'mir mir::Body<'tcx>, Self::ExtraFnVal>> {
399398
debug!("find_mir_or_extra_fn: {:?}", instance);
400399

compiler/rustc_const_eval/src/interpret/machine.rs

-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
195195
fn find_mir_or_extra_fn(
196196
ecx: &mut InterpCx<'mir, 'tcx, Self>,
197197
instance: ty::Instance<'tcx>,
198-
abi: CallAbi,
199198
) -> InterpResult<'tcx, Either<&'mir mir::Body<'tcx>, Self::ExtraFnVal>>;
200199

201200
/// Execute `fn_val`. It is the hook's responsibility to advance the instruction

compiler/rustc_const_eval/src/interpret/terminator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
550550
| ty::InstanceDef::ThreadLocalShim(..)
551551
| ty::InstanceDef::Item(_) => {
552552
// We need MIR for this fn
553-
let body = match M::find_mir_or_extra_fn(self, instance, caller_abi)? {
553+
let body = match M::find_mir_or_extra_fn(self, instance)? {
554554
Either::Left(b) => b,
555555
Either::Right(f) => {
556556
return M::call_extra_fn(

compiler/rustc_mir_transform/src/dataflow_const_prop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,6 @@ impl<'mir, 'tcx: 'mir> rustc_const_eval::interpret::Machine<'mir, 'tcx> for Dumm
904904
fn find_mir_or_extra_fn(
905905
_ecx: &mut InterpCx<'mir, 'tcx, Self>,
906906
_instance: ty::Instance<'tcx>,
907-
_abi: rustc_target::spec::abi::Abi,
908907
) -> interpret::InterpResult<'tcx, Either<&'mir Body<'tcx>, Self::ExtraFnVal>> {
909908
unimplemented!()
910909
}

src/tools/miri/src/machine.rs

-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,6 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
943943
fn find_mir_or_extra_fn(
944944
ecx: &mut MiriInterpCx<'mir, 'tcx>,
945945
instance: ty::Instance<'tcx>,
946-
abi: Abi,
947946
) -> InterpResult<'tcx, Either<&'mir mir::Body<'tcx>, ExtraFnVal>> {
948947
// For foreign items, we return `ExtraFnVal::ForeignFn` to later try to see if we can
949948
// emulate them.

0 commit comments

Comments
 (0)