use rand::rngs::StdRng;
use rand::SeedableRng;
+use log::info;
use rustc_hir::def_id::DefId;
use rustc_middle::ty::{self, layout::LayoutCx, TyCtxt};
pub args: Vec<String>,
/// The seed to use when non-determinism or randomness are required (e.g. ptr-to-int cast, `getrandom()`).
pub seed: Option<u64>,
- /// The stacked borrow id to report about
+ /// The stacked borrows pointer id to report about
pub tracked_pointer_tag: Option<PtrId>,
+ /// The stacked borrows call ID to report about
+ pub tracked_call_id: Option<CallId>,
/// The allocation id to report about.
pub tracked_alloc_id: Option<AllocId>,
}
args: vec![],
seed: None,
tracked_pointer_tag: None,
+ tracked_call_id: None,
tracked_alloc_id: None,
}
}
main_id: DefId,
config: MiriConfig,
) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Tag>)> {
- let tcx_at = tcx.at(rustc_span::source_map::DUMMY_SP);
let param_env = ty::ParamEnv::reveal_all();
let layout_cx = LayoutCx { tcx, param_env };
let mut ecx = InterpCx::new(
- tcx_at,
+ tcx,
+ rustc_span::source_map::DUMMY_SP,
param_env,
Evaluator::new(config.communicate, config.validate, layout_cx),
MemoryExtra::new(
StdRng::seed_from_u64(config.seed.unwrap_or(0)),
config.stacked_borrows,
config.tracked_pointer_tag,
+ config.tracked_call_id,
config.tracked_alloc_id,
config.check_alignment,
),
/// Returns `Some(return_code)` if program executed completed.
/// Returns `None` if an evaluation error occured.
pub fn eval_main<'tcx>(tcx: TyCtxt<'tcx>, main_id: DefId, config: MiriConfig) -> Option<i64> {
- // FIXME: on Windows, we ignore leaks (https://github.com/rust-lang/miri/issues/1302).
- let ignore_leaks = config.ignore_leaks || tcx.sess.target.target.target_os == "windows";
+ // Copy setting before we move `config`.
+ let ignore_leaks = config.ignore_leaks;
let (mut ecx, ret_place) = match create_ecx(tcx, main_id, config) {
Ok(v) => v,
- Err(mut err) => {
+ Err(err) => {
err.print_backtrace();
panic!("Miri initialization error: {}", err.kind)
}
let res: InterpResult<'_, i64> = (|| {
// Main loop.
loop {
+ let info = ecx.preprocess_diagnostics();
match ecx.schedule()? {
SchedulingAction::ExecuteStep => {
assert!(ecx.step()?, "a terminated thread was scheduled for execution");
}
+ SchedulingAction::ExecuteTimeoutCallback => {
+ assert!(ecx.machine.communicate,
+ "scheduler callbacks require disabled isolation, but the code \
+ that created the callback did not check it");
+ ecx.run_timeout_callback()?;
+ }
SchedulingAction::ExecuteDtors => {
- ecx.run_tls_dtors_for_active_thread()?;
+ // This will either enable the thread again (so we go back
+ // to `ExecuteStep`), or determine that this thread is done
+ // for good.
+ ecx.schedule_next_tls_dtor_for_active_thread()?;
}
SchedulingAction::Stop => {
break;
}
}
- ecx.process_diagnostics();
+ ecx.process_diagnostics(info);
}
- // Read the return code pointer *before* we run TLS destructors, to assert
- // that it was written to by the time that `start` lang item returned.
- let return_code = ecx.read_scalar(ret_place.into())?.not_undef()?.to_machine_isize(&ecx)?;
- // Run Windows destructors. (We do not support concurrency on Windows
- // yet, so we run the destructor of the main thread separately.)
- ecx.run_windows_tls_dtors()?;
+ let return_code = ecx.read_scalar(ret_place.into())?.check_init()?.to_machine_isize(&ecx)?;
Ok(return_code)
})();
match res {
Ok(return_code) => {
if !ignore_leaks {
- let leaks = ecx.memory.leak_report();
+ info!("Additonal static roots: {:?}", ecx.machine.static_roots);
+ let leaks = ecx.memory.leak_report(&ecx.machine.static_roots);
if leaks != 0 {
tcx.sess.err("the evaluated program leaked memory");
// Ignore the provided return code - let the reported error