Make this code more efficient

[oota-llvm.git] / tools / llvm-ranlib / llvm-ranlib.cpp

diff --git a/tools/llvm-ranlib/llvm-ranlib.cpp b/tools/llvm-ranlib/llvm-ranlib.cpp
index b387aa5eeceff14842ad86837c7339c0a796c1d2..9085b7ed45c948e6ed0f736345b63668a45bc330 100644 (file)
--- a/tools/llvm-ranlib/llvm-ranlib.cpp
+++ b/tools/llvm-ranlib/llvm-ranlib.cpp
@@ -1,10 +1,10 @@
 //===-- llvm-ranlib.cpp - LLVM archive index generator --------------------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
+// This file was developed by Reid Spencer and is distributed under the
 // University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // Adds or updates an index (symbol table) for an LLVM archive file.
@@ -12,38 +12,43 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Module.h"
-#include "llvm/Bytecode/Archive.h"
+#include "llvm/Bitcode/Archive.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
-#include <algorithm>
 #include <iomanip>
+#include <memory>
 
 using namespace llvm;
 
 // llvm-ar operation code and modifier flags
-cl::opt<std::string> 
-ArchiveName(cl::Positional, cl::Optional, cl::desc("<archive-file>..."));
+static cl::opt<std::string>
+ArchiveName(cl::Positional, cl::Optional, cl::desc("<archive-file>"));
 
-cl::opt<bool>
+static cl::opt<bool>
 Verbose("verbose",cl::Optional,cl::init(false),
         cl::desc("Print the symbol table"));
 
-sys::Path TmpArchive;
-
-void cleanup() {
-  if (TmpArchive.exists())
-    TmpArchive.destroyFile();
+// printSymbolTable - print out the archive's symbol table.
+void printSymbolTable(Archive* TheArchive) {
+  std::cout << "\nArchive Symbol Table:\n";
+  const Archive::SymTabType& symtab = TheArchive->getSymbolTable();
+  for (Archive::SymTabType::const_iterator I=symtab.begin(), E=symtab.end();
+       I != E; ++I ) {
+    unsigned offset = TheArchive->getFirstFileOffset() + I->second;
+    std::cout << " " << std::setw(9) << offset << "\t" << I->first <<"\n";
+  }
 }
 
 int main(int argc, char **argv) {
+  llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
 
   // Have the command line options parsed and handle things
   // like --help and --version.
   cl::ParseCommandLineOptions(argc, argv,
     " LLVM Archive Index Generator (llvm-ranlib)\n\n"
-    "  This program adds or updates an index of bytecode symbols\n"
+    "  This program adds or updates an index of bitcode symbols\n"
     "  to an LLVM archive file."
   );
 
@@ -57,21 +62,25 @@ int main(int argc, char **argv) {
 
     // Check the path name of the archive
     sys::Path ArchivePath;
-    if (!ArchivePath.setFile(ArchiveName))
+    if (!ArchivePath.set(ArchiveName))
       throw std::string("Archive name invalid: ") + ArchiveName;
 
     // Make sure it exists, we don't create empty archives
     if (!ArchivePath.exists())
-      throw "Archive file does not exist";
-
-    // Archive* TheArchive = Archive::OpenAndLoad(ArchivePath);
-    Archive* TheArchive = Archive::OpenAndLoad(ArchivePath);
+      throw std::string("Archive file does not exist");
 
-    assert(TheArchive && "Unable to instantiate the archive");
+    std::string err_msg;
+    std::auto_ptr<Archive>
+      AutoArchive(Archive::OpenAndLoad(ArchivePath,&err_msg));
+    Archive* TheArchive = AutoArchive.get();
+    if (!TheArchive)
+      throw err_msg;
 
-    TheArchive->writeToDisk(true,false,false,Verbose);
+    if (TheArchive->writeToDisk(true, false, false, &err_msg ))
+      throw err_msg;
 
-    delete TheArchive;
+    if (Verbose)
+      printSymbolTable(TheArchive);
 
   } catch (const char*msg) {
     std::cerr << argv[0] << ": " << msg << "\n\n";
@@ -80,9 +89,8 @@ int main(int argc, char **argv) {
     std::cerr << argv[0] << ": " << msg << "\n";
     exitCode = 2;
   } catch (...) {
-    std::cerr << argv[0] << ": An nexpected unknown exception occurred.\n";
+    std::cerr << argv[0] << ": An unexpected unknown exception occurred.\n";
     exitCode = 3;
   }
-  cleanup();
   return exitCode;
 }