Skip to content

Commit

Permalink
Rollup merge of rust-lang#65689 - RalfJung:miri-debug, r=Centril
Browse files Browse the repository at this point in the history
bring back some Debug instances for Miri

These were erroneously removed in rust-lang#65647, but Miri needs them.

r? @Centril Cc @nnethercote @oli-obk
  • Loading branch information
JohnTitor committed Oct 23, 2019
2 parents c3e5413 + fc5b485 commit 12f32c2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_mir/interpret/eval_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pub struct Frame<'mir, 'tcx, Tag=(), Extra=()> {
pub extra: Extra,
}

#[derive(Clone, Eq, PartialEq)]
#[derive(Clone, Eq, PartialEq, Debug)] // Miri debug-prints these
pub enum StackPopCleanup {
/// Jump to the next block in the caller, or cause UB if None (that's a function
/// that may never return). Also store layout of return place so
Expand All @@ -113,7 +113,7 @@ pub struct LocalState<'tcx, Tag=(), Id=AllocId> {
}

/// Current value of a local variable
#[derive(Clone, PartialEq, Eq)]
#[derive(Clone, PartialEq, Eq, Debug)] // Miri debug-prints these
pub enum LocalValue<Tag=(), Id=AllocId> {
/// This local is not currently alive, and cannot be used at all.
Dead,
Expand Down

0 comments on commit 12f32c2

Please sign in to comment.