authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-13 19:29:55-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-13 19:29:55-07:00
loga726e09389aceff39f4478f215f4991a5f148e8d
tree026e08cf51ba5fd8694eb5c727b357ac55b15b86
parent022bca9b0600da3dda8b30fefe8eb817647b0f08

std.debug.Coverage.resolveAddressesDwarf: assert sorted

2 files changed, 6 insertions(+), 0 deletions(-)

lib/std/debug/Coverage.zig+5
...@@ -145,6 +145,7 @@ pub const ResolveAddressesDwarfError = Dwarf.ScanError;...@@ -145,6 +145,7 @@ pub const ResolveAddressesDwarfError = Dwarf.ScanError;
145pub fn resolveAddressesDwarf(145pub fn resolveAddressesDwarf(
146 cov: *Coverage,146 cov: *Coverage,
147 gpa: Allocator,147 gpa: Allocator,
148 /// Asserts the addresses are in ascending order.
148 sorted_pc_addrs: []const u64,149 sorted_pc_addrs: []const u64,
149 /// Asserts its length equals length of `sorted_pc_addrs`.150 /// Asserts its length equals length of `sorted_pc_addrs`.
150 output: []SourceLocation,151 output: []SourceLocation,
...@@ -156,11 +157,15 @@ pub fn resolveAddressesDwarf(...@@ -156,11 +157,15 @@ pub fn resolveAddressesDwarf(
156 var range_i: usize = 0;157 var range_i: usize = 0;
157 var range: *std.debug.Dwarf.Range = &d.ranges.items[0];158 var range: *std.debug.Dwarf.Range = &d.ranges.items[0];
158 var line_table_i: usize = undefined;159 var line_table_i: usize = undefined;
160 var prev_pc: u64 = 0;
159 var prev_cu: ?*std.debug.Dwarf.CompileUnit = null;161 var prev_cu: ?*std.debug.Dwarf.CompileUnit = null;
160 // Protects directories and files tables from other threads.162 // Protects directories and files tables from other threads.
161 cov.mutex.lock();163 cov.mutex.lock();
162 defer cov.mutex.unlock();164 defer cov.mutex.unlock();
163 next_pc: for (sorted_pc_addrs, output) |pc, *out| {165 next_pc: for (sorted_pc_addrs, output) |pc, *out| {
166 assert(pc >= prev_pc);
167 prev_pc = pc;
168
164 while (pc >= range.end) {169 while (pc >= range.end) {
165 range_i += 1;170 range_i += 1;
166 if (range_i >= d.ranges.items.len) {171 if (range_i >= d.ranges.items.len) {
lib/std/debug/Info.zig+1
...@@ -51,6 +51,7 @@ pub const ResolveAddressesError = Coverage.ResolveAddressesDwarfError;...@@ -51,6 +51,7 @@ pub const ResolveAddressesError = Coverage.ResolveAddressesDwarfError;
51pub fn resolveAddresses(51pub fn resolveAddresses(
52 info: *Info,52 info: *Info,
53 gpa: Allocator,53 gpa: Allocator,
54 /// Asserts the addresses are in ascending order.
54 sorted_pc_addrs: []const u64,55 sorted_pc_addrs: []const u64,
55 /// Asserts its length equals length of `sorted_pc_addrs`.56 /// Asserts its length equals length of `sorted_pc_addrs`.
56 output: []SourceLocation,57 output: []SourceLocation,