mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwarf: fix LineNumberProgram check

Browse Source 
- on first iteration populate `prev_` fields and do nothing else

closes #8421
This commit is contained in:
Michael Dusan 2021-04-12 15:27:59 -04:00
parent 0fa1a2cb73
commit 28ae498254
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/dwarf.zig
View File

@ -157,6 +157,7 @@ const LineNumberProgram = struct {
include_dirs: []const []const u8, include_dirs: []const []const u8,
file_entries: *ArrayList(FileEntry), file_entries: *ArrayList(FileEntry),
prev_valid: bool,
prev_address: usize, prev_address: usize,
prev_file: usize, prev_file: usize,
prev_line: i64, prev_line: i64,
@ -175,6 +176,7 @@ const LineNumberProgram = struct {
self.basic_block = false; self.basic_block = false;
self.end_sequence = false; self.end_sequence = false;
// Invalidate all the remaining fields // Invalidate all the remaining fields
self.prev_valid = false;
self.prev_address = 0; self.prev_address = 0;
self.prev_file = undefined; self.prev_file = undefined;
self.prev_line = undefined; self.prev_line = undefined;
@ -197,6 +199,7 @@ const LineNumberProgram = struct {
.file_entries = file_entries, .file_entries = file_entries,
.default_is_stmt = is_stmt, .default_is_stmt = is_stmt,
.target_address = target_address, .target_address = target_address,
.prev_valid = false,
.prev_address = 0, .prev_address = 0,
.prev_file = undefined, .prev_file = undefined,
.prev_line = undefined, .prev_line = undefined,
@ -208,7 +211,7 @@ const LineNumberProgram = struct {
} }
pub fn checkLineMatch(self: *LineNumberProgram) !?debug.LineInfo { pub fn checkLineMatch(self: *LineNumberProgram) !?debug.LineInfo {
if (self.target_address >= self.prev_address and self.target_address < self.address) { if (self.prev_valid and self.target_address >= self.prev_address and self.target_address < self.address) {
const file_entry = if (self.prev_file == 0) { const file_entry = if (self.prev_file == 0) {
return error.MissingDebugInfo; return error.MissingDebugInfo;
} else if (self.prev_file - 1 >= self.file_entries.items.len) { } else if (self.prev_file - 1 >= self.file_entries.items.len) {
@ -228,6 +231,7 @@ const LineNumberProgram = struct {
}; };
} }
self.prev_valid = true;
self.prev_address = self.address; self.prev_address = self.address;
self.prev_file = self.file; self.prev_file = self.file;
self.prev_line = self.line; self.prev_line = self.line;