Rebased PNaCl localmods in LLVM to 223109

tools/llvm-nm/llvm-nm.cpp

 //===-- llvm-nm.cpp - Symbol table dumping utility for llvm ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This program is a utility that works like traditional Unix "nm", that is, it
 // prints out the names of symbols in a bitcode or object file, along with some
 // information about each symbol.
 //
 // This "nm" supports many of the features of GNU "nm", including its different
 // output formats.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalAlias.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/LLVMContext.h"
+#include "llvm/Bitcode/NaCl/NaClReaderWriter.h" // @LOCALMOD
+#include "llvm/IRReader/IRReader.h"             // @LOCALMOD
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/IRObjectFile.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
@@ skipping 119 matching lines @@
 cl::opt<bool> NoLLVMBitcode("no-llvm-bc",
                             cl::desc("Disable LLVM bitcode reader"));
 
 bool PrintAddress = true;
 
 bool MultipleFiles = false;
 
 bool HadError = false;
 
 std::string ToolName;
+
+// @LOCALMOD-BEGIN
+cl::opt<NaClFileFormat> InputFileFormat(
+    "bitcode-format", cl::desc("Define format of input file:"),
+    cl::values(clEnumValN(LLVMFormat, "llvm", "LLVM file (default)"),
+               clEnumValN(PNaClFormat, "pnacl", "PNaCl bitcode file"),
+               clEnumValEnd),
+    cl::init(LLVMFormat));
+
+static cl::opt<bool>
+VerboseErrors(
+    "verbose-parse-errors",
+    cl::desc("Print out more descriptive PNaCl bitcode parse errors"),
+    cl::init(false));
+// @LOCALMOD-END
 }
 
 static void error(Twine Message, Twine Path = Twine()) {
   HadError = true;
   errs() << ToolName << ": " << Path << ": " << Message << ".\n";
 }
 
 static bool error(std::error_code EC, Twine Path = Twine()) {
   if (EC) {
     error(EC.message(), Path);
@@ skipping 829 matching lines @@
   return true;
 }
 
 static void dumpSymbolNamesFromFile(std::string &Filename) {
   ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (error(BufferOrErr.getError(), Filename))
     return;
 
   LLVMContext &Context = getGlobalContext();
+
+  // @LOCALMOD-BEGIN
+  // Support parsing PNaCl bitcode files
+  switch (InputFileFormat) {
+  case LLVMFormat:
+    break;
+  case PNaClFormat:
+  case AutodetectFileFormat:
+    report_fatal_error("command only supports LLVM file format!");
+  }
+  /* TODO(jfb) This is currently broken: the code base now requires an Object.
+  if (InputFileFormat == PNaClFormat) {
+    std::string VerboseBuffer;
+    raw_string_ostream VerboseStrm(VerboseBuffer);
+    raw_ostream *Verbose = VerboseErrors ? &VerboseStrm : nullptr;
+    ErrorOr<Module *> Result =
+        NaClParseBitcodeFile(BufferOrErr.get().release(), Verbose,
+        Context);
+    if (Result) {
+      DumpSymbolNamesFromModule(Result.get());
+      delete Result;
+    } else {
+      error(VerboseStrm.str() + Result.message()), Filename);
+      return;
+    }
+  }
+  */
+  // @LOCALMOD-END
+
   ErrorOr<std::unique_ptr<Binary>> BinaryOrErr = createBinary(
       BufferOrErr.get()->getMemBufferRef(), NoLLVMBitcode ? nullptr : &Context);
   if (error(BinaryOrErr.getError(), Filename))
     return;
   Binary &Bin = *BinaryOrErr.get();
 
   if (Archive *A = dyn_cast<Archive>(&Bin)) {
     if (ArchiveMap) {
       Archive::symbol_iterator I = A->symbol_begin();
       Archive::symbol_iterator E = A->symbol_end();
@@ skipping 264 matching lines @@
           "for the -s option");
 
   std::for_each(InputFilenames.begin(), InputFilenames.end(),
                 dumpSymbolNamesFromFile);
 
   if (HadError)
     return 1;
 
   return 0;
 }