mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 19:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

link: mark prelink tasks as procesed under -fno-emit-bin

Browse Source 
The old logic only decremented `remaining_prelink_tasks` if `bin_file`
was not `null`. This meant that on `-fno-emit-bin` builds with
registered prelink tasks (e.g. C source files), we exited from
`Compilation.performAllTheWorkInner` early, assuming a prelink error.

Instead, when `bin_file` is `null`, we still decrement
`remaining_prelink_tasks`; we just don't do any actual work.

Resolves: #22682
This commit is contained in:
mlugg 2025-03-14 22:44:44 +00:00 committed by Andrew Kelley
parent 9c9d3931df
commit 9f235a105b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/link.zig
View File

@ -1457,8 +1457,10 @@ pub const Task = union(enum) {
pub fn doTask(comp: *Compilation, tid: usize, task: Task) void { pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
const diags = &comp.link_diags; const diags = &comp.link_diags;
switch (task) { switch (task) {
.load_explicitly_provided => if (comp.bin_file) |base| { .load_explicitly_provided => {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Parse Linker Inputs", comp.link_inputs.len); const prog_node = comp.work_queue_progress_node.start("Parse Linker Inputs", comp.link_inputs.len);
defer prog_node.end(); defer prog_node.end();
for (comp.link_inputs) |input| { for (comp.link_inputs) |input| {
@ -1475,8 +1477,10 @@ pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
prog_node.completeOne(); prog_node.completeOne();
} }
}, },
.load_host_libc => if (comp.bin_file) |base| { .load_host_libc => {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Linker Parse Host libc", 0); const prog_node = comp.work_queue_progress_node.start("Linker Parse Host libc", 0);
defer prog_node.end(); defer prog_node.end();
@ -1535,8 +1539,9 @@ pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
} }
} }
}, },
.load_object => |path| if (comp.bin_file) |base| { .load_object => |path| {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Linker Parse Object", 0); const prog_node = comp.work_queue_progress_node.start("Linker Parse Object", 0);
defer prog_node.end(); defer prog_node.end();
base.openLoadObject(path) catch |err| switch (err) { base.openLoadObject(path) catch |err| switch (err) {
@ -1544,8 +1549,9 @@ pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
else => |e| diags.addParseError(path, "failed to parse object: {s}", .{@errorName(e)}), else => |e| diags.addParseError(path, "failed to parse object: {s}", .{@errorName(e)}),
}; };
}, },
.load_archive => |path| if (comp.bin_file) |base| { .load_archive => |path| {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Linker Parse Archive", 0); const prog_node = comp.work_queue_progress_node.start("Linker Parse Archive", 0);
defer prog_node.end(); defer prog_node.end();
base.openLoadArchive(path, null) catch |err| switch (err) { base.openLoadArchive(path, null) catch |err| switch (err) {
@ -1553,8 +1559,9 @@ pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
else => |e| diags.addParseError(path, "failed to parse archive: {s}", .{@errorName(e)}), else => |e| diags.addParseError(path, "failed to parse archive: {s}", .{@errorName(e)}),
}; };
}, },
.load_dso => |path| if (comp.bin_file) |base| { .load_dso => |path| {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Linker Parse Shared Library", 0); const prog_node = comp.work_queue_progress_node.start("Linker Parse Shared Library", 0);
defer prog_node.end(); defer prog_node.end();
base.openLoadDso(path, .{ base.openLoadDso(path, .{
@ -1565,8 +1572,9 @@ pub fn doTask(comp: *Compilation, tid: usize, task: Task) void {
else => |e| diags.addParseError(path, "failed to parse shared library: {s}", .{@errorName(e)}), else => |e| diags.addParseError(path, "failed to parse shared library: {s}", .{@errorName(e)}),
}; };
}, },
.load_input => |input| if (comp.bin_file) |base| { .load_input => |input| {
comp.remaining_prelink_tasks -= 1; comp.remaining_prelink_tasks -= 1;
const base = comp.bin_file orelse return;
const prog_node = comp.work_queue_progress_node.start("Linker Parse Input", 0); const prog_node = comp.work_queue_progress_node.start("Linker Parse Input", 0);
defer prog_node.end(); defer prog_node.end();
base.loadInput(input) catch |err| switch (err) { base.loadInput(input) catch |err| switch (err) {