Dwarf: Fix high pc patching

[yota9]

Summary

The DW_FORM_addr form of highPC address is written in absolute addres,
the data form is written in offset-from-low pc format.

Due to the large test binary the test is prepared separately in
https://github.com/rafaelauler/bolt-tests/pull/8

Vladislav Khmelevsky,
Advanced Software Technology Lab, Huawei

[ayermolo]

Thanks for working on this. Sorry it took so long.

[ayermolo]

Do you need help committing this?

[yota9]

Thanks, I will do it now :)

bolt/lib/Rewrite/DWARFRewriter.cpp

if (LowPCVal->V.getForm() == dwarf::DW_FORM_GNU_addr_index) {
     TempDebugPatcher = getBinaryDWODebugInfoPatcher(*Unit->getDWOId());
     TempDebugPatcher->addUDataPatch(LowPCOffset, AddressIndex,
                                     std::abs(int(HighPCOffset - LowPCOffset)));
     // TODO: In DWARF5 support ULEB128 for high_pc
   } else {
     TempDebugPatcher->addLE64Patch(LowPCOffset, Range.LowPC);
   }
 
+  uint64_t HighPC = Range.HighPC;
+  // The DW_FORM_data* is delta between high and low pc
+  if (HighPCVal->V.getForm() != dwarf::Form::DW_FORM_addr)
+    HighPC -= Range.LowPC;
+
   if (isHighPcFormEightBytes(HighPCVal->V.getForm()))
-    TempDebugPatcher->addLE64Patch(HighPCOffset, Range.HighPC - Range.LowPC);
+    TempDebugPatcher->addLE64Patch(HighPCOffset, HighPC);
   else
-    TempDebugPatcher->addLE32Patch(HighPCOffset, Range.HighPC - Range.LowPC,
-                                   HighPCVal->Size);
+    TempDebugPatcher->addLE32Patch(HighPCOffset, HighPC);
 }
 
 void DWARFRewriter::convertToRangesPatchAbbrev(
     const DWARFUnit &Unit, const DWARFAbbreviationDeclaration *Abbrev,
     DebugAbbrevWriter &AbbrevWriter, Optional<uint64_t> RangesBase) {
   auto getAttributeForm = [&Abbrev](const dwarf::Attribute Attr) {
     Optional<uint32_t> Index = Abbrev->findAttributeIndex(Attr);
     assert(Index && "attribute not found");