authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-07-20 10:44:49-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-07-20 10:44:49-04:00
logef3a746da1a85a8b4a653cb78e0464c71d35b64e
tree1399f8c2a1d523788b85c28e4230729b7d1380e3
parent4f742c4cfc3c3134a0d6ebfdfc354286ae97b2c1
parent542423915466c0e20b0947f745a1de276fbd8b03
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #20691 from jacobly0/dev

dev: fix llvm backend checks

12 files changed, 30 insertions(+), 12 deletions(-)

src/Compilation.zig+1-2
...@@ -1729,7 +1729,6 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil...@@ -1729,7 +1729,6 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
1729 comp.emit_llvm_ir != null or1729 comp.emit_llvm_ir != null or
1730 comp.emit_llvm_bc != null))1730 comp.emit_llvm_bc != null))
1731 {1731 {
1732 dev.check(.llvm_backend);
1733 if (opt_zcu) |zcu| zcu.llvm_object = try LlvmObject.create(arena, comp);1732 if (opt_zcu) |zcu| zcu.llvm_object = try LlvmObject.create(arena, comp);
1734 }1733 }
17351734
...@@ -2704,7 +2703,7 @@ pub fn emitLlvmObject(...@@ -2704,7 +2703,7 @@ pub fn emitLlvmObject(
2704 arena: Allocator,2703 arena: Allocator,
2705 default_emit: Emit,2704 default_emit: Emit,
2706 bin_emit_loc: ?EmitLoc,2705 bin_emit_loc: ?EmitLoc,
2707 llvm_object: *LlvmObject,2706 llvm_object: LlvmObject.Ptr,
2708 prog_node: std.Progress.Node,2707 prog_node: std.Progress.Node,
2709) !void {2708) !void {
2710 const sub_prog_node = prog_node.start("LLVM Emit Object", 0);2709 const sub_prog_node = prog_node.start("LLVM Emit Object", 0);
src/Zcu.zig+1-1
...@@ -58,7 +58,7 @@ comp: *Compilation,...@@ -58,7 +58,7 @@ comp: *Compilation,
58/// Usually, the LlvmObject is managed by linker code, however, in the case58/// Usually, the LlvmObject is managed by linker code, however, in the case
59/// that -fno-emit-bin is specified, the linker code never executes, so we59/// that -fno-emit-bin is specified, the linker code never executes, so we
60/// store the LlvmObject here.60/// store the LlvmObject here.
61llvm_object: if (dev.env.supports(.llvm_backend)) ?*LlvmObject else ?noreturn,61llvm_object: ?LlvmObject.Ptr,
6262
63/// Pointer to externally managed resource.63/// Pointer to externally managed resource.
64root_mod: *Package.Module,64root_mod: *Package.Module,
src/codegen/llvm.zig+5-1
...@@ -26,6 +26,7 @@ const wasm_c_abi = @import("../arch/wasm/abi.zig");...@@ -26,6 +26,7 @@ const wasm_c_abi = @import("../arch/wasm/abi.zig");
26const aarch64_c_abi = @import("../arch/aarch64/abi.zig");26const aarch64_c_abi = @import("../arch/aarch64/abi.zig");
27const arm_c_abi = @import("../arch/arm/abi.zig");27const arm_c_abi = @import("../arch/arm/abi.zig");
28const riscv_c_abi = @import("../arch/riscv64/abi.zig");28const riscv_c_abi = @import("../arch/riscv64/abi.zig");
29const dev = @import("../dev.zig");
2930
30const target_util = @import("../target.zig");31const target_util = @import("../target.zig");
31const libcFloatPrefix = target_util.libcFloatPrefix;32const libcFloatPrefix = target_util.libcFloatPrefix;
...@@ -865,9 +866,12 @@ pub const Object = struct {...@@ -865,9 +866,12 @@ pub const Object = struct {
865 field_index: u32,866 field_index: u32,
866 };867 };
867868
869 pub const Ptr = if (dev.env.supports(.llvm_backend)) *Object else noreturn;
870
868 pub const TypeMap = std.AutoHashMapUnmanaged(InternPool.Index, Builder.Type);871 pub const TypeMap = std.AutoHashMapUnmanaged(InternPool.Index, Builder.Type);
869872
870 pub fn create(arena: Allocator, comp: *Compilation) !*Object {873 pub fn create(arena: Allocator, comp: *Compilation) !Ptr {
874 dev.check(.llvm_backend);
871 const gpa = comp.gpa;875 const gpa = comp.gpa;
872 const target = comp.root_mod.resolved_target.result;876 const target = comp.root_mod.resolved_target.result;
873 const llvm_target_triple = try targetTriple(arena, target);877 const llvm_target_triple = try targetTriple(arena, target);
src/dev.zig-1
...@@ -23,7 +23,6 @@ pub const Env = enum {...@@ -23,7 +23,6 @@ pub const Env = enum {
23 sema,23 sema,
2424
25 /// - sema25 /// - sema
26 /// - jit command on x86_64-linux host
27 /// - `zig build-* -fno-llvm -fno-lld -target x86_64-linux`26 /// - `zig build-* -fno-llvm -fno-lld -target x86_64-linux`
28 @"x86_64-linux",27 @"x86_64-linux",
2928
src/link.zig+1-1
...@@ -968,7 +968,7 @@ pub const File = struct {...@@ -968,7 +968,7 @@ pub const File = struct {
968 pub fn emitLlvmObject(968 pub fn emitLlvmObject(
969 base: File,969 base: File,
970 arena: Allocator,970 arena: Allocator,
971 llvm_object: *LlvmObject,971 llvm_object: LlvmObject.Ptr,
972 prog_node: std.Progress.Node,972 prog_node: std.Progress.Node,
973 ) !void {973 ) !void {
974 return base.comp.emitLlvmObject(arena, base.emit, .{974 return base.comp.emitLlvmObject(arena, base.emit, .{
src/link/Coff.zig+2-1
...@@ -4,7 +4,7 @@...@@ -4,7 +4,7 @@
4//! LLD is also the default linker for LLVM.4//! LLD is also the default linker for LLVM.
55
6/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.6/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.
7llvm_object: ?*LlvmObject = null,7llvm_object: ?LlvmObject.Ptr = null,
88
9base: link.File,9base: link.File,
10image_base: u64,10image_base: u64,
...@@ -2765,6 +2765,7 @@ const StringTable = @import("StringTable.zig");...@@ -2765,6 +2765,7 @@ const StringTable = @import("StringTable.zig");
2765const Type = @import("../Type.zig");2765const Type = @import("../Type.zig");
2766const Value = @import("../Value.zig");2766const Value = @import("../Value.zig");
2767const AnalUnit = InternPool.AnalUnit;2767const AnalUnit = InternPool.AnalUnit;
2768const dev = @import("../dev.zig");
27682769
2769pub const base_tag: link.File.Tag = .coff;2770pub const base_tag: link.File.Tag = .coff;
27702771
src/link/Elf.zig+1-1
...@@ -30,7 +30,7 @@ entry_name: ?[]const u8,...@@ -30,7 +30,7 @@ entry_name: ?[]const u8,
30ptr_width: PtrWidth,30ptr_width: PtrWidth,
3131
32/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.32/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.
33llvm_object: ?*LlvmObject = null,33llvm_object: ?LlvmObject.Ptr = null,
3434
35/// A list of all input files.35/// A list of all input files.
36/// Index of each input file also encodes the priority or precedence of one input file36/// Index of each input file also encodes the priority or precedence of one input file
src/link/Elf/Atom.zig+12
...@@ -1113,6 +1113,7 @@ const x86_64 = struct {...@@ -1113,6 +1113,7 @@ const x86_64 = struct {
1113 code: ?[]const u8,1113 code: ?[]const u8,
1114 it: *RelocsIterator,1114 it: *RelocsIterator,
1115 ) !void {1115 ) !void {
1116 dev.check(.x86_64_backend);
1116 const is_static = elf_file.base.isStatic();1117 const is_static = elf_file.base.isStatic();
1117 const is_dyn_lib = elf_file.isEffectivelyDynLib();1118 const is_dyn_lib = elf_file.isEffectivelyDynLib();
11181119
...@@ -1235,6 +1236,7 @@ const x86_64 = struct {...@@ -1235,6 +1236,7 @@ const x86_64 = struct {
1235 code: []u8,1236 code: []u8,
1236 stream: anytype,1237 stream: anytype,
1237 ) (error{ InvalidInstruction, CannotEncode } || RelocError)!void {1238 ) (error{ InvalidInstruction, CannotEncode } || RelocError)!void {
1239 dev.check(.x86_64_backend);
1238 const r_type: elf.R_X86_64 = @enumFromInt(rel.r_type());1240 const r_type: elf.R_X86_64 = @enumFromInt(rel.r_type());
1239 const r_offset = std.math.cast(usize, rel.r_offset) orelse return error.Overflow;1241 const r_offset = std.math.cast(usize, rel.r_offset) orelse return error.Overflow;
12401242
...@@ -1380,6 +1382,7 @@ const x86_64 = struct {...@@ -1380,6 +1382,7 @@ const x86_64 = struct {
1380 code: []u8,1382 code: []u8,
1381 stream: anytype,1383 stream: anytype,
1382 ) !void {1384 ) !void {
1385 dev.check(.x86_64_backend);
1383 _ = code;1386 _ = code;
1384 _ = it;1387 _ = it;
1385 const r_type: elf.R_X86_64 = @enumFromInt(rel.r_type());1388 const r_type: elf.R_X86_64 = @enumFromInt(rel.r_type());
...@@ -1420,6 +1423,7 @@ const x86_64 = struct {...@@ -1420,6 +1423,7 @@ const x86_64 = struct {
1420 }1423 }
14211424
1422 fn relaxGotpcrelx(code: []u8) !void {1425 fn relaxGotpcrelx(code: []u8) !void {
1426 dev.check(.x86_64_backend);
1423 const old_inst = disassemble(code) orelse return error.RelaxFailure;1427 const old_inst = disassemble(code) orelse return error.RelaxFailure;
1424 const inst = switch (old_inst.encoding.mnemonic) {1428 const inst = switch (old_inst.encoding.mnemonic) {
1425 .call => try Instruction.new(old_inst.prefix, .call, &.{1429 .call => try Instruction.new(old_inst.prefix, .call, &.{
...@@ -1438,6 +1442,7 @@ const x86_64 = struct {...@@ -1438,6 +1442,7 @@ const x86_64 = struct {
1438 }1442 }
14391443
1440 fn relaxRexGotpcrelx(code: []u8) !void {1444 fn relaxRexGotpcrelx(code: []u8) !void {
1445 dev.check(.x86_64_backend);
1441 const old_inst = disassemble(code) orelse return error.RelaxFailure;1446 const old_inst = disassemble(code) orelse return error.RelaxFailure;
1442 switch (old_inst.encoding.mnemonic) {1447 switch (old_inst.encoding.mnemonic) {
1443 .mov => {1448 .mov => {
...@@ -1456,6 +1461,7 @@ const x86_64 = struct {...@@ -1456,6 +1461,7 @@ const x86_64 = struct {
1456 elf_file: *Elf,1461 elf_file: *Elf,
1457 stream: anytype,1462 stream: anytype,
1458 ) !void {1463 ) !void {
1464 dev.check(.x86_64_backend);
1459 assert(rels.len == 2);1465 assert(rels.len == 2);
1460 const writer = stream.writer();1466 const writer = stream.writer();
1461 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());1467 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
...@@ -1495,6 +1501,7 @@ const x86_64 = struct {...@@ -1495,6 +1501,7 @@ const x86_64 = struct {
1495 elf_file: *Elf,1501 elf_file: *Elf,
1496 stream: anytype,1502 stream: anytype,
1497 ) !void {1503 ) !void {
1504 dev.check(.x86_64_backend);
1498 assert(rels.len == 2);1505 assert(rels.len == 2);
1499 const writer = stream.writer();1506 const writer = stream.writer();
1500 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());1507 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
...@@ -1543,6 +1550,7 @@ const x86_64 = struct {...@@ -1543,6 +1550,7 @@ const x86_64 = struct {
1543 }1550 }
15441551
1545 fn canRelaxGotTpOff(code: []const u8) bool {1552 fn canRelaxGotTpOff(code: []const u8) bool {
1553 dev.check(.x86_64_backend);
1546 const old_inst = disassemble(code) orelse return false;1554 const old_inst = disassemble(code) orelse return false;
1547 switch (old_inst.encoding.mnemonic) {1555 switch (old_inst.encoding.mnemonic) {
1548 .mov => if (Instruction.new(old_inst.prefix, .mov, &.{1556 .mov => if (Instruction.new(old_inst.prefix, .mov, &.{
...@@ -1558,6 +1566,7 @@ const x86_64 = struct {...@@ -1558,6 +1566,7 @@ const x86_64 = struct {
1558 }1566 }
15591567
1560 fn relaxGotTpOff(code: []u8) void {1568 fn relaxGotTpOff(code: []u8) void {
1569 dev.check(.x86_64_backend);
1561 const old_inst = disassemble(code) orelse unreachable;1570 const old_inst = disassemble(code) orelse unreachable;
1562 switch (old_inst.encoding.mnemonic) {1571 switch (old_inst.encoding.mnemonic) {
1563 .mov => {1572 .mov => {
...@@ -1574,6 +1583,7 @@ const x86_64 = struct {...@@ -1574,6 +1583,7 @@ const x86_64 = struct {
1574 }1583 }
15751584
1576 fn relaxGotPcTlsDesc(code: []u8) !void {1585 fn relaxGotPcTlsDesc(code: []u8) !void {
1586 dev.check(.x86_64_backend);
1577 const old_inst = disassemble(code) orelse return error.RelaxFailure;1587 const old_inst = disassemble(code) orelse return error.RelaxFailure;
1578 switch (old_inst.encoding.mnemonic) {1588 switch (old_inst.encoding.mnemonic) {
1579 .lea => {1589 .lea => {
...@@ -1596,6 +1606,7 @@ const x86_64 = struct {...@@ -1596,6 +1606,7 @@ const x86_64 = struct {
1596 elf_file: *Elf,1606 elf_file: *Elf,
1597 stream: anytype,1607 stream: anytype,
1598 ) !void {1608 ) !void {
1609 dev.check(.x86_64_backend);
1599 assert(rels.len == 2);1610 assert(rels.len == 2);
1600 const writer = stream.writer();1611 const writer = stream.writer();
1601 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());1612 const rel: elf.R_X86_64 = @enumFromInt(rels[1].r_type());
...@@ -2312,3 +2323,4 @@ const File = @import("file.zig").File;...@@ -2312,3 +2323,4 @@ const File = @import("file.zig").File;
2312const Object = @import("Object.zig");2323const Object = @import("Object.zig");
2313const Symbol = @import("Symbol.zig");2324const Symbol = @import("Symbol.zig");
2314const Thunk = @import("thunks.zig").Thunk;2325const Thunk = @import("thunks.zig").Thunk;
2326const dev = @import("../../dev.zig");
src/link/MachO.zig+2-2
...@@ -1,7 +1,7 @@...@@ -1,7 +1,7 @@
1base: link.File,1base: link.File,
22
3/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.3/// If this is not null, an object file is created by LLVM and emitted to zcu_object_sub_path.
4llvm_object: ?*LlvmObject = null,4llvm_object: ?LlvmObject.Ptr = null,
55
6/// Debug symbols bundle (or dSym).6/// Debug symbols bundle (or dSym).
7d_sym: ?DebugSymbols = null,7d_sym: ?DebugSymbols = null,
...@@ -4510,7 +4510,6 @@ const dead_strip = @import("MachO/dead_strip.zig");...@@ -4510,7 +4510,6 @@ const dead_strip = @import("MachO/dead_strip.zig");
4510const eh_frame = @import("MachO/eh_frame.zig");4510const eh_frame = @import("MachO/eh_frame.zig");
4511const fat = @import("MachO/fat.zig");4511const fat = @import("MachO/fat.zig");
4512const link = @import("../link.zig");4512const link = @import("../link.zig");
4513const llvm_backend = @import("../codegen/llvm.zig");
4514const load_commands = @import("MachO/load_commands.zig");4513const load_commands = @import("MachO/load_commands.zig");
4515const relocatable = @import("MachO/relocatable.zig");4514const relocatable = @import("MachO/relocatable.zig");
4516const tapi = @import("tapi.zig");4515const tapi = @import("tapi.zig");
...@@ -4562,6 +4561,7 @@ const UnwindInfo = @import("MachO/UnwindInfo.zig");...@@ -4562,6 +4561,7 @@ const UnwindInfo = @import("MachO/UnwindInfo.zig");
4562const WeakBind = bind.WeakBind;4561const WeakBind = bind.WeakBind;
4563const ZigGotSection = synthetic.ZigGotSection;4562const ZigGotSection = synthetic.ZigGotSection;
4564const ZigObject = @import("MachO/ZigObject.zig");4563const ZigObject = @import("MachO/ZigObject.zig");
4564const dev = @import("../dev.zig");
45654565
4566pub const MachError = error{4566pub const MachError = error{
4567 /// Not enough permissions held to perform the requested kernel4567 /// Not enough permissions held to perform the requested kernel
src/link/MachO/Atom.zig+3
...@@ -897,6 +897,7 @@ fn resolveRelocInner(...@@ -897,6 +897,7 @@ fn resolveRelocInner(
897897
898const x86_64 = struct {898const x86_64 = struct {
899 fn relaxGotLoad(self: Atom, code: []u8, rel: Relocation, macho_file: *MachO) ResolveError!void {899 fn relaxGotLoad(self: Atom, code: []u8, rel: Relocation, macho_file: *MachO) ResolveError!void {
900 dev.check(.x86_64_backend);
900 const old_inst = disassemble(code) orelse return error.RelaxFail;901 const old_inst = disassemble(code) orelse return error.RelaxFail;
901 switch (old_inst.encoding.mnemonic) {902 switch (old_inst.encoding.mnemonic) {
902 .mov => {903 .mov => {
...@@ -920,6 +921,7 @@ const x86_64 = struct {...@@ -920,6 +921,7 @@ const x86_64 = struct {
920 }921 }
921922
922 fn relaxTlv(code: []u8) error{RelaxFail}!void {923 fn relaxTlv(code: []u8) error{RelaxFail}!void {
924 dev.check(.x86_64_backend);
923 const old_inst = disassemble(code) orelse return error.RelaxFail;925 const old_inst = disassemble(code) orelse return error.RelaxFail;
924 switch (old_inst.encoding.mnemonic) {926 switch (old_inst.encoding.mnemonic) {
925 .mov => {927 .mov => {
...@@ -1214,3 +1216,4 @@ const Relocation = @import("Relocation.zig");...@@ -1214,3 +1216,4 @@ const Relocation = @import("Relocation.zig");
1214const Symbol = @import("Symbol.zig");1216const Symbol = @import("Symbol.zig");
1215const Thunk = @import("thunks.zig").Thunk;1217const Thunk = @import("thunks.zig").Thunk;
1216const UnwindInfo = @import("UnwindInfo.zig");1218const UnwindInfo = @import("UnwindInfo.zig");
1219const dev = @import("../../dev.zig");
src/link/NvPtx.zig+1-1
...@@ -23,7 +23,7 @@ const Liveness = @import("../Liveness.zig");...@@ -23,7 +23,7 @@ const Liveness = @import("../Liveness.zig");
23const LlvmObject = @import("../codegen/llvm.zig").Object;23const LlvmObject = @import("../codegen/llvm.zig").Object;
2424
25base: link.File,25base: link.File,
26llvm_object: *LlvmObject,26llvm_object: LlvmObject.Ptr,
2727
28pub fn createEmpty(28pub fn createEmpty(
29 arena: Allocator,29 arena: Allocator,
src/link/Wasm.zig+1-1
...@@ -61,7 +61,7 @@ export_table: bool,...@@ -61,7 +61,7 @@ export_table: bool,
61/// Output name of the file61/// Output name of the file
62name: []const u8,62name: []const u8,
63/// If this is not null, an object file is created by LLVM and linked with LLD afterwards.63/// If this is not null, an object file is created by LLVM and linked with LLD afterwards.
64llvm_object: ?*LlvmObject = null,64llvm_object: ?LlvmObject.Ptr = null,
65/// The file index of a `ZigObject`. This will only contain a valid index when a zcu exists,65/// The file index of a `ZigObject`. This will only contain a valid index when a zcu exists,
66/// and the chosen backend is the Wasm backend.66/// and the chosen backend is the Wasm backend.
67zig_object_index: File.Index = .null,67zig_object_index: File.Index = .null,