Skip to content

Commit

Permalink
[PowerPC] Fix label address calculation for ppc64
Browse files Browse the repository at this point in the history
This patch fixes calculating address of label for non-pic ppc64.

Differential Revision: https://reviews.llvm.org/D50965

llvm-svn: 342368
  • Loading branch information
Strahinja Petrovic committed Sep 17, 2018
1 parent 1a56234 commit 488fd4e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion llvm/lib/Target/PowerPC/PPCISelLowering.cpp
Expand Up @@ -2705,7 +2705,8 @@ SDValue PPCTargetLowering::LowerBlockAddress(SDValue Op,

// 64-bit SVR4 ABI code is always position-independent.
// The actual BlockAddress is stored in the TOC.
if (Subtarget.isSVR4ABI() && isPositionIndependent()) {
if (Subtarget.isSVR4ABI() &&
(Subtarget.isPPC64() || isPositionIndependent())) {
if (Subtarget.isPPC64())
setUsesTOCBasePtr(DAG);
SDValue GA = DAG.getTargetBlockAddress(BA, PtrVT, BASDN->getOffset());
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/PowerPC/ppc-label2.ll
@@ -0,0 +1,21 @@
; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=pic | FileCheck --check-prefix=CHECK-PIC32 %s
; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=static | FileCheck --check-prefix=CHECK-STATIC32 %s
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=pic | FileCheck --check-prefix=CHECK-PPC64 %s
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -ppc-asm-full-reg-names -relocation-model=static | FileCheck --check-prefix=CHECK-PPC64 %s


define dso_local i64 @foo() {
entry:
br label %__here

__here: ; preds = %entry
ret i64 ptrtoint (i8* blockaddress(@foo, %__here) to i64)
}

; CHECK-PIC32: lwz {{r[0-9]+}}, .LC0-.LTOC(r30)
; CHECK-PIC32-NOT: li {{r[0-9]+}}, .Ltmp1-.L1$pb@l
; CHECK-PIC32-NOT: addis 4, 30, .Ltmp1-.L1$pb@ha
; CHECK-STATIC32: li {{r[0-9]+}}, .Ltmp0@l
; CHECK-STATIC32-NEXT: addis {{r[0-9]+}}, {{r[0-9]+}}, .Ltmp0@ha
; CHECK-PPC64: addis r3, r2, .LC0@toc@ha
; CHECK-PPC64-NEXT: ld r3, .LC0@toc@l(r3)

0 comments on commit 488fd4e

Please sign in to comment.