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