Skip to content

Commit a953b32

Browse files
miri: Directly use rustc_abi
1 parent 7c7bb7d commit a953b32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+526
-485
lines changed

src/tools/miri/clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
arithmetic-side-effects-allowed = ["rustc_target::abi::Size"]
1+
arithmetic-side-effects-allowed = ["rustc_abi::Size"]

src/tools/miri/src/alloc_addresses/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use std::cell::RefCell;
77
use std::cmp::max;
88

99
use rand::Rng;
10+
use rustc_abi::{Align, Size};
1011
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1112
use rustc_span::Span;
12-
use rustc_target::abi::{Align, Size};
1313

1414
use self::reuse_pool::ReusePool;
1515
use crate::concurrency::VClock;

src/tools/miri/src/alloc_addresses/reuse_pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Manages a pool of addresses that can be reused.
22
33
use rand::Rng;
4-
use rustc_target::abi::{Align, Size};
4+
use rustc_abi::{Align, Size};
55

66
use crate::concurrency::VClock;
77
use crate::{MemoryKind, MiriConfig, ThreadId};

src/tools/miri/src/alloc_bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::alloc::Layout;
22
use std::borrow::Cow;
33
use std::{alloc, slice};
44

5+
use rustc_abi::{Align, Size};
56
use rustc_middle::mir::interpret::AllocBytes;
6-
use rustc_target::abi::{Align, Size};
77

88
/// Allocation bytes that explicitly handle the layout of the data they're storing.
99
/// This is necessary to interface with native code that accesses the program store in Miri.

src/tools/miri/src/bin/miri.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
extern crate tracing;
1212

1313
// The rustc crates we need
14+
extern crate rustc_abi;
1415
extern crate rustc_data_structures;
1516
extern crate rustc_driver;
1617
extern crate rustc_hir;
@@ -21,14 +22,14 @@ extern crate rustc_metadata;
2122
extern crate rustc_middle;
2223
extern crate rustc_session;
2324
extern crate rustc_span;
24-
extern crate rustc_target;
2525

2626
use std::env::{self, VarError};
2727
use std::num::NonZero;
2828
use std::path::PathBuf;
2929
use std::str::FromStr;
3030

3131
use miri::{BacktraceStyle, BorrowTrackerMethod, ProvenanceMode, RetagFields, ValidationMode};
32+
use rustc_abi::ExternAbi;
3233
use rustc_data_structures::sync::Lrc;
3334
use rustc_driver::Compilation;
3435
use rustc_hir::def_id::LOCAL_CRATE;
@@ -47,7 +48,6 @@ use rustc_session::config::{CrateType, EntryFnType, ErrorOutputType, OptLevel};
4748
use rustc_session::search_paths::PathKind;
4849
use rustc_session::{CtfeBacktrace, EarlyDiagCtxt};
4950
use rustc_span::def_id::DefId;
50-
use rustc_target::spec::abi::Abi;
5151
use tracing::debug;
5252

5353
struct MiriCompilerCalls {
@@ -368,7 +368,7 @@ fn entry_fn(tcx: TyCtxt<'_>) -> (DefId, EntryFnType) {
368368
tcx.types.isize,
369369
false,
370370
hir::Safety::Safe,
371-
Abi::Rust,
371+
ExternAbi::Rust,
372372
));
373373

374374
let correct_func_sig = check_function_signature(

src/tools/miri/src/borrow_tracker/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::cell::RefCell;
22
use std::fmt;
33
use std::num::NonZero;
44

5+
use rustc_abi::Size;
56
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
67
use rustc_middle::mir::RetagKind;
7-
use rustc_target::abi::Size;
88
use smallvec::SmallVec;
99

1010
use crate::*;

src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::fmt;
22

3+
use rustc_abi::Size;
34
use rustc_data_structures::fx::FxHashSet;
45
use rustc_span::{Span, SpanData};
5-
use rustc_target::abi::Size;
66
use smallvec::SmallVec;
77

88
use crate::borrow_tracker::{GlobalStateInner, ProtectorKind};

src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
1313
use std::{fmt, mem};
1414

15+
use rustc_abi::Size;
1516
use rustc_data_structures::fx::FxHashSet;
1617
use rustc_span::Span;
17-
use rustc_target::abi::Size;
1818
use smallvec::SmallVec;
1919

2020
use crate::borrow_tracker::tree_borrows::Permission;

src/tools/miri/src/concurrency/cpu_affinity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use rustc_abi::Endian;
12
use rustc_middle::ty::layout::LayoutOf;
2-
use rustc_target::abi::Endian;
33

44
use crate::*;
55

src/tools/miri/src/concurrency/data_race.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ use std::cell::{Cell, Ref, RefCell, RefMut};
4444
use std::fmt::Debug;
4545
use std::mem;
4646

47+
use rustc_abi::{Align, HasDataLayout, Size};
4748
use rustc_ast::Mutability;
4849
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
4950
use rustc_index::{Idx, IndexVec};
5051
use rustc_middle::mir;
5152
use rustc_middle::ty::Ty;
5253
use rustc_span::Span;
53-
use rustc_target::abi::{Align, HasDataLayout, Size};
5454

5555
use super::vector_clock::{VClock, VTimestamp, VectorIdx};
5656
use super::weak_memory::EvalContextExt as _;

0 commit comments

Comments
 (0)