Skip to content

[Outlining] Fixes break reconstruction #6352

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
ashleynh merged 7 commits into from
Feb 28, 2024
Merged

[Outlining] Fixes break reconstruction #6352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a00196
label fix
ashleynh Jan 30, 2024
a8de1ee
comments
ashleynh Feb 27, 2024
c84d16b
assert
ashleynh Feb 27, 2024
ae7ab8a
check type none
ashleynh Feb 27, 2024
d7a60e3
assert comment
ashleynh Feb 28, 2024
c9ac6eb
assert comment2
ashleynh Feb 28, 2024
ed481b5
oops
ashleynh Feb 28, 2024
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
Prev Previous commit
oops
  • Loading branch information
@ashleynh
ashleynh committed Feb 28, 2024
commit ed481b517d0e601d94a9235fdc8a1ee2b3b5ee5e
2 changes: 1 addition & 1 deletion src/passes/Outlining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct ReconstructStringifyWalker
// Assert ensures new unhandled branch instructions
// will quickly cause an error. Serves as a reminder to
// implement a new special-case visit*WithType.
assert(curr->is<BrOn> || !Properties::isBranch(curr));
assert(curr->is<BrOn>() || !Properties::isBranch(curr));
ASSERT_OK(builder->visit(curr));
Copy link
Member

@tlively tlively Feb 27, 2024

Choose a reason for hiding this comment

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

It would be good to add an assertion somewhere to future-proof ourselves against the possibility that a new kind of Expression starts to need a visit*WithType variant. This could either be an assert(!Properties::isBranch(curr)) here guarding the default builder->visit(curr) case, or it could be an assertion that curr is a Break or Switch inside IRBuilder::getBranchValue.

Copy link
Collaborator Author

@ashleynh ashleynh Feb 27, 2024

Choose a reason for hiding this comment

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

done

}
}
Expand Down
4 changes: 2 additions & 2 deletions src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ Result<> IRBuilder::visitBreakWithType(Break* curr, Type type) {
CHECK_ERR(cond);
curr->condition = *cond;
}
if (type == Type::None) {
if (type == Type::none) {
curr->value = nullptr;
} else {
auto value = pop(type.size());
Expand All @@ -470,7 +470,7 @@ Result<> IRBuilder::visitSwitchWithType(Switch* curr, Type type) {
auto cond = pop();
CHECK_ERR(cond);
curr->condition = *cond;
if (type == Type::None) {
if (type == Type::none) {
curr->value = nullptr;
} else {
auto value = pop(type.size());
Expand Down