From f39f4f928a7d8228c9898c4a93aac0ec3bbc6bdd Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 11 Oct 2009 21:05:34 +0000 Subject: [PATCH] temporarily revert previous patch llvm-svn: 83791 --- .../Transforms/Scalar/InstructionCombining.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp index 9d883543c800..06a5660f72ec 100644 --- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp @@ -12681,9 +12681,6 @@ static void AddReachableCodeToWorklist(BasicBlock *BB, const TargetData *TD) { SmallVector Worklist; Worklist.push_back(BB); - - std::vector InstrsForInstCombineWorklist; - InstrsForInstCombineWorklist.reserve(128); while (!Worklist.empty()) { BB = Worklist.back(); @@ -12730,7 +12727,7 @@ static void AddReachableCodeToWorklist(BasicBlock *BB, DBI_Prev = 0; } - InstrsForInstCombineWorklist.push_back(Inst); + IC.Worklist.Add(Inst); } // Recursively visit successors. If this is a branch or switch on a @@ -12762,16 +12759,6 @@ static void AddReachableCodeToWorklist(BasicBlock *BB, for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i) Worklist.push_back(TI->getSuccessor(i)); } - - // Once we've found all of the instructions to add to instcombine's worklist, - // add them in reverse order. This way instcombine will visit from the top - // of the function down. This jives well with the way that it adds all uses - // of instructions to the worklist after doing a transformation, thus avoiding - // some N^2 behavior in pathological cases. - for (std::vector::reverse_iterator - I = InstrsForInstCombineWorklist.rbegin(), - E = InstrsForInstCombineWorklist.rend(); I != E; ++I) - IC.Worklist.Add(*I); } bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) {