From ded681d2725907c7de9db53d59cee0c51fad6fcb Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Thu, 2 Feb 2012 18:52:15 +0000
Subject: [PATCH] BBVectorize: Simplify code, no functionality change.

Also silences warnings about bodyless for loops.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149612 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Vectorize/BBVectorize.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/Transforms/Vectorize/BBVectorize.cpp b/lib/Transforms/Vectorize/BBVectorize.cpp
index dc88e2c85f6..ce6e994c463 100644
--- a/lib/Transforms/Vectorize/BBVectorize.cpp
+++ b/lib/Transforms/Vectorize/BBVectorize.cpp
@@ -1591,9 +1591,7 @@ namespace {
                      std::multimap<Value *, Value *> &LoadMoveSet,
                      Instruction *I, Instruction *J) {
     // Skip to the first instruction past I.
-    BasicBlock::iterator L = BB.begin();
-    for (; cast<Instruction>(L) != I; ++L);
-    ++L;
+    BasicBlock::iterator L = llvm::next(BasicBlock::iterator(I));
 
     DenseSet<Value *> Users;
     AliasSetTracker WriteSet(*AA);
@@ -1613,9 +1611,7 @@ namespace {
                      Instruction *&InsertionPt,
                      Instruction *I, Instruction *J) {
     // Skip to the first instruction past I.
-    BasicBlock::iterator L = BB.begin();
-    for (; cast<Instruction>(L) != I; ++L);
-    ++L;
+    BasicBlock::iterator L = llvm::next(BasicBlock::iterator(I));
 
     DenseSet<Value *> Users;
     AliasSetTracker WriteSet(*AA);
@@ -1643,9 +1639,7 @@ namespace {
                      std::multimap<Value *, Value *> &LoadMoveSet,
                      Instruction *I) {
     // Skip to the first instruction past I.
-    BasicBlock::iterator L = BB.begin();
-    for (; cast<Instruction>(L) != I; ++L);
-    ++L;
+    BasicBlock::iterator L = llvm::next(BasicBlock::iterator(I));
 
     DenseSet<Value *> Users;
     AliasSetTracker WriteSet(*AA);