Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(symcache): Use saturating addition in writer #883

Merged
merged 4 commits into from
Dec 18, 2024
Merged

fix(symcache): Use saturating addition in writer #883

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbe96bc
fix(symcache): Use saturating addition in writer
loewenheim Dec 17, 2024
0159cb5
Use try_into
loewenheim Dec 18, 2024
6d1feb6
changelog
loewenheim Dec 18, 2024
161d7dd
Extract logic to function and add test
loewenheim Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions symbolic-symcache/src/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,9 @@ impl<'a> SymCacheConverter<'a> {
let mut inlinee_ranges = Vec::new();
for inlinee in &function.inlinees {
for line in &inlinee.lines {
let start = line.address as u32;
let end = (line.address + line.size.unwrap_or(1)) as u32;
let start = line.address.try_into().unwrap_or(u32::MAX);
let end =
start.saturating_add(line.size.unwrap_or(1).try_into().unwrap_or(u32::MAX));
loewenheim marked this conversation as resolved.
Show resolved Hide resolved
inlinee_ranges.push(start..end);
}
}
Expand All @@ -213,8 +214,9 @@ impl<'a> SymCacheConverter<'a> {

// Iterate over the line records.
while let Some(line) = next_line.take() {
let line_range_start = line.address as u32;
let line_range_end = (line.address + line.size.unwrap_or(1)) as u32;
let line_range_start = line.address.try_into().unwrap_or(u32::MAX);
let line_range_end = line_range_start
.saturating_add(line.size.unwrap_or(1).try_into().unwrap_or(u32::MAX));

// Find the call location for this line.
while next_call_location.is_some() && next_call_location.unwrap().0 <= line_range_start
Expand Down Expand Up @@ -308,16 +310,18 @@ impl<'a> SymCacheConverter<'a> {
let mut current_address = line_range_start;
while current_address < line_range_end {
// Emit our source location at current_address if current_address is not covered by an inlinee.
if next_inline.is_none() || next_inline.as_ref().unwrap().start > current_address {
if next_inline
.as_ref()
.is_none_or(|next| next.start > current_address)
{
// "insert_range"
self.ranges.insert(current_address, source_location.clone());
}

// If there is an inlinee range covered by this line record, turn this line into that
// call's "call line". Make a `call_location_idx` for it and store it in `callee_call_locations`.
if next_inline.is_some() && next_inline.as_ref().unwrap().start < line_range_end {
let inline_range = next_inline.take().unwrap();

if let Some(inline_range) = next_inline.take_if(|next| next.start < line_range_end)
{
// "make_call_location"
let (call_location_idx, _) =
self.call_locations.insert_full(source_location.clone());
Expand All @@ -341,8 +345,9 @@ impl<'a> SymCacheConverter<'a> {
// multiple identical small "call line" records instead of one combined record
// covering the entire inlinee range. We can't have different "call lines" for a single
// inlinee range anyway, so it's fine to skip these.
while next_line.is_some()
&& (next_line.as_ref().unwrap().address as u32) < current_address
while next_line
.as_ref()
.is_some_and(|next| (next.address as u32) < current_address)
{
next_line = line_iter.next();
}
Expand Down
Loading