Commit 296586f

committed

miri: for ABI mismatch errors, say which argument is the problem

1 parent 86ef320 commit 296586fCopy full SHA for 296586f

File tree

25 files changed

+45

-35

lines changed

compiler
- rustc_const_eval
  - messages.ftl
  - src
    - errors.rs
    - interpret
      - call.rs
- rustc_middle/src/mir/interpret
  - error.rs
src/tools/miri
- src
  - diagnostics.rs
  - helpers.rs
- tests/fail

25 files changed

+45

-35

lines changed

`‎compiler/rustc_const_eval/messages.ftl`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,15 +128,15 @@ const_eval_frame_note_inner = inside {$where_ ->`
`128`	`128`
`129`	`129`	`const_eval_frame_note_last = the failure occurred here`
`130`	`130`
	`131`	`+const_eval_incompatible_arg_types =`
	`132`	`+ calling a function whose parameter #{$arg_idx} has type {$callee_ty} passing argument of type {$caller_ty}`
	`133`	`+`
`131`	`134`	`const_eval_incompatible_calling_conventions =`
`132`	`135`	`calling a function with calling convention "{$callee_conv}" using calling convention "{$caller_conv}"`
`133`	`136`
`134`	`137`	`const_eval_incompatible_return_types =`
`135`	`138`	`calling a function with return type {$callee_ty} passing return place of type {$caller_ty}`
`136`	`139`
`137`		`-const_eval_incompatible_types =`
`138`		`- calling a function with argument of type {$callee_ty} passing data of type {$caller_ty}`
`139`		`-`
`140`	`140`	`const_eval_interior_mutable_borrow_escaping =`
`141`	`141`	`interior mutable shared borrows of temporaries that have their lifetime extended until the end of the program are not allowed`
`142`	`142`	`.label = this borrow of an interior mutable value refers to such a temporary`

`‎compiler/rustc_const_eval/src/errors.rs`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ impl<'a> ReportErrorExt for UndefinedBehaviorInfo<'a> {`
`500`	`500`	`InvalidNichedEnumVariantWritten { .. } => {`
`501`	`501`	`const_eval_invalid_niched_enum_variant_written`
`502`	`502`	`}`
`503`		`- AbiMismatchArgument { .. } => const_eval_incompatible_types,`
	`503`	`+ AbiMismatchArgument { .. } => const_eval_incompatible_arg_types,`
`504`	`504`	`AbiMismatchReturn { .. } => const_eval_incompatible_return_types,`
`505`	`505`	`}`
`506`	`506`	`}`
`@@ -625,12 +625,16 @@ impl<'a> ReportErrorExt for UndefinedBehaviorInfo<'a> {`
`625`	`625`	`diag.arg("data_size", info.data_size);`
`626`	`626`	`}`
`627`	`627`	`InvalidNichedEnumVariantWritten { enum_ty } => {`
`628`		`- diag.arg("ty", enum_ty.to_string());`
	`628`	`+ diag.arg("ty", enum_ty);`
`629`	`629`	`}`
`630`		`- AbiMismatchArgument { caller_ty, callee_ty }`
`631`		`- \| AbiMismatchReturn { caller_ty, callee_ty } => {`
`632`		`- diag.arg("caller_ty", caller_ty.to_string());`
`633`		`- diag.arg("callee_ty", callee_ty.to_string());`
	`630`	`+ AbiMismatchArgument { arg_idx, caller_ty, callee_ty } => {`
	`631`	`+ diag.arg("arg_idx", arg_idx + 1); // adjust for 1-indexed lists in output`
	`632`	`+ diag.arg("caller_ty", caller_ty);`
	`633`	`+ diag.arg("callee_ty", callee_ty);`
	`634`	`+ }`
	`635`	`+ AbiMismatchReturn { caller_ty, callee_ty } => {`
	`636`	`+ diag.arg("caller_ty", caller_ty);`
	`637`	`+ diag.arg("callee_ty", callee_ty);`
`634`	`638`	`}`
`635`	`639`	`}`
`636`	`640`	`}`

`‎compiler/rustc_const_eval/src/interpret/call.rs`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {`
`270`	`270`	`Item = (&'x FnArg<'tcx, M::Provenance>, &'y ArgAbi<'tcx, Ty<'tcx>>),`
`271`	`271`	`>,`
`272`	`272`	`callee_abi: &ArgAbi<'tcx, Ty<'tcx>>,`
	`273`	`+ callee_arg_idx: usize,`
`273`	`274`	`callee_arg: &mir::Place<'tcx>,`
`274`	`275`	`callee_ty: Ty<'tcx>,`
`275`	`276`	`already_live: bool,`
`@@ -298,6 +299,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {`
`298`	`299`	`// Check compatibility`
`299`	`300`	`if !self.check_argument_compat(caller_abi, callee_abi)? {`
`300`	`301`	`throw_ub!(AbiMismatchArgument {`
	`302`	`+ arg_idx: callee_arg_idx,`
`301`	`303`	`caller_ty: caller_abi.layout.ty,`
`302`	`304`	`callee_ty: callee_abi.layout.ty`
`303`	`305`	`});`
`@@ -424,7 +426,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {`
`424`	`426`	// this is a single iterator (that handles `spread_arg`), then
`425`	`427`	// `pass_argument` would be the loop body. It takes care to
`426`	`428`	// not advance `caller_iter` for ignored arguments.
`427`		`- let mut callee_args_abis = callee_fn_abi.args.iter();`
	`429`	`+ let mut callee_args_abis = callee_fn_abi.args.iter().enumerate();`
`428`	`430`	`for local in body.args_iter() {`
`429`	`431`	`// Construct the destination place for this argument. At this point all`
`430`	`432`	// locals are still dead, so we cannot construct a `PlaceTy`.
`@@ -445,21 +447,23 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {`
`445`	`447`	`&[mir::ProjectionElem::Field(FieldIdx::from_usize(i), field_ty)],`
`446`	`448`	`*self.tcx,`
`447`	`449`	`);`
`448`		`- let callee_abi = callee_args_abis.next().unwrap();`
	`450`	`+ let (idx,callee_abi) = callee_args_abis.next().unwrap();`
`449`	`451`	`self.pass_argument(`
`450`	`452`	`&mut caller_args,`
`451`	`453`	`callee_abi,`
	`454`	`+ idx,`
`452`	`455`	`&dest,`
`453`	`456`	`field_ty,`
`454`	`457`	`/* already_live */ true,`
`455`	`458`	`)?;`
`456`	`459`	`}`
`457`	`460`	`} else {`
`458`	`461`	`// Normal argument. Cannot mark it as live yet, it might be unsized!`
`459`		`- let callee_abi = callee_args_abis.next().unwrap();`
	`462`	`+ let (idx,callee_abi) = callee_args_abis.next().unwrap();`
`460`	`463`	`self.pass_argument(`
`461`	`464`	`&mut caller_args,`
`462`	`465`	`callee_abi,`
	`466`	`+ idx,`
`463`	`467`	`&dest,`
`464`	`468`	`ty,`
`465`	`469`	`/* already_live */ false,`