Skip to content

[NFC] Avoid long if-else chain in ModuleUtils::CodeScanner #8206

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
kripken merged 3 commits into from
Jan 14, 2026
+62 −62
Merged

[NFC] Avoid long if-else chain in ModuleUtils::CodeScanner #8206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66da23d
go
kripken Jan 14, 2026
caf7112
go
kripken Jan 14, 2026
f1e85fe
format
kripken Jan 14, 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
124 changes: 62 additions & 62 deletions src/ir/module-utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,7 @@ struct TypeInfos {
bool contains(HeapType type) { return info.count(type); }
};

struct CodeScanner
: PostWalker<CodeScanner, UnifiedExpressionVisitor<CodeScanner>> {
struct CodeScanner : PostWalker<CodeScanner> {
TypeInfos& info;
TypeInclusion inclusion;

Expand All @@ -401,70 +400,71 @@ struct CodeScanner
setModule(&wasm);
}

void visitExpression(Expression* curr) {
if (auto* call = curr->dynCast<CallIndirect>()) {
info.note(call->heapType);
} else if (auto* call = curr->dynCast<CallRef>()) {
info.note(call->target->type);
} else if (curr->is<RefNull>()) {
info.note(curr->type);
} else if (curr->is<Select>() && curr->type.isRef()) {
void visitCallIndirect(CallIndirect* curr) { info.note(curr->heapType); }
void visitCallRef(CallRef* curr) { info.note(curr->target->type); }
void visitRefNull(RefNull* curr) { info.note(curr->type); }
void visitSelect(Select* curr) {
if (curr->type.isRef()) {
// This select will be annotated in the binary, so note it.
info.note(curr->type);
} else if (curr->is<StructNew>()) {
info.note(curr->type);
} else if (curr->is<ArrayNew>()) {
info.note(curr->type);
} else if (curr->is<ArrayNewData>()) {
info.note(curr->type);
} else if (curr->is<ArrayNewElem>()) {
info.note(curr->type);
} else if (curr->is<ArrayNewFixed>()) {
info.note(curr->type);
} else if (auto* copy = curr->dynCast<ArrayCopy>()) {
info.note(copy->destRef->type);
info.note(copy->srcRef->type);
} else if (auto* fill = curr->dynCast<ArrayFill>()) {
info.note(fill->ref->type);
} else if (auto* init = curr->dynCast<ArrayInitData>()) {
info.note(init->ref->type);
} else if (auto* init = curr->dynCast<ArrayInitElem>()) {
info.note(init->ref->type);
} else if (auto* cast = curr->dynCast<RefCast>()) {
info.note(cast->type);
} else if (auto* cast = curr->dynCast<RefTest>()) {
info.note(cast->castType);
} else if (auto* cast = curr->dynCast<BrOn>()) {
if (cast->op == BrOnCast || cast->op == BrOnCastFail) {
info.note(cast->ref->type);
info.note(cast->castType);
}
} else if (auto* get = curr->dynCast<StructGet>()) {
info.note(get->ref->type);
} else if (auto* set = curr->dynCast<StructSet>()) {
info.note(set->ref->type);
} else if (auto* get = curr->dynCast<ArrayGet>()) {
info.note(get->ref->type);
} else if (auto* set = curr->dynCast<ArraySet>()) {
info.note(set->ref->type);
} else if (auto* contBind = curr->dynCast<ContBind>()) {
info.note(contBind->cont->type);
info.note(contBind->type);
} else if (auto* contNew = curr->dynCast<ContNew>()) {
info.note(contNew->type);
} else if (auto* resume = curr->dynCast<Resume>()) {
info.note(resume->cont->type);
info.note(resume->type);
} else if (auto* resumeThrow = curr->dynCast<ResumeThrow>()) {
info.note(resumeThrow->cont->type);
info.note(resumeThrow->type);
} else if (auto* switch_ = curr->dynCast<StackSwitch>()) {
info.note(switch_->cont->type);
info.note(switch_->type);
} else if (Properties::isControlFlowStructure(curr)) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
}
void visitStructNew(StructNew* curr) { info.note(curr->type); }
void visitArrayNew(ArrayNew* curr) { info.note(curr->type); }
void visitArrayNewData(ArrayNewData* curr) { info.note(curr->type); }
void visitArrayNewElem(ArrayNewElem* curr) { info.note(curr->type); }
void visitArrayNewFixed(ArrayNewFixed* curr) { info.note(curr->type); }
void visitArrayCopy(ArrayCopy* curr) {
info.note(curr->destRef->type);
info.note(curr->srcRef->type);
}
void visitArrayFill(ArrayFill* curr) { info.note(curr->ref->type); }
void visitArrayInitData(ArrayInitData* curr) { info.note(curr->ref->type); }
void visitArrayInitElem(ArrayInitElem* curr) { info.note(curr->ref->type); }
void visitRefCast(RefCast* curr) { info.note(curr->type); }
void visitRefTest(RefTest* curr) { info.note(curr->castType); }
void visitBrOn(BrOn* curr) {
if (curr->op == BrOnCast || curr->op == BrOnCastFail) {
info.note(curr->ref->type);
info.note(curr->castType);
}
}
void visitStructGet(StructGet* curr) { info.note(curr->ref->type); }
void visitStructSet(StructSet* curr) { info.note(curr->ref->type); }
void visitArrayGet(ArrayGet* curr) { info.note(curr->ref->type); }
void visitArraySet(ArraySet* curr) { info.note(curr->ref->type); }
void visitContBind(ContBind* curr) {
info.note(curr->cont->type);
info.note(curr->type);
}
void visitContNew(ContNew* curr) { info.note(curr->type); }
void visitResume(Resume* curr) {
info.note(curr->cont->type);
info.note(curr->type);
}
void visitResumeThrow(ResumeThrow* curr) {
info.note(curr->cont->type);
info.note(curr->type);
}
void visitStackSwitch(StackSwitch* curr) {
info.note(curr->cont->type);
info.note(curr->type);
}
void visitBlock(Block* curr) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
void visitIf(If* curr) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
void visitLoop(Loop* curr) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
void visitTry(Try* curr) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
void visitTryTable(TryTable* curr) {
info.noteControlFlow(Signature(Type::none, curr->type));
}
};

void classifyTypeVisibility(Module& wasm,
Expand Down
Loading