mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor code so the call to codemap.files() does not deadlock

Browse Source
This commit is contained in:
John Kåre Alsaker 2017-12-03 14:08:21 +01:00
parent 94b712413b
commit f7082dcafb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/ich/caching_codemap_view.rs
View File

@ -78,11 +78,9 @@ pub fn byte_pos_to_line_and_col(&mut self,
// If the entry doesn't point to the correct file, fix it up
if pos < cache_entry.file.start_pos || pos >= cache_entry.file.end_pos {
let file_valid;
let files = self.codemap.files();
if files.len() > 0 {
if self.codemap.files().len() > 0 {
let file_index = self.codemap.lookup_filemap_idx(pos);
let file = files[file_index].clone();
let file = self.codemap.files()[file_index].clone();
if pos >= file.start_pos && pos < file.end_pos {
cache_entry.file = file;