summaryrefslogtreecommitdiff
path: root/lib/Transforms/Scalar/Scalar.cpp
diff options
context:
space:
mode:
authorJiangning Liu <jiangning.liu@arm.com>2014-06-13 22:57:59 +0000
committerJiangning Liu <jiangning.liu@arm.com>2014-06-13 22:57:59 +0000
commitc5bc067a0fb05fe36761bb280d630dce5611f400 (patch)
tree85ee401bdc015e66816aad6babcd46198420941e /lib/Transforms/Scalar/Scalar.cpp
parent7354a3fe576b34919b0752306fd1b382f879a115 (diff)
downloadllvm-c5bc067a0fb05fe36761bb280d630dce5611f400.tar.gz
llvm-c5bc067a0fb05fe36761bb280d630dce5611f400.tar.bz2
llvm-c5bc067a0fb05fe36761bb280d630dce5611f400.tar.xz
Move GlobalMerge from Transform to CodeGen.
This patch is to move GlobalMerge pass from Transform/Scalar to CodeGen, because GlobalMerge depends on TargetMachine. In the mean time, the macro INITIALIZE_TM_PASS is also moved to CodeGen/Passes.h. With this fix we can avoid making libScalarOpts depend on libCodeGen. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210951 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/Scalar.cpp')
-rw-r--r--lib/Transforms/Scalar/Scalar.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/Scalar.cpp b/lib/Transforms/Scalar/Scalar.cpp
index 5c7db5b16e..edf012d811 100644
--- a/lib/Transforms/Scalar/Scalar.cpp
+++ b/lib/Transforms/Scalar/Scalar.cpp
@@ -38,7 +38,6 @@ void llvm::initializeScalarOpts(PassRegistry &Registry) {
initializeDSEPass(Registry);
initializeGVNPass(Registry);
initializeEarlyCSEPass(Registry);
- initializeGlobalMergePass(Registry);
initializeIndVarSimplifyPass(Registry);
initializeJumpThreadingPass(Registry);
initializeLICMPass(Registry);