diff options
Diffstat (limited to 'tools/opt/opt.cpp')
-rw-r--r-- | tools/opt/opt.cpp | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 218e5f0b1d..99249b9442 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -14,8 +14,6 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" -#include "llvm/Bytecode/Reader.h" -#include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Assembly/PrintModulePass.h" #include "llvm/Analysis/Verifier.h" @@ -37,17 +35,12 @@ #include <algorithm> using namespace llvm; -static cl::opt<bool> Bitcode("bitcode"); - // The OptimizationList is automatically populated with registered Passes by the // PassNameParser. // static cl::list<const PassInfo*, bool, PassNameParser> PassList(cl::desc("Optimizations available:")); -static cl::opt<bool> NoCompress("disable-compression", cl::init(true), - cl::desc("Don't compress the generated bytecode")); - // Other command line options... // static cl::opt<std::string> @@ -267,21 +260,15 @@ int main(int argc, char **argv) { // Load the input module... std::auto_ptr<Module> M; - if (Bitcode) { - MemoryBuffer *Buffer - = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size()); - - if (Buffer == 0) - ErrorMessage = "Error reading file '" + InputFilename + "'"; - else - M.reset(ParseBitcodeFile(Buffer, &ErrorMessage)); - - delete Buffer; - } else { - M.reset(ParseBytecodeFile(InputFilename, - Compressor::decompressToNewBuffer, - &ErrorMessage)); - } + MemoryBuffer *Buffer + = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size()); + + if (Buffer == 0) + ErrorMessage = "Error reading file '" + InputFilename + "'"; + else + M.reset(ParseBitcodeFile(Buffer, &ErrorMessage)); + + delete Buffer; if (M.get() == 0) { cerr << argv[0] << ": "; if (ErrorMessage.size()) @@ -372,13 +359,8 @@ int main(int argc, char **argv) { Passes.add(createVerifierPass()); // Write bytecode out to disk or cout as the last step... - OStream L(*Out); - if (!NoOutput && !AnalyzeOnly) { - if (Bitcode) - Passes.add(CreateBitcodeWriterPass(*Out)); - else - Passes.add(new WriteBytecodePass(&L, false, !NoCompress)); - } + if (!NoOutput && !AnalyzeOnly) + Passes.add(CreateBitcodeWriterPass(*Out)); // Now that we have all of the passes ready, run them. Passes.run(*M.get()); |