use log::trace;
use rand::rngs::StdRng;
-use rustc_ast::attr;
use rustc_data_structures::fx::FxHashMap;
use rustc_middle::{
mir,
},
};
use rustc_span::symbol::{sym, Symbol};
+use rustc_span::def_id::DefId;
use rustc_target::abi::{LayoutOf, Size};
use crate::*;
C,
/// Windows `HeapAlloc` memory.
WinHeap,
- /// Memory for args, errno, extern statics and other parts of the machine-managed environment.
+ /// Memory for args, errno, and other parts of the machine-managed environment.
/// This memory may leak.
Machine,
/// Memory for env vars. Separate from `Machine` because we clean it up and leak-check it.
/// Globals copied from `tcx`.
/// This memory may leak.
Global,
+ /// Memory for extern statics.
+ /// This memory may leak.
+ ExternStatic,
+ /// Memory for thread-local statics.
+ /// This memory may leak.
+ Tls,
}
impl Into<MemoryKind<MiriMemoryKind>> for MiriMemoryKind {
use self::MiriMemoryKind::*;
match self {
Rust | C | WinHeap | Env => false,
- Machine | Global => true,
+ Machine | Global | ExternStatic | Tls => true,
}
}
}
WinHeap => write!(f, "Windows heap"),
Machine => write!(f, "machine-managed memory"),
Env => write!(f, "environment variable"),
- Global => write!(f, "global"),
+ Global => write!(f, "global (static or const)"),
+ ExternStatic => write!(f, "extern static"),
+ Tls => write!(f, "thread-local static"),
}
}
}
tracked_alloc_id: Option<AllocId>,
/// Controls whether alignment of memory accesses is being checked.
- check_alignment: bool,
+ pub(crate) check_alignment: AlignmentCheck,
}
impl MemoryExtra {
rng: StdRng,
stacked_borrows: bool,
tracked_pointer_tag: Option<PtrId>,
+ tracked_call_id: Option<CallId>,
tracked_alloc_id: Option<AllocId>,
- check_alignment: bool,
+ check_alignment: AlignmentCheck,
) -> Self {
let stacked_borrows = if stacked_borrows {
- Some(Rc::new(RefCell::new(stacked_borrows::GlobalState::new(tracked_pointer_tag))))
+ Some(Rc::new(RefCell::new(stacked_borrows::GlobalState::new(tracked_pointer_tag, tracked_call_id))))
} else {
None
};
pub fn init_extern_statics<'tcx, 'mir>(
this: &mut MiriEvalContext<'mir, 'tcx>,
) -> InterpResult<'tcx> {
- match this.tcx.sess.target.target.target_os.as_str() {
+ match this.tcx.sess.target.target_os.as_str() {
"linux" => {
// "__cxa_thread_atexit_impl"
// This should be all-zero, pointer-sized.
let layout = this.machine.layouts.usize;
- let place = this.allocate(layout, MiriMemoryKind::Machine.into());
+ let place = this.allocate(layout, MiriMemoryKind::ExternStatic.into());
this.write_scalar(Scalar::from_machine_usize(0, this), place.into())?;
Self::add_extern_static(this, "__cxa_thread_atexit_impl", place.ptr);
// "environ"
// "_tls_used"
// This is some obscure hack that is part of the Windows TLS story. It's a `u8`.
let layout = this.machine.layouts.u8;
- let place = this.allocate(layout, MiriMemoryKind::Machine.into());
+ let place = this.allocate(layout, MiriMemoryKind::ExternStatic.into());
this.write_scalar(Scalar::from_u8(0), place.into())?;
Self::add_extern_static(this, "_tls_used", place.ptr);
}
pub(crate) argv: Option<Scalar<Tag>>,
pub(crate) cmd_line: Option<Scalar<Tag>>,
- /// Last OS error location in memory. It is a 32-bit integer.
- pub(crate) last_error: Option<MPlaceTy<'tcx, Tag>>,
-
/// TLS state.
pub(crate) tls: TlsData<'tcx>,
/// Whether to enforce the validity invariant.
pub(crate) validate: bool,
- pub(crate) file_handler: FileHandler,
- pub(crate) dir_handler: DirHandler,
-
- /// The temporary used for storing the argument of
- /// the call to `miri_start_panic` (the panic payload) when unwinding.
- /// This is pointer-sized, and matches the `Payload` type in `src/libpanic_unwind/miri.rs`.
- pub(crate) panic_payload: Option<Scalar<Tag>>,
+ pub(crate) file_handler: shims::posix::FileHandler,
+ pub(crate) dir_handler: shims::posix::DirHandler,
/// The "time anchor" for this machine's monotone clock (for `Instant` simulation).
pub(crate) time_anchor: Instant,
/// Precomputed `TyLayout`s for primitive data types that are commonly used inside Miri.
pub(crate) layouts: PrimitiveLayouts<'tcx>,
+
+ /// Allocations that are considered roots of static memory (that may leak).
+ pub(crate) static_roots: Vec<AllocId>,
}
impl<'mir, 'tcx> Evaluator<'mir, 'tcx> {
argc: None,
argv: None,
cmd_line: None,
- last_error: None,
tls: TlsData::default(),
communicate,
validate,
file_handler: Default::default(),
dir_handler: Default::default(),
- panic_payload: None,
time_anchor: Instant::now(),
layouts,
threads: ThreadManager::default(),
+ static_roots: Vec::new(),
}
}
}
#[inline(always)]
fn enforce_alignment(memory_extra: &MemoryExtra) -> bool {
- memory_extra.check_alignment
+ memory_extra.check_alignment != AlignmentCheck::None
+ }
+
+ #[inline(always)]
+ fn force_int_for_alignment_check(memory_extra: &Self::MemoryExtra) -> bool {
+ memory_extra.check_alignment == AlignmentCheck::Int
}
#[inline(always)]
Ok(())
}
- fn adjust_global_const(
- ecx: &InterpCx<'mir, 'tcx, Self>,
- mut val: mir::interpret::ConstValue<'tcx>,
- ) -> InterpResult<'tcx, mir::interpret::ConstValue<'tcx>> {
- ecx.remap_thread_local_alloc_ids(&mut val)?;
- Ok(val)
+ fn thread_local_static_alloc_id(
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
+ def_id: DefId,
+ ) -> InterpResult<'tcx, AllocId> {
+ ecx.get_or_create_thread_local_alloc_id(def_id)
}
- fn canonical_alloc_id(mem: &Memory<'mir, 'tcx, Self>, id: AllocId) -> AllocId {
- let tcx = mem.tcx;
- // Figure out if this is an extern static, and if yes, which one.
- let def_id = match tcx.alloc_map.lock().get(id) {
- Some(GlobalAlloc::Static(def_id)) if tcx.is_foreign_item(def_id) => def_id,
- _ => {
- // No need to canonicalize anything.
- return id;
- }
- };
- let attrs = tcx.get_attrs(def_id);
- let link_name = match attr::first_attr_value_str_by_name(&attrs, sym::link_name) {
+ fn extern_static_alloc_id(
+ memory: &Memory<'mir, 'tcx, Self>,
+ def_id: DefId,
+ ) -> InterpResult<'tcx, AllocId> {
+ let attrs = memory.tcx.get_attrs(def_id);
+ let link_name = match memory.tcx.sess.first_attr_value_str_by_name(&attrs, sym::link_name) {
Some(name) => name,
- None => tcx.item_name(def_id),
+ None => memory.tcx.item_name(def_id),
};
- // Check if we know this one.
- if let Some(canonical_id) = mem.extra.extern_statics.get(&link_name) {
- trace!("canonical_alloc_id: {:?} ({}) -> {:?}", id, link_name, canonical_id);
- *canonical_id
+ if let Some(&id) = memory.extra.extern_statics.get(&link_name) {
+ Ok(id)
} else {
- // Return original id; `Memory::get_static_alloc` will throw an error.
- id
+ throw_unsup_format!("`extern` static {:?} is not supported by Miri", def_id)
}
}
if Some(id) == memory_extra.tracked_alloc_id {
register_diagnostic(NonHaltingDiagnostic::FreedAlloc(id));
}
-
+
Ok(())
}
ecx.active_thread_stack_mut()
}
- #[inline(always)]
- fn stack<'a>(
- ecx: &'a InterpCx<'mir, 'tcx, Self>,
- ) -> &'a [Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>] {
- &ecx.machine.stack
- }
-
- #[inline(always)]
- fn stack_mut<'a>(
- ecx: &'a mut InterpCx<'mir, 'tcx, Self>,
- ) -> &'a mut Vec<Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>> {
- &mut ecx.machine.stack
- }
-
#[inline(always)]
fn after_stack_push(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
if ecx.memory.extra.stacked_borrows.is_some() {
projects / rust.git / blobdiff