llvm-vtabledump: strip trailing NUL bytes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218502 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-vtabledump/trivial.test b/test/tools/llvm-vtabledump/trivial.test
index a0b9683296e2f525d7b56cc2f50b055b9c9b530c..4ee37ecdd884f2a34e41eb431239b8cd3f458cc2 100644 (file)
--- a/test/tools/llvm-vtabledump/trivial.test
+++ b/test/tools/llvm-vtabledump/trivial.test
@@ -44,7 +44,7 @@ CHECK-NEXT: ??_R1A@?0A@EA@S@@8[Flags]: 64
 CHECK-NEXT: ??_R1A@?0A@EA@S@@8[ClassHierarchyDescriptor]: ??_R3S@@8
 CHECK-NEXT: ??_R0?AUA@@@8[VFPtr]: ??_7type_info@@6B@
 CHECK-NEXT: ??_R0?AUA@@@8[AlwaysZero]: 0
-CHECK-NEXT: ??_R0?AUA@@@8[MangledName]: .?AUA@@\x00
+CHECK-NEXT: ??_R0?AUA@@@8[MangledName]: .?AUA@@
 CHECK-NEXT: ??_R0?AUS@@@8[VFPtr]: ??_7type_info@@6B@
 CHECK-NEXT: ??_R0?AUS@@@8[AlwaysZero]: 0
-CHECK-NEXT: ??_R0?AUS@@@8[MangledName]: .?AUS@@\x00
+CHECK-NEXT: ??_R0?AUS@@@8[MangledName]: .?AUS@@

diff --git a/tools/llvm-vtabledump/llvm-vtabledump.cpp b/tools/llvm-vtabledump/llvm-vtabledump.cpp
index e3e13693923a95dfdca8786275864a705f456c38..95803a3708291c125c36dcb6af3fb62fd279dfbf 100644 (file)
--- a/tools/llvm-vtabledump/llvm-vtabledump.cpp
+++ b/tools/llvm-vtabledump/llvm-vtabledump.cpp
@@ -303,7 +303,9 @@ static void dumpVTables(const ObjectFile *Obj) {
       AlwaysZero |= Data;
     outs() << TDName << "[AlwaysZero]: " << AlwaysZero << '\n';
     outs() << TDName << "[MangledName]: ";
-    outs().write_escaped(TD.MangledName, /*UseHexEscapes=*/true) << '\n';
+    outs().write_escaped(TD.MangledName.rtrim(StringRef("\0", 1)),
+                         /*UseHexEscapes=*/true)
+        << '\n';
   }
 }