From: Jordan Rupprecht <rupprecht@google.com>
Date: Thu, 28 Mar 2019 23:08:06 +0000 (+0000)
Subject: [llvm-readobj] Fix formatting of unknown note types
X-Git-Tag: llvmorg-10-init~8935
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dc28b6d2b89ed160038c14c9cc7aa7c29004c5c;p=platform%2Fupstream%2Fllvm.git

[llvm-readobj] Fix formatting of unknown note types

llvm-svn: 357221
---

diff --git a/llvm/test/tools/llvm-readobj/note-unknown.s b/llvm/test/tools/llvm-readobj/note-unknown.s
new file mode 100644
index 0000000..7b0696a
--- /dev/null
+++ b/llvm/test/tools/llvm-readobj/note-unknown.s
@@ -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"
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 2d5a306..d2fb2c3 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -4704,7 +4704,8 @@ void LLVMStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
       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)) + ")");
     }
   };