[llvm] 2458492 - Use new DWARFDataExtractor::getInitialLength in DWARFDebugPubTable

[Pavel Labath via llvm-commits]

Author: Pavel Labath
Date: 2020-03-04T13:01:35+01:00
New Revision: 2458492a9ae4c62f3723ad86a8fbd6c423bb1e17

URL: https://github.com/llvm/llvm-project/commit/2458492a9ae4c62f3723ad86a8fbd6c423bb1e17
DIFF: https://github.com/llvm/llvm-project/commit/2458492a9ae4c62f3723ad86a8fbd6c423bb1e17.diff

LOG: Use new DWARFDataExtractor::getInitialLength in DWARFDebugPubTable

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp
index bfa10441ba3a..e3458d9ab8aa 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);