Improve error messages in order to help with fixing a big-endian bug.

[ecbeckmann]

Summary

Added output to stderr so that we can actually see what is happening when the test fails on big endian.

llvm/trunk/include/llvm/Object/WindowsResource.h

private:
   BinaryByteStream BBS;
 };
 
 class WindowsResourceParser {
 public:
   class TreeNode;
   WindowsResourceParser();
   Error parse(WindowsResource *WR);
-  void printTree() const;
+  void printTree(raw_ostream &OS) const;
   const TreeNode &getTree() const { return Root; }
   const ArrayRef<std::vector<uint8_t>> getData() const { return Data; }
   const ArrayRef<std::vector<UTF16>> getStringTable() const {
     return StringTable;
   }
 
   class TreeNode {
   public:

llvm/trunk/lib/Object/WindowsResource.cpp

if (Err)
     return std::move(Err);
   return Ref;
 }
 
 ResourceEntryRef::ResourceEntryRef(BinaryStreamRef Ref,
                                    const WindowsResource *Owner, Error &Err)
     : Reader(Ref), OwningRes(Owner) {
   if (loadNext())
-    Err = make_error<GenericBinaryError>("Could not read first entry.",
+    Err = make_error<GenericBinaryError>("Could not read first entry.\n",
                                          object_error::unexpected_eof);
 }
 
 Error ResourceEntryRef::moveNext(bool &End) {
   // Reached end of all the entries.
   if (Reader.bytesRemaining() == 0) {
     End = true;
     return Error::success();
if (IsNewNameString)
       StringTable.push_back(Entry.getNameString());
 
     RETURN_IF_ERROR(Entry.moveNext(End));
   }
 
   return Error::success();
 }
 
-void WindowsResourceParser::printTree() const {
-  ScopedPrinter Writer(outs());
+void WindowsResourceParser::printTree(raw_ostream &OS) const {
+  ScopedPrinter Writer(OS);
   Root.print(Writer, "Resource Tree");
 }
 
 void WindowsResourceParser::TreeNode::addEntry(const ResourceEntryRef &Entry,
                                                bool &IsNewTypeString,
                                                bool &IsNewNameString) {
   TreeNode &TypeNode = addTypeNode(Entry, IsNewTypeString);
   TreeNode &NameNode = TypeNode.addNameNode(Entry, IsNewNameString);

llvm/trunk/test/tools/llvm-cvtres/combined.test

 // Check that cvtres properly handles merging multiple .res files.
 // The inputs were generated with the following commands, using the original Windows
 // rc.exe:
 // > rc /fo test_resource.res /nologo test_resource.rc
 // > rc /fo languages.res /nologo languages.rc
 // The object file we are comparing against was generated with this command using
 // the original Windows cvtres.exe.
 // > cvtres /machine:X86 /readonly /nologo /out:combined.obj.coff \
 //   languages.res test_resource.res
 
-RUN: llvm-cvtres /out:%t %p/Inputs/languages.res %p/Inputs/test_resource.res
+RUN: llvm-cvtres /verbose /out:%t %p/Inputs/languages.res %p/Inputs/test_resource.res
 RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s
 
 CHECK:     Resources [
 CHECK-NEXT:  Total Number of Resources: 12
 CHECK-DAG:   Number of String Entries: 1
 CHECK-NEXT:  Number of ID Entries: 5
 CHECK-NEXT:  Type: STRINGARRAY [
 CHECK-NEXT:    Table Offset: 0x40

llvm/trunk/test/tools/llvm-cvtres/object.test

 // Check COFF emission of cvtres
 // The input was generated with the following command, using the original Windows
 // rc.exe:
 // > rc /fo test_resource.res /nologo test_resource.rc
 // The object file we are comparing against was generated with this command using
 // the original Windows cvtres.exe.
 // > cvtres /machine:X86 /readonly /nologo /out:test_resource.obj.coff \
 //   test_resource.res
 
-RUN: llvm-cvtres /out:%t %p/Inputs/test_resource.res
+RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res
 RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s
 
 CHECK:     Resources [
 CHECK-NEXT:  Total Number of Resources: 8
 CHECK-DAG:   Number of String Entries: 1
 CHECK-NEXT:  Number of ID Entries: 4
 CHECK-NEXT:  Type: STRINGARRAY [
 CHECK-NEXT:    Table Offset: 0x38

llvm/trunk/tools/llvm-cvtres/llvm-cvtres.cpp

if (Verbose) {
         EntryNumber++;
       }
       outs() << "Number of resources: " << EntryNumber << "\n";
     }
 
     error(Parser.parse(RF));
   }
 
-  if (Verbose)
-    Parser.printTree();
+  if (Verbose) {
+    Parser.printTree(outs());
+    Parser.printTree(errs());
+  }
 
   error(
       llvm::object::writeWindowsResourceCOFF(OutputFile, MachineType, Parser));
 
+  if (Verbose) {
+    Expected<object::OwningBinary<object::Binary>> BinaryOrErr =
+        object::createBinary(OutputFile);
+    if (!BinaryOrErr)
+      reportError(OutputFile, errorToErrorCode(BinaryOrErr.takeError()));
+    Binary &Binary = *BinaryOrErr.get().getBinary();
+    ScopedPrinter W(errs());
+    W.printBinaryBlock("Output File Raw Data", Binary.getData());
+  }
+
   return 0;
 }