Merge with upstream and remove extra code that isn't needed.

clayborg · clayborg · commit 98b0ee510484 · 2025-11-14T16:41:02.000-08:00
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
@@ -376,10 +376,6 @@ void DWARFUnit::SetDwoStrOffsetsBase() {
 
     // Skip padding.
     baseOffset += 2;
-  } else {
-    // Size of offset for .debug_str_offsets is same as DWARF offset byte size
-    // of the DWARFUnit for DWARF version 4 and earlier.
-    m_str_offsets_size = m_header.getDwarfOffsetByteSize();
   }
 
   SetStrOffsetsBase(baseOffset);

Original file line number	Diff line number	Diff line change
`@@ -376,10 +376,6 @@ void DWARFUnit::SetDwoStrOffsetsBase() {`
`376`	`376`
`377`	`377`	`// Skip padding.`
`378`	`378`	`baseOffset += 2;`
`379`		`- } else {`
`380`		`- // Size of offset for .debug_str_offsets is same as DWARF offset byte size`
`381`		`- // of the DWARFUnit for DWARF version 4 and earlier.`
`382`		`- m_str_offsets_size = m_header.getDwarfOffsetByteSize();`
`383`	`379`	`}`
`384`	`380`
`385`	`381`	`SetStrOffsetsBase(baseOffset);`