Allow llvm-dis to disassemble multiple files

[ormris]

Summary

Allow llvm-dis to disassemble multiple files

[MaskRay]

Can you add a test? Should -o be considered incompatible with multiple files?

llvm/tools/llvm-dis/llvm-dis.cpp

214

The idea with OF_TextWithCRLF is that there needs to be \r\n for Windows.

[ormris]

Sure, I can add one. What would OutputFilename mean in this context? A prefix for all output files?

llvm/tools/llvm-dis/llvm-dis.cpp

214

Will fix.

[ormris]

Changelog:

• Add test
• Fix output mode

[ormris]

ping

[MaskRay]

llvm/test/tools/llvm-dis/multiple-files.ll

2

cp

4

Delete llvm-dis < %t0. It's not this file's purpose to test single file.

9

make sure the prefix error: and filename (if exists) is in the diagnostic.

llvm/tools/llvm-dis/llvm-dis.cpp

161

!OutputFilename.empty()

[ormris]

Changelog:

• Fix error condition
• Remove unneeded test cases
• Add error prefix

[MaskRay]

LGTM.

[ormris]

Thanks for the review!

llvm/test/tools/llvm-dis/multiple-files.ll

+; RUN: llvm-as -o %t0 %s
+; RUN: llvm-as -o %t1 %s
+; RUN: not llvm-dis -o %t2 %t0 %t1 2>&1 | FileCheck %s --check-prefix ERROR
+; RUN: llvm-dis < %t0 -o - | FileCheck %s
+; RUN: llvm-dis %t0 -o - | FileCheck %s
+; RUN: llvm-dis %t0 %t1
+; RUN: FileCheck %s < %t0.ll
+; RUN: FileCheck %s < %t1.ll
+; ERROR: output file name cannot be set for multiple input files
+
+; CHECK: declare void @foo
+declare void @foo() 

llvm/tools/llvm-dis/llvm-dis.cpp

 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/ToolOutputFile.h"
 #include "llvm/Support/WithColor.h"
 #include <system_error>
 using namespace llvm;
 
-static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
+static cl::list<std::string> InputFilenames(cl::Positional, cl::ZeroOrMore,
+                                            cl::desc("[input bitcode]..."));
 
 static cl::opt<std::string>
 OutputFilename("o", cl::desc("Override output filename"),
                cl::value_desc("filename"));
 
 static cl::opt<bool>
 Force("f", cl::desc("Enable binary output on terminals"));
 
int main(int argc, char **argv) {
 
   ExitOnErr.setBanner(std::string(argv[0]) + ": error: ");
 
   LLVMContext Context;
   Context.setDiagnosticHandler(
       std::make_unique<LLVMDisDiagnosticHandler>(argv[0]));
   cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .ll disassembler\n");
 
-  std::unique_ptr<MemoryBuffer> MB =
-      ExitOnErr(errorOrToExpected(MemoryBuffer::getFileOrSTDIN(InputFilename)));
+  if (InputFilenames.size() < 1) {
+    InputFilenames.push_back("-");
+  } else if (InputFilenames.size() > 1 && OutputFilename != "") {
+    errs() << "output file name cannot be set for multiple input files\n";
+    return 1;
+  }
+
+  for (std::string InputFilename : InputFilenames) {
+    std::unique_ptr<MemoryBuffer> MB = ExitOnErr(
+        errorOrToExpected(MemoryBuffer::getFileOrSTDIN(InputFilename)));
 
     BitcodeFileContents IF = ExitOnErr(llvm::getBitcodeFileContents(*MB));
 
     const size_t N = IF.Mods.size();
 
     if (OutputFilename == "-" && N > 1)
       errs() << "only single module bitcode files can be written to stdout\n";
 
-  for (size_t i = 0; i < N; ++i) {
-    BitcodeModule MB = IF.Mods[i];
-    std::unique_ptr<Module> M = ExitOnErr(MB.getLazyModule(Context, MaterializeMetadata,
-                                          SetImporting));
+    for (size_t I = 0; I < N; ++I) {
+      BitcodeModule MB = IF.Mods[I];
+      std::unique_ptr<Module> M = ExitOnErr(
+          MB.getLazyModule(Context, MaterializeMetadata, SetImporting));
       if (MaterializeMetadata)
         ExitOnErr(M->materializeMetadata());
       else
         ExitOnErr(M->materializeAll());
 
       BitcodeLTOInfo LTOInfo = ExitOnErr(MB.getLTOInfo());
       std::unique_ptr<ModuleSummaryIndex> Index;
       if (LTOInfo.HasSummary)
         Index = ExitOnErr(MB.getSummary());
 
       std::string FinalFilename(OutputFilename);
 
       // Just use stdout.  We won't actually print anything on it.
       if (DontPrint)
         FinalFilename = "-";
 
       if (FinalFilename.empty()) { // Unspecified output, infer it.
         if (InputFilename == "-") {
           FinalFilename = "-";
         } else {
           StringRef IFN = InputFilename;
           FinalFilename = (IFN.endswith(".bc") ? IFN.drop_back(3) : IFN).str();
           if (N > 1)
-          FinalFilename += std::string(".") + std::to_string(i);
+            FinalFilename += std::string(".") + std::to_string(I);
           FinalFilename += ".ll";
         }
       } else {
         if (N > 1)
-        FinalFilename += std::string(".") + std::to_string(i);
+          FinalFilename += std::string(".") + std::to_string(I);
       }
 
       std::error_code EC;
       std::unique_ptr<ToolOutputFile> Out(
           new ToolOutputFile(FinalFilename, EC, sys::fs::OF_TextWithCRLF));
       if (EC) {
         errs() << EC.message() << '\n';
         return 1;
       }
 
       std::unique_ptr<AssemblyAnnotationWriter> Annotator;
       if (ShowAnnotations)
         Annotator.reset(new CommentWriter());
 
       // All that llvm-dis does is write the assembly to a file.
       if (!DontPrint) {
         M->print(Out->os(), Annotator.get(), PreserveAssemblyUseListOrder);
         if (Index)
           Index->print(Out->os());
       }
 
       // Declare success.
       Out->keep();
     }
+  }
 
   return 0;
 }