summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevang Patel <dpatel@apple.com>2008-12-08 17:02:37 +0000
committerDevang Patel <dpatel@apple.com>2008-12-08 17:02:37 +0000
commit1c469d36b0ed2972addd55f5ca3ea33207f151c0 (patch)
treec543762d0e9405e3de12a0eedac8468ef3191255
parent1042ff345adc802065327b37d75335a3cc1f2493 (diff)
downloadbcm5719-llvm-1c469d36b0ed2972addd55f5ca3ea33207f151c0.tar.gz
bcm5719-llvm-1c469d36b0ed2972addd55f5ca3ea33207f151c0.zip
Undo previous patch.
llvm-svn: 60701
-rw-r--r--llvm/lib/Transforms/Scalar/LoopUnswitch.cpp4
-rw-r--r--llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll2
2 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
index 2bf194dbb73..97aa475a67f 100644
--- a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
@@ -168,9 +168,7 @@ static Value *FindLIVLoopCondition(Value *Cond, Loop *L, bool &Changed) {
// TODO: Handle: br (VARIANT|INVARIANT).
// TODO: Hoist simple expressions out of loops.
- if (Instruction *I = dyn_cast<Instruction>(Cond))
- if (!L->contains(I->getParent()))
- return 0;
+ if (L->isLoopInvariant(Cond)) return Cond;
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Cond))
if (BO->getOpcode() == Instruction::And ||
diff --git a/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
index 430ada4e8c1..3bc57265ce7 100644
--- a/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -loop-unswitch -stats | not grep loop-unswitch
+; RUN: llvm-as < %s | opt -loop-unswitch -verify -disable-output
define void @test_fc_while_continue_or(float %x, float %y, float* %result) nounwind {
OpenPOWER on IntegriCloud