From: Tom Stellard Date: Tue, 28 Nov 2017 16:35:04 +0000 (+0000) Subject: Merging r319130: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e430490419645a35399e7937d96482681984e47;p=llvm Merging r319130: ------------------------------------------------------------------------ r319130 | matze | 2017-11-27 17:17:52 -0800 (Mon, 27 Nov 2017) | 7 lines ARM: Fix PR32578 https://llvm.org/PR32578 I simplified and converted the reproducer into a lit test. Patch by Vedant Kumar! ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@319181 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp index 6f380ae2e85..00b788a1b53 100644 --- a/lib/Target/ARM/ARMFrameLowering.cpp +++ b/lib/Target/ARM/ARMFrameLowering.cpp @@ -479,7 +479,7 @@ void ARMFrameLowering::emitPrologue(MachineFunction &MF, if (DPRCSSize > 0) { // Since vpush register list cannot have gaps, there may be multiple vpush // instructions in the prologue. - while (MBBI->getOpcode() == ARM::VSTMDDB_UPD) { + while (MBBI != MBB.end() && MBBI->getOpcode() == ARM::VSTMDDB_UPD) { DefCFAOffsetCandidates.addInst(MBBI, sizeOfSPAdjustment(*MBBI)); LastPush = MBBI++; } diff --git a/test/CodeGen/ARM/pr32578.ll b/test/CodeGen/ARM/pr32578.ll new file mode 100644 index 00000000000..541ba35e5be --- /dev/null +++ b/test/CodeGen/ARM/pr32578.ll @@ -0,0 +1,27 @@ +; RUN: llc -o - %s | FileCheck %s +target triple = "armv7" + +; CHECK-LABEL: func: +; CHECK: push {r11, lr} +; CHECK: vpush {d8} +; CEHCK: b .LBB0_2 +define arm_aapcscc double @func() { + br label %tailrecurse + +tailrecurse: + %v0 = load i16, i16* undef, align 8 + %cond36.i = icmp eq i16 %v0, 3 + br i1 %cond36.i, label %sw.bb.i, label %sw.epilog.i + +sw.bb.i: + %v1 = load double, double* undef, align 8 + %call21.i = tail call arm_aapcscc double @func() + %mul.i = fmul double %v1, %call21.i + ret double %mul.i + +sw.epilog.i: + tail call arm_aapcscc void @_ZNK10shared_ptrdeEv() + br label %tailrecurse +} + +declare arm_aapcscc void @_ZNK10shared_ptrdeEv() local_unnamed_addr