nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-01 20:47:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed infinite loop issues and added some improved logging.

Browse Source
This commit is contained in:
David Wood 2018-01-27 13:30:34 +00:00
parent 0c467d5d09
commit 0bd96671f0
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libsyntax/codemap.rs
View File

@ -638,25 +638,33 @@ impl CodeMap {
fn find_width_of_character_at_span(&self, sp: Span, forwards: bool) -> u32 { fn find_width_of_character_at_span(&self, sp: Span, forwards: bool) -> u32 {
// Disregard malformed spans and assume a one-byte wide character. // Disregard malformed spans and assume a one-byte wide character.
if sp.lo() >= sp.hi() { if sp.lo() >= sp.hi() {
debug!("find_width_of_character_at_span: early return malformed span");
return 1; return 1;
} }
let local_begin = self.lookup_byte_offset(sp.lo()); let local_begin = self.lookup_byte_offset(sp.lo());
let local_end = self.lookup_byte_offset(sp.hi()); let local_end = self.lookup_byte_offset(sp.hi());
debug!("find_width_of_character_at_span: local_begin=`{:?}`, local_end=`{:?}`",
local_begin, local_end);
let start_index = local_begin.pos.to_usize(); let start_index = local_begin.pos.to_usize();
let end_index = local_end.pos.to_usize(); let end_index = local_end.pos.to_usize();
debug!("find_width_of_character_at_span: start_index=`{:?}`, end_index=`{:?}`",
start_index, end_index);
// Disregard indexes that are at the start or end of their spans, they can't fit bigger // Disregard indexes that are at the start or end of their spans, they can't fit bigger
// characters. // characters.
if (!forwards && end_index == usize::min_value()) || if (!forwards && end_index == usize::min_value()) ||
(forwards && start_index == usize::max_value()) { (forwards && start_index == usize::max_value()) {
debug!("find_width_of_character_at_span: start or end of span, cannot be multibyte");
return 1; return 1;
} }
let source_len = (local_begin.fm.end_pos - local_begin.fm.start_pos).to_usize(); let source_len = (local_begin.fm.end_pos - local_begin.fm.start_pos).to_usize();
debug!("find_width_of_character_at_span: source_len=`{:?}`", source_len);
// Ensure indexes are also not malformed. // Ensure indexes are also not malformed.
if start_index > end_index || end_index > source_len { if start_index > end_index || end_index > source_len {
debug!("find_width_of_character_at_span: source indexes are malformed");
return 1; return 1;
} }
@ -671,16 +679,22 @@ impl CodeMap {
} else { } else {
return 1; return 1;
}; };
debug!("DTW start {:?} end {:?}", start_index, end_index); debug!("find_width_of_character_at_span: snippet=`{:?}`", snippet);
debug!("DTW snippet {:?}", snippet);
let file_start_pos = local_begin.fm.start_pos.to_usize();
let file_end_pos = local_begin.fm.end_pos.to_usize();
debug!("find_width_of_character_at_span: file_start_pos=`{:?}` file_end_pos=`{:?}`",
file_start_pos, file_end_pos);
let mut target = if forwards { end_index + 1 } else { end_index - 1 }; let mut target = if forwards { end_index + 1 } else { end_index - 1 };
debug!("DTW initial target {:?}", target); debug!("find_width_of_character_at_span: initial target=`{:?}`", target);
while !snippet.is_char_boundary(target - start_index) {
while !snippet.is_char_boundary(target - start_index)
&& target >= file_start_pos && target <= file_end_pos {
target = if forwards { target + 1 } else { target - 1 }; target = if forwards { target + 1 } else { target - 1 };
debug!("DTW update target {:?}", target); debug!("find_width_of_character_at_span: target=`{:?}`", target);
} }
debug!("DTW final target {:?}", target); debug!("find_width_of_character_at_span: final target=`{:?}`", target);
if forwards { if forwards {
(target - end_index) as u32 (target - end_index) as u32