From 3ceae8db47ec82774df29c45b2d89d379bfd1676 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Mon, 24 Sep 2018 16:53:49 +0200 Subject: [PATCH] Also remap absolute source names in save-analysis --- src/librustc_save_analysis/span_utils.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/librustc_save_analysis/span_utils.rs b/src/librustc_save_analysis/span_utils.rs index 56728aed7692..47677a751712 100644 --- a/src/librustc_save_analysis/span_utils.rs +++ b/src/librustc_save_analysis/span_utils.rs @@ -37,11 +37,18 @@ impl<'a> SpanUtils<'a> { pub fn make_filename_string(&self, file: &SourceFile) -> String { match &file.name { - FileName::Real(path) if !path.is_absolute() && !file.name_was_remapped => { - self.sess.working_dir.0 - .join(&path) - .display() - .to_string() + FileName::Real(path) if !file.name_was_remapped => { + if path.is_absolute() { + self.sess.source_map().path_mapping() + .map_prefix(path.clone()).0 + .display() + .to_string() + } else { + self.sess.working_dir.0 + .join(&path) + .display() + .to_string() + } }, // If the file name is already remapped, we assume the user // configured it the way they wanted to, so use that directly