Skip to content

Commit

Permalink
CodeGen: check return types match when emitting tail call to builtin.
Browse files Browse the repository at this point in the history
We were just completely ignoring the types when determining whether we could
safely emit a libcall as a tail call. This is clearly wrong.

Theoretically, we could dig deeper looking for incidental matches (much like
the generic code in Analysis.cpp does), but it's probably not worth it for the
few libcalls that exist.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264084 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
TNorthover committed Mar 22, 2016
1 parent e6f4276 commit 7561ec8
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 3 deletions.
7 changes: 5 additions & 2 deletions lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2247,9 +2247,12 @@ SDValue SelectionDAGLegalize::ExpandLibCall(RTLIB::Libcall LC, SDNode *Node,
SDValue InChain = DAG.getEntryNode();

// isTailCall may be true since the callee does not reference caller stack
// frame. Check if it's in the right position.
// frame. Check if it's in the right position and that the return types match.
SDValue TCChain = InChain;
bool isTailCall = TLI.isInTailCallPosition(DAG, Node, TCChain);
const Function *F = DAG.getMachineFunction().getFunction();
bool isTailCall =
TLI.isInTailCallPosition(DAG, Node, TCChain) &&
(RetTy == F->getReturnType() || F->getReturnType()->isVoidTy());
if (isTailCall)
InChain = TCChain;

Expand Down
37 changes: 37 additions & 0 deletions test/CodeGen/ARM/tail-call-builtin.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
; RUN: llc -mtriple=thumbv7-linux-gnueabihf %s -o - | FileCheck %s

define i64 @test_mismatched_call(double %in) {
; CHECK-LABEL: test_mismatched_call:
; CHECK: bl floor
; CHECK: vmov r0, r1, d0

%val = tail call double @floor(double %in)
%res = bitcast double %val to i64
ret i64 %res
}

define double @test_matched_call(double %in) {
; CHECK-LABEL: test_matched_call:
; CHECK: b floor

%val = tail call double @floor(double %in)
ret double %val
}

define void @test_irrelevant_call(double %in) {
; CHECK-LABEL: test_irrelevant_call:
; CHECK-NOT: bl floor

%val = tail call double @floor(double %in)
ret void
}

define arm_aapcscc double @test_callingconv(double %in) {
; CHECK: test_callingconv:
; CHECK: bl floor

%val = tail call double @floor(double %in)
ret double %val
}

declare double @floor(double) nounwind readonly
2 changes: 1 addition & 1 deletion test/CodeGen/X86/atomic-non-integer.ll
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ define half @load_half(half* %fptr) {
; CHECK-LABEL: @load_half
; CHECK: movw (%rdi), %ax
; CHECK: movzwl %ax, %edi
; CHECK: jmp __gnu_h2f_ieee
; CHECK: callq __gnu_h2f_ieee
%v = load atomic half, half* %fptr unordered, align 2
ret half %v
}
Expand Down

0 comments on commit 7561ec8

Please sign in to comment.