Commit 2a03d6b007163fbd83567a6b0907a1866c1f92e8 | zig

author	Andrew Kelley <andrew@ziglang.org> 2026-09-23 13:12:16-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2026-09-24 23:53:46+02:00
log	2a03d6b007163fbd83567a6b0907a1866c1f92e8
tree	38e5bfa39a1abf905a7daba9f871be9d157dd421
parent	d037c6c19d2021001ecf20884a4219aec88f151a

Maker: properly deinit compiler child procs

Problem was that when Maker.Step.Compile was deinitialized, it would
reap the memory for the child process, but not actually kill & wait for
the termination of the process. Leaving the extra processes running
caused "Reusing Cache Artifacts" deadlocks, not to mention wasting
resources.

closes #36513

5 files changed, 29 insertions(+), 10 deletions(-)

lib
- compiler
  - Maker.zig
  - Maker
    Step.zig
    Step
    Compile.zig
    Fmt.zig
    Run.zig

lib/compiler/Maker.zig+2-1

...	@@ -2674,7 +2674,8 @@ fn makeSteps(	...	@@ -2674,7 +2674,8 @@ fn makeSteps(
2674		2674
2675	fn deinit(maker: *Maker) void {	2675	fn deinit(maker: *Maker) void {
2676	const gpa = maker.gpa;	2676	const gpa = maker.gpa;
2677	for (maker.steps) \|*step\| step.deinit(gpa);	2677	const io = maker.graph.io;
		2678	for (maker.steps) \|*step\| step.deinit(gpa, io);
2678	maker.memory_blocked_steps.deinit(gpa);	2679	maker.memory_blocked_steps.deinit(gpa);
2679	maker.initial_steps.deinit(gpa);	2680	maker.initial_steps.deinit(gpa);
2680	maker.step_stack.deinit(gpa);	2681	maker.step_stack.deinit(gpa);

lib/compiler/Maker/Step.zig+16-7

 @@ -309,15 +309,13 @@ pub fn make(
     }
 }
-pub fn deinit(step: *Step, gpa: Allocator) void {
+pub fn deinit(step: *Step, gpa: Allocator, io: Io) void {
     step.clearResultStderr(gpa);
     step.clearFailedCommand(gpa);
     step.clearErrorBundle(gpa);
     step.inputs.deinit(gpa);
-    if (step.getZigProcess()) |zp| gpa.destroy(zp);
     switch (step.extended) {
         .check_file,
-        .compile,
         .config_header,
         .fail,
         .find_program,
 @@ -331,7 +329,7 @@ pub fn deinit(step: *Step, gpa: Allocator) void {
         .update_source_files,
         .write_file,
         => {},
-        inline .fmt, .run => |*extended| extended.deinit(gpa),
+        inline .compile, .fmt, .run => |*extended| extended.deinit(gpa, io),
     }
     step.* = undefined;
 }
 @@ -455,6 +453,11 @@ pub const ZigProcess = struct {
         zp.multi_reader.deinit();
         zp.* = undefined;
     }
+    pub fn destroy(zp: *ZigProcess, gpa: Allocator, io: Io) void {
+        zp.deinit(io);
+        gpa.destroy(zp);
+    }
 };
 /// Assumes that argv contains `--listen=-` and that the process being spawned
 @@ -482,9 +485,8 @@ pub fn evalZigProcess(
         zp.progress_ipc_index = null;
         var exited = false;
         defer if (exited) {
-            s.extended.compile.zig_process = null;
+            s.clearZigProcess();
-            zp.deinit(io);
+            zp.destroy(gpa, io);
-            gpa.destroy(zp);
         } else zp.saveState(prog_node);
         const result = zigProcessUpdate(step_index, maker, zp, watch) catch |err| switch (err) {
             error.BrokenPipe, error.EndOfStream => |reason| {
 @@ -730,6 +732,13 @@ pub fn getZigProcess(s: *Step) ?*ZigProcess {
     };
 }
+fn clearZigProcess(s: *Step) void {
+    (switch (s.extended) {
+        .compile => |*compile| &compile.zig_process,
+        else => return,
+    }).* = null;
+}
 fn sendMessage(io: Io, file: Io.File, tag: std.zig.Client.Message.Tag) !void {
     const header: std.zig.Client.Message.Header = .{
         .tag = tag,

lib/compiler/Maker/Step/Compile.zig+7

...	@@ -86,6 +86,13 @@ pub fn make(	...	@@ -86,6 +86,13 @@ pub fn make(
86	}	86	}
87	}	87	}
88		88
		89	pub fn deinit(compile: *Compile, gpa: Allocator, io: Io) void {
		90	if (compile.zig_process) \|zp\| {
		91	zp.destroy(gpa, io);
		92	compile.zig_process = null;
		93	}
		94	}
		95
89	fn updateGeneratedFile(	96	fn updateGeneratedFile(
90	maker: *Maker,	97	maker: *Maker,
91	arena: Allocator,	98	arena: Allocator,

lib/compiler/Maker/Step/Fmt.zig+2-1

...	@@ -64,6 +64,7 @@ pub fn make(	...	@@ -64,6 +64,7 @@ pub fn make(
64	try step.handleChildProcessTerm(maker, run_result.term);	64	try step.handleChildProcessTerm(maker, run_result.term);
65	}	65	}
66		66
67	pub fn deinit(fmt: *Fmt, gpa: std.mem.Allocator) void {	67	pub fn deinit(fmt: *Fmt, gpa: std.mem.Allocator, io: std.Io) void {
		68	_ = io;
68	fmt.argv.deinit(gpa);	69	fmt.argv.deinit(gpa);
69	}	70	}

lib/compiler/Maker/Step/Run.zig+2-1

...	@@ -372,7 +372,8 @@ pub fn make(	...	@@ -372,7 +372,8 @@ pub fn make(
372	step.clearFailedCommand(gpa);	372	step.clearFailedCommand(gpa);
373	}	373	}
374		374
375	pub fn deinit(run: *Run, gpa: Allocator) void {	375	pub fn deinit(run: *Run, gpa: Allocator, io: Io) void {
		376	_ = io;
376	run.fuzz_tests.deinit(gpa);	377	run.fuzz_tests.deinit(gpa);
377	}	378	}
378		379