diff options
| author | Jacob Gravelle <jgravelle@google.com> | 2017-04-17 21:40:28 +0000 |
|---|---|---|
| committer | Jacob Gravelle <jgravelle@google.com> | 2017-04-17 21:40:28 +0000 |
| commit | 0bb75412332a2ecdcf2067dd26268ffecc664ae5 (patch) | |
| tree | a61f72926c545064d041f2a14dfe433f06c8e3f9 /llvm | |
| parent | 21793a617ab645faae343519e48bb11ce592c03c (diff) | |
| download | bcm5719-llvm-0bb75412332a2ecdcf2067dd26268ffecc664ae5.tar.gz bcm5719-llvm-0bb75412332a2ecdcf2067dd26268ffecc664ae5.zip | |
[WebAssembly] Fix WebAssemblyOptimizeReturned after r300367
Summary:
Refactoring changed paramHasAttr(1 + i) to paramHasAttr(0), fix that to
paramHasAttr(i).
Add more tests to WebAssemblyOptimizeReturned that catch that
regression.
Reviewers: dschuff
Subscribers: jfb, sbc100, llvm-commits
Differential Revision: https://reviews.llvm.org/D32136
llvm-svn: 300502
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/returned.ll | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp index f4c9a4ef6b9..559165e4c86 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp @@ -54,7 +54,7 @@ FunctionPass *llvm::createWebAssemblyOptimizeReturned() { void OptimizeReturned::visitCallSite(CallSite CS) { for (unsigned i = 0, e = CS.getNumArgOperands(); i < e; ++i) - if (CS.paramHasAttr(0, Attribute::Returned)) { + if (CS.paramHasAttr(i, Attribute::Returned)) { Instruction *Inst = CS.getInstruction(); Value *Arg = CS.getArgOperand(i); // Ignore constants, globals, undef, etc. diff --git a/llvm/test/CodeGen/WebAssembly/returned.ll b/llvm/test/CodeGen/WebAssembly/returned.ll index b059fd8a598..dfd3fad794f 100644 --- a/llvm/test/CodeGen/WebAssembly/returned.ll +++ b/llvm/test/CodeGen/WebAssembly/returned.ll @@ -47,3 +47,34 @@ define void @test_constant_arg() { ret void } declare i32* @returns_arg(i32* returned) + +; Test that the optimization isn't performed on arguments without the +; "returned" attribute. + +; CHECK-LABEL: test_other_skipped: +; CHECK-NEXT: .param i32, i32, f64{{$}} +; CHECK-NEXT: {{^}} i32.call $drop=, do_something@FUNCTION, $0, $1, $2{{$}} +; CHECK-NEXT: {{^}} call do_something_with_i32@FUNCTION, $1{{$}} +; CHECK-NEXT: {{^}} call do_something_with_double@FUNCTION, $2{{$}} +declare i32 @do_something(i32 returned, i32, double) +declare void @do_something_with_i32(i32) +declare void @do_something_with_double(double) +define void @test_other_skipped(i32 %a, i32 %b, double %c) { + %call = call i32 @do_something(i32 %a, i32 %b, double %c) + call void @do_something_with_i32(i32 %b) + call void @do_something_with_double(double %c) + ret void +} + +; Test that the optimization is performed on arguments other than the first. + +; CHECK-LABEL: test_second_arg: +; CHECK-NEXT: .param i32, i32{{$}} +; CHECK-NEXT: .result i32{{$}} +; CHECK-NEXT: {{^}} i32.call $push0=, do_something_else@FUNCTION, $0, $1{{$}} +; CHECK-NEXT: return $pop0{{$}} +declare i32 @do_something_else(i32, i32 returned) +define i32 @test_second_arg(i32 %a, i32 %b) { + %call = call i32 @do_something_else(i32 %a, i32 %b) + ret i32 %b +} |
