From 281dabaa880a8099b0fff752c8e1f4bdd5eec423 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Mon, 6 Nov 2023 13:47:39 +0100 Subject: Compilation: unconditionally close open file handles for writable dance --- src/Compilation.zig | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/Compilation.zig') diff --git a/src/Compilation.zig b/src/Compilation.zig index f2a0fb5e63..e7216abe56 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2295,10 +2295,16 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void defer comp.gpa.free(o_sub_path); // Work around windows `AccessDenied` if any files within this directory are open - // by doing the makeExecutable/makeWritable dance. + // by closing and reopening the file handles. const need_writable_dance = builtin.os.tag == .windows and comp.bin_file.file != null; if (need_writable_dance) { - try comp.bin_file.makeExecutable(); + // We cannot just call `makeExecutable` as it makes a false assumption that we have a + // file handle open only when linking an executable file. This used to be true when + // our linkers were incapable of emitting relocatables and static archive. Now that + // they are capable, we need to unconditionally close the file handle and re-open it + // in the follow up call to `makeWritable`. + comp.bin_file.file.?.close(); + comp.bin_file.file = null; } try comp.bin_file.renameTmpIntoCache(comp.local_cache_directory, tmp_dir_sub_path, o_sub_path); -- cgit v1.2.3