seems like for generators we cannot access the freevars

rust-lang · Oct 13, 2018 · d0c585c · d0c585c
1 parent 93f53e5
commit d0c585c
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/librustc_mir/interpret/validity.rs b/src/librustc_mir/interpret/validity.rs
@@ -559,12 +559,16 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
             // generators and closures.
             ty::Closure(def_id, _) | ty::Generator(def_id, _, _) => {
                 if let Some(node_id) = self.tcx.hir.as_local_node_id(def_id) {
-                    let freevar = self.tcx.with_freevars(node_id, |fv| fv[field]);
-                    PathElem::ClosureVar(self.tcx.hir.name(freevar.var_id()))
-                } else {
-                    // The closure is not local, so we cannot get the name
-                    PathElem::ClosureVar(Symbol::intern(&field.to_string()))
+                    if let Some(freevar) = self.tcx.with_freevars(
+                        node_id,
+                        |fv| fv.get(field).map(|field| *field))
+                    {
+                        return PathElem::ClosureVar(self.tcx.hir.name(freevar.var_id()));
+                    }
                 }
+                // The closure is not local, or the freevars don't match up (seen for a generator!),
+                // so we cannot get the name.
+                PathElem::ClosureVar(Symbol::intern(&field.to_string()))
             }
 
             // tuples