diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-07-21 02:44:58 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-07-21 02:44:58 -0700 |
| commit | f303c3943f188b76c6d2566bd65429a8b60e8a59 (patch) | |
| tree | 72bc31b2923544e0308abe815be89356de65bcc3 /lib/std | |
| parent | d484269543c571454818599cce0460f9b363631f (diff) | |
| download | zig-f303c3943f188b76c6d2566bd65429a8b60e8a59.tar.gz zig-f303c3943f188b76c6d2566bd65429a8b60e8a59.zip | |
Revert "Merge pull request #20380 from tau-dev/master"
This reverts commit 397be0c9cc8156d38d1487a4c80210007033cbd0, reversing
changes made to 18d412ab2fb7bda92f7bfbdf732849bbcd066c33.
Caused test failures in master branch.
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/debug.zig | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig index 6780e17e1e..bc7023eae2 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -2459,24 +2459,13 @@ pub const ModuleDebugInfo = switch (native_os) { module, relocated_address - coff_section.virtual_address, ) orelse "???"; - // While DWARF gets us just the function's own name, the PDB - // stores it qualified with its namespace by the C++ `::` - // operator. We can strip that for consistency; the - // SymbolInfo will contain the line number, which is a more - // language-neutral way of distinguishing same-named symbols - // anyway. - const symbol_simple_name = if (mem.indexOf(u8, symbol_name, "::")) |cpp_namespace| - symbol_name[cpp_namespace + 2 ..] - else - symbol_name; - const opt_line_info = try self.pdb.?.getLineNumberInfo( module, relocated_address - coff_section.virtual_address, ); return SymbolInfo{ - .symbol_name = symbol_simple_name, + .symbol_name = symbol_name, .compile_unit_name = obj_basename, .line_info = opt_line_info, }; |
