Commit fd62912787ee4f26b06ba86560e9aa605095ae04 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2025-01-04 00:06:24+00:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2025-01-04 05:44:29+00:00
log	fd62912787ee4f26b06ba86560e9aa605095ae04
tree	5eaeee5c1d341f68b7e0f497ee4b739f65416fd6
parent	f818098971fdafdaaa6af4b927f2cf47332ed5f7
signature	Commit is signed but in an unrecognized format.

1 files changed, 12 insertions(+), 3 deletions(-)

src/Zcu/PerThread.zig+12-3

 @@ -545,10 +545,19 @@ pub fn updateZirRefs(pt: Zcu.PerThread) Allocator.Error!void {
 pub fn ensureFileAnalyzed(pt: Zcu.PerThread, file_index: Zcu.File.Index) Zcu.SemaError!void {
     const file_root_type = pt.zcu.fileRootType(file_index);
     if (file_root_type != .none) {
-        _ = try pt.ensureTypeUpToDate(file_root_type);
+        if (pt.ensureTypeUpToDate(file_root_type)) |_| {
-    } else {
+            return;
-        return pt.semaFile(file_index);
+        } else |err| switch (err) {
+            error.AnalysisFail => {
+                // The file's root `struct_decl` has, at some point, been lost, because the file failed AstGen.
+                // Clear `file_root_type`, and try the `semaFile` call below, in case the instruction has since
+                // been discovered under a new `TrackedInst.Index`.
+                pt.zcu.setFileRootType(file_index, .none);
+            },
+            else => |e| return e,
+        }
     }
+    return pt.semaFile(file_index);
 }
 /// Ensures that the state of the given `ComptimeUnit` is fully up-to-date, performing re-analysis