mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zcu: fix bug clearing compile errors

Browse Source 
And add an assertion in safe builds that our initial check is actually
correct.
This commit is contained in:
mlugg 2025-02-04 15:05:40 +00:00
parent 3ca588bcc6
commit fb481d0bf8
No known key found for this signature in database
GPG Key ID: 3F5B7DCCBF4AF02E
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Zcu/PerThread.zig
View File

@ -2795,21 +2795,32 @@ pub fn getErrorValueFromSlice(pt: Zcu.PerThread, name: []const u8) Allocator.Err
/// Removes any entry from `Zcu.failed_files` associated with `file`. Acquires `Compilation.mutex` as needed.
/// `file.zir` must be unchanged from the last update, as it is used to determine if there is such an entry.
fn lockAndClearFileCompileError(pt: Zcu.PerThread, file: *Zcu.File) void {
switch (file.getMode()) {
.zig => {
const zir = file.zir orelse return;
if (!zir.hasCompileErrors()) return;
},
.zon => {
const zoir = file.zoir orelse return;
if (!zoir.hasCompileErrors()) return;
const maybe_has_error = switch (file.status) {
.never_loaded => false,
.retryable_failure => true,
.astgen_failure => true,
.success => switch (file.getMode()) {
.zig => has_error: {
const zir = file.zir orelse break :has_error false;
break :has_error zir.hasCompileErrors();
},
.zon => has_error: {
const zoir = file.zoir orelse break :has_error false;
break :has_error zoir.hasCompileErrors();
},
},
};
// If runtime safety is on, let's quickly lock the mutex and check anyway.
if (!maybe_has_error and !std.debug.runtime_safety) {
return;
}
pt.zcu.comp.mutex.lock();
defer pt.zcu.comp.mutex.unlock();
if (pt.zcu.failed_files.fetchSwapRemove(file)) |kv| {
if (kv.value) |msg| msg.destroy(pt.zcu.gpa); // Delete previous error message.
assert(maybe_has_error); // the runtime safety case above
if (kv.value) |msg| msg.destroy(pt.zcu.gpa); // delete previous error message
}
}