bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: avoid loading the same source-file multiple times

Browse source 
We already had a cache for file contents, but we read the source-file
before testing the cache, causing obvious slowness, so this just avoids
loading the source-file when the cache already has the contents.
This commit is contained in:
Ariel Ben-Yehuda 2017-08-01 14:17:11 +03:00
parent 91aff5775d
commit c9d14a846f
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libsyntax/codemap.rs
View file

@ -561,8 +561,9 @@ impl CodeMapper for CodeMap {
sp sp
} }
fn ensure_filemap_source_present(&self, file_map: Rc<FileMap>) -> bool { fn ensure_filemap_source_present(&self, file_map: Rc<FileMap>) -> bool {
let src = self.file_loader.read_file(Path::new(&file_map.name)).ok(); file_map.add_external_src(
return file_map.add_external_src(src) || self.file_loader.read_file(Path::new(&file_map.name)).ok()
)
} }
} }

5
src/libsyntax_pos/lib.rs
View file

@ -618,8 +618,11 @@ impl FileMap {
/// If the hash of the input doesn't match or no input is supplied via None, /// If the hash of the input doesn't match or no input is supplied via None,
/// it is interpreted as an error and the corresponding enum variant is set. /// it is interpreted as an error and the corresponding enum variant is set.
/// The return value signifies whether some kind of source is present. /// The return value signifies whether some kind of source is present.
pub fn add_external_src(&self, src: Option<String>) -> bool { pub fn add_external_src<F>(&self, get_src: F) -> bool
where F: FnOnce() -> Option<String>
{
if *self.external_src.borrow() == ExternalSource::AbsentOk { if *self.external_src.borrow() == ExternalSource::AbsentOk {
let src = get_src();
let mut external_src = self.external_src.borrow_mut(); let mut external_src = self.external_src.borrow_mut();
if let Some(src) = src { if let Some(src) = src {
let mut hasher: StableHasher<u128> = StableHasher::new(); let mut hasher: StableHasher<u128> = StableHasher::new();