Rustup to rustc 1.17.0-nightly (824c9ebbd 2017-03-12)

diff --git a/src/lvalue.rs b/src/lvalue.rs
index d4d292cd4e53e9209377ccfb535b37248982b6e0..8971f050a8998817d9709737d85004a7f41e2d74 100644 (file)
--- a/src/lvalue.rs
+++ b/src/lvalue.rs
@@ -137,9 +137,9 @@ pub(super) fn eval_lvalue(&mut self, mir_lvalue: &mir::Lvalue<'tcx>) -> EvalResu
             Local(mir::RETURN_POINTER) => self.frame().return_lvalue,
             Local(local) => Lvalue::Local { frame: self.stack.len() - 1, local, field: None },
 
-            Static(def_id) => {
+            Static(ref statik) => {
                 let substs = self.tcx.intern_substs(&[]);
-                Lvalue::Global(GlobalId { def_id, substs, promoted: None })
+                Lvalue::Global(GlobalId { def_id: statik.def_id, substs, promoted: None })
             }
 
             Projection(ref proj) => return self.eval_lvalue_projection(proj),

diff --git a/src/step.rs b/src/step.rs
index c08ac9693a4b1d28f7ae8942c07a4ea4090711eb..ced709b3a9340c8d21f6c94c750ab98b1e00c3dc 100644 (file)
--- a/src/step.rs
+++ b/src/step.rs
@@ -242,7 +242,8 @@ fn visit_lvalue(
         location: mir::Location
     ) {
         self.super_lvalue(lvalue, context, location);
-        if let mir::Lvalue::Static(def_id) = *lvalue {
+        if let mir::Lvalue::Static(ref statik) = *lvalue {
+            let def_id = statik.def_id;
             let substs = self.ecx.tcx.intern_substs(&[]);
             let span = self.span;
             if let Some(node_item) = self.ecx.tcx.hir.get_if_local(def_id) {