summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Transforms/Scalar/CorrelatedValuePropagation.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp b/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
index a62eb20..c673b0b 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<LazyValueInfo>();
- 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<SelectInst>(II))
- Changed |= processSelect(SI);
+ BBChanged |= processSelect(SI);
else if (PHINode *P = dyn_cast<PHINode>(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;
}