Skip to content

Fix br_on_cast parsing with non-nullable extra values #9036

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
pttydou wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix br_on_cast parsing with non-nullable extra values #9036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d7b25
Fix br_on_cast parsing with non-nullable extra values
pttydou Aug 23, 2026
852506f
Limit nondefaultable local fixup to scratch locals
pttydou Aug 27, 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
3 changes: 3 additions & 0 deletions src/parser/parse-5-defs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

#include "wat-parser-internal.h"

#include "ir/type-updating.h"

namespace wasm::WATParser {

Result<> parseDefinitions(
Expand Down Expand Up @@ -63,6 +65,7 @@ Result<> parseDefinitions(
if (auto* err = end.getErr()) {
return ctx.in.err(decls.funcDefs[i].pos, err->msg);
}
TypeUpdating::handleNonDefaultableLocals(f, decls.wasm);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ Result<> IRBuilder::makeBrOn(Index label,
case BrOnCast:
case BrOnCastDescEq:
if (out->isNullable()) {
resultType = Type(in->getHeapType(), NonNullable);
resultType = in->with(NonNullable);
} else {
resultType = *in;
}
Expand Down
17 changes: 17 additions & 0 deletions test/lit/basic/br-on-cast-extra-values.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
;; RUN: wasm-opt %s -all -S -o %t
;; RUN: wasm-opt %s -all --roundtrip -S -o %t.roundtrip

@tlively tlively Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please update the test to include the expected output. After updating the RUN line, you can use scripts/update_lit_checks.py to generate the expectations.

Suggested change
;; RUN: wasm-opt %s -all -S -o %t
;; RUN: wasm-opt %s -all --roundtrip -S -o %t.roundtrip
;; RUN: wasm-opt %s -all --roundtrip -S -o - | filecheck %s

@pttydou pttydou Aug 27, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Updated the test to pipe the roundtrip output through FileCheck and generated the expected output with scripts/update_lit_checks.py. The focused lit tests pass locally.


(module
(type $s (struct))
(func (param $s (ref $s)) (result (ref $s) (ref $s))
local.get $s
local.get $s
br_on_cast 0 (ref $s) (ref $s)
)
(func (param $s (ref (exact $s)))
(result (ref (exact $s)) (ref null (exact $s)))
local.get $s
local.get $s
br_on_cast 0 (ref (exact $s)) (ref null (exact $s))
)
)
Loading