//! Main evaluator loop and setting up the initial stack frame.
+use std::collections::HashSet;
use std::ffi::OsStr;
use std::iter;
+use std::panic::{self, AssertUnwindSafe};
+use std::thread;
use log::info;
use rustc_session::config::EntryFnType;
-use std::collections::HashSet;
-
use crate::*;
#[derive(Copy, Clone, Debug, PartialEq)]
pub data_race_detector: bool,
/// Determine if weak memory emulation should be enabled. Requires data race detection to be enabled
pub weak_memory_emulation: bool,
+ /// Track when an outdated (weak memory) load happens.
+ pub track_outdated_loads: bool,
/// Rate of spurious failures for compare_exchange_weak atomic operations,
/// between 0.0 and 1.0, defaulting to 0.8 (80% chance of failure).
pub cmpxchg_weak_failure_rate: f64,
tracked_alloc_ids: HashSet::default(),
data_race_detector: true,
weak_memory_emulation: true,
+ track_outdated_loads: false,
cmpxchg_weak_failure_rate: 0.8, // 80%
measureme_out: None,
panic_on_unsupported: false,
entry_id: DefId,
entry_type: EntryFnType,
config: &MiriConfig,
-) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Tag>)> {
+) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Provenance>)> {
let param_env = ty::ParamEnv::reveal_all();
let layout_cx = LayoutCx { tcx, param_env };
let mut ecx = InterpCx::new(
// Third argument (`argv`): created from `config.args`.
let argv = {
// Put each argument in memory, collect pointers.
- let mut argvs = Vec::<Immediate<Tag>>::new();
+ let mut argvs = Vec::<Immediate<Provenance>>::new();
for arg in config.args.iter() {
// Make space for `0` terminator.
let size = u64::try_from(arg.len()).unwrap().checked_add(1).unwrap();
};
// Perform the main execution.
- let res: InterpResult<'_, i64> = (|| {
+ let res: thread::Result<InterpResult<'_, i64>> = panic::catch_unwind(AssertUnwindSafe(|| {
// Main loop.
loop {
let info = ecx.preprocess_diagnostics();
}
let return_code = ecx.read_scalar(&ret_place.into())?.to_machine_isize(&ecx)?;
Ok(return_code)
- })();
-
- // Machine cleanup.
- // Execution of the program has halted so any memory access we do here
- // cannot produce a real data race. If we do not do something to disable
- // data race detection here, some uncommon combination of errors will
- // cause a data race to be detected:
- // https://github.com/rust-lang/miri/issues/2020
- ecx.allow_data_races_mut(|ecx| EnvVars::cleanup(ecx).unwrap());
+ }));
+ let res = res.unwrap_or_else(|panic_payload| {
+ ecx.handle_ice();
+ panic::resume_unwind(panic_payload)
+ });
+
+ // Machine cleanup. Only do this if all threads have terminated; threads that are still running
+ // might cause data races (https://github.com/rust-lang/miri/issues/2020) or Stacked Borrows
+ // errors (https://github.com/rust-lang/miri/issues/2396) if we deallocate here.
+ if ecx.have_all_terminated() {
+ EnvVars::cleanup(&mut ecx).unwrap();
+ }
// Process the result.
match res {