From c53fa9a8983a0195076f436e70be24f449c37afc Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Mon, 21 Nov 2016 18:11:36 +1300 Subject: [PATCH] save-analysis: fix ICE on partially resolved path Occurs when we produce save-analysis before type checking is complete (due to errors). --- src/librustc_save_analysis/lib.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index 862345fd46e..68836d8823e 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -545,7 +545,11 @@ pub fn get_path_def(&self, id: NodeId) -> Def { } pub fn get_path_data(&self, id: NodeId, path: &ast::Path) -> Option { +<<<<<<< HEAD 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); filter!(self.span_utils, sub_span, path.span, None); match def { -- 2.44.0