[llvm] r326690 - Fix location of comment in EmitPopInst

Thomas Preud'homme via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 5 03:49:00 PST 2018


Author: thopre
Date: Mon Mar  5 03:49:00 2018
New Revision: 326690

URL: http://llvm.org/viewvc/llvm-project?rev=326690&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Target/ARM/ARMFrameLowering.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMFrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMFrameLowering.cpp?rev=326690&r1=326689&r2=326690&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMFrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMFrameLowering.cpp Mon Mar  5 03:49:00 2018
@@ -1068,6 +1068,7 @@ void ARMFrameLowering::emitPopInst(Machi
           !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(Machi
           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




More information about the llvm-commits mailing list