birth-software/nativity
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix struct debug info

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-04-10 11:06:52 -06:00
parent 42f7297df7
commit f2c978fd47
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap/backend/llvm.zig
View File

@ -1521,17 +1521,19 @@ pub const LLVM = struct {
.field_types = &.{}, .field_types = &.{},
.forward_declaration = null, .forward_declaration = null,
}); });
try llvm.debug_type_map.put_no_clobber(context.my_allocator, sema_type_index, struct_type.toType()); try llvm.debug_type_map.put_no_clobber(context.my_allocator, sema_type_index, struct_type.toType());
var field_types = try UnpinnedArray(*LLVM.DebugInfo.Type).initialize_with_capacity(context.my_allocator, @intCast(fields.len)); var field_types = try UnpinnedArray(*LLVM.DebugInfo.Type).initialize_with_capacity(context.my_allocator, @intCast(fields.len));
bit_size = 0; bit_size = 0;
for (fields) |struct_field_index| { for (fields) |struct_field_index| {
const struct_field = unit.struct_fields.get(struct_field_index); const struct_field = unit.struct_fields.get(struct_field_index);
const struct_field_type = unit.types.get(struct_field.type); const struct_field_type = unit.types.get(struct_field.type);
const struct_field_bit_size = struct_field_type.getBitSize(unit); const struct_field_bit_size = struct_field_type.getBitSize(unit);
const field_type = try llvm.getDebugType(unit, context, struct_field.type); const field_type = try llvm.getDebugType(unit, context, struct_field.type);
//TODO: fix const field_name = unit.getIdentifier(struct_field.name);
const alignment = struct_field_bit_size; const alignment = struct_field_bit_size;
const member_type = llvm.debug_info_builder.createMemberType(null, "", "".len, file, 0, struct_field_bit_size, alignment, bit_size, flags, field_type).toType(); const member_type = llvm.debug_info_builder.createMemberType(null, field_name.ptr, field_name.len, file, 0, struct_field_bit_size, alignment, bit_size, flags, field_type).toType();
field_types.append_with_capacity(member_type); field_types.append_with_capacity(member_type);
bit_size += struct_field_bit_size; bit_size += struct_field_bit_size;
} }
@ -1756,8 +1758,8 @@ pub const LLVM = struct {
const types = [2]*LLVM.DebugInfo.Type{ pointer_type, len_type }; const types = [2]*LLVM.DebugInfo.Type{ pointer_type, len_type };
const member_types = [2]*LLVM.DebugInfo.Type{ const member_types = [2]*LLVM.DebugInfo.Type{
llvm.debug_info_builder.createMemberType(null, "", "".len, null, 0, 64, 3, 0, flags, types[0]).toType(), llvm.debug_info_builder.createMemberType(null, "pointer", "pointer".len, null, 0, 64, 3, 0, flags, types[0]).toType(),
llvm.debug_info_builder.createMemberType(null, "", "".len, null, 0, 64, 3, 64, flags, types[1]).toType(), llvm.debug_info_builder.createMemberType(null, "length", "length".len, null, 0, 64, 3, 64, flags, types[1]).toType(),
}; };
const struct_type = llvm.createDebugStructType(.{ const struct_type = llvm.createDebugStructType(.{
.scope = scope, .scope = scope,

2
lib/std/std.nat
View File

@ -161,5 +161,3 @@ const Target = struct {
os: builtin.Os, os: builtin.Os,
abi: builtin.Abi, abi: builtin.Abi,
}; };
var page_allocator = PageAllocator{};