maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

AMDGPU: Fix assert when erroring on a call 

For some reason an assert is now hit when a valid chain
is not returned, so return the entry chain.

llvm-svn: 269948
This commit is contained in:
Matt Arsenault 2016-05-18 16:10:11 +00:00
parent 233a364bd8
commit 9430b9113a
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
View File

@ -619,7 +619,11 @@ SDValue AMDGPUTargetLowering::LowerCall(CallLoweringInfo &CLI,
DiagnosticInfoUnsupported NoCalls( DiagnosticInfoUnsupported NoCalls(
Fn, "unsupported call to function " + FuncName, CLI.DL.getDebugLoc()); Fn, "unsupported call to function " + FuncName, CLI.DL.getDebugLoc());
DAG.getContext()->diagnose(NoCalls); DAG.getContext()->diagnose(NoCalls);
return SDValue();
for (unsigned I = 0, E = CLI.Ins.size(); I != E; ++I)
InVals.push_back(DAG.getUNDEF(CLI.Ins[I].VT));
return DAG.getEntryNode();
} }
SDValue AMDGPUTargetLowering::LowerDYNAMIC_STACKALLOC(SDValue Op, SDValue AMDGPUTargetLowering::LowerDYNAMIC_STACKALLOC(SDValue Op,

18
llvm/test/CodeGen/AMDGPU/call.ll
View File

@ -1,8 +1,10 @@
; RUN: not llc -march=amdgcn -mcpu=SI -verify-machineinstrs -exit-on-error < %s 2>&1 | FileCheck %s ; RUN: not llc -march=amdgcn -verify-machineinstrs < %s 2>&1 | FileCheck %s
; RUN: not llc -march=amdgcn -mcpu=tonga -verify-machineinstrs -exit-on-error < %s 2>&1 | FileCheck %s ; RUN: not llc -march=amdgcn -mcpu=tonga -verify-machineinstrs < %s 2>&1 | FileCheck %s
; RUN: not llc -march=r600 -mcpu=cypress -exit-on-error < %s 2>&1 | FileCheck %s ; RUN: not llc -march=r600 -mcpu=cypress < %s 2>&1 | FileCheck %s
; CHECK: in function test_call_external{{.*}}: unsupported call to function external_function ; CHECK: in function test_call_external{{.*}}: unsupported call to function external_function
; CHECK: in function test_call{{.*}}: unsupported call to function defined_function
; CHECK: in function test_tail_call{{.*}}: unsupported call to function defined_function
declare i32 @external_function(i32) nounwind declare i32 @external_function(i32) nounwind
@ -31,3 +33,13 @@ define void @test_call(i32 addrspace(1)* %out, i32 addrspace(1)* %in) {
store i32 %result, i32 addrspace(1)* %out store i32 %result, i32 addrspace(1)* %out
ret void ret void
} }
define void @test_tail_call(i32 addrspace(1)* %out, i32 addrspace(1)* %in) {
%b_ptr = getelementptr i32, i32 addrspace(1)* %in, i32 1
%a = load i32, i32 addrspace(1)* %in
%b = load i32, i32 addrspace(1)* %b_ptr
%c = tail call i32 @defined_function(i32 %b) nounwind
%result = add i32 %a, %c
store i32 %result, i32 addrspace(1)* %out
ret void
}