Skip to content

[lld][WebAssembly] Fix check for implicitly exported mutable globals #160966

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
Sep 27, 2025
Merged

[lld][WebAssembly] Fix check for implicitly exported mutable globals #160966

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
3 changes: 3 additions & 0 deletions lld/test/wasm/mutable-global-exports.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ _start:
# CHECK-ALL-NEXT: - Name: __wasm_call_ctors
# CHECK-ALL-NEXT: Kind: FUNCTION
# CHECK-ALL-NEXT: Index: 0
# CHECK-ALL-NEXT: - Name: __stack_pointer
# CHECK-ALL-NEXT: Kind: GLOBAL
# CHECK-ALL-NEXT: Index: 0
# CHECK-ALL-NEXT: - Name: _start
# CHECK-ALL-NEXT: Kind: FUNCTION
# CHECK-ALL-NEXT: Index: 1
Expand Down
6 changes: 5 additions & 1 deletion lld/wasm/Writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,9 @@ void Writer::calculateExports() {
unsigned globalIndex =
out.importSec->getNumImportedGlobals() + out.globalSec->numGlobals();

bool hasMutableGlobals =
out.targetFeaturesSec->features.count("mutable-globals") > 0;

for (Symbol *sym : symtab->symbols()) {
if (!sym->isExported())
continue;
Expand All @@ -801,7 +804,8 @@ void Writer::calculateExports() {
}
export_ = {name, WASM_EXTERNAL_FUNCTION, f->getExportedFunctionIndex()};
} else if (auto *g = dyn_cast<DefinedGlobal>(sym)) {
if (g->getGlobalType()->Mutable && !g->getFile() && !g->forceExport) {
if (!hasMutableGlobals && g->getGlobalType()->Mutable && !g->getFile() &&
!g->isExportedExplicit()) {
// Avoid exporting mutable globals are linker synthesized (e.g.
// __stack_pointer or __tls_base) unless they are explicitly exported
// from the command line.
Expand Down