Commit 650bc19ff33cc6b48cca154b3740301ff0b02001 | zig

author	Jacob Young <jacobly@ziglang.org> 2025-04-22 00:02:55-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:28-07:00
log	650bc19ff33cc6b48cca154b3740301ff0b02001
tree	b21d2b5def7068de1964cf141b5307f15d94c714
parent	fceec91f7787613256d95b20891c18659adc0494

Zcu: fix cached z(o)ir loading

3 files changed, 25 insertions(+), 30 deletions(-)

src
- Zcu.zig
- Zcu
  - PerThread.zig
- main.zig

src/Zcu.zig+14-19

 @@ -2817,12 +2817,18 @@ comptime {
 }
 pub fn loadZirCache(gpa: Allocator, cache_file: std.fs.File) !Zir {
-    var header: Zir.Header = undefined;
+    var cache_fr = cache_file.reader();
-    if (try cache_file.readAll(std.mem.asBytes(&header)) < @sizeOf(Zir.Header)) return error.EndOfStream;
+    var cache_br = cache_fr.interface().unbuffered();
-    return loadZirCacheBody(gpa, header, cache_file);
+    return result: {
+        const header = cache_br.takeStruct(Zir.Header) catch |err| break :result err;
+        break :result loadZirCacheBody(gpa, header.*, &cache_br);
+    } catch |err| switch (err) {
+        error.ReadFailed => return cache_fr.err.?,
+        else => |e| return e,
+    };
 }
-pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_file: std.fs.File) !Zir {
+pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_br: *std.io.BufferedReader) !Zir {
     var instructions: std.MultiArrayList(Zir.Inst) = .{};
     errdefer instructions.deinit(gpa);
 @@ -2850,16 +2856,11 @@ pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_file: std.fs.F
         if (data_has_safety_tag)
             @ptrCast(safety_buffer)
         else
-            zir.instructions.items(.data),
+            @ptrCast(zir.instructions.items(.data)),
         zir.string_bytes,
         @ptrCast(zir.extra),
     };
-    var cache_fr = cache_file.reader();
+    try cache_br.readVecAll(&vecs);
-    var cache_br = cache_fr.interface().unbuffered();
-    cache_br.readVecAll(&vecs) catch |err| switch (err) {
-        error.ReadFailed => return cache_fr.err.?,
-        error.EndOfStream => return error.UnexpectedFileSize,
-    };
     if (data_has_safety_tag) {
         const tags = zir.instructions.items(.tag);
         for (zir.instructions.items(.data), 0..) |*data, i| {
 @@ -2871,7 +2872,6 @@ pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_file: std.fs.F
             };
         }
     }
     return zir;
 }
 @@ -2947,7 +2947,7 @@ pub fn saveZoirCache(cache_file: std.fs.File, stat: std.fs.File.Stat, zoir: Zoir
     };
 }
-pub fn loadZoirCacheBody(gpa: Allocator, header: Zoir.Header, cache_file: std.fs.File) !Zoir {
+pub fn loadZoirCacheBody(gpa: Allocator, header: Zoir.Header, cache_br: *std.io.BufferedReader) !Zoir {
     var zoir: Zoir = .{
         .nodes = .empty,
         .extra = &.{},
 @@ -2983,12 +2983,7 @@ pub fn loadZoirCacheBody(gpa: Allocator, header: Zoir.Header, cache_file: std.fs
         @ptrCast(zoir.compile_errors),
         @ptrCast(zoir.error_notes),
     };
-    var cache_fr = cache_file.reader();
+    try cache_br.readVecAll(&vecs);
-    var cache_br = cache_fr.interface().unbuffered();
-    cache_br.readVecAll(&vecs) catch |err| switch (err) {
-        error.ReadFailed => return cache_fr.err.?,
-        error.EndOfStream => return error.UnexpectedFileSize,
-    };
     return zoir;
 }

src/Zcu/PerThread.zig+9-10

 @@ -349,6 +349,7 @@ fn loadZirZoirCache(
     // First we read the header to determine the lengths of arrays.
     const header = (cache_br.takeStruct(Header) catch |err| switch (err) {
+        error.ReadFailed => return cache_fr.err.?,
         // This can happen if Zig bails out of this function between creating
         // the cached file and writing it.
         error.EndOfStream => return .invalid,
 @@ -365,17 +366,15 @@ fn loadZirZoirCache(
     }
     switch (mode) {
-        .zig => {
+        .zig => file.zir = Zcu.loadZirCacheBody(gpa, header, &cache_br) catch |err| switch (err) {
-            file.zir = Zcu.loadZirCacheBody(gpa, header, cache_file) catch |err| switch (err) {
+            error.ReadFailed => return cache_fr.err.?,
-                error.UnexpectedFileSize => return .truncated,
+            error.EndOfStream => return .truncated,
-                else => |e| return e,
+            else => |e| return e,
-            };
         },
-        .zon => {
+        .zon => file.zoir = Zcu.loadZoirCacheBody(gpa, header, &cache_br) catch |err| switch (err) {
-            file.zoir = Zcu.loadZoirCacheBody(gpa, header, cache_file) catch |err| switch (err) {
+            error.ReadFailed => return cache_fr.err.?,
-                error.UnexpectedFileSize => return .truncated,
+            error.EndOfStream => return .truncated,
-                else => |e| return e,
+            else => |e| return e,
-            };
         },
     }

src/main.zig+2-1

...	@@ -6359,7 +6359,8 @@ fn cmdDumpZir(	...	@@ -6359,7 +6359,8 @@ fn cmdDumpZir(
6359		6359
6360	const zir = try Zcu.loadZirCache(arena, f);	6360	const zir = try Zcu.loadZirCache(arena, f);
6361		6361
6362	var stdout_bw = fs.File.stdout().writer().buffered(&stdio_buffer);	6362	var stdout_fw = fs.File.stdout().writer();
		6363	var stdout_bw = stdout_fw.interface().buffered(&stdio_buffer);
6363	{	6364	{
6364	const instruction_bytes = zir.instructions.len *	6365	const instruction_bytes = zir.instructions.len *
6365	// Here we don't use @sizeOf(Zir.Inst.Data) because it would include	6366	// Here we don't use @sizeOf(Zir.Inst.Data) because it would include