Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion llvm/lib/Target/ARM/ARMISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2510,9 +2510,44 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,

if (isTailCall && VA.isMemLoc() && !AfterFormalArgLoads) {
Chain = DAG.getStackArgumentTokenFactor(Chain);
if (ByValTempChain)
if (ByValTempChain) {
// In case of large byval copies, re-using the stackframe for tail-calls
// can lead to overwriting incoming arguments on the stack. Force
// loading these stack arguments before the copy to avoid that.
SmallVector<SDValue, 8> IncomingLoad;
for (unsigned I = 0; I < OutVals.size(); ++I) {
if (Outs[I].Flags.isByVal())
continue;

SDValue OutVal = OutVals[I];
LoadSDNode *OutLN = dyn_cast_or_null<LoadSDNode>(OutVal);
if (!OutLN)
continue;

FrameIndexSDNode *FIN =
dyn_cast_or_null<FrameIndexSDNode>(OutLN->getBasePtr());
if (!FIN)
continue;

if (!MFI.isFixedObjectIndex(FIN->getIndex()))
continue;

for (const CCValAssign &VA : ArgLocs) {
if (VA.isMemLoc())
IncomingLoad.push_back(OutVal.getValue(1));
}
}

// Update the chain to force loads for potentially clobbered argument
// loads to happen before the byval copy.
if (!IncomingLoad.empty()) {
IncomingLoad.push_back(Chain);
Chain = DAG.getNode(ISD::TokenFactor, dl, MVT::Other, IncomingLoad);
}

Chain = DAG.getNode(ISD::TokenFactor, dl, MVT::Other, Chain,
ByValTempChain);
}
AfterFormalArgLoads = true;
}

Expand Down
69 changes: 69 additions & 0 deletions llvm/test/CodeGen/ARM/byval_struct_copy_tailcall.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
; RUN: llc -mtriple thumbv7em-apple-darwin -o - < %s | FileCheck %s

%"struct.s1" = type { [19 x i32] }

define void @f0(ptr byval(%"struct.s1") %0, ptr %1) #1 {
; CHECK-LABEL: _f0: @ @f0
; CHECK-NEXT: @ %bb.0:
; CHECK-NEXT: sub sp, #16
; CHECK-NEXT: push {r4, lr}
; CHECK-NEXT: sub sp, #76
; CHECK-NEXT: add.w r9, sp, #84
; CHECK-NEXT: stm.w r9, {r0, r1, r2, r3}
; CHECK-NEXT: mov r0, sp
; CHECK-NEXT: add r1, sp, #84
; CHECK-NEXT: movs r2, #76
; CHECK-NEXT: mov r3, r0
; CHECK-NEXT: LBB0_1: @ =>This Inner Loop Header: Depth=1
; CHECK-NEXT: ldr r4, [r1], #4
; CHECK-NEXT: subs r2, #4
; CHECK-NEXT: str r4, [r3], #4
; CHECK-NEXT: bne LBB0_1
; CHECK-NEXT: @ %bb.2:
; CHECK-NEXT: add.w r1, r0, #12
; CHECK-NEXT: add r2, sp, #100
; CHECK-NEXT: ldr r0, [sp, #160]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the load that had happened after the copy and got overwritten.

; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldr r3, [r1], #4
; CHECK-NEXT: str r3, [r2], #4
; CHECK-NEXT: ldm.w sp, {r1, r2, r3}
; CHECK-NEXT: add sp, #76
; CHECK-NEXT: pop.w {r4, lr}
; CHECK-NEXT: add sp, #16
; CHECK-NEXT: b.w _f1
tail call void @f1(ptr %1, ptr byval(%"struct.s1") %0)
ret void
}

declare void @f1(ptr, ptr)

attributes #1 = { nounwind "frame-pointes"="non-leaf" }