diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-01-09 13:53:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 13:53:56 -0500 |
| commit | 5e345ff0ee9eb70d7f5f7167227f6a1e8903f428 (patch) | |
| tree | 34d82c8ef040fc30fe895043d7a84d75552d36cf /lib/std/debug.zig | |
| parent | 5ab5de89c03bf9b3f08dfaa78d3b0fe41a72cdea (diff) | |
| parent | c51b79c56e32594e4fb119fc760ae38b69fb9bbb (diff) | |
| download | zig-5e345ff0ee9eb70d7f5f7167227f6a1e8903f428.tar.gz zig-5e345ff0ee9eb70d7f5f7167227f6a1e8903f428.zip | |
Merge pull request #3955 from LemonBoy/fix-1528
Pointer arithmetic affects the alignment factor
Diffstat (limited to 'lib/std/debug.zig')
| -rw-r--r-- | lib/std/debug.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig index 94f81908da..dfdaca6d3f 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -1084,7 +1084,7 @@ fn openSelfDebugInfoMacOs(allocator: *mem.Allocator) !DebugInfo { std.macho.LC_SYMTAB => break @ptrCast(*std.macho.symtab_command, ptr), else => {}, } - ptr += lc.cmdsize; // TODO https://github.com/ziglang/zig/issues/1403 + ptr = @alignCast(@alignOf(std.macho.load_command), ptr + lc.cmdsize); } else { return error.MissingDebugInfo; }; @@ -2129,7 +2129,7 @@ fn getLineNumberInfoMacOs(di: *DebugInfo, symbol: MachoSymbol, target_address: u std.macho.LC_SEGMENT_64 => break @ptrCast(*const std.macho.segment_command_64, @alignCast(@alignOf(std.macho.segment_command_64), ptr)), else => {}, } - ptr += lc.cmdsize; // TODO https://github.com/ziglang/zig/issues/1403 + ptr = @alignCast(@alignOf(std.macho.load_command), ptr + lc.cmdsize); } else { return error.MissingDebugInfo; }; |