bjoernager/rust
bjoernager/rust
1
Fork 0
Code 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 5a6ca7a38d
commit c53fa9a898
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_save_analysis/lib.rs
View file

@ -545,7 +545,11 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
} }
pub fn get_path_data(&self, id: NodeId, path: &ast::Path) -> Option<Data> { pub fn get_path_data(&self, id: NodeId, path: &ast::Path) -> Option<Data> {
<<<<<<< HEAD
let def = self.get_path_def(id); let def = self.get_path_def(id);
=======
let def = option_try!(self.tcx.expect_resolution(id).maybe_full_def());
>>>>>>> save-analysis: fix ICE on partially resolved path
let sub_span = self.span_utils.span_for_last_ident(path.span); let sub_span = self.span_utils.span_for_last_ident(path.span);
filter!(self.span_utils, sub_span, path.span, None); filter!(self.span_utils, sub_span, path.span, None);
match def { match def {