Commit `9e51972701`

Jacob Young <jacobly0@users.noreply.github.com>

2023-02-26 11:27:26

llvm: fix untagged struct names in debug info for llvm (again)

At least lldb misbehaves with all these same-named unions, so just generate a unique name.

master

1 parent f6c9346

Changed files (1)

src

codegen

llvm.zig

@@ -2214,11 +2214,16 @@ pub const Object = struct {
                     ));
                 }
 
-                const union_name = if (layout.tag_size == 0) name.ptr else "AnonUnion";
+                var union_name_buf: ?[:0]const u8 = null;
+                defer if (union_name_buf) |buf| gpa.free(buf);
+                const union_name = if (layout.tag_size == 0) name else name: {
+                    union_name_buf = try std.fmt.allocPrintZ(gpa, "{s}:Payload", .{name});
+                    break :name union_name_buf.?;
+                };
 
                 const union_di_ty = dib.createUnionType(
                     compile_unit_scope,
-                    union_name,
+                    union_name.ptr,
                     null, // file
                     0, // line
                     ty.abiSize(target) * 8, // size in bits

Commit 9e51972701

Commit `9e51972701`