archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Compilation: fix appendFileSystemInput race between main thread and C object workers

Browse source 
Co-authored-by: Matthew Lugg <mlugg@mlugg.co.uk>
This commit is contained in:
Alex Rønne Petersen 2025-12-06 09:53:20 +01:00
parent 28c5cc390c
commit 621e1d7b1e
No known key found for this signature in database
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Compilation.zig
View file

@ -3231,6 +3231,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) UpdateE
}
}
/// Thread-safe. Assumes that `comp.mutex` is *not* already held by the caller.
pub fn appendFileSystemInput(comp: *Compilation, path: Compilation.Path) Allocator.Error!void {
const gpa = comp.gpa;
const fsi = comp.file_system_inputs orelse return;
@ -3251,6 +3252,10 @@ pub fn appendFileSystemInput(comp: *Compilation, path: Compilation.Path) Allocat
.{ @tagName(path.root), want_prefix_dir, path.sub_path },
);
// There may be concurrent calls to this function from C object workers and/or the main thread.
comp.mutex.lock();
defer comp.mutex.unlock();
try fsi.ensureUnusedCapacity(gpa, path.sub_path.len + 3);
if (fsi.items.len > 0) fsi.appendAssumeCapacity(0);
fsi.appendAssumeCapacity(prefix);
@ -6443,10 +6448,6 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
return error.InvalidDepFile;
},
};
// There may be concurrent calls to `appendFileSystemInput` from other C objects.
comp.mutex.lock();
defer comp.mutex.unlock();
try comp.appendFileSystemInput(input_path);
}
}