[llvm] r357221 - [llvm-readobj] Fix formatting of unknown note types

[Jordan Rupprecht via llvm-commits]

Author: rupprecht
Date: Thu Mar 28 16:08:06 2019
New Revision: 357221

URL: http://llvm.org/viewvc/llvm-project?rev=357221&view=rev
Log:
[llvm-readobj] Fix formatting of unknown note types

Added:
    llvm/trunk/test/tools/llvm-readobj/note-unknown.s
Modified:
    llvm/trunk/tools/llvm-readobj/ELFDumper.cpp

Added: llvm/trunk/test/tools/llvm-readobj/note-unknown.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/note-unknown.s?rev=357221&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/note-unknown.s (added)
+++ llvm/trunk/test/tools/llvm-readobj/note-unknown.s Thu Mar 28 16:08:06 2019
@@ -0,0 +1,28 @@
+// REQUIRES: x86-registered-target
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
+
+// RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
+// RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
+
+// GNU:      Displaying notes found at file offset 0x00000040 with length 0x00000010:
+// GNU-NEXT:   Owner                 Data size       Description
+// GNU-NEXT:   XYZ                  0x00000000       Unknown note type: (0x00000003)
+
+// LLVM:      Notes [
+// LLVM-NEXT:   NoteSection {
+// LLVM-NEXT:     Offset: 0x40
+// LLVM-NEXT:     Size: 0x10
+// LLVM-NEXT:     Note {
+// LLVM-NEXT:       Owner: XYZ
+// LLVM-NEXT:       Data size: 0x0
+// LLVM-NEXT:       Type: Unknown (0x00000003)
+// LLVM-NEXT:     }
+// LLVM-NEXT:   }
+// LLVM-NEXT: ]
+
+.section ".note.foo", "a"
+	.align 4
+	.long 4 /* namesz */
+	.long 0 /* descsz */
+	.long 3 /* type */
+	.asciz "XYZ"

Modified: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/ELFDumper.cpp?rev=357221&r1=357220&r2=357221&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp Thu Mar 28 16:08:06 2019
@@ -4704,7 +4704,8 @@ void LLVMStyle<ELFT>::printNotes(const E
       if (!N.Type.empty())
         W.printString(N.Type, N.Value);
     } else {
-      W.getOStream() << "Unknown note type: (" << format_hex(Type, 10) << ')';
+      W.printString("Type",
+                    "Unknown (" + to_string(format_hex(Type, 10)) + ")");
     }
   };