Skip to content

Commit 9659fbc

Browse files
RalfJungRalfJung
committed
fmt
1 parent fe35924 commit 9659fbc

25 files changed

+211
-411
lines changed

Diff for: ‎src/tools/miri/src/helpers.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
925925
if fn_abi.conv != exp_abi {
926926
throw_ub_format!(
927927
"calling a function with ABI {:?} using caller ABI {:?}",
928-
exp_abi, fn_abi.conv);
928+
exp_abi,
929+
fn_abi.conv
930+
);
929931
}
930932
interp_ok(())
931933
}

Diff for: ‎src/tools/miri/src/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rand::{Rng, SeedableRng};
1313
use rustc_abi::{Align, ExternAbi, Size};
1414
use rustc_attr_parsing::InlineAttr;
1515
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
16-
use rustc_target::callconv::FnAbi;
1716
#[allow(unused)]
1817
use rustc_data_structures::static_assert_size;
1918
use rustc_middle::mir;
@@ -25,6 +24,7 @@ use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
2524
use rustc_session::config::InliningThreshold;
2625
use rustc_span::def_id::{CrateNum, DefId};
2726
use rustc_span::{Span, SpanData, Symbol};
27+
use rustc_target::callconv::FnAbi;
2828

2929
use crate::concurrency::cpu_affinity::{self, CpuAffinityMask};
3030
use crate::concurrency::data_race::{self, NaReadType, NaWriteType};

Diff for: ‎src/tools/miri/src/shims/foreign_items.rs

+23-41
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ use rustc_ast::expand::allocator::alloc_error_handler_name;
99
use rustc_hir::def::DefKind;
1010
use rustc_hir::def_id::CrateNum;
1111
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
12-
use rustc_middle::{mir, ty};
1312
use rustc_middle::ty::Ty;
13+
use rustc_middle::{mir, ty};
1414
use rustc_span::Symbol;
1515
use rustc_target::callconv::{Conv, FnAbi};
1616

17-
1817
use self::helpers::{ToHost, ToSoft};
1918
use super::alloc::EvalContextExt as _;
2019
use super::backtrace::EvalContextExt as _;
@@ -279,7 +278,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
279278
match link_name.as_str() {
280279
// Miri-specific extern functions
281280
"miri_start_unwind" => {
282-
let [payload] = this.check_shim(abi, Conv::Rust, link_name, args)?;
281+
let [payload] = this.check_shim(abi, Conv::Rust, link_name, args)?;
283282
this.handle_miri_start_unwind(payload)?;
284283
return interp_ok(EmulateItemResult::NeedsUnwind);
285284
}
@@ -288,7 +287,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
288287
this.run_provenance_gc();
289288
}
290289
"miri_get_alloc_id" => {
291-
let [ptr] = this.check_shim(abi, Conv::Rust, link_name, args)?;
290+
let [ptr] = this.check_shim(abi, Conv::Rust, link_name, args)?;
292291
let ptr = this.read_pointer(ptr)?;
293292
let (alloc_id, _, _) = this.ptr_get_alloc_id(ptr, 0).map_err_kind(|_e| {
294293
err_machine_stop!(TerminationInfo::Abort(format!(
@@ -298,7 +297,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
298297
this.write_scalar(Scalar::from_u64(alloc_id.0.get()), dest)?;
299298
}
300299
"miri_print_borrow_state" => {
301-
let [id, show_unnamed] = this.check_shim(abi, Conv::Rust, link_name, args)?;
300+
let [id, show_unnamed] = this.check_shim(abi, Conv::Rust, link_name, args)?;
302301
let id = this.read_scalar(id)?.to_u64()?;
303302
let show_unnamed = this.read_scalar(show_unnamed)?.to_bool()?;
304303
if let Some(id) = std::num::NonZero::new(id).map(AllocId)
@@ -312,8 +311,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
312311
"miri_pointer_name" => {
313312
// This associates a name to a tag. Very useful for debugging, and also makes
314313
// tests more strict.
315-
let [ptr, nth_parent, name] =
316-
this.check_shim(abi, Conv::Rust, link_name, args)?;
314+
let [ptr, nth_parent, name] = this.check_shim(abi, Conv::Rust, link_name, args)?;
317315
let ptr = this.read_pointer(ptr)?;
318316
let nth_parent = this.read_scalar(nth_parent)?.to_u8()?;
319317
let name = this.read_immediate(name)?;
@@ -337,8 +335,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
337335
this.machine.static_roots.push(alloc_id);
338336
}
339337
"miri_host_to_target_path" => {
340-
let [ptr, out, out_size] =
341-
this.check_shim(abi, Conv::Rust, link_name, args)?;
338+
let [ptr, out, out_size] = this.check_shim(abi, Conv::Rust, link_name, args)?;
342339
let ptr = this.read_pointer(ptr)?;
343340
let out = this.read_pointer(out)?;
344341
let out_size = this.read_scalar(out_size)?.to_target_usize(this)?;
@@ -429,22 +426,20 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
429426

430427
// Aborting the process.
431428
"exit" => {
432-
let [code] =
433-
this.check_shim(abi, Conv::C , link_name, args)?;
429+
let [code] = this.check_shim(abi, Conv::C, link_name, args)?;
434430
let code = this.read_scalar(code)?.to_i32()?;
435431
throw_machine_stop!(TerminationInfo::Exit { code: code.into(), leak_check: false });
436432
}
437433
"abort" => {
438-
let [] = this.check_shim(abi, Conv::C , link_name, args)?;
434+
let [] = this.check_shim(abi, Conv::C, link_name, args)?;
439435
throw_machine_stop!(TerminationInfo::Abort(
440436
"the program aborted execution".to_owned()
441437
))
442438
}
443439

444440
// Standard C allocation
445441
"malloc" => {
446-
let [size] =
447-
this.check_shim(abi, Conv::C , link_name, args)?;
442+
let [size] = this.check_shim(abi, Conv::C, link_name, args)?;
448443
let size = this.read_target_usize(size)?;
449444
if size <= this.max_size_of_val().bytes() {
450445
let res = this.malloc(size, /*zero_init:*/ false)?;
@@ -458,8 +453,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
458453
}
459454
}
460455
"calloc" => {
461-
let [items, elem_size] =
462-
this.check_shim(abi, Conv::C , link_name, args)?;
456+
let [items, elem_size] = this.check_shim(abi, Conv::C, link_name, args)?;
463457
let items = this.read_target_usize(items)?;
464458
let elem_size = this.read_target_usize(elem_size)?;
465459
if let Some(size) = this.compute_size_in_bytes(Size::from_bytes(elem_size), items) {
@@ -474,14 +468,12 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
474468
}
475469
}
476470
"free" => {
477-
let [ptr] =
478-
this.check_shim(abi, Conv::C , link_name, args)?;
471+
let [ptr] = this.check_shim(abi, Conv::C, link_name, args)?;
479472
let ptr = this.read_pointer(ptr)?;
480473
this.free(ptr)?;
481474
}
482475
"realloc" => {
483-
let [old_ptr, new_size] =
484-
this.check_shim(abi, Conv::C , link_name, args)?;
476+
let [old_ptr, new_size] = this.check_shim(abi, Conv::C, link_name, args)?;
485477
let old_ptr = this.read_pointer(old_ptr)?;
486478
let new_size = this.read_target_usize(new_size)?;
487479
if new_size <= this.max_size_of_val().bytes() {
@@ -619,8 +611,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
619611

620612
// C memory handling functions
621613
"memcmp" => {
622-
let [left, right, n] =
623-
this.check_shim(abi, Conv::C , link_name, args)?;
614+
let [left, right, n] = this.check_shim(abi, Conv::C, link_name, args)?;
624615
let left = this.read_pointer(left)?;
625616
let right = this.read_pointer(right)?;
626617
let n = Size::from_bytes(this.read_target_usize(n)?);
@@ -644,8 +635,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
644635
this.write_scalar(Scalar::from_i32(result), dest)?;
645636
}
646637
"memrchr" => {
647-
let [ptr, val, num] =
648-
this.check_shim(abi, Conv::C , link_name, args)?;
638+
let [ptr, val, num] = this.check_shim(abi, Conv::C, link_name, args)?;
649639
let ptr = this.read_pointer(ptr)?;
650640
let val = this.read_scalar(val)?.to_i32()?;
651641
let num = this.read_target_usize(num)?;
@@ -671,8 +661,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
671661
}
672662
}
673663
"memchr" => {
674-
let [ptr, val, num] =
675-
this.check_shim(abi, Conv::C , link_name, args)?;
664+
let [ptr, val, num] = this.check_shim(abi, Conv::C, link_name, args)?;
676665
let ptr = this.read_pointer(ptr)?;
677666
let val = this.read_scalar(val)?.to_i32()?;
678667
let num = this.read_target_usize(num)?;
@@ -695,8 +684,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
695684
}
696685
}
697686
"strlen" => {
698-
let [ptr] =
699-
this.check_shim(abi, Conv::C , link_name, args)?;
687+
let [ptr] = this.check_shim(abi, Conv::C, link_name, args)?;
700688
let ptr = this.read_pointer(ptr)?;
701689
// This reads at least 1 byte, so we are already enforcing that this is a valid pointer.
702690
let n = this.read_c_str(ptr)?.len();
@@ -706,8 +694,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
706694
)?;
707695
}
708696
"wcslen" => {
709-
let [ptr] =
710-
this.check_shim(abi, Conv::C , link_name, args)?;
697+
let [ptr] = this.check_shim(abi, Conv::C, link_name, args)?;
711698
let ptr = this.read_pointer(ptr)?;
712699
// This reads at least 1 byte, so we are already enforcing that this is a valid pointer.
713700
let n = this.read_wchar_t_str(ptr)?.len();
@@ -717,8 +704,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
717704
)?;
718705
}
719706
"memcpy" => {
720-
let [ptr_dest, ptr_src, n] =
721-
this.check_shim(abi, Conv::C , link_name, args)?;
707+
let [ptr_dest, ptr_src, n] = this.check_shim(abi, Conv::C, link_name, args)?;
722708
let ptr_dest = this.read_pointer(ptr_dest)?;
723709
let ptr_src = this.read_pointer(ptr_src)?;
724710
let n = this.read_target_usize(n)?;
@@ -732,8 +718,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
732718
this.write_pointer(ptr_dest, dest)?;
733719
}
734720
"strcpy" => {
735-
let [ptr_dest, ptr_src] =
736-
this.check_shim(abi, Conv::C , link_name, args)?;
721+
let [ptr_dest, ptr_src] = this.check_shim(abi, Conv::C, link_name, args)?;
737722
let ptr_dest = this.read_pointer(ptr_dest)?;
738723
let ptr_src = this.read_pointer(ptr_src)?;
739724

@@ -878,8 +863,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
878863
this.write_scalar(res, dest)?;
879864
}
880865
"lgammaf_r" => {
881-
let [x, signp] =
882-
this.check_shim(abi, Conv::C , link_name, args)?;
866+
let [x, signp] = this.check_shim(abi, Conv::C, link_name, args)?;
883867
let x = this.read_scalar(x)?.to_f32()?;
884868
let signp = this.deref_pointer(signp)?;
885869

@@ -890,8 +874,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
890874
this.write_scalar(res, dest)?;
891875
}
892876
"lgamma_r" => {
893-
let [x, signp] =
894-
this.check_shim(abi, Conv::C , link_name, args)?;
877+
let [x, signp] = this.check_shim(abi, Conv::C, link_name, args)?;
895878
let x = this.read_scalar(x)?.to_f64()?;
896879
let signp = this.deref_pointer(signp)?;
897880

@@ -904,8 +887,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
904887

905888
// LLVM intrinsics
906889
"llvm.prefetch" => {
907-
let [p, rw, loc, ty] =
908-
this.check_shim(abi, Conv::C , link_name, args)?;
890+
let [p, rw, loc, ty] = this.check_shim(abi, Conv::C, link_name, args)?;
909891

910892
let _ = this.read_pointer(p)?;
911893
let rw = this.read_scalar(rw)?.to_i32()?;
@@ -932,7 +914,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
932914
// Used to implement the x86 `_mm{,256,512}_popcnt_epi{8,16,32,64}` and wasm
933915
// `{i,u}8x16_popcnt` functions.
934916
name if name.starts_with("llvm.ctpop.v") => {
935-
let [op] = this.check_shim(abi, Conv::C , link_name, args)?;
917+
let [op] = this.check_shim(abi, Conv::C, link_name, args)?;
936918

937919
let (op, op_len) = this.project_to_simd(op)?;
938920
let (dest, dest_len) = this.project_to_simd(dest)?;

Diff for: ‎src/tools/miri/src/shims/unix/android/foreign_items.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ use rustc_middle::ty::Ty;
22
use rustc_span::Symbol;
33
use rustc_target::callconv::{Conv, FnAbi};
44

5-
6-
75
use crate::shims::unix::android::thread::prctl;
86
use crate::shims::unix::linux_like::epoll::EvalContextExt as _;
97
use crate::shims::unix::linux_like::eventfd::EvalContextExt as _;
@@ -27,14 +25,12 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
2725
match link_name.as_str() {
2826
// epoll, eventfd
2927
"epoll_create1" => {
30-
let [flag] =
31-
this.check_shim(abi, Conv::C, link_name, args)?;
28+
let [flag] = this.check_shim(abi, Conv::C, link_name, args)?;
3229
let result = this.epoll_create1(flag)?;
3330
this.write_scalar(result, dest)?;
3431
}
3532
"epoll_ctl" => {
36-
let [epfd, op, fd, event] =
37-
this.check_shim(abi, Conv::C, link_name, args)?;
33+
let [epfd, op, fd, event] = this.check_shim(abi, Conv::C, link_name, args)?;
3834
let result = this.epoll_ctl(epfd, op, fd, event)?;
3935
this.write_scalar(result, dest)?;
4036
}
@@ -44,8 +40,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
4440
this.epoll_wait(epfd, events, maxevents, timeout, dest)?;
4541
}
4642
"eventfd" => {
47-
let [val, flag] =
48-
this.check_shim(abi, Conv::C, link_name, args)?;
43+
let [val, flag] = this.check_shim(abi, Conv::C, link_name, args)?;
4944
let result = this.eventfd(val, flag)?;
5045
this.write_scalar(result, dest)?;
5146
}

Diff for: ‎src/tools/miri/src/shims/unix/foreign_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::ffi::OsStr;
22
use std::str;
33

44
use rustc_abi::Size;
5-
use rustc_middle::ty::layout::LayoutOf;
65
use rustc_middle::ty::Ty;
6+
use rustc_middle::ty::layout::LayoutOf;
77
use rustc_span::Symbol;
88
use rustc_target::callconv::{Conv, FnAbi};
99

Diff for: ‎src/tools/miri/src/shims/unix/freebsd/foreign_items.rs

+7-14
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
2222
match link_name.as_str() {
2323
// Threading
2424
"pthread_set_name_np" => {
25-
let [thread, name] =
26-
this.check_shim(abi, Conv::C, link_name, args)?;
25+
let [thread, name] = this.check_shim(abi, Conv::C, link_name, args)?;
2726
let max_len = usize::MAX; // FreeBSD does not seem to have a limit.
2827
// FreeBSD's pthread_set_name_np does not return anything.
2928
this.pthread_setname_np(
@@ -34,8 +33,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
3433
)?;
3534
}
3635
"pthread_get_name_np" => {
37-
let [thread, name, len] =
38-
this.check_shim(abi, Conv::C, link_name, args)?;
36+
let [thread, name, len] = this.check_shim(abi, Conv::C, link_name, args)?;
3937
// FreeBSD's pthread_get_name_np does not return anything
4038
// and uses strlcpy, which truncates the resulting value,
4139
// but always adds a null terminator (except for zero-sized buffers).
@@ -52,26 +50,22 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
5250
// For those, we both intercept `func` and `call@FBSD_1.0` symbols cases
5351
// since freebsd 12 the former form can be expected.
5452
"stat" | "stat@FBSD_1.0" => {
55-
let [path, buf] =
56-
this.check_shim(abi, Conv::C, link_name, args)?;
53+
let [path, buf] = this.check_shim(abi, Conv::C, link_name, args)?;
5754
let result = this.macos_fbsd_solaris_stat(path, buf)?;
5855
this.write_scalar(result, dest)?;
5956
}
6057
"lstat" | "lstat@FBSD_1.0" => {
61-
let [path, buf] =
62-
this.check_shim(abi, Conv::C, link_name, args)?;
58+
let [path, buf] = this.check_shim(abi, Conv::C, link_name, args)?;
6359
let result = this.macos_fbsd_solaris_lstat(path, buf)?;
6460
this.write_scalar(result, dest)?;
6561
}
6662
"fstat" | "fstat@FBSD_1.0" => {
67-
let [fd, buf] =
68-
this.check_shim(abi, Conv::C, link_name, args)?;
63+
let [fd, buf] = this.check_shim(abi, Conv::C, link_name, args)?;
6964
let result = this.macos_fbsd_solaris_fstat(fd, buf)?;
7065
this.write_scalar(result, dest)?;
7166
}
7267
"readdir_r" | "readdir_r@FBSD_1.0" => {
73-
let [dirp, entry, result] =
74-
this.check_shim(abi, Conv::C, link_name, args)?;
68+
let [dirp, entry, result] = this.check_shim(abi, Conv::C, link_name, args)?;
7569
let result = this.macos_fbsd_readdir_r(dirp, entry, result)?;
7670
this.write_scalar(result, dest)?;
7771
}
@@ -86,8 +80,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
8680
// Incomplete shims that we "stub out" just to get pre-main initialization code to work.
8781
// These shims are enabled only when the caller is in the standard library.
8882
"pthread_attr_get_np" if this.frame_in_std() => {
89-
let [_thread, _attr] =
90-
this.check_shim(abi, Conv::C, link_name, args)?;
83+
let [_thread, _attr] = this.check_shim(abi, Conv::C, link_name, args)?;
9184
this.write_null(dest)?;
9285
}
9386

0 commit comments

Comments
 (0)