Skip to content

[wasm-split] Remove module elements in bulk (NFC) #8990

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

Open
aheejin wants to merge 3 commits into from
+31 −36
Open

[wasm-split] Remove module elements in bulk (NFC) #8990

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e9ea51
[wasm-split] Remove module elements in bulk (NFC)
aheejin Aug 8, 2026
0355b59
Merge branch 'wasm_split_owning_modules' into wasm_split_remove_opt
aheejin Aug 15, 2026
e802ede
Update src/ir/module-splitting.cpp
aheejin Aug 15, 2026
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
67 changes: 31 additions & 36 deletions src/ir/module-splitting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,15 +1107,15 @@ void ModuleSplitter::shareImportableItems() {
// the primary and secondary modules), export the item from the primary and
// import it from the using secondary modules.

std::vector<Name> memoriesToRemove;
std::unordered_set<Name> memoriesToRemove;
for (auto& memory : primary.memories) {
if (tracker.useEmpty(memory->name, tracker.memories)) {
memoriesToRemove.push_back(memory->name);
memoriesToRemove.insert(memory->name);
} else if (tracker.usedBySingleSecondary(memory->name, tracker.memories)) {
auto* secondary =
tracker.getUsingSecondaries(memory->name, tracker.memories)[0];
ModuleUtils::copyMemory(memory.get(), *secondary);
memoriesToRemove.push_back(memory->name);
memoriesToRemove.insert(memory->name);
} else {
for (auto* secondary :
tracker.getUsingSecondaries(memory->name, tracker.memories)) {
Expand All @@ -1126,20 +1126,19 @@ void ModuleSplitter::shareImportableItems() {
}
}
}
for (auto& name : memoriesToRemove) {
primary.removeMemory(name);
}
primary.removeMemories(
[&](Memory* memory) { return memoriesToRemove.contains(memory->name); });

std::vector<Name> tablesToRemove;
std::unordered_set<Name> tablesToRemove;
for (auto& table : primary.tables) {
if (tracker.useEmpty(table->name, tracker.tables)) {
tablesToRemove.push_back(table->name);
tablesToRemove.insert(table->name);
} else if (tracker.usedBySingleSecondary(table->name, tracker.tables)) {
auto* secondary =
tracker.getUsingSecondaries(table->name, tracker.tables)[0];
assert(!secondary->getTableOrNull(table->name));
ModuleUtils::copyTable(table.get(), *secondary);
tablesToRemove.push_back(table->name);
tablesToRemove.insert(table->name);
} else {
for (auto* secondary :
tracker.getUsingSecondaries(table->name, tracker.tables)) {
Expand All @@ -1148,24 +1147,23 @@ void ModuleSplitter::shareImportableItems() {
}
}
}
for (auto& name : tablesToRemove) {
primary.removeTable(name);
}
primary.removeTables(
[&](Table* table) { return tablesToRemove.count(table->name); });

std::vector<Name> globalsToRemove;
std::unordered_set<Name> globalsToRemove;
for (auto& global : primary.globals) {
if (global->mutable_) {
assert(primary.features.hasMutableGlobals() &&
"TODO: add wrapper functions for disallowed mutable globals");
}

if (tracker.useEmpty(global->name, tracker.globals)) {
globalsToRemove.push_back(global->name);
globalsToRemove.insert(global->name);
} else if (tracker.usedBySingleSecondary(global->name, tracker.globals)) {
auto* secondary =
tracker.getUsingSecondaries(global->name, tracker.globals)[0];
ModuleUtils::copyGlobal(global.get(), *secondary);
globalsToRemove.push_back(global->name);
globalsToRemove.insert(global->name);
} else {
for (auto* secondary :
tracker.getUsingSecondaries(global->name, tracker.globals)) {
Expand All @@ -1176,18 +1174,17 @@ void ModuleSplitter::shareImportableItems() {
}
}
}
for (auto& name : globalsToRemove) {
primary.removeGlobal(name);
}
primary.removeGlobals(
[&](Global* global) { return globalsToRemove.count(global->name); });

std::vector<Name> tagsToRemove;
std::unordered_set<Name> tagsToRemove;
for (auto& tag : primary.tags) {
if (tracker.useEmpty(tag->name, tracker.tags)) {
tagsToRemove.push_back(tag->name);
tagsToRemove.insert(tag->name);
} else if (tracker.usedBySingleSecondary(tag->name, tracker.tags)) {
auto* secondary = tracker.getUsingSecondaries(tag->name, tracker.tags)[0];
ModuleUtils::copyTag(tag.get(), *secondary);
tagsToRemove.push_back(tag->name);
tagsToRemove.insert(tag->name);
} else {
for (auto* secondary :
tracker.getUsingSecondaries(tag->name, tracker.tags)) {
Expand All @@ -1196,45 +1193,43 @@ void ModuleSplitter::shareImportableItems() {
}
}
}
for (auto& name : tagsToRemove) {
primary.removeTag(name);
}
primary.removeTags([&](Tag* tag) { return tagsToRemove.count(tag->name); });

// Move segments that are exclusively used in a secondary module. If not, do
// nothing. (Segments cannot be imported / exported. They will be handled in
// indirectReferencesToSecondaryFunctions.)

std::vector<Name> dataSegmentsToRemove;
std::unordered_set<Name> dataSegmentsToRemove;
for (auto& dataSegment : primary.dataSegments) {
if (tracker.useEmpty(dataSegment->name, tracker.dataSegments)) {
dataSegmentsToRemove.push_back(dataSegment->name);
dataSegmentsToRemove.insert(dataSegment->name);
} else if (tracker.usedBySingleSecondary(dataSegment->name,
tracker.dataSegments)) {
auto* secondary =
tracker.getUsingSecondaries(dataSegment->name, tracker.dataSegments)[0];
ModuleUtils::copyDataSegment(dataSegment.get(), *secondary);
dataSegmentsToRemove.push_back(dataSegment->name);
dataSegmentsToRemove.insert(dataSegment->name);
}
}
for (auto& name : dataSegmentsToRemove) {
primary.removeDataSegment(name);
}
primary.removeDataSegments([&](DataSegment* dataSegment) {
return dataSegmentsToRemove.count(dataSegment->name);
});

std::vector<Name> elementSegmentsToRemove;
std::unordered_set<Name> elementSegmentsToRemove;
for (auto& elementSegment : primary.elementSegments) {
if (tracker.useEmpty(elementSegment->name, tracker.elementSegments)) {
elementSegmentsToRemove.push_back(elementSegment->name);
elementSegmentsToRemove.insert(elementSegment->name);
} else if (tracker.usedBySingleSecondary(elementSegment->name,
tracker.elementSegments)) {
auto* secondary = tracker.getUsingSecondaries(elementSegment->name,
tracker.elementSegments)[0];
ModuleUtils::copyElementSegment(elementSegment.get(), *secondary);
elementSegmentsToRemove.push_back(elementSegment->name);
elementSegmentsToRemove.insert(elementSegment->name);
}
}
for (auto& name : elementSegmentsToRemove) {
primary.removeElementSegment(name);
}
primary.removeElementSegments([&](ElementSegment* elementSegment) {
return elementSegmentsToRemove.count(elementSegment->name);
});
}

void ModuleSplitter::indirectReferencesToSecondaryFunctions() {
Expand Down
Loading