1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp
index bfa10441..e3458d9 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp
@@ -28,12 +28,8 @@ DWARFDebugPubTable::DWARFDebugPubTable(const DWARFObject &Obj,
     Sets.push_back({});
     Set &SetData = Sets.back();
 
-    dwarf::DwarfFormat Format = dwarf::DWARF32;
-    SetData.Length = PubNames.getU32(&Offset);
-    if (SetData.Length == dwarf::DW_LENGTH_DWARF64) {
-      Format = dwarf::DWARF64;
-      SetData.Length = PubNames.getU64(&Offset);
-    }
+    dwarf::DwarfFormat Format;
+    std::tie(SetData.Length, Format) = PubNames.getInitialLength(&Offset);
     const unsigned OffsetSize = dwarf::getDwarfOffsetByteSize(Format);
 
     SetData.Version = PubNames.getU16(&Offset);