bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix --pretty=expanded with --remap-path-prefix

Browse source 
Per https://github.com/rust-lang/rust/issues/80832, using
--pretty=expanded and --remap-path-prefix results in an ICE.

This is becasue the session source files table is stored in remapped
form, whereas --pretty-expanded looks up unremapped files. This remaps
the path prefixes before lookup.
This commit is contained in:
Jeremy Fitzhardinge 2021-01-09 16:04:48 -08:00
parent 6184f23950
commit 67978d56c1
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_span/src/source_map.rs
View file

@ -870,8 +870,10 @@ impl SourceMap {
}
pub fn get_source_file(&self, filename: &FileName) -> Option<Lrc<SourceFile>> {
// Remap filename before lookup
let filename = self.path_mapping().map_filename_prefix(filename).0;
for sf in self.files.borrow().source_files.iter() {
if *filename == sf.name {
if filename == sf.name {
return Some(sf.clone());
}
}
@ -1039,4 +1041,15 @@ impl FilePathMapping {
(path, false)
}
fn map_filename_prefix(&self, file: &FileName) -> (FileName, bool) {
match file {
FileName::Real(realfile) => {
let path = realfile.local_path();
let (path, mapped) = self.map_prefix(path.to_path_buf());
(FileName::Real(RealFileName::Named(path)), mapped)
}
other => (other.clone(), false),
}
}
}