Skip to content

Commit f7082dc

Browse files
committed
Refactor code so the call to codemap.files() does not deadlock
1 parent 94b7124 commit f7082dc

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/librustc/ich/caching_codemap_view.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,9 @@ impl<'cm> CachingCodemapView<'cm> {
7878
// If the entry doesn't point to the correct file, fix it up
7979
if pos < cache_entry.file.start_pos || pos >= cache_entry.file.end_pos {
8080
let file_valid;
81-
let files = self.codemap.files();
82-
83-
if files.len() > 0 {
81+
if self.codemap.files().len() > 0 {
8482
let file_index = self.codemap.lookup_filemap_idx(pos);
85-
let file = files[file_index].clone();
83+
let file = self.codemap.files()[file_index].clone();
8684

8785
if pos >= file.start_pos && pos < file.end_pos {
8886
cache_entry.file = file;

0 commit comments

Comments
 (0)