OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save-analysis: fix ICE on partially resolved path

Browse Source 
Occurs when we produce save-analysis before type checking is complete (due to errors).
This commit is contained in:
Nick Cameron 2016-11-21 18:11:36 +13:00
parent 4bc9290133
commit 3295afa6e2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/librustc/hir/def.rs
View File

@ -85,10 +85,15 @@ impl PathResolution {
/// Get the definition, if fully resolved, otherwise panic.
pub fn full_def(&self) -> Def {
if self.depth != 0 {
bug!("path not fully resolved: {:?}", self);
self.maybe_full_def().unwrap_or_else(|| bug!("path not fully resolved: {:?}", self))
}
pub fn maybe_full_def(&self) -> Option<Def> {
if self.depth == 0 {
Some(self.base_def)
} else {
None
}
self.base_def
}
pub fn kind_name(&self) -> &'static str {

2
src/librustc_save_analysis/lib.rs
View File

@ -497,7 +497,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
}
pub fn get_path_data(&self, id: NodeId, path: &ast::Path) -> Option<Data> {
let def = self.tcx.expect_def(id);
let def = option_try!(self.tcx.expect_resolution(id).maybe_full_def());
let sub_span = self.span_utils.span_for_last_ident(path.span);
filter!(self.span_utils, sub_span, path.span, None);
match def {