Merge pull request #176 from kubkon/safe-file-index

Migrate to safe File.Index

Author: kubkon

src/Atom.zig

@@ -42,7 +42,7 @@ pub fn getName(self: Atom, macho_file: *MachO) [:0]const u8 {
 }
 
 pub fn getFile(self: Atom, macho_file: *MachO) File {
-    return macho_file.getFile(self.file).?;
+    return macho_file.getFile(self.file);
 }
 
 pub fn toRef(self: Atom) Ref {
@@ -847,7 +847,7 @@ fn format2(
     const atom = ctx.atom;
     const macho_file = ctx.macho_file;
     const file = atom.getFile(macho_file);
-    try writer.print("atom({d}) : {s} : @{x} : sect({d}) : align({x}) : size({x}) : thunk({d})", .{
+    try writer.print("atom({}) : {s} : @{x} : sect({d}) : align({x}) : size({x}) : thunk({d})", .{
         atom.atom_index,                 atom.getName(macho_file), atom.getAddress(macho_file),
         atom.out_n_sect,                 atom.alignment,           atom.size,
         atom.getExtra(macho_file).thunk,
@@ -876,10 +876,21 @@ pub const Index = enum(u32) {
     }
 
     pub fn toRef(index: Index, file: File.Index) Ref {
-        const result: Ref = @enumFromInt(@intFromEnum(index) | @as(u64, @intCast(file)) << 32);
+        const result: Ref = @enumFromInt(@intFromEnum(index) | @as(u64, @intFromEnum(file)) << 32);
         assert(result != .none);
         return result;
     }
+
+    pub fn format(
+        index: Index,
+        comptime unused_fmt_string: []const u8,
+        options: std.fmt.FormatOptions,
+        writer: anytype,
+    ) !void {
+        _ = unused_fmt_string;
+        _ = options;
+        try writer.print("{d}", .{@intFromEnum(index)});
+    }
 };
 
 pub const OptionalIndex = enum(u32) {
@@ -890,6 +901,21 @@ pub const OptionalIndex = enum(u32) {
         if (opt == .none) return null;
         return @enumFromInt(@intFromEnum(opt));
     }
+
+    pub fn format(
+        opt: OptionalIndex,
+        comptime unused_fmt_string: []const u8,
+        options: std.fmt.FormatOptions,
+        writer: anytype,
+    ) !void {
+        _ = unused_fmt_string;
+        _ = options;
+        if (opt == .none) {
+            try writer.writeAll(".none");
+        } else {
+            try writer.print("{d}", .{@intFromEnum(opt)});
+        }
+    }
 };
 
 pub const Ref = enum(u64) {
@@ -900,7 +926,7 @@ pub const Ref = enum(u64) {
         if (ref == .none) return null;
         const raw = @intFromEnum(ref);
         const atom_index: Index = @enumFromInt(@as(u32, @truncate(raw)));
-        const file_index: File.Index = @truncate(raw >> 32);
+        const file_index: File.Index = @enumFromInt(@as(u32, @truncate(raw >> 32)));
         return .{ .atom = atom_index, .file = file_index };
     }
 
@@ -918,7 +944,7 @@ pub const UnwrappedRef = struct {
     file: File.Index,
 
     pub fn getAtom(ref: UnwrappedRef, macho_file: *MachO) *Atom {
-        return macho_file.getFile(ref.file).?.getAtom(ref.atom);
+        return macho_file.getFile(ref.file).getAtom(ref.atom);
     }
 };
 

src/Dylib.zig

@@ -711,7 +711,7 @@ pub fn writeSymtab(self: Dylib, macho_file: *MachO) void {
 }
 
 pub inline fn getUmbrella(self: Dylib, macho_file: *MachO) *Dylib {
-    return macho_file.getFile(self.umbrella).?.dylib;
+    return macho_file.getFile(self.umbrella).dylib;
 }
 
 fn addString(self: *Dylib, allocator: Allocator, name: []const u8) !MachO.String {
@@ -740,7 +740,7 @@ fn addSymbol(self: *Dylib, allocator: Allocator) !Symbol.Index {
 fn addSymbolAssumeCapacity(self: *Dylib) Symbol.Index {
     const index: Symbol.Index = @enumFromInt(self.symbols.items.len);
     const symbol = self.symbols.addOneAssumeCapacity();
-    symbol.* = .{ .file = self.index };
+    symbol.* = .{ .file = self.index.toOptional() };
     return index;
 }
 

src/InternalObject.zig

@@ -166,7 +166,7 @@ pub fn resolveBoundarySymbols(self: *InternalObject, macho_file: *MachO) !void {
     defer boundary_symbols.deinit();
 
     for (macho_file.objects.items) |index| {
-        const object = macho_file.getFile(index).?.object;
+        const object = macho_file.getFile(index).object;
         for (object.symbols.items, 0..) |sym, i| {
             const sym_index: Symbol.Index = @enumFromInt(i);
             const nlist = object.symtab.items(.nlist)[i];
@@ -344,7 +344,7 @@ pub fn resolveObjcMsgSendSymbols(self: *InternalObject, macho_file: *MachO) !voi
     defer objc_msgsend_syms.deinit();
 
     for (macho_file.objects.items) |index| {
-        const object = macho_file.getFile(index).?.object;
+        const object = macho_file.getFile(index).object;
 
         for (object.symbols.items, 0..) |sym, i| {
             const sym_index: Symbol.Index = @enumFromInt(i);
@@ -768,7 +768,7 @@ pub fn addSymbol(self: *InternalObject, allocator: Allocator) !Symbol.Index {
 pub fn addSymbolAssumeCapacity(self: *InternalObject) Symbol.Index {
     const index: Symbol.Index = @enumFromInt(self.symbols.items.len);
     const symbol = self.symbols.addOneAssumeCapacity();
-    symbol.* = .{ .file = self.index };
+    symbol.* = .{ .file = self.index.toOptional() };
     return index;
 }