remove EH cruft, add bitcode support

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

tools/llvm-extract/Makefile

@@ -6,10 +6,10 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
+
 LEVEL = ../..
 
 TOOLNAME = llvm-extract
-LINK_COMPONENTS := bcreader bcwriter ipo
-REQUIRES_EH := 1
+LINK_COMPONENTS := bcreader bcwriter ipo bitreader bitwriter
 
 include $(LEVEL)/Makefile.common

tools/llvm-extract/llvm-extract.cpp

@@ -14,6 +14,7 @@
 
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"
@@ -21,6 +22,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compressor.h"
 #include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
@@ -28,6 +30,8 @@
 #include <fstream>
 using namespace llvm;
 
+cl::opt<bool> Bitcode("bitcode");
+
 // InputFilename - The filename to read from.
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
@@ -54,12 +58,26 @@ ExtractFunc("func", cl::desc("Specify function to extract"), cl::init("main"),
 
 int main(int argc, char **argv) {
   llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
-  try {
   cl::ParseCommandLineOptions(argc, argv, " llvm extractor\n");
   sys::PrintStackTraceOnErrorSignal();
 
-    std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename,
+  std::auto_ptr<Module> M;
+  
+  if (Bitcode) {
+    MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&InputFilename[0],
+                                                        InputFilename.size());
+    if (Buffer == 0) {
+      cerr << "Error reading file '" + InputFilename + "'";
+      return 1;
+    } else {
+      M.reset(ParseBitcodeFile(Buffer));
+    }
+    delete Buffer;
+  } else {
+    M.reset(ParseBytecodeFile(InputFilename,
                               Compressor::decompressToNewBuffer));
+  }
+  
   if (M.get() == 0) {
     cerr << argv[0] << ": bytecode didn't read correctly.\n";
     return 1;
@@ -103,16 +121,13 @@ int main(int argc, char **argv) {
   }
 
   OStream L(*Out);
+  if (Bitcode)
+    Passes.add(CreateBitcodeWriterPass(*Out));
+  else 
     Passes.add(new WriteBytecodePass(&L));  // Write bytecode to file...
   Passes.run(*M.get());
 
   if (Out != &std::cout)
     delete Out;
   return 0;
-  } catch (const std::string& msg) {
-    cerr << argv[0] << ": " << msg << "\n";
-  } catch (...) {
-    cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
-  }
-  return 1;
 }

tools/llvm-link/Makefile

@@ -9,7 +9,6 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-link
-LINK_COMPONENTS = linker bcreader bcwriter
-REQUIRES_EH := 1
+LINK_COMPONENTS = linker bcreader bcwriter bitreader bitwriter
 
 include $(LEVEL)/Makefile.common

tools/llvm-link/llvm-link.cpp

@@ -15,10 +15,12 @@
 #include "llvm/Linker.h"
 #include "llvm/Module.h"
 #include "llvm/Analysis/Verifier.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/System/Signals.h"
 #include "llvm/System/Path.h"
@@ -27,6 +29,8 @@
 #include <memory>
 using namespace llvm;
 
+cl::opt<bool> Bitcode("bitcode");
+
 static cl::list<std::string>
 InputFilenames(cl::Positional, cl::OneOrMore,
                cl::desc("<input bytecode files>"));
@@ -59,9 +63,22 @@ static inline std::auto_ptr<Module> LoadFile(const std::string &FN) {
   std::string ErrorMessage;
   if (Filename.exists()) {
     if (Verbose) cerr << "Loading '" << Filename.c_str() << "'\n";
-    Module* Result = ParseBytecodeFile(Filename.toString(), 
+    Module* Result = 0;
+    
+    if (Bitcode) {
+      const std::string &FNStr = Filename.toString();
+      MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(&FNStr[0],
+                                                          FNStr.size());
+      if (Buffer == 0)
+        ErrorMessage = "Error reading file '" + FNStr + "'";
+      else
+        Result = ParseBitcodeFile(Buffer, &ErrorMessage);
+      delete Buffer;
+    } else {
+      Result = ParseBytecodeFile(Filename.toString(), 
                                  Compressor::decompressToNewBuffer,
                                  &ErrorMessage);
+    }
     if (Result) return std::auto_ptr<Module>(Result);   // Load successful!
 
     if (Verbose) {
@@ -78,7 +95,6 @@ static inline std::auto_ptr<Module> LoadFile(const std::string &FN) {
 
 int main(int argc, char **argv) {
   llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
-  try {
   cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
   sys::PrintStackTraceOnErrorSignal();
   assert(InputFilenames.size() > 0 && "OneOrMore is not working");
@@ -143,15 +159,13 @@ int main(int argc, char **argv) {
   }
 
   if (Verbose) cerr << "Writing bytecode...\n";
+  if (Bitcode) {
+    WriteBitcodeToFile(Composite.get(), *Out);
+  } else {
     OStream L(*Out);
     WriteBytecodeToFile(Composite.get(), L, !NoCompress);
+  }
 
   if (Out != &std::cout) delete Out;
   return 0;
-  } catch (const std::string& msg) {
-    cerr << argv[0] << ": " << msg << "\n";
-  } catch (...) {
-    cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
-  }
-  return 1;
 }