Skip to content

NFC: Take a const Module for iter... functions #8822

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
stevenfontanella merged 1 commit into from
Jun 10, 2026
+18 −22
Merged

NFC: Take a const Module for iter... functions #8822

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
40 changes: 18 additions & 22 deletions src/ir/module-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,58 +76,56 @@ void renameFunction(Module& wasm, Name oldName, Name newName);

// Convenient iteration over imported/non-imported module elements

template<typename T> inline void iterImportedMemories(Module& wasm, T visitor) {
inline void iterImportedMemories(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.memories) {
if (import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterDefinedMemories(Module& wasm, T visitor) {
inline void iterDefinedMemories(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.memories) {
if (!import->imported()) {
visitor(import.get());
}
}
}

template<typename T>
inline void iterMemorySegments(Module& wasm, Name memory, T visitor) {
inline void
iterMemorySegments(const Module& wasm, Name memory, auto&& visitor) {
for (auto& segment : wasm.dataSegments) {
if (segment->isActive() && segment->memory == memory) {
visitor(segment.get());
}
}
}

template<typename T>
inline void iterActiveDataSegments(Module& wasm, T visitor) {
inline void iterActiveDataSegments(const Module& wasm, auto&& visitor) {
for (auto& segment : wasm.dataSegments) {
if (segment->isActive()) {
visitor(segment.get());
}
}
}

template<typename T> inline void iterImportedTables(Module& wasm, T visitor) {
inline void iterImportedTables(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.tables) {
if (import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterDefinedTables(Module& wasm, T visitor) {
inline void iterDefinedTables(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.tables) {
if (!import->imported()) {
visitor(import.get());
}
}
}

template<typename T>
inline void iterTableSegments(Module& wasm, Name table, T visitor) {
inline void iterTableSegments(const Module& wasm, Name table, auto&& visitor) {
// Just a precaution so that we don't iterate over passive elem segments by
// accident
assert(table.is() && "Table name must not be null");
Expand All @@ -139,65 +137,63 @@ inline void iterTableSegments(Module& wasm, Name table, T visitor) {
}
}

template<typename T>
inline void iterActiveElementSegments(Module& wasm, T visitor) {
inline void iterActiveElementSegments(const Module& wasm, auto&& visitor) {
for (auto& segment : wasm.elementSegments) {
if (segment->isActive()) {
visitor(segment.get());
}
}
}

template<typename T> inline void iterImportedGlobals(Module& wasm, T visitor) {
inline void iterImportedGlobals(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.globals) {
if (import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterDefinedGlobals(Module& wasm, T visitor) {
inline void iterDefinedGlobals(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.globals) {
if (!import->imported()) {
visitor(import.get());
}
}
}

template<typename T>
inline void iterImportedFunctions(Module& wasm, T visitor) {
inline void iterImportedFunctions(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.functions) {
if (import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterDefinedFunctions(Module& wasm, T visitor) {
inline void iterDefinedFunctions(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.functions) {
if (!import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterImportedTags(Module& wasm, T visitor) {
inline void iterImportedTags(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.tags) {
if (import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterDefinedTags(Module& wasm, T visitor) {
inline void iterDefinedTags(const Module& wasm, auto&& visitor) {
for (auto& import : wasm.tags) {
if (!import->imported()) {
visitor(import.get());
}
}
}

template<typename T> inline void iterImports(Module& wasm, T visitor) {
inline void iterImports(const Module& wasm, auto&& visitor) {
iterImportedMemories(wasm, visitor);
iterImportedTables(wasm, visitor);
iterImportedGlobals(wasm, visitor);
Expand All @@ -207,7 +203,7 @@ template<typename T> inline void iterImports(Module& wasm, T visitor) {

// Iterates over all importable module items. The visitor provided should have
// signature void(ExternalKind, Importable*).
template<typename T> inline void iterImportable(Module& wasm, T visitor) {
inline void iterImportable(const Module& wasm, auto&& visitor) {
for (auto& curr : wasm.functions) {
if (curr->imported()) {
visitor(ExternalKind::Function, curr.get());
Expand Down Expand Up @@ -237,7 +233,7 @@ template<typename T> inline void iterImportable(Module& wasm, T visitor) {

// Iterates over all module items. The visitor provided should have signature
// void(ModuleItemKind, Named*).
template<typename T> inline void iterModuleItems(Module& wasm, T visitor) {
inline void iterModuleItems(const Module& wasm, auto&& visitor) {
for (auto& curr : wasm.functions) {
visitor(ModuleItemKind::Function, curr.get());
}
Expand Down
Loading