authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-17 19:11:06-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-19 12:39:37-07:00
log5b8bee462a63538083e7b2e16f1dae7b39c8529b
treef7f86646f4c2130e57d7379f74b3b6d480c3147e
parent5a6c3aaedfef1ff242317f622252e0c7eebf0159

mingw: fix path usage

- better reporting of cache checking failure - fix not using Path properly - fix not using Path properly in Preprocessor code

3 files changed, 51 insertions(+), 47 deletions(-)

src/Compilation.zig+2-1
...@@ -5351,6 +5351,7 @@ fn buildMingwCrtFile(comp: *Compilation, crt_file: mingw.CrtFile, prog_node: std...@@ -5351,6 +5351,7 @@ fn buildMingwCrtFile(comp: *Compilation, crt_file: mingw.CrtFile, prog_node: std
53515351
5352fn buildMingwImportLib(comp: *Compilation, lib_name: []const u8, is_prelink: bool, prog_node: std.Progress.Node) void {5352fn buildMingwImportLib(comp: *Compilation, lib_name: []const u8, is_prelink: bool, prog_node: std.Progress.Node) void {
5353 const crt_file_path = mingw.buildImportLib(comp, lib_name, prog_node) catch |err| switch (err) {5353 const crt_file_path = mingw.buildImportLib(comp, lib_name, prog_node) catch |err| switch (err) {
5354 error.AlreadyReported => return,
5354 // TODO: This isn't actually true for self-hosted5355 // TODO: This isn't actually true for self-hosted
5355 // In the non-prelink case we will end up putting foo.lib onto the linker line and letting the linker5356 // In the non-prelink case we will end up putting foo.lib onto the linker line and letting the linker
5356 // use its library paths to look for libraries and report any problems.5357 // use its library paths to look for libraries and report any problems.
...@@ -5364,7 +5365,7 @@ fn buildMingwImportLib(comp: *Compilation, lib_name: []const u8, is_prelink: boo...@@ -5364,7 +5365,7 @@ fn buildMingwImportLib(comp: *Compilation, lib_name: []const u8, is_prelink: boo
5364 // TODO Surface more error details.5365 // TODO Surface more error details.
5365 else => |e| return comp.lockAndSetMiscFailure(5366 else => |e| return comp.lockAndSetMiscFailure(
5366 .windows_import_lib,5367 .windows_import_lib,
5367 "unable to generate mingw DLL import .lib file for {s}: {t}",5368 "generating mingw DLL import .lib file for {s} failed: {t}",
5368 .{ lib_name, e },5369 .{ lib_name, e },
5369 ),5370 ),
5370 };5371 };
src/libs/mingw.zig+37-24
...@@ -215,12 +215,15 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P...@@ -215,12 +215,15 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P
215 defer arena_allocator.deinit();215 defer arena_allocator.deinit();
216 const arena = arena_allocator.allocator();216 const arena = arena_allocator.allocator();
217217
218 const def_file_path = findDef(arena, io, comp.getTarget(), comp.dirs.zig_lib, lib_name) catch |err| switch (err) {218 const def_file_path: Cache.Path = .{
219 error.FileNotFound => return error.DefNotFound,219 .root_dir = comp.dirs.zig_lib,
220 else => |e| return e,220 .sub_path = findDef(arena, io, comp.getTarget(), comp.dirs.zig_lib, lib_name) catch |err| switch (err) {
221 error.FileNotFound => return error.DefNotFound,
222 else => |e| return e,
223 },
221 };224 };
222 // Only .def.in files need preprocessing225 // Only .def.in files need preprocessing
223 const def_needs_preprocessing = mem.endsWith(u8, def_file_path, ".def.in");226 const def_needs_preprocessing = mem.endsWith(u8, def_file_path.sub_path, ".def.in");
224227
225 const target = comp.getTarget();228 const target = comp.getTarget();
226229
...@@ -243,15 +246,34 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P...@@ -243,15 +246,34 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P
243 var man = cache.obtain();246 var man = cache.obtain();
244 defer man.deinit();247 defer man.deinit();
245248
246 _ = try man.addFilePath(.{249 _ = try man.addFilePath(def_file_path, null);
247 .root_dir = comp.dirs.zig_lib,
248 .sub_path = def_file_path,
249 }, null);
250250
251 const final_lib_basename = try std.fmt.allocPrint(gpa, "{s}.lib", .{lib_name});251 const final_lib_basename = try std.fmt.allocPrint(gpa, "{s}.lib", .{lib_name});
252 errdefer gpa.free(final_lib_basename);252 errdefer gpa.free(final_lib_basename);
253253
254 if (try man.hit(prog_node)) {254 const is_hit = man.hit(prog_node) catch |err| switch (err) {
255 error.CacheCheckFailed => switch (man.diagnostic) {
256 .none => unreachable,
257 .manifest_create, .manifest_read, .manifest_lock => |e| {
258 comp.setMiscFailure(.windows_import_lib, "checking cache failed: {t} {t}", .{ man.diagnostic, e });
259 return error.AlreadyReported;
260 },
261 .file_open, .file_stat, .file_read, .file_hash => |op| {
262 const pp = man.files.keys()[op.file_index].prefixed_path;
263 const prefix = man.cache.prefixes()[pp.prefix];
264 comp.setMiscFailure(.windows_import_lib, "checking cache failed: {f}{s} {t} {t}", .{
265 prefix, pp.sub_path, man.diagnostic, op.err,
266 });
267 return error.AlreadyReported;
268 },
269 },
270 error.OutOfMemory, error.Canceled => |e| return e,
271 error.InvalidFormat => {
272 comp.setMiscFailure(.windows_import_lib, "checking cache failed: invalid manifest file format", .{});
273 return error.AlreadyReported;
274 },
275 };
276 if (is_hit) {
255 const digest = man.final();277 const digest = man.final();
256 const sub_path = try std.fs.path.join(gpa, &.{ "o", &digest, final_lib_basename });278 const sub_path = try std.fs.path.join(gpa, &.{ "o", &digest, final_lib_basename });
257 errdefer gpa.free(sub_path);279 errdefer gpa.free(sub_path);
...@@ -276,20 +298,11 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P...@@ -276,20 +298,11 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P
276 var o_dir = try comp.dirs.global_cache.handle.createDirPathOpen(io, o_sub_path, .{});298 var o_dir = try comp.dirs.global_cache.handle.createDirPathOpen(io, o_sub_path, .{});
277 defer o_dir.close(io);299 defer o_dir.close(io);
278300
279 const include_dir = try comp.dirs.zig_lib.join(arena, &.{ "libc", "mingw", "def-include" });301 const sep = path.sep_str;
280302 const include_dir: Cache.Path = .{
281 if (comp.verbose_cc) {303 .root_dir = comp.dirs.zig_lib,
282 var buffer: [256]u8 = undefined;304 .sub_path = "libc" ++ sep ++ "mingw" ++ sep ++ "def-include",
283 const stderr = try io.lockStderr(&buffer, null);305 };
284 defer io.unlockStderr();
285 const w = &stderr.file_writer.interface;
286 w.print("def file: {s}\n", .{def_file_path}) catch |err| switch (err) {
287 error.WriteFailed => return stderr.file_writer.err.?,
288 };
289 w.print("include dir: {s}\n", .{include_dir}) catch |err| switch (err) {
290 error.WriteFailed => return stderr.file_writer.err.?,
291 };
292 }
293306
294 const members = members: {307 const members = members: {
295 const members_node = sub_node.start("Members", 0);308 const members_node = sub_node.start("Members", 0);
...@@ -313,7 +326,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P...@@ -313,7 +326,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8, prog_node: std.P
313326
314 break :pp try aw.toOwnedSliceSentinel(0);327 break :pp try aw.toOwnedSliceSentinel(0);
315 },328 },
316 false => try Io.Dir.cwd().readFileAllocOptions(io, def_file_path, gpa, .unlimited, .of(u8), 0),329 false => try def_file_path.root_dir.handle.readFileAllocOptions(io, def_file_path.sub_path, gpa, .unlimited, .of(u8), 0),
317 };330 };
318 defer gpa.free(input);331 defer gpa.free(input);
319332
src/libs/mingw/Preprocessor.zig+12-22
...@@ -4,6 +4,7 @@ const Allocator = std.mem.Allocator;...@@ -4,6 +4,7 @@ const Allocator = std.mem.Allocator;
4const Token = Tokenizer.Token;4const Token = Tokenizer.Token;
5const mem = std.mem;5const mem = std.mem;
6const assert = std.debug.assert;6const assert = std.debug.assert;
7const Path = std.Build.Cache.Path;
78
8test {9test {
9 _ = Tokenizer;10 _ = Tokenizer;
...@@ -25,15 +26,15 @@ pub const Source = struct {...@@ -25,15 +26,15 @@ pub const Source = struct {
25 pub const generated: Source.Id = std.math.maxInt(usize);26 pub const generated: Source.Id = std.math.maxInt(usize);
26 pub const Id = usize;27 pub const Id = usize;
27 id: Id = generated,28 id: Id = generated,
28 path: []const u8,29 path: Path,
29 buf: []const u8,30 buf: []const u8,
30};31};
3132
32sources: std.array_hash_map.String(Source) = .empty,33sources: std.array_hash_map.Custom(Path, Source, Path.TableAdapter, false) = .empty,
3334
34arena: Allocator,35arena: Allocator,
35io: std.Io,36io: std.Io,
36include_dir: []const u8,37include_dir: Path,
3738
38top_expansion_buf: ExpandBuf = .empty,39top_expansion_buf: ExpandBuf = .empty,
39add_expansion_nl: usize = 0,40add_expansion_nl: usize = 0,
...@@ -132,7 +133,7 @@ fn defineBuiltin(pp: *Preprocessor, name: []const u8) !void {...@@ -132,7 +133,7 @@ fn defineBuiltin(pp: *Preprocessor, name: []const u8) !void {
132 });133 });
133}134}
134135
135pub fn preprocess(pp: *Preprocessor, file_path: []const u8) !void {136pub fn preprocess(pp: *Preprocessor, file_path: Path) !void {
136 const source = try pp.addSourceFromPath(file_path);137 const source = try pp.addSourceFromPath(file_path);
137 try pp.preprocessFile(source);138 try pp.preprocessFile(source);
138}139}
...@@ -789,13 +790,9 @@ fn makeGeneratedToken(...@@ -789,13 +790,9 @@ fn makeGeneratedToken(
789 return pasted_token;790 return pasted_token;
790}791}
791792
792fn findInclude(793fn findInclude(pp: *Preprocessor, filename: []const u8, includer_token: Token) !?Source {
793 pp: *Preprocessor,
794 filename: []const u8,
795 includer_token: Token,
796) !?Source {
797 const other_file = pp.sources.values()[includer_token.source].path;794 const other_file = pp.sources.values()[includer_token.source].path;
798 const dir = std.fs.path.dirname(other_file) orelse ".";795 const dir: Path = other_file.dirname() orelse .cwd();
799 if (try pp.checkIncludeDir(filename, dir)) |res| return res;796 if (try pp.checkIncludeDir(filename, dir)) |res| return res;
800797
801 return pp.checkIncludeDir(filename, pp.include_dir);798 return pp.checkIncludeDir(filename, pp.include_dir);
...@@ -804,31 +801,24 @@ fn findInclude(...@@ -804,31 +801,24 @@ fn findInclude(
804fn checkIncludeDir(801fn checkIncludeDir(
805 pp: *Preprocessor,802 pp: *Preprocessor,
806 include_path: []const u8,803 include_path: []const u8,
807 include_dir: []const u8,804 include_dir: Path,
808) !?Source {805) !?Source {
809 const format = "{s}{c}{s}";
810 var bfa_buf: [1024]u8 = undefined;806 var bfa_buf: [1024]u8 = undefined;
811 var bfa_state: std.heap.BufferFirstAllocator = .init(&bfa_buf, pp.arena);807 var bfa_state: std.heap.BufferFirstAllocator = .init(&bfa_buf, pp.arena);
812 const bfa = bfa_state.allocator();808 const bfa = bfa_state.allocator();
813 const header_path = try std.fmt.allocPrint(bfa, format, .{809 const header_path = try include_dir.join(bfa, include_path);
814 include_dir,
815 std.fs.path.sep,
816 include_path,
817 });
818 defer bfa.free(header_path);
819
820 return pp.addSourceFromPath(header_path) catch |err| switch (err) {810 return pp.addSourceFromPath(header_path) catch |err| switch (err) {
821 error.OutOfMemory => |e| return e,811 error.OutOfMemory => |e| return e,
822 else => return null,812 else => return null,
823 };813 };
824}814}
825815
826pub fn addSourceFromPath(pp: *Preprocessor, path: []const u8) !Source {816pub fn addSourceFromPath(pp: *Preprocessor, path: Path) !Source {
827 if (pp.sources.get(path)) |src| return src;817 if (pp.sources.get(path)) |src| return src;
828 try pp.sources.ensureUnusedCapacity(pp.arena, 1);818 try pp.sources.ensureUnusedCapacity(pp.arena, 1);
829819
830 const contents = try std.Io.Dir.cwd().readFileAlloc(pp.io, path, pp.arena, .limited(std.math.maxInt(u32)));820 const contents = try path.root_dir.handle.readFileAlloc(pp.io, path.sub_path, pp.arena, .limited(std.math.maxInt(u32)));
831 const duped_path = try pp.arena.dupe(u8, path);821 const duped_path = try path.clone(pp.arena);
832822
833 const src: Source = .{823 const src: Source = .{
834 .buf = contents,824 .buf = contents,