Skip to content

Commit dad55c2

Browse files
committed
[ARM] [ELF] Fix ARMMaterializeGV for Indirect calls
Recent shouldAssumeDSOLocal changes (introduced by 961f31d) do not take in consideration the relocation model anymore. The ARM fast-isel pass uses the function return to set whether a global symbol is loaded indirectly or not, and without the expected information llvm now generates an extra load for following code: ``` $ cat test.ll @__asan_option_detect_stack_use_after_return = external global i32 define dso_local i32 @main(i32 %argc, i8** %argv) #0 { entry: %0 = load i32, i32* @__asan_option_detect_stack_use_after_return, align 4 %1 = icmp ne i32 %0, 0 br i1 %1, label %2, label %3 2: ret i32 0 3: ret i32 1 } attributes #0 = { noinline optnone } $ lcc test.ll -o - [...] main: .fnstart [...] movw r0, :lower16:__asan_option_detect_stack_use_after_return movt r0, :upper16:__asan_option_detect_stack_use_after_return ldr r0, [r0] ldr r0, [r0] cmp r0, #0 [...] ``` And without 'optnone' it produces: ``` [...] main: .fnstart [...] movw r0, :lower16:__asan_option_detect_stack_use_after_return movt r0, :upper16:__asan_option_detect_stack_use_after_return ldr r0, [r0] clz r0, r0 lsr r0, r0, #5 bx lr [...] ``` This triggered a lot of invalid memory access in sanitizers for arm-linux-gnueabihf. I checked this patch both a stage1 built with gcc and a stage2 bootstrap and it fixes all the Linux sanitizers issues. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D95379
1 parent f9d7f77 commit dad55c2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

llvm/lib/Target/ARM/ARMFastISel.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,9 @@ unsigned ARMFastISel::ARMMaterializeGV(const GlobalValue *GV, MVT VT) {
606606
}
607607
}
608608

609-
if (IsIndirect) {
609+
if ((Subtarget->isTargetELF() && Subtarget->isGVInGOT(GV)) ||
610+
(Subtarget->isTargetMachO() && IsIndirect) ||
611+
Subtarget->genLongCalls()) {
610612
MachineInstrBuilder MIB;
611613
unsigned NewDestReg = createResultReg(TLI.getRegClassFor(VT));
612614
if (isThumb2)

llvm/test/CodeGen/ARM/fast-isel-intrinsic.ll

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ define void @t2() nounwind ssp {
6161

6262
; ARM-ELF: movw [[REG1:r[0-9]+]], :lower16:temp
6363
; ARM-ELF: movt [[REG1]], :upper16:temp
64-
; ARM-ELF: add [[REG1]], r1, #4
65-
; ARM-ELF-NEXT: add r1, r1, #16
64+
; ARM-ELF: add r0, [[REG1]], #4
65+
; ARM-ELF-NEXT: add r1, [[REG1]], #16
6666

6767
; ARM: movw r2, #17
6868
; ARM: bl {{_?}}memcpy
@@ -106,7 +106,7 @@ define void @t3() nounwind ssp {
106106

107107
; ARM-ELF: movw [[REG0:r[0-9]+]], :lower16:temp
108108
; ARM-ELF: movt [[REG0]], :upper16:temp
109-
; ARM-ELF: add [[REG0]], r1, #4
109+
; ARM-ELF: add r0, [[REG0]], #4
110110
; ARM-ELF-NEXT: add r1, r1, #16
111111

112112
; ARM: movw r2, #10

0 commit comments

Comments
 (0)