[llvm-branch-commits] [llvm-branch] r155828 - in /llvm/branches/release_31: ./ lib/Transforms/Scalar/LoopStrengthReduce.cpp test/Transforms/LoopStrengthReduce/pr12691.ll

[Bill Wendling]

Author: void
Date: Mon Apr 30 12:12:42 2012
New Revision: 155828

URL: http://llvm.org/viewvc/llvm-project?rev=155828&view=rev
Log:
Merging r155809:
------------------------------------------------------------------------
r155809 | rafael | 2012-04-29 20:53:06 -0700 (Sun, 29 Apr 2012) | 2 lines

Make sure HoistInsertPosition finds a position that is dominated by all
inputs.
------------------------------------------------------------------------

Added:
    llvm/branches/release_31/test/Transforms/LoopStrengthReduce/pr12691.ll
      - copied unchanged from r155809, llvm/trunk/test/Transforms/LoopStrengthReduce/pr12691.ll
Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 30 12:12:42 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284-155288,155307,155342,155466,155536,155668,155818
+/llvm/trunk:155230,155284-155288,155307,155342,155466,155536,155668,155809,155818

Modified: llvm/branches/release_31/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=155828&r1=155827&r2=155828&view=diff
==============================================================================
--- llvm/branches/release_31/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/branches/release_31/lib/Transforms/Scalar/LoopStrengthReduce.cpp Mon Apr 30 12:12:42 2012
@@ -4108,7 +4108,7 @@
       // Attempt to find an insert position in the middle of the block,
       // instead of at the end, so that it can be used for other expansions.
       if (IDom == Inst->getParent() &&
-          (!BetterPos || DT.dominates(BetterPos, Inst)))
+          (!BetterPos || !DT.dominates(Inst, BetterPos)))
         BetterPos = llvm::next(BasicBlock::iterator(Inst));
     }
     if (!AllDominate)