[llvm] 24e07e1 - DebugInfoDWARF: Refactor/simplify a couple of minor things

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2021-11-09T13:20:07-08:00
New Revision: 24e07e1cf58841601287dca3df55078041dde00d

URL: https://github.com/llvm/llvm-project/commit/24e07e1cf58841601287dca3df55078041dde00d
DIFF: https://github.com/llvm/llvm-project/commit/24e07e1cf58841601287dca3df55078041dde00d.diff

LOG: DebugInfoDWARF: Refactor/simplify a couple of minor things

Added: 
    

Modified: 
    llvm/lib/DebugInfo/DWARF/DWARFDie.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
index 7caf678e8ad1c..525a3082e5691 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -278,13 +278,7 @@ struct DWARFTypePrinter {
     default: {
       const char *NamePtr = dwarf::toString(D.find(DW_AT_name), nullptr);
       if (!NamePtr) {
-        StringRef TagStr = TagString(D.getTag());
-        static constexpr StringRef Prefix = "DW_TAG_";
-        static constexpr StringRef Suffix = "_type";
-        if (TagStr.startswith(Prefix) && TagStr.endswith(Suffix))
-          OS << TagStr.substr(Prefix.size(),
-                              TagStr.size() - (Prefix.size() + Suffix.size()))
-             << " ";
+        appendTypeTagName(D.getTag());
         return Inner;
       }
       Word = true;
@@ -672,7 +666,7 @@ struct DWARFTypePrinter {
       return;
     if (D.getTag() == DW_TAG_type_unit)
       return;
-    if (D.getTag() == llvm::dwarf::DW_TAG_skeleton_unit)
+    if (D.getTag() == DW_TAG_skeleton_unit)
       return;
     if (D.getTag() == DW_TAG_subprogram)
       return;