From 9883d1e1a72bb22e9a3a58f707726455c62ce5b4 Mon Sep 17 00:00:00 2001 From: Max Kazantsev Date: Fri, 9 Nov 2018 05:39:04 +0000 Subject: [PATCH] [NFC] Add utility function for SafetyInfo updates for moveBefore llvm-svn: 346472 --- llvm/lib/Transforms/Scalar/LICM.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 7789cb923450..e7402ea579b0 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -126,6 +126,9 @@ CloneInstructionInExitBlock(Instruction &I, BasicBlock &ExitBlock, PHINode &PN, static void eraseInstruction(Instruction &I, ICFLoopSafetyInfo &SafetyInfo, AliasSetTracker *AST); +static void moveInstructionBefore(Instruction &I, Instruction &Dest, + ICFLoopSafetyInfo &SafetyInfo); + namespace { struct LoopInvariantCodeMotion { using ASTrackerMapTy = DenseMap>; @@ -890,6 +893,13 @@ static void eraseInstruction(Instruction &I, ICFLoopSafetyInfo &SafetyInfo, I.eraseFromParent(); } +static void moveInstructionBefore(Instruction &I, Instruction &Dest, + ICFLoopSafetyInfo &SafetyInfo) { + SafetyInfo.removeInstruction(&I); + SafetyInfo.insertInstructionTo(Dest.getParent()); + I.moveBefore(&Dest); +} + static Instruction *sinkThroughTriviallyReplaceablePHI( PHINode *TPN, Instruction *I, LoopInfo *LI, SmallDenseMap &SunkCopies, @@ -1118,10 +1128,8 @@ static void hoist(Instruction &I, const DominatorTree *DT, const Loop *CurLoop, !SafetyInfo->isGuaranteedToExecute(I, DT, CurLoop)) I.dropUnknownNonDebugMetadata(); - SafetyInfo->removeInstruction(&I); - SafetyInfo->insertInstructionTo(Preheader); // Move the new node to the Preheader, before its terminator. - I.moveBefore(Preheader->getTerminator()); + moveInstructionBefore(I, *Preheader->getTerminator(), *SafetyInfo); // Do not retain debug locations when we are moving instructions to different // basic blocks, because we want to avoid jumpy line tables. Calls, however, -- 2.34.1