dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from pythonesque/fix-const-lookup 

Fix panic during constant lookup.
This commit is contained in:
Manish Goregaokar 2015-05-07 10:51:31 +05:30
parent 9b3264e693 a175463acc
commit 0f77b8cb38
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bit_mask.rs
View File

@ -142,14 +142,16 @@ fn fetch_int_literal(cx: &Context, lit : &Expr) -> Option<u64> {
} else { Option::None }
},
&ExprPath(_, _) => {
let def_map = cx.tcx.def_map.borrow();
let path_res_op = def_map.get(&lit.id);
path_res_op.as_ref().and_then(|x| {
if let &DefConst(def_id) = &x.base_def {
lookup_const_by_id(cx.tcx, def_id, Option::None).and_then(|l| fetch_int_literal(cx, l))
} else { Option::None }
})
},
// Important to let the borrow expire before the const lookup to avoid double
// borrowing.
let def_map = cx.tcx.def_map.borrow();
match def_map.get(&lit.id) {
Some(&PathResolution { base_def: DefConst(def_id), ..}) => Some(def_id),
_ => None
}
}
.and_then(|def_id| lookup_const_by_id(cx.tcx, def_id, Option::None))
.and_then(|l| fetch_int_literal(cx, l)),
_ => Option::None
}
}