aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-04-30 17:12:42 +0000
committerBill Wendling <isanbard@gmail.com>2012-04-30 17:12:42 +0000
commit8cd9fe4d54889d516451ee36d00f130a3140468b (patch)
tree397649a0d55210c8ef4c4fa59e1a194c710cb30a
parent55f951325943a719478d625eb4271adb817fde7d (diff)
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. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@155828 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Transforms/Scalar/LoopStrengthReduce.cpp2
-rw-r--r--test/Transforms/LoopStrengthReduce/pr12691.ll34
2 files changed, 35 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
index fe4700b36e..b085b006e4 100644
--- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp
+++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
@@ -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)
diff --git a/test/Transforms/LoopStrengthReduce/pr12691.ll b/test/Transforms/LoopStrengthReduce/pr12691.ll
new file mode 100644
index 0000000000..8399434343
--- /dev/null
+++ b/test/Transforms/LoopStrengthReduce/pr12691.ll
@@ -0,0 +1,34 @@
+; 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
+}
+
+