Commit f74b21f0bd6919d4388b65e9cb88009da0a67859 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2026-07-06 17:20:05+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-07-08 18:08:25+02:00
log	f74b21f0bd6919d4388b65e9cb88009da0a67859
tree	29d6115351fe0f1eab22e905da6486f51a99f189
parent	134c217a5bea8a7ac524d689e6d0ed34d12b4cef
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

Elf2: fix targetLoad()/targetStore() to work with underaligned pointers

1 files changed, 10 insertions(+), 6 deletions(-)

src
- link
  - Elf2.zig

src/link/Elf2.zig+10-6

 @@ -4108,27 +4108,31 @@ fn targetEndian(elf: *const Elf) std.lang.Endian {
     };
 }
 fn targetLoad(elf: *const Elf, ptr: anytype) @typeInfo(@TypeOf(ptr)).pointer.child {
-    const Child = @typeInfo(@TypeOf(ptr)).pointer.child;
+    const pointer_ty = @typeInfo(@TypeOf(ptr)).pointer;
+    const Child = pointer_ty.child;
+    const alignment = pointer_ty.attrs.@"align" orelse @alignOf(Child);
     return switch (@typeInfo(Child)) {
         else => @compileError(@typeName(Child)),
         .int => std.mem.toNative(Child, ptr.*, elf.targetEndian()),
-        .@"enum" => |@"enum"| @enumFromInt(elf.targetLoad(@as(*@"enum".tag_type, @ptrCast(ptr)))),
+        .@"enum" => |@"enum"| @enumFromInt(elf.targetLoad(@as(*align(alignment) @"enum".tag_type, @ptrCast(ptr)))),
         .@"struct" => |@"struct"| @bitCast(
-            elf.targetLoad(@as(*@"struct".backing_integer.?, @ptrCast(ptr))),
+            elf.targetLoad(@as(*align(alignment) @"struct".backing_integer.?, @ptrCast(ptr))),
         ),
     };
 }
 fn targetStore(elf: *const Elf, ptr: anytype, val: @typeInfo(@TypeOf(ptr)).pointer.child) void {
-    const Child = @typeInfo(@TypeOf(ptr)).pointer.child;
+    const pointer_ty = @typeInfo(@TypeOf(ptr)).pointer;
+    const Child = pointer_ty.child;
+    const alignment = pointer_ty.attrs.@"align" orelse @alignOf(Child);
     return switch (@typeInfo(Child)) {
         else => @compileError(@typeName(Child)),
         .int => ptr.* = std.mem.nativeTo(Child, val, elf.targetEndian()),
         .@"enum" => |@"enum"| elf.targetStore(
-            @as(*@"enum".tag_type, @ptrCast(ptr)),
+            @as(*align(alignment) @"enum".tag_type, @ptrCast(ptr)),
             @intFromEnum(val),
         ),
         .@"struct" => |@"struct"| elf.targetStore(
-            @as(*@"struct".backing_integer.?, @ptrCast(ptr)),
+            @as(*align(alignment) @"struct".backing_integer.?, @ptrCast(ptr)),
             @bitCast(val),
         ),
     };