[llvm-branch-commits] [llvm-branch] r99333 - /llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp

[Dan Gohman]

Author: djg
Date: Tue Mar 23 16:57:44 2010
New Revision: 99333

URL: http://llvm.org/viewvc/llvm-project?rev=99333&view=rev
Log:
$ svn merge -c 99332 https://djg@llvm.org/svn/llvm-project/llvm/trunk
--- Merging r99332 into '.':
U    lib/Analysis/ScalarEvolutionExpander.cpp

Modified:
    llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp

Modified: llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp?rev=99333&r1=99332&r2=99333&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Analysis/ScalarEvolutionExpander.cpp Tue Mar 23 16:57:44 2010
@@ -1276,19 +1276,8 @@
        L = L->getParentLoop())
     if (S->isLoopInvariant(L)) {
       if (!L) break;
-      if (BasicBlock *Preheader = L->getLoopPreheader()) {
+      if (BasicBlock *Preheader = L->getLoopPreheader())
         InsertPt = Preheader->getTerminator();
-        BasicBlock::iterator IP = InsertPt;
-        // Back past any debug info instructions.  Sometimes we inserted
-        // something earlier before debug info but after any real instructions.
-        // This should behave the same as if debug info was not present.
-        while (IP != Preheader->begin()) {
-          --IP;
-          if (!isa<DbgInfoIntrinsic>(IP))
-            break;
-          InsertPt = IP;
-        }
-      }
     } else {
       // If the SCEV is computable at this level, insert it into the header
       // after the PHIs (and after any other instructions that we've inserted