Skip to content

Make the necessary changes to support concurrency in Miri. #70598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 20, 2020
Merged

Make the necessary changes to support concurrency in Miri. #70598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c53210c
Make the necessary changes to support concurrency in Miri.
Mar 16, 2020
7e6dbd2
Address reviewers' comments: replace resolve_thread_local_allocation_…
Mar 31, 2020
2960a6c
Clarify the comments explaining the purpose of resolve_maybe_global_a…
Apr 2, 2020
9e46807
Add function eval_maybe_thread_local_static_const that allows handlin…
Apr 14, 2020
738ebcf
Remove now unnecessary resolve_maybe_global_alloc.
Apr 15, 2020
844eead
Rename Machine::eval_maybe_thread_local_static_const to adjust_global…
Apr 16, 2020
d41f8bf
Move the explanation why adjust_global_const is called for all consta…
Apr 16, 2020
cbd9222
Move stack access methods in the Machine implementations out of the e…
Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_mir/interpret/machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
/// `canonical_alloc_id` would result in pointer pointing to `t2`'s thread
/// local and not `t1` as it should.
#[inline]
fn eval_maybe_thread_local_static_const(
fn adjust_global_const(
_ecx: &InterpCx<'mir, 'tcx, Self>,
val: mir::interpret::ConstValue<'tcx>,
) -> InterpResult<'tcx, mir::interpret::ConstValue<'tcx>> {
Expand Down
7 changes: 6 additions & 1 deletion src/librustc_mir/interpret/operand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
}
ty::ConstKind::Value(val_val) => val_val,
};
let val_val = M::eval_maybe_thread_local_static_const(self, val_val)?;
// This call allows the machine to create fresh allocation ids for
// thread-local statics (see the `adjust_global_const` function
// documentation). Please note that the `const_eval` call in the early
// return above calls `eval_const_to_op` again, so `adjust_global_const`
// is guaranteed to be called for all constants.
let val_val = M::adjust_global_const(self, val_val)?;
// Other cases need layout.
let layout = from_known_layout(self.tcx, layout, || self.layout_of(val.ty))?;
let op = match val_val {
Expand Down