From: Owen Anderson Date: Mon, 9 Apr 2007 22:54:50 +0000 (+0000) Subject: Const-ify some parameters, and some cosmetic cleanups. No functionality X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad190145912facc6fbf2fbe58023bb238fbf2365;p=oota-llvm.git Const-ify some parameters, and some cosmetic cleanups. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35842 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index e4e0ff77356..f9e5fbc850c 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -419,8 +419,8 @@ static void AddBlockAndPredsToSet(BasicBlock *BB, BasicBlock *StopBlock, /// FindPHIToPartitionLoops - The first part of loop-nestification is to find a /// PHI node that tells us how to partition the loops. -static PHINode *FindPHIToPartitionLoops(Loop *L, ETForest *EF, - AliasAnalysis *AA) { +static PHINode *FindPHIToPartitionLoops(Loop *L, ETForest *EF, + AliasAnalysis *AA) { for (BasicBlock::iterator I = L->getHeader()->begin(); isa(I); ) { PHINode *PN = cast(I); ++I; @@ -675,7 +675,7 @@ void LoopSimplify::InsertUniqueBackedgeBlock(Loop *L) { // Returns true if BasicBlock A dominates at least one block in vector B // Helper function for UpdateDomInfoForRevectoredPreds -static bool BlockDominatesAny(BasicBlock* A, std::vector& B, ETForest& ETF) { +static bool BlockDominatesAny(BasicBlock* A, const std::vector& B, const ETForest& ETF) { for (std::vector::iterator BI = B.begin(), BE = B.end(); BI != BE; ++BI) { if (ETF.dominates(A, *BI)) return true; @@ -858,6 +858,7 @@ void LoopSimplify::UpdateDomInfoForRevectoredPreds(BasicBlock *NewBB, // Only consider dominators of NewBBSucc if (!DFI->second.count(NewBBSucc)) continue; + if (BlockDominatesAny(FI, PredBlocks, ETF)) { // If NewBBSucc should not stay in our dominator frontier, remove it. // We remove it unless there is a predecessor of NewBBSucc that we