| author |  Jacob Young <jacobly@ziglang.org> 2025-03-29 18:43:53-04:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2025-03-31 19:06:25-04:00 |
| log | b431e9af9764b118ac8f515b4fede3192474d338 |
| tree | a196aae7f76ebe8b0095de9d95e752a0111a8e1c |
| parent | d53cc5e5b2ac51793ea19a847d8cee409af1dee3 |
Elf: fix incrementally reallocating the last atom in a section
2 files changed, 28 insertions(+), 3 deletions(-)
src- link
- test
- incremental
src/link/Elf/ZigObject.zig+8-3
| ... | @@ -1937,9 +1937,14 @@ pub fn allocateAtom(self: *ZigObject, atom_ptr: *Atom, requires_padding: bool, e | ... | @@ -1937,9 +1937,14 @@ pub fn allocateAtom(self: *ZigObject, atom_ptr: *Atom, requires_padding: bool, e |
| 1937 | const shdr = &slice.items(.shdr)[atom_ptr.output_section_index]; | 1937 | const shdr = &slice.items(.shdr)[atom_ptr.output_section_index]; |
| 1938 | const last_atom_ref = &slice.items(.last_atom)[atom_ptr.output_section_index]; | 1938 | const last_atom_ref = &slice.items(.last_atom)[atom_ptr.output_section_index]; |
| 1939 | 1939 | ||
| 1940 | // This only works if this atom is the only atom in the output section. In | 1940 | if (last_atom_ref.eql(atom_ptr.ref())) { |
| 1941 | // every other case, we need to redo the prev/next links. | 1941 | if (atom_ptr.prevAtom(elf_file)) |prev_atom| { |
| 1942 | if (last_atom_ref.eql(atom_ptr.ref())) last_atom_ref.* = .{}; | 1942 | prev_atom.next_atom_ref = .{}; |
| 1943 | last_atom_ref.* = prev_atom.ref(); | ||
| 1944 | } else { | ||
| 1945 | last_atom_ref.* = .{}; | ||
| 1946 | } | ||
| 1947 | } | ||
| 1943 | 1948 | ||
| 1944 | const alloc_res = try elf_file.allocateChunk(.{ | 1949 | const alloc_res = try elf_file.allocateChunk(.{ |
| 1945 | .shndx = atom_ptr.output_section_index, | 1950 | .shndx = atom_ptr.output_section_index, |
test/incremental/no_change_preserves_tag_names created+20
| ... | @@ -0,0 +1,20 @@ | ||
| 1 | #target=x86_64-linux-selfhosted | ||
| 2 | #target=x86_64-linux-cbe | ||
| 3 | #target=x86_64-windows-cbe | ||
| 4 | //#target=wasm32-wasi-selfhosted | ||
| 5 | #update=initial version | ||
| 6 | #file=main.zig | ||
| 7 | const std = @import("std"); | ||
| 8 | var some_enum: enum { first, second } = .first; | ||
| 9 | pub fn main() !void { | ||
| 10 | try std.io.getStdOut().writeAll(@tagName(some_enum)); | ||
| 11 | } | ||
| 12 | #expect_stdout="first" | ||
| 13 | #update=no change | ||
| 14 | #file=main.zig | ||
| 15 | const std = @import("std"); | ||
| 16 | var some_enum: enum { first, second } = .first; | ||
| 17 | pub fn main() !void { | ||
| 18 | try std.io.getStdOut().writeAll(@tagName(some_enum)); | ||
| 19 | } | ||
| 20 | #expect_stdout="first" | ||