Skip to content

Commit 57f796e

Browse files
nia-eRalfJung
andcommitted
Apply suggestions from code review
Co-authored-by: Ralf Jung <[email protected]>
1 parent 146d346 commit 57f796e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/shims/native_lib/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
276276

277277
/// Extract the value from the result of reading an operand from the machine
278278
/// 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> {
280280
let this = self.eval_context_ref();
281281
let scalar = |v| interp_ok(this.read_immediate(v)?.to_scalar());
282282
interp_ok(match v.layout.ty.kind() {
@@ -341,7 +341,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
341341
let ptr_raw = this.get_alloc_bytes_unchecked_raw(id)?;
342342
// SAFETY: We know for sure that at ptr_raw the next layout.size bytes
343343
// 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
345345
// initialised.
346346
unsafe {
347347
std::slice::from_raw_parts(ptr_raw, mplace.layout.size.bytes_usize())
@@ -383,7 +383,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
383383
}
384384
// TODO: unions, etc.
385385
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");
387387
}
388388

389389
let this = self.eval_context_ref();

0 commit comments

Comments
 (0)