From 869a144f4e53db38789e630fbd9cc57384685ce6 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 31 Aug 2010 18:55:52 +0000 Subject: [PATCH] Only try to clean up the current block if we changed that block already. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112625 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Scalar/CorrelatedValuePropagation.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp b/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp index a62eb20a88e..c673b0b3326 100644 --- a/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp +++ b/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp @@ -100,19 +100,25 @@ bool CorrelatedValuePropagation::processPHI(PHINode *P) { bool CorrelatedValuePropagation::runOnFunction(Function &F) { LVI = &getAnalysis(); - bool Changed = false; + bool FnChanged = false; for (Function::iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI) { + bool BBChanged = false; for (BasicBlock::iterator BI = FI->begin(), BE = FI->end(); BI != BE; ) { Instruction *II = BI++; if (SelectInst *SI = dyn_cast(II)) - Changed |= processSelect(SI); + BBChanged |= processSelect(SI); else if (PHINode *P = dyn_cast(II)) - Changed |= processPHI(P); + BBChanged |= processPHI(P); } - SimplifyInstructionsInBlock(FI); + // Propagating correlated values might leave cruft around. + // Try to clean it up before we continue. + if (BBChanged) + SimplifyInstructionsInBlock(FI); + + FnChanged |= BBChanged; } - return Changed; + return FnChanged; }