Instead of clearing the rewriter, don't attempt to rewrite dead phi nodes.

Also fix 80 column violation.

llvm-svn: 72371
This commit is contained in:
Torok Edwin 2009-05-24 19:36:09 +00:00
parent 2d49c4f98d
commit 5349cf5f4b
2 changed files with 4 additions and 3 deletions

View File

@ -615,7 +615,8 @@ Value *SCEVExpander::expandCodeFor(SCEVHandle SH, const Type *Ty) {
Value *SCEVExpander::expand(const SCEV *S) {
// Check to see if we already expanded this.
std::map<SCEVHandle, AssertingVH<Value> >::iterator I = InsertedExpressions.find(S);
std::map<SCEVHandle, AssertingVH<Value> >::iterator I =
InsertedExpressions.find(S);
if (I != InsertedExpressions.end())
return I->second;

View File

@ -250,7 +250,8 @@ void IndVarSimplify::RewriteLoopExitValues(Loop *L,
// Iterate over all of the PHI nodes.
BasicBlock::iterator BBI = ExitBB->begin();
while ((PN = dyn_cast<PHINode>(BBI++))) {
if (PN->use_empty())
continue; // dead use, don't replace it
// Iterate over all of the values in all the PHI nodes.
for (unsigned i = 0; i != NumPreds; ++i) {
// If the value being merged in is not integer or is not defined
@ -303,7 +304,6 @@ void IndVarSimplify::RewriteLoopExitValues(Loop *L,
// in the loop, so we don't need an LCSSA phi node anymore.
if (NumPreds == 1) {
PN->replaceAllUsesWith(ExitVal);
Rewriter.clear();
RecursivelyDeleteTriviallyDeadInstructions(PN);
break;
}