RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-14 15:39:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[WebAssembly] Fix WebAssemblyOptimizeReturned after r300367

Browse Source 
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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@300502 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jacob Gravelle 2017-04-17 21:40:28 +00:00
parent 2e4163e54d
commit fee2961b5a
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/WebAssembly/WebAssemblyOptimizeReturned.cpp
View File

@ -54,7 +54,7 @@ FunctionPass *llvm::createWebAssemblyOptimizeReturned() {
void OptimizeReturned::visitCallSite(CallSite CS) { void OptimizeReturned::visitCallSite(CallSite CS) {
for (unsigned i = 0, e = CS.getNumArgOperands(); i < e; ++i) 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(); Instruction *Inst = CS.getInstruction();
Value *Arg = CS.getArgOperand(i); Value *Arg = CS.getArgOperand(i);
// Ignore constants, globals, undef, etc. // Ignore constants, globals, undef, etc.

31
test/CodeGen/WebAssembly/returned.ll
View File

@ -47,3 +47,34 @@ define void @test_constant_arg() {
ret void ret void
} }
declare i32* @returns_arg(i32* returned) 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
}