diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-03-12 14:18:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 14:18:58 -0500 |
| commit | 5ff7b04a6ad72eb86b6d467dfdc25bea1a9ecf63 (patch) | |
| tree | a4bffd48c7c31b64af53425464e0c0c048156abf /lib | |
| parent | 01081ce5a59f4e2e57a9ff6e5885269ed3014279 (diff) | |
| parent | d532c21d890e1aa22cd4c57d6a3f749890256254 (diff) | |
| download | zig-5ff7b04a6ad72eb86b6d467dfdc25bea1a9ecf63.tar.gz zig-5ff7b04a6ad72eb86b6d467dfdc25bea1a9ecf63.zip | |
Merge pull request #11133 from Vexu/stage2
stage2: misc fixes on the way to `std.debug.dumpCurrentStackTrace`
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/debug.zig | 1 | ||||
| -rw-r--r-- | lib/std/dwarf.zig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig index a2cbf88730..3d06c16d57 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -1630,7 +1630,6 @@ fn getSymbolFromDwarf(address: u64, di: *DW.DwarfInfo) !SymbolInfo { .symbol_name = nosuspend di.getSymbolName(address) orelse "???", .compile_unit_name = compile_unit.die.getAttrString(di, DW.AT.name) catch |err| switch (err) { error.MissingDebugInfo, error.InvalidDebugInfo => "???", - else => return err, }, .line_info = nosuspend di.getLineNumberInfo(compile_unit.*, address) catch |err| switch (err) { error.MissingDebugInfo, error.InvalidDebugInfo => null, diff --git a/lib/std/dwarf.zig b/lib/std/dwarf.zig index 12ec357849..93d744ca5f 100644 --- a/lib/std/dwarf.zig +++ b/lib/std/dwarf.zig @@ -822,7 +822,7 @@ pub const DwarfInfo = struct { // in the list itself. // If no starting value is specified use zero. var base_address = compile_unit.die.getAttrAddr(AT.low_pc) catch |err| switch (err) { - error.MissingDebugInfo => 0, + error.MissingDebugInfo => @as(u64, 0), // TODO https://github.com/ziglang/zig/issues/11135 else => return err, }; |