From 8f9acfac898bc6667eaba6564d2a1b583d902c50 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Wed, 5 Oct 2011 20:44:29 +0000 Subject: Revert 141203. InstCombine is looping on unit tests. llvm-svn: 141209 --- .../lib/Transforms/InstCombine/InstructionCombining.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'llvm/lib/Transforms/InstCombine/InstructionCombining.cpp') diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp index a302a46290e..cee27ff5913 100644 --- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -2009,17 +2009,20 @@ bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) { ++NumCombined; // Should we replace the old instruction with a new one? if (Result != I) { + DEBUG(errs() << "IC: Old = " << *I << '\n' + << " New = " << *Result << '\n'); + if (!I->getDebugLoc().isUnknown()) Result->setDebugLoc(I->getDebugLoc()); // Everything uses the new instruction now. I->replaceAllUsesWith(Result); - // Move the name to the new instruction. - Result->takeName(I); - - DEBUG(errs() << "IC: Old = " << *I << '\n' - << " New = " << *Result << '\n'); + // Push the new instruction and any users onto the worklist. + Worklist.Add(Result); + Worklist.AddUsersToWorkList(*Result); + // Move the name to the new instruction first. + Result->takeName(I); // Insert the new instruction into the basic block... BasicBlock *InstParent = I->getParent(); @@ -2032,10 +2035,6 @@ bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) { InstParent->getInstList().insert(InsertPos, Result); EraseInstFromFunction(*I); - - // Push the new instruction and any users onto the worklist. - Worklist.Add(Result); - Worklist.AddUsersToWorkList(*Result); } else { #ifndef NDEBUG DEBUG(errs() << "IC: Mod = " << OrigI << '\n' -- cgit v1.2.3