From 26bc54301b5a20271805599497c3f4c927d39aeb Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 26 Jun 2015 18:02:52 +0000
Subject: [PATCH] Move VectorUtils from Transforms to Analysis to correct
 layering violation

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240804 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/{Transforms/Utils => Analysis}/VectorUtils.h | 0
 lib/Analysis/CMakeLists.txt                               | 1 +
 lib/Analysis/LoopAccessAnalysis.cpp                       | 2 +-
 lib/{Transforms/Utils => Analysis}/VectorUtils.cpp        | 2 +-
 lib/Transforms/Utils/CMakeLists.txt                       | 1 -
 lib/Transforms/Vectorize/LoopVectorize.cpp                | 2 +-
 lib/Transforms/Vectorize/SLPVectorizer.cpp                | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename include/llvm/{Transforms/Utils => Analysis}/VectorUtils.h (100%)
 rename lib/{Transforms/Utils => Analysis}/VectorUtils.cpp (99%)

diff --git a/include/llvm/Transforms/Utils/VectorUtils.h b/include/llvm/Analysis/VectorUtils.h
similarity index 100%
rename from include/llvm/Transforms/Utils/VectorUtils.h
rename to include/llvm/Analysis/VectorUtils.h
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index b22ee7e2493..3ec79adba57 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -62,6 +62,7 @@ add_llvm_library(LLVMAnalysis
   TypeBasedAliasAnalysis.cpp
   ScopedNoAliasAA.cpp
   ValueTracking.cpp
+  VectorUtils.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Analysis
diff --git a/lib/Analysis/LoopAccessAnalysis.cpp b/lib/Analysis/LoopAccessAnalysis.cpp
index b1dd51dc617..b11cd7e84a6 100644
--- a/lib/Analysis/LoopAccessAnalysis.cpp
+++ b/lib/Analysis/LoopAccessAnalysis.cpp
@@ -22,7 +22,7 @@
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/VectorUtils.h"
+#include "llvm/Analysis/VectorUtils.h"
 using namespace llvm;
 
 #define DEBUG_TYPE "loop-accesses"
diff --git a/lib/Transforms/Utils/VectorUtils.cpp b/lib/Analysis/VectorUtils.cpp
similarity index 99%
rename from lib/Transforms/Utils/VectorUtils.cpp
rename to lib/Analysis/VectorUtils.cpp
index f3fd829a9c2..96fddd103cc 100644
--- a/lib/Transforms/Utils/VectorUtils.cpp
+++ b/lib/Analysis/VectorUtils.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/VectorUtils.h"
+#include "llvm/Analysis/VectorUtils.h"
 
 /// \brief Identify if the intrinsic is trivially vectorizable.
 /// This method returns true if the intrinsic's argument types are all
diff --git a/lib/Transforms/Utils/CMakeLists.txt b/lib/Transforms/Utils/CMakeLists.txt
index 1f8643d1d60..470e2d09132 100644
--- a/lib/Transforms/Utils/CMakeLists.txt
+++ b/lib/Transforms/Utils/CMakeLists.txt
@@ -37,7 +37,6 @@ add_llvm_library(LLVMTransformUtils
   UnifyFunctionExitNodes.cpp
   Utils.cpp
   ValueMapper.cpp
-  VectorUtils.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Transforms
diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp
index 7e21002e074..49b07dadd8e 100644
--- a/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -96,7 +96,7 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "llvm/Transforms/Utils/VectorUtils.h"
+#include "llvm/Analysis/VectorUtils.h"
 #include "llvm/Transforms/Utils/LoopUtils.h"
 #include <algorithm>
 #include <map>
diff --git a/lib/Transforms/Vectorize/SLPVectorizer.cpp b/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 370e2956ac4..7c4c279dcf4 100644
--- a/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -43,7 +43,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/VectorUtils.h"
+#include "llvm/Analysis/VectorUtils.h"
 #include <algorithm>
 #include <map>
 #include <memory>
-- 
2.34.1