Commit fb481d0bf81df7b0ce9afde5cd615133d9895726 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2025-02-04 15:05:40+00:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2025-02-04 16:20:30+00:00
log	fb481d0bf81df7b0ce9afde5cd615133d9895726
tree	b9b259669c258624f91f7c002245438677b804ce
parent	3ca588bcc6d6640b7faa41a271580dd384963927
signature	Commit is signed but in an unrecognized format.

Zcu: fix bug clearing compile errors

And add an assertion in safe builds that our initial check is actually
correct.

1 files changed, 20 insertions(+), 9 deletions(-)

src
- Zcu
  - PerThread.zig

src/Zcu/PerThread.zig+20-9

 @@ -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()) {
+    const maybe_has_error = switch (file.status) {
-        .zig => {
+        .never_loaded => false,
-            const zir = file.zir orelse return;
+        .retryable_failure => true,
-            if (!zir.hasCompileErrors()) return;
+        .astgen_failure => true,
-        },
+        .success => switch (file.getMode()) {
-        .zon => {
+            .zig => has_error: {
-            const zoir = file.zoir orelse return;
+                const zir = file.zir orelse break :has_error false;
-            if (!zoir.hasCompileErrors()) return;
+                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
     }
 }