From dfde194287b7afa66a14804fdbc43211ce52e2f7 Mon Sep 17 00:00:00 2001 From: antlilja Date: Fri, 23 Feb 2024 03:12:54 +0100 Subject: [PATCH] LLVM Builder: Make some Metadata no longer be distinct --- src/codegen/llvm/Builder.zig | 28 ++++++++++++++-------------- src/codegen/llvm/ir.zig | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/codegen/llvm/Builder.zig b/src/codegen/llvm/Builder.zig index b2486dd193..3a8e535a9d 100644 --- a/src/codegen/llvm/Builder.zig +++ b/src/codegen/llvm/Builder.zig @@ -12284,7 +12284,7 @@ fn debugFileAssumeCapacity( directory: MetadataString, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.file, Metadata.File{ + return self.metadataSimpleAssumeCapacity(.file, Metadata.File{ .filename = filename, .directory = directory, }); @@ -12338,7 +12338,7 @@ fn debugSubprogramAssumeCapacity( fn debugLexicalBlockAssumeCapacity(self: *Builder, scope: Metadata, file: Metadata, line: u32, column: u32) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.lexical_block, Metadata.LexicalBlock{ + return self.metadataSimpleAssumeCapacity(.lexical_block, Metadata.LexicalBlock{ .scope = scope, .file = file, .line = line, @@ -12358,7 +12358,7 @@ fn debugLocationAssumeCapacity(self: *Builder, line: u32, column: u32, scope: Me fn debugBoolTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_bits: u64) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.basic_bool_type, Metadata.BasicType{ + return self.metadataSimpleAssumeCapacity(.basic_bool_type, Metadata.BasicType{ .name = name, .size_in_bits_lo = @truncate(size_in_bits), .size_in_bits_hi = @truncate(size_in_bits >> 32), @@ -12367,7 +12367,7 @@ fn debugBoolTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_bit fn debugUnsignedTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_bits: u64) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.basic_unsigned_type, Metadata.BasicType{ + return self.metadataSimpleAssumeCapacity(.basic_unsigned_type, Metadata.BasicType{ .name = name, .size_in_bits_lo = @truncate(size_in_bits), .size_in_bits_hi = @truncate(size_in_bits >> 32), @@ -12376,7 +12376,7 @@ fn debugUnsignedTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in fn debugSignedTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_bits: u64) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.basic_signed_type, Metadata.BasicType{ + return self.metadataSimpleAssumeCapacity(.basic_signed_type, Metadata.BasicType{ .name = name, .size_in_bits_lo = @truncate(size_in_bits), .size_in_bits_hi = @truncate(size_in_bits >> 32), @@ -12385,7 +12385,7 @@ fn debugSignedTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_b fn debugFloatTypeAssumeCapacity(self: *Builder, name: MetadataString, size_in_bits: u64) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.basic_float_type, Metadata.BasicType{ + return self.metadataSimpleAssumeCapacity(.basic_float_type, Metadata.BasicType{ .name = name, .size_in_bits_lo = @truncate(size_in_bits), .size_in_bits_hi = @truncate(size_in_bits >> 32), @@ -12537,7 +12537,7 @@ fn debugCompositeTypeAssumeCapacity( fields_tuple: Metadata, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(tag, Metadata.CompositeType{ + return self.metadataSimpleAssumeCapacity(tag, Metadata.CompositeType{ .name = name, .file = file, .scope = scope, @@ -12563,7 +12563,7 @@ fn debugPointerTypeAssumeCapacity( offset_in_bits: u64, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.derived_pointer_type, Metadata.DerivedType{ + return self.metadataSimpleAssumeCapacity(.derived_pointer_type, Metadata.DerivedType{ .name = name, .file = file, .scope = scope, @@ -12590,7 +12590,7 @@ fn debugMemberTypeAssumeCapacity( offset_in_bits: u64, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.derived_member_type, Metadata.DerivedType{ + return self.metadataSimpleAssumeCapacity(.derived_member_type, Metadata.DerivedType{ .name = name, .file = file, .scope = scope, @@ -12610,7 +12610,7 @@ fn debugSubroutineTypeAssumeCapacity( types_tuple: Metadata, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.subroutine_type, Metadata.SubroutineType{ + return self.metadataSimpleAssumeCapacity(.subroutine_type, Metadata.SubroutineType{ .types_tuple = types_tuple, }); } @@ -12674,7 +12674,7 @@ fn debugSubrangeAssumeCapacity( count: Metadata, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.subrange, Metadata.Subrange{ + return self.metadataSimpleAssumeCapacity(.subrange, Metadata.Subrange{ .lower_bound = lower_bound, .count = count, }); @@ -12797,7 +12797,7 @@ fn debugLocalVarAssumeCapacity( ty: Metadata, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.local_var, Metadata.LocalVar{ + return self.metadataSimpleAssumeCapacity(.local_var, Metadata.LocalVar{ .name = name, .file = file, .scope = scope, @@ -12816,7 +12816,7 @@ fn debugParameterAssumeCapacity( arg_no: u32, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.parameter, Metadata.Parameter{ + return self.metadataSimpleAssumeCapacity(.parameter, Metadata.Parameter{ .name = name, .file = file, .scope = scope, @@ -12858,7 +12858,7 @@ fn debugGlobalVarExpressionAssumeCapacity( expression: Metadata, ) Metadata { assert(!self.strip); - return self.metadataDistinctAssumeCapacity(.global_var_expression, Metadata.GlobalVarExpression{ + return self.metadataSimpleAssumeCapacity(.global_var_expression, Metadata.GlobalVarExpression{ .variable = variable, .expression = expression, }); diff --git a/src/codegen/llvm/ir.zig b/src/codegen/llvm/ir.zig index 50a8f65654..db8e3e1f57 100644 --- a/src/codegen/llvm/ir.zig +++ b/src/codegen/llvm/ir.zig @@ -658,7 +658,7 @@ pub const MetadataBlock = struct { pub const File = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 16 }, - .{ .literal = 1 }, // is distinct + .{ .literal = 0 }, // is distinct MetadataAbbrev, // filename MetadataAbbrev, // directory .{ .literal = 0 }, // checksum @@ -743,7 +743,7 @@ pub const MetadataBlock = struct { pub const LexicalBlock = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 22 }, - .{ .literal = 1 }, // is distinct + .{ .literal = 0 }, // is distinct MetadataAbbrev, // scope MetadataAbbrev, // file LineAbbrev, // line @@ -776,7 +776,7 @@ pub const MetadataBlock = struct { pub const BasicType = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 15 }, - .{ .literal = 1 }, // is distinct + .{ .literal = 0 }, // is distinct .{ .literal = std.dwarf.TAG.base_type }, // tag MetadataAbbrev, // name .{ .vbr = 6 }, // size in bits @@ -793,7 +793,7 @@ pub const MetadataBlock = struct { pub const CompositeType = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 18 }, - .{ .literal = 1 | 0x2 }, // is distinct | is not used in old type ref + .{ .literal = 0 | 0x2 }, // is distinct | is not used in old type ref .{ .fixed = 32 }, // tag MetadataAbbrev, // name MetadataAbbrev, // file @@ -832,7 +832,7 @@ pub const MetadataBlock = struct { pub const DerivedType = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 17 }, - .{ .literal = 1 }, // is distinct + .{ .literal = 0 }, // is distinct .{ .fixed = 32 }, // tag MetadataAbbrev, // name MetadataAbbrev, // file @@ -860,7 +860,7 @@ pub const MetadataBlock = struct { pub const SubroutineType = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 19 }, - .{ .literal = 1 | 0x2 }, // is distinct | has no old type refs + .{ .literal = 0 | 0x2 }, // is distinct | has no old type refs .{ .literal = 0 }, // flags MetadataAbbrev, // types .{ .literal = 0 }, // cc @@ -895,7 +895,7 @@ pub const MetadataBlock = struct { pub const Subrange = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 13 }, - .{ .literal = 0b11 }, // is distinct | version + .{ .literal = 0b10 }, // is distinct | version MetadataAbbrev, // count MetadataAbbrev, // lower bound .{ .literal = 0 }, // upper bound @@ -928,7 +928,7 @@ pub const MetadataBlock = struct { pub const LocalVar = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 28 }, - .{ .literal = 0b11 }, // is distinct | has alignment + .{ .literal = 0b10 }, // is distinct | has alignment MetadataAbbrev, // scope MetadataAbbrev, // name MetadataAbbrev, // file @@ -950,7 +950,7 @@ pub const MetadataBlock = struct { pub const Parameter = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 28 }, - .{ .literal = 0b11 }, // is distinct | has alignment + .{ .literal = 0b10 }, // is distinct | has alignment MetadataAbbrev, // scope MetadataAbbrev, // name MetadataAbbrev, // file @@ -1000,7 +1000,7 @@ pub const MetadataBlock = struct { pub const GlobalVarExpression = struct { pub const ops = [_]AbbrevOp{ .{ .literal = 37 }, - .{ .literal = 1 }, // is distinct + .{ .literal = 0 }, // is distinct MetadataAbbrev, // variable MetadataAbbrev, // expression };