Skip to content

[WebAssembly] Generate invokes with llvm.wasm.(re)throw #128105

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

[WebAssembly] Generate invokes with llvm.wasm.(re)throw #128105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8702f84
[WebAssembly] Generate invokes with llvm.wasm.(re)throw
aheejin Feb 20, 2025
2c0d362
Merge branch 'main' into invoke_throw
aheejin Feb 22, 2025
7dfce0c
Merge branch 'main' into invoke_throw
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
4 changes: 2 additions & 2 deletions clang/lib/CodeGen/CGBuiltin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22524,11 +22524,11 @@ Value *CodeGenFunction::EmitWebAssemblyBuiltinExpr(unsigned BuiltinID,
Value *Tag = EmitScalarExpr(E->getArg(0));
Value *Obj = EmitScalarExpr(E->getArg(1));
Function *Callee = CGM.getIntrinsic(Intrinsic::wasm_throw);
return Builder.CreateCall(Callee, {Tag, Obj});
return EmitRuntimeCallOrInvoke(Callee, {Tag, Obj});
}
case WebAssembly::BI__builtin_wasm_rethrow: {
Function *Callee = CGM.getIntrinsic(Intrinsic::wasm_rethrow);
return Builder.CreateCall(Callee);
return EmitRuntimeCallOrInvoke(Callee);
}
case WebAssembly::BI__builtin_wasm_memory_atomic_wait32: {
Value *Addr = EmitScalarExpr(E->getArg(0));
Expand Down
20 changes: 20 additions & 0 deletions clang/test/CodeGenCXX/builtins-eh-wasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// RUN: %clang_cc1 -triple wasm32-unknown-unknown -fexceptions -fcxx-exceptions -target-feature +reference-types -target-feature +exception-handling -target-feature +multivalue -exception-model=wasm -emit-llvm -o - %s | FileCheck %s

// Check if __builtin_wasm_throw and __builtin_wasm_rethrow are correctly
// invoked when placed in try-catch.

void throw_in_try(void *obj) {
try {
Copy link
Member

Choose a reason for hiding this comment

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

do we also expect there to be an invoke when not placed in a try, or does EmitRuntimeCallOrInvoke handle that case automatically?

Copy link
Member Author

Choose a reason for hiding this comment

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

It handles the case automatically (hence CallOrInvoke)

__builtin_wasm_throw(0, obj);
} catch (...) {
}
// CHECK: invoke void @llvm.wasm.throw(i32 0, ptr %{{.*}})
}

void rethrow_in_try() {
try {
__builtin_wasm_rethrow();
Copy link
Member Author

Choose a reason for hiding this comment

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

This code actually does not make sense because this call is not within a catch, but this test only has the purpose of checking whether invoke is generated and does not go through the backend, so it should be fine
(As I said in the PR description, we don't use this builtin for our C++ implementation, but I didn't remove this because other people might want to use it)

} catch (...) {
}
// CHECK: invoke void @llvm.wasm.rethrow()
}