diff options
| author | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2018-03-05 11:49:00 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2018-03-05 11:49:00 +0000 |
| commit | c699eaa3119bf808971a067b34532b8cf4530766 (patch) | |
| tree | a1ea24bdeadeb286c770d302f3bcee50a8d4ff1e | |
| parent | 9d3b45301f99bddd7ff3520ef806d888d5ca1f94 (diff) | |
| download | bcm5719-llvm-c699eaa3119bf808971a067b34532b8cf4530766.tar.gz bcm5719-llvm-c699eaa3119bf808971a067b34532b8cf4530766.zip | |
Fix location of comment in EmitPopInst
Comment about folding return in LDM was not moved along with the
corresponding code in r242714. This commit fixes that.
llvm-svn: 326690
| -rw-r--r-- | llvm/lib/Target/ARM/ARMFrameLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.cpp b/llvm/lib/Target/ARM/ARMFrameLowering.cpp index 9ad1608eda2..d0986a73b70 100644 --- a/llvm/lib/Target/ARM/ARMFrameLowering.cpp +++ b/llvm/lib/Target/ARM/ARMFrameLowering.cpp @@ -1068,6 +1068,7 @@ void ARMFrameLowering::emitPopInst(MachineBasicBlock &MBB, !isTrap && STI.hasV5TOps()) { if (MBB.succ_empty()) { Reg = ARM::PC; + // Fold the return instruction into the LDM. DeleteRet = true; LdmOpc = AFI->isThumbFunction() ? ARM::t2LDMIA_RET : ARM::LDMIA_RET; // We 'restore' LR into PC so it is not live out of the return block: @@ -1075,7 +1076,6 @@ void ARMFrameLowering::emitPopInst(MachineBasicBlock &MBB, Info.setRestored(false); } else LdmOpc = AFI->isThumbFunction() ? ARM::t2LDMIA_UPD : ARM::LDMIA_UPD; - // Fold the return instruction into the LDM. } // If NoGap is true, pop consecutive registers and then leave the rest |
