bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Oliver Schneider 2017-03-13 11:28:45 +01:00
parent 41d59b117a
commit 4cb1f639b7
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lvalue.rs
View file

@ -137,9 +137,9 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
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),

3
src/step.rs
View file

@ -242,7 +242,8 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> {
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) {