Skip to content

WebAssembly: Move runtime libcall setting out of TargetLowering #142624

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 2 commits into from
Jun 16, 2025
Merged

WebAssembly: Move runtime libcall setting out of TargetLowering #142624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
129c1db
WebAssembly: Move runtime libcall setting out of TargetLowering
arsenm Jun 2, 2025
9fd32f4
Remove lld test
arsenm Jun 13, 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
6 changes: 0 additions & 6 deletions lld/test/wasm/lto/Inputs/libcall-return-addr.ll
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions lld/test/wasm/lto/libcall-return-addr.ll
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions llvm/lib/IR/RuntimeLibcalls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,11 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT) {
setLibcallName(RTLIB::MULO_I64, nullptr);
}
setLibcallName(RTLIB::MULO_I128, nullptr);
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should this be if (TT.isOSEmscripten()) ?

Copy link
Member

Choose a reason for hiding this comment

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

I suspect this predates when we had an emscripten triple, and it should probably be behind isOSEmscripten()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not looking to change behavior here, this should be done separately

Copy link
Collaborator

Choose a reason for hiding this comment

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

This particular change LGTM, but @nikic, can you explain where the !TT.isWasm above came from? It looks like you added it in dad9e4a.

Copy link
Contributor

Choose a reason for hiding this comment

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

IIRC to preserve existing behavior and because these libcalls were listed in RuntimeLibcallSignatureTable.

I don't think wasm is typically used with libgcc? Is that supported?

Copy link
Member

Choose a reason for hiding this comment

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

AFAIK there are no uses of libgcc with wasm.

// Define the emscripten name for return address helper.
// TODO: when implementing other Wasm backends, make this generic or only do
// this on emscripten depending on what they end up doing.
setLibcallName(RTLIB::RETURN_ADDRESS, "emscripten_return_address");
}

if (TT.isSystemZ() && TT.isOSzOS()) {
Expand Down
5 changes: 0 additions & 5 deletions llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,6 @@ WebAssemblyTargetLowering::WebAssemblyTargetLowering(

setMaxAtomicSizeInBitsSupported(64);

// Define the emscripten name for return address helper.
// TODO: when implementing other Wasm backends, make this generic or only do
// this on emscripten depending on what they end up doing.
setLibcallName(RTLIB::RETURN_ADDRESS, "emscripten_return_address");

// Always convert switches to br_tables unless there is only one case, which
// is equivalent to a simple branch. This reduces code size for wasm, and we
// defer possible jump table optimizations to the VM.
Expand Down
Loading