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

[Dan Gohman via llvm-commits]

Author: djg
Date: Mon May 21 21:58:36 2018
New Revision: 332947

URL: http://llvm.org/viewvc/llvm-project?rev=332947&view=rev
Log:
[WebAssembly] Fix fast-isel lowering illegal argument and return types.

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.

Added:
    llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i256.ll
      - copied, changed from r332940, llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll
Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h
    llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyFastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyFastISel.cpp?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyFastISel.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyFastISel.cpp Mon May 21 21:58:36 2018
@@ -700,14 +700,22 @@ bool WebAssemblyFastISel::fastLowerArgum
   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;

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h Mon May 21 21:58:36 2018
@@ -60,6 +60,8 @@ class WebAssemblyFunctionInfo final : pu
   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); }

Modified: llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll Mon May 21 21:58:36 2018
@@ -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
 }

Copied: llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i256.ll (from r332940, llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i256.ll?p2=llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i256.ll&p1=llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll&r1=332940&r2=332947&rev=332947&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i24.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/fast-isel-i256.ll Mon May 21 21:58:36 2018
@@ -1,16 +1,33 @@
 ; RUN: llc < %s -O0
 ; PR36564
+; PR37546
 
-; Test that fast-isel properly copes with i24 arguments and return types.
+; 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"
 
-define i24 @add(i24 %x, i24 %y) {
-    %z = add i24 %x, %y
-    ret i24 %z
+; 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
 }
 
-define i24 @return_zero() {
-    ret i24 0
+; 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
 }