Commit 187d0a692de2f00e64a446548873f7a12d9ddb4f | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2025-12-22 17:29:28-08:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-12-23 22:15:12-08:00
log	187d0a692de2f00e64a446548873f7a12d9ddb4f
tree	753349f54dc9b6e3af38557f441665cbc7f0a177
parent	7c1236e267e536379f8b91148117fb0b8e965334

compiler: handle cancelation from finishPrelinkQueue

3 files changed, 5 insertions(+), 3 deletions(-)

src
- Compilation.zig
- InternPool.zig
- link
  - Queue.zig

src/Compilation.zig+3-1

...	...	@@ -5056,7 +5056,9 @@ fn dispatchPrelinkWork(comp: *Compilation, main_progress_node: std.Progress.Node
5056	5056	}
5057	5057
5058	5058	prelink_group.wait(io);
5059		comp.link_queue.finishPrelinkQueue(comp);
	5059	comp.link_queue.finishPrelinkQueue(comp) catch \|err\| switch (err) {
	5060	error.Canceled => return,
	5061	};
5060	5062	}
5061	5063
5062	5064	const JobError = Allocator.Error \|\| Io.Cancelable;

src/InternPool.zig-1

...	...	@@ -11,7 +11,6 @@ const assert = std.debug.assert;
11	11	const BigIntConst = std.math.big.int.Const;
12	12	const BigIntMutable = std.math.big.int.Mutable;
13	13	const Cache = std.Build.Cache;
14		const Io = std.Io;
15	14	const Limb = std.math.big.Limb;
16	15	const Hash = std.hash.Wyhash;
17	16	const Zir = std.zig.Zir;

src/link/Queue.zig+2-1

...	...	@@ -121,7 +121,7 @@ pub fn enqueueZcu(
121	121	link.doZcuTask(comp, tid, task);
122	122	}
123	123
124		pub fn finishPrelinkQueue(q: Queue, comp: Compilation) void {
	124	pub fn finishPrelinkQueue(q: Queue, comp: Compilation) Io.Cancelable!void {
125	125	if (q.future != null) {
126	126	q.prelink_queue.close(comp.io);
127	127	return;
...	...	@@ -136,6 +136,7 @@ pub fn finishPrelinkQueue(q: Queue, comp: Compilation) void {
136	136	} else \|err\| switch (err) {
137	137	error.OutOfMemory => comp.link_diags.setAllocFailure(),
138	138	error.LinkFailure => {},
	139	error.Canceled => \|e\| return e,
139	140	}
140	141	}
141	142	}