caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebAssembly: Move runtime libcall setting out of TargetLowering (#142624)

Browse Source 
RuntimeLibcallInfo needs to be correct outside of codegen contexts.
This commit is contained in:
Matt Arsenault
2025-06-16 10:46:05 +09:00
committed by GitHub
parent f23b841f0f
commit ba7369c49c
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lld/test/wasm/lto/Inputs/libcall-return-addr.ll
View File

@@ -1,6 +0,0 @@
target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-f128:64-n32:64-S128-ni:1:10:20"
target triple = "wasm32-unknown-emscripten"
define ptr @emscripten_return_address() {
ret ptr null
}

18
lld/test/wasm/lto/libcall-return-addr.ll
View File

@@ -1,18 +0,0 @@
; RUN: llvm-as %s -o %t.o
; RUN: llvm-as %p/Inputs/libcall-return-addr.ll -o %t.return-addr.o
; RUN: rm -f %t.a
; RUN: llvm-ar rcs %t.a %t.return-addr.o
; RUN: not wasm-ld --export-all %t.o %t.a -o %t.wasm 2>&1 | FileCheck %s
target datalayout = "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-f128:64-n32:64-S128-ni:1:10:20"
target triple = "wasm32-unknown-emscripten"
@g_ptr = global ptr null
define void @_start() {
%addr = call ptr @llvm.returnaddress(i32 1)
store ptr %addr, ptr @g_ptr
ret void
}
; CHECK: wasm-ld: error: {{.*}}return-addr.o): attempt to add bitcode file after LTO (emscripten_return_address)

5
llvm/lib/IR/RuntimeLibcalls.cpp
View File

@@ -531,6 +531,11 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT) {
setLibcallName(RTLIB::MULO_I64, nullptr);
}
setLibcallName(RTLIB::MULO_I128, nullptr);
} else {
// 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()) {

5
llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp
View File

@@ -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.