Skip to content

[WebAssembly] Make llvm.wasm.throw invokable #128104

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
merged 8 commits into from
Feb 25, 2025
Merged

[WebAssembly] Make llvm.wasm.throw invokable #128104

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ddc2c9a
[WebAssembly] Make llvm.wasm.throw invokable
aheejin Feb 20, 2025
87456cc
clang-format insists this :(
aheejin Feb 21, 2025
aa5fafd
Use a static array
aheejin Feb 21, 2025
aa7b0f6
Use std::array (also for wasm_rethrow)
aheejin Feb 21, 2025
614293e
Error message update in test
aheejin Feb 21, 2025
5d9f948
Update llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
aheejin Feb 25, 2025
722d689
Merge branch 'main' into invokable_throw
aheejin Feb 25, 2025
f8bd25e
80 col wrapping
aheejin Feb 25, 2025
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
12 changes: 6 additions & 6 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3364,14 +3364,14 @@ void SelectionDAGBuilder::visitInvoke(const InvokeInst &I) {
// but this intrinsic is special because it can be invoked, so we manually
// lower it to a DAG node here.
case Intrinsic::wasm_throw: {
SmallVector<SDValue, 8> Ops;
Ops.push_back(getControlRoot()); // inchain for the terminator node
const TargetLowering &TLI = DAG.getTargetLoweringInfo();
Ops.push_back(
SmallVector<SDValue, 8> Ops = {
Copy link
Contributor

@arsenm arsenm Feb 21, 2025

Choose a reason for hiding this comment

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

std::array

Copy link
Member Author

@aheejin aheejin Feb 21, 2025

Choose a reason for hiding this comment

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

Done: aa7b0f6

getControlRoot(), // inchain for the terminator node
DAG.getTargetConstant(Intrinsic::wasm_throw, getCurSDLoc(),
TLI.getPointerTy(DAG.getDataLayout())));
Ops.push_back(getValue(I.getArgOperand(0))); // tag
Ops.push_back(getValue(I.getArgOperand(1))); // thrown value
TLI.getPointerTy(DAG.getDataLayout())),
getValue(I.getArgOperand(0)), // tag
getValue(I.getArgOperand(1)) // thrown value
};
SDVTList VTs = DAG.getVTList(ArrayRef<EVT>({MVT::Other})); // outchain
DAG.setRoot(DAG.getNode(ISD::INTRINSIC_VOID, getCurSDLoc(), VTs, Ops));
break;
Expand Down
Loading