From: Rafael Espindola Date: Mon, 20 Jun 2016 17:45:33 +0000 (+0000) Subject: Use shouldAssumeDSOLocal. X-Git-Tag: android-x86-7.1-r4~31519 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2f3bd31038390a4f73a05f3481c82d7ad8752b9;p=android-x86%2Fexternal-llvm.git Use shouldAssumeDSOLocal. With this ARM fast isel knows that PIE variable are not preemptable. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@273169 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp index 01a59971117..cbd96a72e07 100644 --- a/lib/Target/ARM/ARMFastISel.cpp +++ b/lib/Target/ARM/ARMFastISel.cpp @@ -2967,8 +2967,10 @@ bool ARMFastISel::tryToFoldLoadIntoMI(MachineInstr *MI, unsigned OpNo, unsigned ARMFastISel::ARMLowerPICELF(const GlobalValue *GV, unsigned Align, MVT VT) { + Reloc::Model RM = TM.getRelocationModel(); + const Triple &TargetTriple = TM.getTargetTriple(); bool UseGOT_PREL = - !(GV->hasHiddenVisibility() || GV->hasLocalLinkage()); + !shouldAssumeDSOLocal(RM, TargetTriple, *GV->getParent(), GV); LLVMContext *Context = &MF->getFunction()->getContext(); unsigned ARMPCLabelIndex = AFI->createPICLabelUId(); diff --git a/test/CodeGen/ARM/fast-isel-pie.ll b/test/CodeGen/ARM/fast-isel-pie.ll new file mode 100644 index 00000000000..23a88bdaa22 --- /dev/null +++ b/test/CodeGen/ARM/fast-isel-pie.ll @@ -0,0 +1,19 @@ +; RUN: llc < %s -O0 -fast-isel-abort=1 -relocation-model=pic -mtriple=armv7-pc-linux-gnueabi | FileCheck %s + +@var = global i32 42 + +define i32* @foo() { +; CHECK: foo: +; CHECK: ldr r0, .L[[POOL:.*]] +; CHECK-NEXT: .L[[ADDR:.*]]: +; CHECK-NEXT: add r0, pc, r0 +; CHECK-NEXT: bx lr + +; CHECK: .L[[POOL]]: +; CHECK-NEXT: .long var-(.L[[ADDR]]+8) + + ret i32* @var +} + +!llvm.module.flags = !{!0} +!0 = !{i32 1, !"PIE Level", i32 2}