Include ADCE pass, rename include/Opt directory to llvm/Optimizations

Optimizations now in opt namespace.
Rename SCCP pass to DoSCCP


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

1 files changed, 5 insertions, 2 deletions

diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 7bae1d8..f039a8a 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -25,7 +25,9 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Tools/CommandLine.h"
-#include "llvm/Opt/AllOpts.h"
+#include "llvm/Optimizations/AllOpts.h"
+
+using namespace opt;
 
 struct {
   const string ArgName, Name;
@@ -37,8 +39,9 @@ struct {
   { "-strip"     , "Strip Symbols",         DoSymbolStripping     },
   { "-mstrip"    , "Strip Module Symbols",  DoFullSymbolStripping },
   { "-indvars"   , "Simplify Induction Vars",DoInductionVariableCannonicalize },
-  { "-sccp"      , "Sparse Conditional Constant Prop", DoSCCP<Module> },
+  { "-sccp"      , "Sparse Conditional Constant Prop", DoSCCP },
   { "-cpm"       , "Constant Pool Merging", DoConstantPoolMerging },
+  { "-adce"      , "Agressive DCE",         DoADCE },
 };
 
 int main(int argc, char **argv) {