zig

commit 0fa1a2cb732c85a59e72a720f19bc0d69ac9b08c (tree)
parent 746f65f8b3ce11d67d8fd392aea8bc05a24adae6
Author: Michael Dusan <michael.dusan@gmail.com>
Date:   Mon, 12 Apr 2021 06:55:12 -0400

Revert "dwarf: fix LineNumberProgram check"

- needed/needs to go through review process

This reverts commit 746f65f8b3ce11d67d8fd392aea8bc05a24adae6.

Diffstat:
M
lib/std/dwarf.zig
 | 
2
+-
M
test/stack_traces.zig
 | 
15
+++++++++++++++

2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/lib/std/dwarf.zig b/lib/std/dwarf.zig
@@ -208,7 +208,7 @@ const LineNumberProgram = struct {
     }
 
     pub fn checkLineMatch(self: *LineNumberProgram) !?debug.LineInfo {
-        if (self.prev_address > 0 and self.target_address >= self.prev_address and self.target_address < self.address) {
+        if (self.target_address >= self.prev_address and self.target_address < self.address) {
             const file_entry = if (self.prev_file == 0) {
                 return error.MissingDebugInfo;
             } else if (self.prev_file - 1 >= self.file_entries.items.len) {
diff --git a/test/stack_traces.zig b/test/stack_traces.zig
@@ -20,6 +20,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
             ,
         },
         .ReleaseSafe = .{
+            .exclude = struct {
+                pub fn exclude() bool {
+                    return if (std.builtin.object_format == .elf) true else false;
+                }
+            },
             .exclude_os = .{
                 .windows, // segfault
             },
@@ -69,6 +74,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
             ,
         },
         .ReleaseSafe = .{
+            .exclude = struct {
+                pub fn exclude() bool {
+                    return if (std.builtin.object_format == .elf) true else false;
+                }
+            },
             .exclude_os = .{
                 .windows, // segfault
             },
@@ -135,6 +145,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
             ,
         },
         .ReleaseSafe = .{
+            .exclude = struct {
+                pub fn exclude() bool {
+                    return if (std.builtin.object_format == .elf) true else false;
+                }
+            },
             .exclude_os = .{
                 .windows, // segfault
             },