user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix genmc build

Browse source
This commit is contained in:
Ralf Jung 2025-10-15 21:58:02 +02:00
parent 7c28d96b7a
commit 952be8e886
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/miri/src/concurrency/genmc/global_allocations.rs
View file

@ -6,7 +6,7 @@ use rand::SeedableRng;
use rand::rngs::StdRng;
use rustc_const_eval::interpret::{AllocId, AllocInfo, InterpResult, interp_ok};
use rustc_data_structures::fx::FxHashMap;
use tracing::debug;
use rustc_log::tracing::debug;
use crate::alloc_addresses::AddressGenerator;

1
src/tools/miri/src/concurrency/genmc/run.rs
View file

@ -3,6 +3,7 @@ use std::sync::Arc;
use std::time::Instant;
use genmc_sys::EstimationResult;
use rustc_log::tracing;
use rustc_middle::ty::TyCtxt;
use super::GlobalState;

3
src/tools/miri/src/concurrency/genmc/scheduling.rs
View file

@ -1,4 +1,5 @@
use genmc_sys::{ActionKind, ExecutionState};
use rustc_data_structures::either::Either;
use rustc_middle::mir::TerminatorKind;
use rustc_middle::ty::{self, Ty};
@ -38,7 +39,7 @@ fn get_next_instruction_kind<'tcx>(
let Some(frame) = thread_manager.active_thread_stack().last() else {
return interp_ok(NonAtomic);
};
let either::Either::Left(loc) = frame.current_loc() else {
let Either::Left(loc) = frame.current_loc() else {
// We are unwinding, so the next step is definitely not atomic.
return interp_ok(NonAtomic);
};