[llvm-branch-commits] [llvm-branch] r92530 - in /llvm/branches/Apple/Zoidberg/lib/Transforms/Utils: LoopSimplify.cpp SSAUpdater.cpp

[Bill Wendling]

Author: void
Date: Mon Jan  4 17:00:01 2010
New Revision: 92530

URL: http://llvm.org/viewvc/llvm-project?rev=92530&view=rev
Log:
$ svn merge -c 91821 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r91821 into '.':
U    lib/Transforms/Utils/LoopSimplify.cpp
$ svn merge -c 91820 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r91820 into '.':
U    test/Transforms/LoopRotate/phi-duplicate.ll
$ svn merge -c 91848 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r91848 into '.':
U    lib/Transforms/Utils/SSAUpdater.cpp

Modified:
    llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/LoopSimplify.cpp
    llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/SSAUpdater.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/LoopSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/LoopSimplify.cpp?rev=92530&r1=92529&r2=92530&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/LoopSimplify.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/LoopSimplify.cpp Mon Jan  4 17:00:01 2010
@@ -305,12 +305,6 @@
     }
   }
 
-  // If there are duplicate phi nodes (for example, from loop rotation),
-  // get rid of them.
-  for (Loop::block_iterator BB = L->block_begin(), E = L->block_end();
-       BB != E; ++BB)
-    EliminateDuplicatePHINodes(*BB);
-
   return Changed;
 }
 

Modified: llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/SSAUpdater.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/SSAUpdater.cpp?rev=92530&r1=92529&r2=92530&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/SSAUpdater.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Transforms/Utils/SSAUpdater.cpp Mon Jan  4 17:00:01 2010
@@ -220,7 +220,7 @@
 
   // Query AvailableVals by doing an insertion of null.
   std::pair<AvailableValsTy::iterator, bool> InsertRes =
-  AvailableVals.insert(std::make_pair(BB, WeakVH()));
+    AvailableVals.insert(std::make_pair(BB, TrackingVH<Value>()));
 
   // Handle the case when the insertion fails because we have already seen BB.
   if (!InsertRes.second) {
@@ -236,8 +236,8 @@
     // it.  When we get back to the first instance of the recursion we will fill
     // in the PHI node.
     return InsertRes.first->second =
-    PHINode::Create(PrototypeValue->getType(), PrototypeValue->getName(),
-                    &BB->front());
+      PHINode::Create(PrototypeValue->getType(), PrototypeValue->getName(),
+                      &BB->front());
   }
 
   // Okay, the value isn't in the map and we just inserted a null in the entry