Commit ee386407 authored by Bill Wendling's avatar Bill Wendling
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 155828
parent e8a900fc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4108,7 +4108,7 @@ LSRInstance::HoistInsertPosition(BasicBlock::iterator IP,
      // 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)
+34 −0
Original line number Diff line number Diff line
; RUN: opt < %s -loop-reduce -S | FileCheck %s

@d = common global i32 0, align 4

define void @fn2(i32 %x) nounwind uwtable {
entry:
  br label %for.cond

for.cond:
  %g.0 = phi i32 [ 0, %entry ], [ %dec, %for.cond ]
  %tobool = icmp eq i32 %x, 0
  %dec = add nsw i32 %g.0, -1
  br i1 %tobool, label %for.cond, label %for.end

for.end:
; CHECK:  %tmp1 = load i32* @d, align 4
; CHECK-NEXT:  %tmp2 = load i32* @d, align 4
; CHECK-NEXT:  %0 = sub i32 %tmp1, %tmp2

  %tmp1 = load i32* @d, align 4
  %add = add nsw i32 %tmp1, %g.0
  %tmp2 = load i32* @d, align 4
  %tobool26 = icmp eq i32 %x, 0
  br i1 %tobool26, label %for.end5, label %for.body.lr.ph

for.body.lr.ph:
  %tobool3 = icmp ne i32 %tmp2, %add
  br label %for.end5

for.end5:
  ret void
}