Skip to content

[lld][WebAssembly] Don't mark --start-lib/--end-lib files as live #137714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

[lld][WebAssembly] Don't mark --start-lib/--end-lib files as live #137714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lld/test/wasm/Inputs/start-lib1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ foo:
.functype foo () -> ()
call bar
end_function

# Static constructor inserted here to ensure the object file is not
# being processed as "live". Live object files have their static constructors
# preserved even if no symbol within is used.
.section .init_array,"",@
.p2align 2
.int32 foo
4 changes: 0 additions & 4 deletions lld/wasm/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,6 @@ void LinkerDriver::addFile(StringRef path) {
if (inWholeArchive) {
for (const auto &[m, offset] : members) {
auto *object = createObjectFile(m, path, offset);
// Mark object as live; object members are normally not
// live by default but -whole-archive is designed to treat
// them as such.
object->markLive();
Copy link
Collaborator Author

@sbc100 sbc100 Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was unnecessary because the forth argument to createObjectFile (lazy) defaults to false which then calls markLive.

files.push_back(object);
}

Expand Down
6 changes: 4 additions & 2 deletions lld/wasm/InputFiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,10 @@ ObjFile::ObjFile(MemoryBufferRef m, StringRef archiveName, bool lazy)
// https://github.com/llvm/llvm-project/issues/98778
checkArch(wasmObj->getArch());

// If this isn't part of an archive, it's eagerly linked, so mark it live.
if (archiveName.empty())
// Unless we are processing this as a lazy object file (e.g. part of an
// archive file or within `--start-lib`/`--end-lib`, it's eagerly linked, so
// mark it live.
if (!lazy)
markLive();
}

Expand Down