From 187d0a692de2f00e64a446548873f7a12d9ddb4f Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 22 Dec 2025 17:29:28 -0800
Subject: [PATCH] compiler: handle cancelation from finishPrelinkQueue

---
 src/Compilation.zig | 4 +++-
 src/InternPool.zig  | 1 -
 src/link/Queue.zig  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Compilation.zig b/src/Compilation.zig
index 8b840b8d452913c6ed7389621841dffe004703e0..8e005992ec45f4e0ff32f53e36e3af0c5d1ed090 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -5056,7 +5056,9 @@ fn dispatchPrelinkWork(comp: *Compilation, main_progress_node: std.Progress.Node
     }
 
     prelink_group.wait(io);
-    comp.link_queue.finishPrelinkQueue(comp);
+    comp.link_queue.finishPrelinkQueue(comp) catch |err| switch (err) {
+        error.Canceled => return,
+    };
 }
 
 const JobError = Allocator.Error || Io.Cancelable;
diff --git a/src/InternPool.zig b/src/InternPool.zig
index 3076aa2cf36490aba4f400e581485edbc1e20b98..69a64cbc4597aaa7ab542bde929a6c630703a7e6 100644
--- a/src/InternPool.zig
+++ b/src/InternPool.zig
@@ -11,7 +11,6 @@ const assert = std.debug.assert;
 const BigIntConst = std.math.big.int.Const;
 const BigIntMutable = std.math.big.int.Mutable;
 const Cache = std.Build.Cache;
-const Io = std.Io;
 const Limb = std.math.big.Limb;
 const Hash = std.hash.Wyhash;
 const Zir = std.zig.Zir;
diff --git a/src/link/Queue.zig b/src/link/Queue.zig
index caa2cc189816f0a0e4565eec8de66fdffcb059e3..b716800baebe7eaccf8e3eba0b8779dbb744faad 100644
--- a/src/link/Queue.zig
+++ b/src/link/Queue.zig
@@ -121,7 +121,7 @@ pub fn enqueueZcu(
     link.doZcuTask(comp, tid, task);
 }
 
-pub fn finishPrelinkQueue(q: *Queue, comp: *Compilation) void {
+pub fn finishPrelinkQueue(q: *Queue, comp: *Compilation) Io.Cancelable!void {
     if (q.future != null) {
         q.prelink_queue.close(comp.io);
         return;
@@ -136,6 +136,7 @@ pub fn finishPrelinkQueue(q: *Queue, comp: *Compilation) void {
         } else |err| switch (err) {
             error.OutOfMemory => comp.link_diags.setAllocFailure(),
             error.LinkFailure => {},
+            error.Canceled => |e| return e,
         }
     }
 }
-- 
2.54.0