mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Zcu: rename skip_analysis_errors to skip_analysis_this_update and respect it

Browse source 
On updates with failed files, we should refrain from doing any semantic
analysis, or even touching codegen/link. That way, incremental
compilation state is untouched for when the user fixes the AstGen
errors.

Resolves: #23205
This commit is contained in:
mlugg 2025-03-11 16:47:28 +00:00 • committed by Matthew Lugg
parent 24db007cde
commit a0401cf3e4
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Compilation.zig
View file

@ -2261,7 +2261,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
zcu.compile_log_text.shrinkAndFree(gpa, 0); zcu.compile_log_text.shrinkAndFree(gpa, 0);
zcu.skip_analysis_errors = false; zcu.skip_analysis_this_update = false;
// Make sure std.zig is inside the import_table. We unconditionally need // Make sure std.zig is inside the import_table. We unconditionally need
// it for start.zig. // it for start.zig.
@ -2336,6 +2336,17 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
const pt: Zcu.PerThread = .activate(zcu, .main); const pt: Zcu.PerThread = .activate(zcu, .main);
defer pt.deactivate(); defer pt.deactivate();
if (!zcu.skip_analysis_this_update) {
if (comp.config.is_test) {
// The `test_functions` decl has been intentionally postponed until now,
// at which point we must populate it with the list of test functions that
// have been discovered and not filtered out.
try pt.populateTestFunctions(main_progress_node);
}
try pt.processExports();
}
if (build_options.enable_debug_extensions and comp.verbose_intern_pool) { if (build_options.enable_debug_extensions and comp.verbose_intern_pool) {
std.debug.print("intern pool stats for '{s}':\n", .{ std.debug.print("intern pool stats for '{s}':\n", .{
comp.root_name, comp.root_name,
@ -2350,15 +2361,6 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
}); });
zcu.intern_pool.dumpGenericInstances(gpa); zcu.intern_pool.dumpGenericInstances(gpa);
} }
if (comp.config.is_test) {
// The `test_functions` decl has been intentionally postponed until now,
// at which point we must populate it with the list of test functions that
// have been discovered and not filtered out.
try pt.populateTestFunctions(main_progress_node);
}
try pt.processExports();
} }
if (anyErrors(comp)) { if (anyErrors(comp)) {
@ -3310,7 +3312,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
} }
} }
} }
if (zcu.skip_analysis_errors) break :zcu_errors; if (zcu.skip_analysis_this_update) break :zcu_errors;
var sorted_failed_analysis: std.AutoArrayHashMapUnmanaged(InternPool.AnalUnit, *Zcu.ErrorMsg).DataList.Slice = s: { var sorted_failed_analysis: std.AutoArrayHashMapUnmanaged(InternPool.AnalUnit, *Zcu.ErrorMsg).DataList.Slice = s: {
const SortOrder = struct { const SortOrder = struct {
zcu: *Zcu, zcu: *Zcu,
@ -3446,7 +3448,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
try comp.link_diags.addMessagesToBundle(&bundle, comp.bin_file); try comp.link_diags.addMessagesToBundle(&bundle, comp.bin_file);
if (comp.zcu) |zcu| { if (comp.zcu) |zcu| {
if (!zcu.skip_analysis_errors and bundle.root_list.items.len == 0 and zcu.compile_log_sources.count() != 0) { if (!zcu.skip_analysis_this_update and bundle.root_list.items.len == 0 and zcu.compile_log_sources.count() != 0) {
const values = zcu.compile_log_sources.values(); const values = zcu.compile_log_sources.values();
// First one will be the error; subsequent ones will be notes. // First one will be the error; subsequent ones will be notes.
const src_loc = values[0].src(); const src_loc = values[0].src();
@ -3957,7 +3959,7 @@ fn performAllTheWorkInner(
// However, this means our analysis data is invalid, so we want to omit all analysis errors. // However, this means our analysis data is invalid, so we want to omit all analysis errors.
assert(zcu.failed_files.count() > 0); // we will get an error assert(zcu.failed_files.count() > 0); // we will get an error
zcu.skip_analysis_errors = true; zcu.skip_analysis_this_update = true;
return; return;
} }

5
src/Zcu.zig
View file

@ -181,7 +181,10 @@ analysis_roots: std.BoundedArray(*Package.Module, 4) = .{},
/// Allocated into `gpa`. /// Allocated into `gpa`.
resolved_references: ?std.AutoHashMapUnmanaged(AnalUnit, ?ResolvedReference) = null, resolved_references: ?std.AutoHashMapUnmanaged(AnalUnit, ?ResolvedReference) = null,
skip_analysis_errors: bool = false, /// If `true`, then semantic analysis must not occur on this update due to AstGen errors.
/// Essentially the entire pipeline after AstGen, including Sema, codegen, and link, is skipped.
/// Reset to `false` at the start of each update in `Compilation.update`.
skip_analysis_this_update: bool = false,
stage1_flags: packed struct { stage1_flags: packed struct {
have_winmain: bool = false, have_winmain: bool = false,