Use new induction variable simplification code with -indvars option

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1410 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 903591c80ce2ab4637c5ab4614737f5cd44bfbee..a4c11102019102988fd9962bca58df408cd2e3a1 100644 (file)
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = opt
-USEDLIBS = opt bcreader bcwriter asmwriter analysis vmcore support instrument transforms ipo target analysis
+USEDLIBS = opt bcreader bcwriter asmwriter analysis vmcore support instrument transforms scalaropts ipo target analysis
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 927a69a5f32b0b02cac70845e8d6470e953a3fa1..837c2ddef5b0b683faa3efe3e44b980c758dd76e 100644 (file)
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Transforms/LevelChange.h"
 #include "llvm/Transforms/SwapStructContents.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
+#include "llvm/Transforms/Scalar/IndVarSimplify.h"
 #include "Support/CommandLine.h"
 #include <fstream>
 #include <memory>
@@ -48,7 +49,7 @@ struct {
   { mergecons, new ConstantMerge() },
   { strip    , new opt::SymbolStripping() },
   { mstrip   , new opt::FullSymbolStripping() },
-  { indvars  , new opt::InductionVariableCannonicalize() },
+  { indvars  , new InductionVariableSimplify() },
   { sccp     , new opt::SCCPPass() },
   { adce     , new opt::AgressiveDCE() },
   { raise    , new RaisePointerReferences() },