From 860e2b802f6ef77b64c1cc25219e6548a0a851cb Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Date: Mon, 7 May 2018 10:44:18 +0200
Subject: [PATCH] Dedup tag reading

---
 miri/validation.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/miri/validation.rs b/miri/validation.rs
index 5b919a09bd91..8f444f19bd86 100644
--- a/miri/validation.rs
+++ b/miri/validation.rs
@@ -455,10 +455,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
                     }
 
                     // Discriminant field for enums (where applicable).
-                    Variants::Tagged { ref tag, .. } => {
-                        assert_eq!(i, 0);
-                        return Ok(tag.value.to_ty(tcx))
-                    },
+                    Variants::Tagged { tag: ref discr, .. } |
                     Variants::NicheFilling { niche: ref discr, .. } => {
                         assert_eq!(i, 0);
                         return Ok(discr.value.to_ty(tcx))