about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-10-23 17:14:44 +0900
committerGitHub <noreply@github.com>2019-10-23 17:14:44 +0900
commit12f32c2f292463132e84eceddd22330ddebe9ad8 (patch)
treee15e52918dd7a868626e2fd6ddbbf89d0a3322ff /src
parentc3e5413813e5798f5b50da096a7d96b752c4c518 (diff)
parentfc5b48514ef6cc74a81686e71b7efe3659fcadb5 (diff)
downloadrust-12f32c2f292463132e84eceddd22330ddebe9ad8.tar.gz
rust-12f32c2f292463132e84eceddd22330ddebe9ad8.zip
Rollup merge of #65689 - RalfJung:miri-debug, r=Centril
bring back some Debug instances for Miri

These were erroneously removed in https://github.com/rust-lang/rust/pull/65647, but Miri needs them.

r? @Centril Cc @nnethercote @oli-obk
Diffstat (limited to 'src')
-rw-r--r--src/librustc_mir/interpret/eval_context.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
index 2ab7c41bb78..d929e958f05 100644
--- a/src/librustc_mir/interpret/eval_context.rs
+++ b/src/librustc_mir/interpret/eval_context.rs
@@ -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
@@ -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,