RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 19:12:56 +02:00
Code Issues Projects Releases Wiki Activity

[WebAssembly] Fix fast-isel lowering illegal argument and return types.

Browse Source 
For both argument and return types, promote illegal types like i24 to i32,
and if a type can't be easily promoted, clear out the signature before
bailing out, so avoid leaving it in a partially complete state.

Fixes PR37546.

llvm-svn: 332947
This commit is contained in:
Dan Gohman 2018-05-22 04:58:36 +00:00
parent fa30317850
commit 2df2ccde1c
4 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Target/WebAssembly/WebAssemblyFastISel.cpp
View File

@ -700,14 +700,22 @@ bool WebAssemblyFastISel::fastLowerArguments() {
MRI.addLiveIn(WebAssembly::ARGUMENTS);
auto *MFI = MF->getInfo<WebAssemblyFunctionInfo>();
for (auto const &Arg : F->args())
MFI->addParam(getLegalType(getSimpleType(Arg.getType())));
for (auto const &Arg : F->args()) {
MVT::SimpleValueType ArgTy = getLegalType(getSimpleType(Arg.getType()));
if (ArgTy == MVT::INVALID_SIMPLE_VALUE_TYPE) {
MFI->clearParamsAndResults();
return false;
}
MFI->addParam(ArgTy);
}
if (!F->getReturnType()->isVoidTy()) {
MVT::SimpleValueType RetTy = getSimpleType(F->getReturnType());
if (RetTy == MVT::INVALID_SIMPLE_VALUE_TYPE)
MVT::SimpleValueType RetTy = getLegalType(getSimpleType(F->getReturnType()));
if (RetTy == MVT::INVALID_SIMPLE_VALUE_TYPE) {
MFI->clearParamsAndResults();
return false;
MFI->addResult(getLegalType(RetTy));
}
MFI->addResult(RetTy);
}
return true;

2
lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h
View File

@ -60,6 +60,8 @@ class WebAssemblyFunctionInfo final : public MachineFunctionInfo {
void addResult(MVT VT) { Results.push_back(VT); }
const std::vector<MVT> &getResults() const { return Results; }
void clearParamsAndResults() { Params.clear(); Results.clear(); }
void setNumLocals(size_t NumLocals) { Locals.resize(NumLocals, MVT::i32); }
void setLocal(size_t i, MVT VT) { Locals[i] = VT; }
void addLocal(MVT VT) { Locals.push_back(VT); }

12
test/CodeGen/WebAssembly/fast-isel-i24.ll
View File

@ -1,16 +1,28 @@
; RUN: llc < %s -O0
; PR36564
; PR37546
; Test that fast-isel properly copes with i24 arguments and return types.
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown"
; CHECK-LABEL: add:
; CHECK-NEXT: .param i32, i32{{$}}
; CHECK-NEXT: .result i32{{$}}
; CHECK-NEXT: get_local $push2=, 0{{$}}
; CHECK-NEXT: get_local $push1=, 1{{$}}
; CHECK-NEXT: i32.add $push0=, $pop2, $pop1{{$}}
; CHECK-NEXT: end_function
define i24 @add(i24 %x, i24 %y) {
%z = add i24 %x, %y
ret i24 %z
}
; CHECK-LABEL: return_zero:
; CHECK-NEXT: .result i32{{$}}
; CHECK-NEXT: i32.const $push0=, 0{{$}}
; CHECK-NEXT: end_function
define i24 @return_zero() {
ret i24 0
}

33
test/CodeGen/WebAssembly/fast-isel-i256.ll Normal file
View File

@ -0,0 +1,33 @@
; RUN: llc < %s -O0
; PR36564
; PR37546
; Test that fast-isel properly copes with i256 arguments and return types.
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown"
; CHECK-LABEL: add:
; CHECK-NEXT: .param i32, i64, i64, i64, i64, i64, i64, i64, i64{{$}}
; CHECK-NOT: .result
; CHECK: end_function
define i256 @add(i256 %x, i256 %y) {
%z = add i256 %x, %y
ret i256 %z
}
; CHECK-LABEL: return_zero:
; CHECK-NEXT: .param i32{{$}}
; CHECK-NOT: .result
; CHECK: end_function
define i256 @return_zero() {
ret i256 0
}
; CHECK-LABEL: return_zero_with_params:
; CHECK-NEXT: .param i32, f32{{$}}
; CHECK-NOT: .result
; CHECK: end_function
define i256 @return_zero_with_params(float %x) {
ret i256 0
}