Commit 3bfa63aa6151c339e02f36819f23ea547c41eb8f | zig

author	Tau <jonathan.haehne@hotmail.com> 2024-06-24 09:30:22+02:00
committer	Tau <jonathan.haehne@hotmail.com> 2024-07-19 17:51:38+02:00
log	3bfa63aa6151c339e02f36819f23ea547c41eb8f
tree	eadbbfcbbb19230b4ddf1e0eb397851b0c79405a
parent	9c2d597e69d13326970daadbaf7fd14f7da64c45

2 files changed, 13 insertions(+), 3 deletions(-)

lib/std/debug.zig+12-1

 @@ -2465,13 +2465,24 @@ 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_name,
+                .symbol_name = symbol_simple_name,
                 .compile_unit_name = obj_basename,
                 .line_info = opt_line_info,
             };

src/codegen/llvm.zig+1-2

...	@@ -2457,8 +2457,7 @@ pub const Object = struct {	...	@@ -2457,8 +2457,7 @@ pub const Object = struct {
2457	// We still may want these for a Zig expression	2457	// We still may want these for a Zig expression
2458	// evaluator in debuggers, but for now they are	2458	// evaluator in debuggers, but for now they are
2459	// completely useless.	2459	// completely useless.
2460	.ComptimeInt, .ComptimeFloat,	2460	.ComptimeInt, .ComptimeFloat, .Type, .Undefined, .Null, .EnumLiteral => continue,
2461	.Type, .Undefined, .Null, .EnumLiteral => continue,
2462	else => {},	2461	else => {},
2463	}	2462	}
2464		2463