Skip to content

Commit 37a9a4e

Browse files
committed
compiler: refactor Zcu.File and path representation
This commit makes some big changes to how we track state for Zig source files. In particular, it changes: * How `File` tracks its path on-disk * How AstGen discovers files * How file-level errors are tracked * How `builtin.zig` files and modules are created The original motivation here was to address incremental compilation bugs with the handling of files, such as #22696. To fix this, a few changes are necessary. Just like declarations may become unreferenced on an incremental update, meaning we suppress analysis errors associated with them, it is also possible for all imports of a file to be removed on an incremental update, in which case file-level errors for that file should be suppressed. As such, after AstGen, the compiler must traverse files (starting from analysis roots) and discover the set of "live files" for this update. Additionally, the compiler's previous handling of retryable file errors was not very good; the source location the error was reported as was based only on the first discovered import of that file. This source location also disappeared on future incremental updates. So, as a part of the file traversal above, we also need to figure out the source locations of imports which errors should be reported against. Another observation I made is that the "file exists in multiple modules" error was not implemented in a particularly good way (I get to say that because I wrote it!). It was subject to races, where the order in which different imports of a file were discovered affects both how errors are printed, and which module the file is arbitrarily assigned, with the latter in turn affecting which other files are considered for import. The thing I realised here is that while the AstGen worker pool is running, we cannot know for sure which module(s) a file is in; we could always discover an import later which changes the answer. So, here's how the AstGen workers have changed. We initially ensure that `zcu.import_table` contains the root files for all modules in this Zcu, even if we don't know any imports for them yet. Then, the AstGen workers do not need to be aware of modules. Instead, they simply ignore module imports, and only spin off more workers when they see a by-path import. During AstGen, we can't use module-root-relative paths, since we don't know which modules files are in; but we don't want to unnecessarily use absolute files either, because those are non-portable and can make `error.NameTooLong` more likely. As such, I have introduced a new abstraction, `Compilation.Path`. This type is a way of representing a filesystem path which has a *canonical form*. The path is represented relative to one of a few special directories: the lib directory, the global cache directory, or the local cache directory. As a fallback, we use absolute (or cwd-relative on WASI) paths. This is kind of similar to `std.Build.Cache.Path` with a pre-defined list of possible `std.Build.Cache.Directory`, but has stricter canonicalization rules based on path resolution to make sure deduplicating files works properly. A `Compilation.Path` can be trivially converted to a `std.Build.Cache.Path` from a `Compilation`, but is smaller, has a canonical form, and has a digest which will be consistent across different compiler processes with the same lib and cache directories (important when we serialize incremental compilation state in the future). `Zcu.File` and `Zcu.EmbedFile` both contain a `Compilation.Path`, which is used to access the file on-disk; module-relative sub paths are used quite rarely (`EmbedFile` doesn't even have one now for simplicity). After the AstGen workers all complete, we know that any file which might be imported is definitely in `import_table` and up-to-date. So, we perform a single-threaded graph traversal; similar to what `resolveReferences` plays for `AnalUnit`s, but for files instead. We figure out which files are alive, and which module each file is in. If a file turns out to be in multiple modules, we set a field on `Zcu` to indicate this error. If a file is in a different module to a prior update, we set a flag instructing `updateZirRefs` to invalidate all dependencies on the file. This traversal also discovers "import errors"; these are errors associated with a specific `@import`. With Zig's current design, there is only one possible error here: "import outside of module root". This must be identified during this traversal instead of during AstGen, because it depends on which module the file is in. I tried also representing "module not found" errors in this same way, but it turns out to be much more useful to report those in Sema, because of use cases like optional dependencies where a module import is behind a comptime-known build option. For simplicity, `failed_files` now just maps to `?[]u8`, since the source location is always the whole file. In fact, this allows removing `LazySrcLoc.Offset.entire_file` completely, slightly simplifying some error reporting logic. File-level errors are now directly built in the `std.zig.ErrorBundle.Wip`. If the payload is not `null`, it is the message for a retryable error (i.e. an error loading the source file), and will be reported with a "file imported here" note pointing to the import site discovered during the single-threaded file traversal. The last piece of fallout here is how `Builtin` works. Rather than constructing "builtin" modules when creating `Package.Module`s, they are now constructed on-the-fly by `Zcu`. The map `Zcu.builtin_modules` maps from digests to `*Package.Module`s. These digests are abstract hashes of the `Builtin` value; i.e. all of the options which are placed into "builtin.zig". During the file traversal, we populate `builtin_modules` as needed, so that when we see this imports in Sema, we just grab the relevant entry from this map. This eliminates a bunch of awkward state tracking during construction of the module graph. It's also now clearer exactly what options the builtin module has, since previously it inherited some options arbitrarily from the first-created module with that "builtin" module! The user-visible effects of this commit are: * retryable file errors are now consistently reported against the whole file, with a note pointing to a live import of that file * some theoretical bugs where imports are wrongly considered distinct (when the import path moves out of the cwd and then back in) are fixed * some consistency issues with how file-level errors are reported are fixed; these errors will now always be printed in the same order regardless of how the AstGen pass assigns file indices * incremental updates do not print retryable file errors differently between updates or depending on file structure/contents * incremental updates support files changing modules * incremental updates support files becoming unreferenced Resolves: #22696
1 parent d32829e commit 37a9a4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2746
-2377
lines changed

src/Builtin.zig

Lines changed: 64 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,26 @@ code_model: std.builtin.CodeModel,
1919
omit_frame_pointer: bool,
2020
wasi_exec_model: std.builtin.WasiExecModel,
2121

22+
/// Compute an abstract hash representing this `Builtin`. This is *not* a hash
23+
/// of the resulting file contents.
24+
pub fn hash(opts: @This()) [std.Build.Cache.bin_digest_len]u8 {
25+
var h: Cache.Hasher = Cache.hasher_init;
26+
inline for (@typeInfo(@This()).@"struct".fields) |f| {
27+
if (comptime std.mem.eql(u8, f.name, "target")) {
28+
// This needs special handling.
29+
std.hash.autoHash(&h, opts.target.cpu);
30+
std.hash.autoHash(&h, opts.target.os.tag);
31+
std.hash.autoHash(&h, opts.target.os.versionRange());
32+
std.hash.autoHash(&h, opts.target.abi);
33+
std.hash.autoHash(&h, opts.target.ofmt);
34+
std.hash.autoHash(&h, opts.target.dynamic_linker);
35+
} else {
36+
std.hash.autoHash(&h, @field(opts, f.name));
37+
}
38+
}
39+
return h.finalResult();
40+
}
41+
2242
pub fn generate(opts: @This(), allocator: Allocator) Allocator.Error![:0]u8 {
2343
var buffer = std.ArrayList(u8).init(allocator);
2444
try append(opts, &buffer);
@@ -263,50 +283,66 @@ pub fn append(opts: @This(), buffer: *std.ArrayList(u8)) Allocator.Error!void {
263283
}
264284
}
265285

266-
pub fn populateFile(comp: *Compilation, mod: *Module, file: *File) !void {
267-
if (mod.root.statFile(mod.root_src_path)) |stat| {
286+
/// This essentially takes the place of `Zcu.PerThread.updateFile`, but for 'builtin' modules.
287+
/// Instead of reading the file from disk, its contents are generated in-memory.
288+
pub fn populateFile(opts: @This(), gpa: Allocator, file: *File) Allocator.Error!void {
289+
assert(file.is_builtin);
290+
assert(file.status == .never_loaded);
291+
assert(file.source == null);
292+
assert(file.tree == null);
293+
assert(file.zir == null);
294+
295+
file.source = try opts.generate(gpa);
296+
297+
log.debug("parsing and generating 'builtin.zig'", .{});
298+
299+
file.tree = try std.zig.Ast.parse(gpa, file.source.?, .zig);
300+
assert(file.tree.?.errors.len == 0); // builtin.zig must parse
301+
302+
file.zir = try AstGen.generate(gpa, file.tree.?);
303+
assert(!file.zir.?.hasCompileErrors()); // builtin.zig must not have astgen errors
304+
file.status = .success;
305+
}
306+
307+
/// After `populateFile` succeeds, call this function to write the generated file out to disk
308+
/// if necessary. This is useful for external tooling such as debuggers.
309+
/// Assumes that `file.mod` is correctly set to the builtin module.
310+
pub fn updateFileOnDisk(file: *File, comp: *Compilation) !void {
311+
assert(file.is_builtin);
312+
assert(file.status == .success);
313+
assert(file.source != null);
314+
315+
const root_dir, const sub_path = file.path.openInfo(comp.dirs);
316+
317+
if (root_dir.statFile(sub_path)) |stat| {
268318
if (stat.size != file.source.?.len) {
269319
std.log.warn(
270-
"the cached file '{}{s}' had the wrong size. Expected {d}, found {d}. " ++
320+
"the cached file '{}' had the wrong size. Expected {d}, found {d}. " ++
271321
"Overwriting with correct file contents now",
272-
.{ mod.root, mod.root_src_path, file.source.?.len, stat.size },
322+
.{ file.path.fmt(comp), file.source.?.len, stat.size },
273323
);
274-
275-
try writeFile(file, mod);
276324
} else {
277325
file.stat = .{
278326
.size = stat.size,
279327
.inode = stat.inode,
280328
.mtime = stat.mtime,
281329
};
330+
return;
282331
}
283332
} else |err| switch (err) {
284-
error.BadPathName => unreachable, // it's always "builtin.zig"
285-
error.NameTooLong => unreachable, // it's always "builtin.zig"
286-
error.PipeBusy => unreachable, // it's not a pipe
287-
error.NoDevice => unreachable, // it's not a pipe
288-
error.WouldBlock => unreachable, // not asking for non-blocking I/O
333+
error.FileNotFound => {},
289334

290-
error.FileNotFound => try writeFile(file, mod),
335+
error.WouldBlock => unreachable, // not asking for non-blocking I/O
336+
error.BadPathName => unreachable, // it's always "o/digest/builtin.zig"
337+
error.NameTooLong => unreachable, // it's always "o/digest/builtin.zig"
291338

339+
// We don't expect the file to be a pipe, but can't mark `error.PipeBusy` as `unreachable`,
340+
// because the user could always replace the file on disk.
292341
else => |e| return e,
293342
}
294343

295-
log.debug("parsing and generating '{s}'", .{mod.root_src_path});
296-
297-
file.tree = try std.zig.Ast.parse(comp.gpa, file.source.?, .zig);
298-
assert(file.tree.?.errors.len == 0); // builtin.zig must parse
299-
300-
file.zir = try AstGen.generate(comp.gpa, file.tree.?);
301-
assert(!file.zir.?.hasCompileErrors()); // builtin.zig must not have astgen errors
302-
file.status = .success;
303-
// Note that whilst we set `zir` here, we populated `path_digest`
304-
// all the way back in `Package.Module.create`.
305-
}
306-
307-
fn writeFile(file: *File, mod: *Module) !void {
308-
var buf: [std.fs.max_path_bytes]u8 = undefined;
309-
var af = try mod.root.atomicFile(mod.root_src_path, .{ .make_path = true }, &buf);
344+
// `make_path` matters because the dir hasn't actually been created yet.
345+
var af = try root_dir.atomicFile(sub_path, .{ .make_path = true });
310346
defer af.deinit();
311347
try af.file.writeAll(file.source.?);
312348
af.finish() catch |err| switch (err) {
@@ -331,6 +367,7 @@ fn writeFile(file: *File, mod: *Module) !void {
331367
const builtin = @import("builtin");
332368
const std = @import("std");
333369
const Allocator = std.mem.Allocator;
370+
const Cache = std.Build.Cache;
334371
const build_options = @import("build_options");
335372
const Module = @import("Package/Module.zig");
336373
const assert = std.debug.assert;

0 commit comments

Comments
 (0)