diff options
| author | mlugg <mlugg@mlugg.co.uk> | 2024-03-05 08:15:28 +0000 |
|---|---|---|
| committer | mlugg <mlugg@mlugg.co.uk> | 2024-03-06 21:26:38 +0000 |
| commit | e043fe474ffe07d1503c6cb70e01983b8d07a1ba (patch) | |
| tree | a4cfce82b6a4239f2a1d203e211db29345b4c1e3 /src/codegen/llvm.zig | |
| parent | 20403ee41d67b02faedbee97a94fc8b9fd3781e0 (diff) | |
| download | zig-e043fe474ffe07d1503c6cb70e01983b8d07a1ba.tar.gz zig-e043fe474ffe07d1503c6cb70e01983b8d07a1ba.zip | |
Fix incorrectly resolved merge conflicts
To be honest, I can't be bothered to figure out which commits these
changes should be in.
Diffstat (limited to 'src/codegen/llvm.zig')
| -rw-r--r-- | src/codegen/llvm.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index d0f8f99037..8f69dbc7e9 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -2642,7 +2642,7 @@ pub const Object = struct { else try o.builder.debugForwardReference(); - const tag_type = union_type.loadTagType(); + const tag_type = union_type.loadTagType(ip); for (0..tag_type.names.len) |field_index| { const field_ty = union_type.field_types.get(ip)[field_index]; @@ -3552,7 +3552,7 @@ pub const Object = struct { const gop = try o.type_map.getOrPut(o.gpa, t.toIntern()); if (!gop.found_existing) { const decl = mod.declPtr(ip.loadOpaqueType(t.toIntern()).decl); - const name = try o.builder.string(ip.stringToSlice(try decl.getFullyQualifiedName(mod))); + const name = try o.builder.string(ip.stringToSlice(try decl.fullyQualifiedName(mod))); gop.value_ptr.* = try o.builder.opaqueType(name); } return gop.value_ptr.*; |