@@ -272,7 +272,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
272
272
273
273
/// Extract the value from the result of reading an operand from the machine
274
274
/// and convert it to a `CArg`.
275
- fn op_to_carg ( & self , v : & OpTy < ' tcx > , tracing : bool ) -> InterpResult < ' tcx , CArg > {
275
+ fn op_to_ffi_arg ( & self , v : & OpTy < ' tcx > , tracing : bool ) -> InterpResult < ' tcx , CArg > {
276
276
let this = self . eval_context_ref ( ) ;
277
277
let scalar = |v| interp_ok ( this. read_immediate ( v) ?. to_scalar ( ) ) ;
278
278
interp_ok ( match v. layout . ty . kind ( ) {
@@ -337,7 +337,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
337
337
let ptr_raw = this. get_alloc_bytes_unchecked_raw ( id) ?;
338
338
// SAFETY: We know for sure that at ptr_raw the next layout.size bytes
339
339
// are part of this allocation and initialised. They might be marked as
340
- // uninit in Miri, but all bytes returned by the isolated allocator are
340
+ // uninit in Miri, but all bytes returned by `MiriAllocBytes` are
341
341
// initialised.
342
342
unsafe {
343
343
std:: slice:: from_raw_parts ( ptr_raw, mplace. layout . size . bytes_usize ( ) )
@@ -379,7 +379,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
379
379
}
380
380
// TODO: unions, etc.
381
381
if !adt_def. is_struct ( ) {
382
- throw_unsup_format ! ( "unsupported argument type for native call: {orig_ty}" ) ;
382
+ throw_unsup_format ! ( "unsupported argument type for native call: {orig_ty} is an enum or union " ) ;
383
383
}
384
384
385
385
let this = self . eval_context_ref ( ) ;
0 commit comments