1 files changed, 28 insertions, 25 deletions

diff --git a/src/link/Elf/SharedObject.zig b/src/link/Elf/SharedObject.zig
index 1e17aa34a8..c97d53a862 100644
--- a/src/link/Elf/SharedObject.zig
+++ b/src/link/Elf/SharedObject.zig
@@ -1,3 +1,20 @@
+const SharedObject = @This();
+
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const elf = std.elf;
+const log = std.log.scoped(.elf);
+const mem = std.mem;
+const Path = std.Build.Cache.Path;
+const Stat = std.Build.Cache.File.Stat;
+const Allocator = mem.Allocator;
+
+const Elf = @import("../Elf.zig");
+const File = @import("file.zig").File;
+const Symbol = @import("Symbol.zig");
+const Diags = @import("../../link.zig").Diags;
+
 path: Path,
 index: File.Index,
 
@@ -92,16 +109,17 @@ pub const Parsed = struct {
 
 pub fn parseHeader(
     gpa: Allocator,
+    io: Io,
     diags: *Diags,
     file_path: Path,
-    fs_file: std.fs.File,
+    file: Io.File,
     stat: Stat,
     target: *const std.Target,
 ) !Header {
     var ehdr: elf.Elf64_Ehdr = undefined;
     {
         const buf = mem.asBytes(&ehdr);
-        const amt = try fs_file.preadAll(buf, 0);
+        const amt = try file.readPositionalAll(io, buf, 0);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
     }
     if (!mem.eql(u8, ehdr.e_ident[0..4], "\x7fELF")) return error.BadMagic;
@@ -118,7 +136,7 @@ pub fn parseHeader(
     errdefer gpa.free(sections);
     {
         const buf = mem.sliceAsBytes(sections);
-        const amt = try fs_file.preadAll(buf, shoff);
+        const amt = try file.readPositionalAll(io, buf, shoff);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
     }
 
@@ -143,7 +161,7 @@ pub fn parseHeader(
         const dynamic_table = try gpa.alloc(elf.Elf64_Dyn, n);
         errdefer gpa.free(dynamic_table);
         const buf = mem.sliceAsBytes(dynamic_table);
-        const amt = try fs_file.preadAll(buf, shdr.sh_offset);
+        const amt = try file.readPositionalAll(io, buf, shdr.sh_offset);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
         break :dt dynamic_table;
     } else &.{};
@@ -158,7 +176,7 @@ pub fn parseHeader(
         const strtab_shdr = sections[dynsym_shdr.sh_link];
         const n = std.math.cast(usize, strtab_shdr.sh_size) orelse return error.Overflow;
         const buf = try strtab.addManyAsSlice(gpa, n);
-        const amt = try fs_file.preadAll(buf, strtab_shdr.sh_offset);
+        const amt = try file.readPositionalAll(io, buf, strtab_shdr.sh_offset);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
     }
 
@@ -190,9 +208,10 @@ pub fn parseHeader(
 
 pub fn parse(
     gpa: Allocator,
+    io: Io,
     /// Moves resources from header. Caller may unconditionally deinit.
     header: *Header,
-    fs_file: std.fs.File,
+    file: Io.File,
 ) !Parsed {
     const symtab = if (header.dynsym_sect_index) |index| st: {
         const shdr = header.sections[index];
@@ -200,7 +219,7 @@ pub fn parse(
         const symtab = try gpa.alloc(elf.Elf64_Sym, n);
         errdefer gpa.free(symtab);
         const buf = mem.sliceAsBytes(symtab);
-        const amt = try fs_file.preadAll(buf, shdr.sh_offset);
+        const amt = try file.readPositionalAll(io, buf, shdr.sh_offset);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
         break :st symtab;
     } else &.{};
@@ -211,7 +230,7 @@ pub fn parse(
 
     if (header.verdef_sect_index) |shndx| {
         const shdr = header.sections[shndx];
-        const verdefs = try Elf.preadAllAlloc(gpa, fs_file, shdr.sh_offset, shdr.sh_size);
+        const verdefs = try Elf.preadAllAlloc(gpa, io, file, shdr.sh_offset, shdr.sh_size);
         defer gpa.free(verdefs);
 
         var offset: u32 = 0;
@@ -237,7 +256,7 @@ pub fn parse(
         const versyms = try gpa.alloc(elf.Versym, symtab.len);
         errdefer gpa.free(versyms);
         const buf = mem.sliceAsBytes(versyms);
-        const amt = try fs_file.preadAll(buf, shdr.sh_offset);
+        const amt = try file.readPositionalAll(io, buf, shdr.sh_offset);
         if (amt != buf.len) return error.UnexpectedEndOfFile;
         break :vs versyms;
     } else &.{};
@@ -534,19 +553,3 @@ const Format = struct {
         }
     }
 };
-
-const SharedObject = @This();
-
-const std = @import("std");
-const assert = std.debug.assert;
-const elf = std.elf;
-const log = std.log.scoped(.elf);
-const mem = std.mem;
-const Path = std.Build.Cache.Path;
-const Stat = std.Build.Cache.File.Stat;
-const Allocator = mem.Allocator;
-
-const Elf = @import("../Elf.zig");
-const File = @import("file.zig").File;
-const Symbol = @import("Symbol.zig");
-const Diags = @import("../../link.zig").Diags;