From c9579271b349a76f756dc2e3a178e8028396dd8f Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 3 Mar 2020 18:52:56 +0100 Subject: [PATCH] Use new DWARFDataExtractor::getInitialLength in DWARFUnit --- llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp index f3fd48c..9e71ef5 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp @@ -262,12 +262,8 @@ bool DWARFUnitHeader::extract(DWARFContext &Context, IndexEntry = Entry; if (!IndexEntry && Index) IndexEntry = Index->getFromOffset(*offset_ptr); - Length = debug_info.getRelocatedValue(4, offset_ptr, nullptr, &Err); - FormParams.Format = DWARF32; - if (Length == dwarf::DW_LENGTH_DWARF64) { - Length = debug_info.getU64(offset_ptr, &Err); - FormParams.Format = DWARF64; - } + std::tie(Length, FormParams.Format) = + debug_info.getInitialLength(offset_ptr, &Err); FormParams.Version = debug_info.getU16(offset_ptr, &Err); if (FormParams.Version >= 5) { UnitType = debug_info.getU8(offset_ptr, &Err); -- 2.7.4