From 9db9308a79c0b66d71e4926381aa51553c4ff042 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 15 Sep 2017 08:58:12 +0200
Subject: [PATCH] Storage{Live,Dead} in generators got fixed

---
 src/librustc_mir/interpret/eval_context.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
index 190e3018c7f4..780155214a09 100644
--- a/src/librustc_mir/interpret/eval_context.rs
+++ b/src/librustc_mir/interpret/eval_context.rs
@@ -488,10 +488,7 @@ fn collect_storage_annotations<'tcx>(mir: &'tcx mir::Mir<'tcx>) -> HashSet<mir::
         // `Value` for that.
         let num_locals = mir.local_decls.len() - 1;
 
-        // FIXME: generators produce broken storage annotations (https://github.com/rust-lang/rust/issues/44179)
-        let locals = if mir.generator_layout.is_some() {
-            vec![Some(Value::ByVal(PrimVal::Undef)); num_locals]
-        } else {
+        let locals = {
             let annotated_locals = collect_storage_annotations(mir);
             let mut locals = vec![None; num_locals];
             for i in 0..num_locals {