mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm: encode variables as DW_TAG_imported_declaration

Browse Source 
Now we get working global variable lookup in GDB! LLDB still re-mangles,
and it looks like we can't do much about that for now.

Also: translate non-owning type declarations into typedefs.
This commit is contained in:
Tau 2024-06-21 00:53:11 +02:00
parent 876258abe4
commit 359bbdd574
3 changed files with 566 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

833
src/codegen/llvm.zig
View File

File diff suppressed because it is too large Load Diff

136
src/codegen/llvm/Builder.zig
View File

@ -7652,6 +7652,8 @@ pub const Metadata = enum(u32) {
derived_pointer_type,
derived_member_type,
derived_static_member_type,
derived_typedef,
imported_declaration,
subroutine_type,
enumerator_unsigned,
enumerator_signed_positive,
@ -7699,6 +7701,8 @@ pub const Metadata = enum(u32) {
.derived_pointer_type,
.derived_member_type,
.derived_static_member_type,
.derived_typedef,
.imported_declaration,
.subroutine_type,
.enumerator_unsigned,
.enumerator_signed_positive,
@ -7816,6 +7820,7 @@ pub const Metadata = enum(u32) {
producer: MetadataString,
enums: Metadata,
globals: Metadata,
imports: Metadata,
};
pub const Subprogram = struct {
@ -7943,6 +7948,14 @@ pub const Metadata = enum(u32) {
}
};
pub const ImportedEntity = struct {
name: MetadataString,
file: Metadata,
scope: Metadata,
line: u32,
entity: Metadata,
};
pub const SubroutineType = struct {
types_tuple: Metadata,
};
@ -8232,6 +8245,7 @@ pub const Metadata = enum(u32) {
DIBasicType,
DICompositeType,
DIDerivedType,
DIImportedEntity,
DISubroutineType,
DIEnumerator,
DISubrange,
@ -9969,7 +9983,7 @@ pub fn printUnbuffered(
.enums = extra.enums,
.retainedTypes = null,
.globals = extra.globals,
.imports = null,
.imports = extra.imports,
.macros = null,
.dwoId = null,
.splitDebugInlining = false,
@ -10110,16 +10124,18 @@ pub fn printUnbuffered(
.derived_pointer_type,
.derived_member_type,
.derived_static_member_type,
.derived_typedef,
=> |kind| {
const extra = self.metadataExtraData(Metadata.DerivedType, metadata_item.data);
try metadata_formatter.specialized(.@"!", .DIDerivedType, .{
.tag = @as(enum {
DW_TAG_pointer_type,
DW_TAG_member,
DW_TAG_typedef,
}, switch (kind) {
.derived_pointer_type => .DW_TAG_pointer_type,
.derived_member_type,
.derived_static_member_type => .DW_TAG_member,
.derived_member_type, .derived_static_member_type => .DW_TAG_member,
.derived_typedef => .DW_TAG_typedef,
else => unreachable,
}),
.name = switch (extra.name) {
@ -10142,6 +10158,22 @@ pub fn printUnbuffered(
.annotations = null,
}, writer);
},
.imported_declaration => {
const extra = self.metadataExtraData(Metadata.ImportedEntity, metadata_item.data);
try metadata_formatter.specialized(.@"!", .DIImportedEntity, .{
.tag = .DW_TAG_imported_declaration,
.scope = extra.scope,
.entity = extra.entity,
.file = extra.file,
.line = extra.line,
.name = switch (extra.name) {
.none => null,
else => extra.name,
},
.elements = null,
}, writer);
},
.subroutine_type => {
const extra = self.metadataExtraData(Metadata.SubroutineType, metadata_item.data);
try metadata_formatter.specialized(.@"!", .DISubroutineType, .{
@ -11747,10 +11779,11 @@ pub fn debugCompileUnit(
producer: MetadataString,
enums: Metadata,
globals: Metadata,
imports: Metadata,
options: Metadata.CompileUnit.Options,
) Allocator.Error!Metadata {
try self.ensureUnusedMetadataCapacity(1, Metadata.CompileUnit, 0);
return self.debugCompileUnitAssumeCapacity(file, producer, enums, globals, options);
return self.debugCompileUnitAssumeCapacity(file, producer, enums, globals, imports, options);
}
pub fn debugSubprogram(
@ -12005,6 +12038,53 @@ pub fn debugMemberType(
);
}
pub fn debugTypedef(
self: *Builder,
name: MetadataString,
file: Metadata,
scope: Metadata,
line: u32,
underlying_type: Metadata,
align_in_bits: u64,
) Allocator.Error!Metadata {
try self.ensureUnusedMetadataCapacity(1, Metadata.DerivedType, 0);
assert(!self.strip);
return self.metadataSimpleAssumeCapacity(.derived_typedef, Metadata.DerivedType{
.name = name,
.file = file,
.scope = scope,
.line = line,
.underlying_type = underlying_type,
.size_in_bits_lo = 0,
.size_in_bits_hi = 0,
.align_in_bits_lo = @truncate(align_in_bits),
.align_in_bits_hi = @truncate(align_in_bits >> 32),
.offset_in_bits_lo = 0,
.offset_in_bits_hi = 0,
});
}
pub fn debugImportDeclaration(
self: *Builder,
name: MetadataString,
file: Metadata,
scope: Metadata,
line: u32,
entity: Metadata,
) Allocator.Error!Metadata {
try self.ensureUnusedMetadataCapacity(1, Metadata.ImportedEntity, 0);
assert(!self.strip);
return self.metadataSimpleAssumeCapacity(.imported_declaration, Metadata.ImportedEntity{
.name = name,
.file = file,
.scope = scope,
.line = line,
.entity = entity,
});
}
pub fn debugSubroutineType(
self: *Builder,
types_tuple: Metadata,
@ -12241,6 +12321,7 @@ pub fn debugCompileUnitAssumeCapacity(
producer: MetadataString,
enums: Metadata,
globals: Metadata,
imports: Metadata,
options: Metadata.CompileUnit.Options,
) Metadata {
assert(!self.strip);
@ -12251,6 +12332,7 @@ pub fn debugCompileUnitAssumeCapacity(
.producer = producer,
.enums = enums,
.globals = globals,
.imports = imports,
},
);
}
@ -12538,22 +12620,19 @@ fn debugMemberTypeAssumeCapacity(
static: bool,
) Metadata {
assert(!self.strip);
return self.metadataSimpleAssumeCapacity(
if (static) .derived_static_member_type else .derived_member_type,
Metadata.DerivedType{
.name = name,
.file = file,
.scope = scope,
.line = line,
.underlying_type = underlying_type,
.size_in_bits_lo = @truncate(size_in_bits),
.size_in_bits_hi = @truncate(size_in_bits >> 32),
.align_in_bits_lo = @truncate(align_in_bits),
.align_in_bits_hi = @truncate(align_in_bits >> 32),
.offset_in_bits_lo = @truncate(offset_in_bits),
.offset_in_bits_hi = @truncate(offset_in_bits >> 32),
}
);
return self.metadataSimpleAssumeCapacity(if (static) .derived_static_member_type else .derived_member_type, Metadata.DerivedType{
.name = name,
.file = file,
.scope = scope,
.line = line,
.underlying_type = underlying_type,
.size_in_bits_lo = @truncate(size_in_bits),
.size_in_bits_hi = @truncate(size_in_bits >> 32),
.align_in_bits_lo = @truncate(align_in_bits),
.align_in_bits_hi = @truncate(align_in_bits >> 32),
.offset_in_bits_lo = @truncate(offset_in_bits),
.offset_in_bits_hi = @truncate(offset_in_bits >> 32),
});
}
fn debugSubroutineTypeAssumeCapacity(
@ -13850,6 +13929,7 @@ pub fn toBitcode(self: *Builder, allocator: Allocator) bitcode_writer.Error![]co
},
.enums = extra.enums,
.globals = extra.globals,
.imports = extra.imports,
}, metadata_adapter);
},
.subprogram,
@ -13945,13 +14025,14 @@ pub fn toBitcode(self: *Builder, allocator: Allocator) bitcode_writer.Error![]co
.derived_pointer_type,
.derived_member_type,
.derived_static_member_type,
.derived_typedef,
=> |kind| {
const extra = self.metadataExtraData(Metadata.DerivedType, data);
try metadata_block.writeAbbrevAdapted(MetadataBlock.DerivedType{
.tag = switch (kind) {
.derived_pointer_type => DW.TAG.pointer_type,
.derived_member_type,
.derived_static_member_type => DW.TAG.member,
.derived_member_type, .derived_static_member_type => DW.TAG.member,
.derived_typedef => DW.TAG.typedef,
else => unreachable,
},
.name = extra.name,
@ -13967,6 +14048,17 @@ pub fn toBitcode(self: *Builder, allocator: Allocator) bitcode_writer.Error![]co
},
}, metadata_adapter);
},
.imported_declaration => {
const extra = self.metadataExtraData(Metadata.ImportedEntity, data);
try metadata_block.writeAbbrevAdapted(MetadataBlock.ImportedEntity{
.tag = DW.TAG.imported_declaration,
.scope = extra.scope,
.entity = extra.entity,
.line = extra.line,
.name = extra.name,
.file = extra.file,
}, metadata_adapter);
},
.subroutine_type => {
const extra = self.metadataExtraData(Metadata.SubroutineType, data);

25
src/codegen/llvm/ir.zig
View File

@ -649,6 +649,7 @@ pub const MetadataBlock = struct {
BasicType,
CompositeType,
DerivedType,
ImportedEntity,
SubroutineType,
Enumerator,
Subrange,
@ -706,7 +707,7 @@ pub const MetadataBlock = struct {
.{ .literal = 0 }, // retained types
.{ .literal = 0 }, // subprograms
MetadataAbbrev, // globals
.{ .literal = 0 }, // imported entities
MetadataAbbrev, // imported entities
.{ .literal = 0 }, // DWO ID
.{ .literal = 0 }, // macros
.{ .literal = 0 }, // split debug inlining
@ -722,6 +723,7 @@ pub const MetadataBlock = struct {
is_optimized: bool,
enums: Builder.Metadata,
globals: Builder.Metadata,
imports: Builder.Metadata,
};
pub const Subprogram = struct {
@ -879,6 +881,27 @@ pub const MetadataBlock = struct {
flags: Builder.Metadata.DIFlags,
};
pub const ImportedEntity = struct {
pub const ops = [_]AbbrevOp{
.{ .literal = 31 },
.{ .literal = 0 }, // is distinct
.{ .fixed = 32 }, // tag
MetadataAbbrev, // scope
MetadataAbbrev, // entity
LineAbbrev, // line
MetadataAbbrev, // name
MetadataAbbrev, // file
.{ .literal = 0 }, // elements
};
tag: u32,
scope: Builder.Metadata,
entity: Builder.Metadata,
line: u32,
name: Builder.MetadataString,
file: Builder.Metadata,
};
pub const SubroutineType = struct {
pub const ops = [_]AbbrevOp{
.{ .literal = 19 },