incremental: fix crash when introducing syntax error

Clearing the analysis roots was very clever and all, but not actually
valid. We need to avoid *any* reference to the analysis errors if there
were any fatal files, and that includes sorting the errors!

Resolves: #22774
This commit is contained in:
mlugg 2025-02-05 21:58:32 +00:00
parent 3031d81387
commit b21becb2a6
No known key found for this signature in database
GPG Key ID: 3F5B7DCCBF4AF02E
3 changed files with 50 additions and 4 deletions

View File

@ -2195,6 +2195,8 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
zcu.compile_log_text.shrinkAndFree(gpa, 0);
zcu.skip_analysis_errors = false;
// Make sure std.zig is inside the import_table. We unconditionally need
// it for start.zig.
const std_mod = zcu.std_mod;
@ -3207,7 +3209,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
});
}
if (comp.zcu) |zcu| {
if (comp.zcu) |zcu| zcu_errors: {
for (zcu.failed_files.keys(), zcu.failed_files.values()) |file, error_msg| {
if (error_msg) |msg| {
try addModuleErrorMsg(zcu, &bundle, msg.*);
@ -3224,6 +3226,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
}
}
}
if (zcu.skip_analysis_errors) break :zcu_errors;
var sorted_failed_analysis: std.AutoArrayHashMapUnmanaged(InternPool.AnalUnit, *Zcu.ErrorMsg).DataList.Slice = s: {
const SortOrder = struct {
zcu: *Zcu,
@ -3359,7 +3362,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
try comp.link_diags.addMessagesToBundle(&bundle, comp.bin_file);
if (comp.zcu) |zcu| {
if (bundle.root_list.items.len == 0 and zcu.compile_log_sources.count() != 0) {
if (!zcu.skip_analysis_errors and bundle.root_list.items.len == 0 and zcu.compile_log_sources.count() != 0) {
const values = zcu.compile_log_sources.values();
// First one will be the error; subsequent ones will be notes.
const src_loc = values[0].src();
@ -3860,10 +3863,9 @@ fn performAllTheWorkInner(
// We give up right now! No updating of ZIR refs, no nothing. The idea is that this prevents
// us from invalidating lots of incremental dependencies due to files with e.g. parse errors.
// However, this means our analysis data is invalid, so we want to omit all analysis errors.
// To do that, let's just clear the analysis roots!
assert(zcu.failed_files.count() > 0); // we will get an error
zcu.analysis_roots.clear(); // no analysis happened
zcu.skip_analysis_errors = true;
return;
}

View File

@ -181,6 +181,8 @@ analysis_roots: std.BoundedArray(*Package.Module, 3) = .{},
/// Allocated into `gpa`.
resolved_references: ?std.AutoHashMapUnmanaged(AnalUnit, ?ResolvedReference) = null,
skip_analysis_errors: bool = false,
stage1_flags: packed struct {
have_winmain: bool = false,
have_wwinmain: bool = false,

View File

@ -0,0 +1,42 @@
#target=x86_64-linux-selfhosted
#target=x86_64-linux-cbe
#target=x86_64-windows-cbe
#target=wasm32-wasi-selfhosted
#update=initial version
#file=main.zig
pub fn main() !void {
@compileError("uh oh");
}
#expect_error=main.zig:2:5: error: uh oh
#update=add parse error
#file=main.zig
pub fn main() !void {
@compileError("uh oh");
#expect_error=main.zig:3:1: error: expected statement, found 'EOF'
#update=fix parse error
#file=main.zig
pub fn main() !void {
@compileError("uh oh");
}
#expect_error=main.zig:2:5: error: uh oh
#update=add parse error again
#file=main.zig
pub fn main() !void {
@compileError("uh oh");
#expect_error=main.zig:3:1: error: expected statement, found 'EOF'
#update=comment @compileError call
#file=main.zig
pub fn main() !void {
//@compileError("uh oh");
#expect_error=main.zig:3:1: error: expected statement, found 'EOF'
#update=fix parse error again
#file=main.zig
pub fn main() !void {
//@compileError("uh oh");
}
#expect_stdout=""