[BOLT][DWARF] Add version 5 split dwarf support

[ayermolo]

Summary

Added support for DWARF5 Split Dwarf.

[ayermolo]

rebase

[ayermolo]

test

[ayermolo]

rebase

[ayermolo]

nit

[dblaikie]

Probably worth changing the == 5 version checks to >= 5 since most things stay the same between DWARF versions, and the things that don't are the exceptions/things we'll need to touch on the next version (& nice to not have to touch/update code for things that stay the same)

bolt/include/bolt/Core/DebugData.h

375–377

That seems like a somewhat problematic API - returning two very different kinds of data (the DWO_ID or the unit offset) seems quite easy to misuse this?

386

Probably name the parameter the same as the member, rather than one character different/lower case.

bolt/lib/Rewrite/DWARFRewriter.cpp

208–210

Probably an uppercase V since that's a separate word within the name?

306

320

reinterpret_cast seems a bit scary here - perhaps TempRangesSectionWriter should be a void* if it could be a pointer to two unrelated types (if it's a pointer to a base class that covers both ranges and rnglists, then a static_cast should suffice for the downcasting from base pointer to derived pointer)

327–329

to avoid two lookups (one for count, the other for op[]) perhaps this code should use find?

[ayermolo]

Comments from @maksfb

bolt/include/bolt/Core/DebugData.h

219

delete

230

make reference

348

add documentation.

386

Pass BC by reference

399

isFinalized

402

releaseBuffer()

bolt/lib/Core/DebugData.cpp

210

const

358–359

const

417

AM --> AMIter

483–485

const
getCUId -->getCUID

1058

remove method, move to constructor

1069

const

1071

Darf --> Dwarf

1075

use static_cast

1093

remove curly braces

bolt/lib/Rewrite/DWARFRewriter.cpp

166

const Unit, AttrInfoVal

168

const

208–209

const DwarfVersion

304

add else if for DWARF < 5 else case llvm_unreachable

322

make finalizeSection virtual and do nothing for dwarf4.

335–336

Make initSection virtual and do nothing for DWARF4

1175

1719

const

bolt/test/X86/dwarf4-df-dualcu.test

24

dwarf4

[ayermolo]

addressing comments

[ayermolo]

oops forgot to switch branches

[ayermolo]

bolt/include/bolt/Core/DebugData.h

375–377

The idea I had behind this APIS is for it to return unique ID representing the CU. As it applies to .debug_addr. For monolithic case is its offset with .debug_info for Split Dwarf case is its DWO ID. At least in my head viewed in that context the return data is the same. It's just something that uniquely identifies this CU, and logic is encapsulated in it.

[ayermolo]

bolt/include/bolt/Core/DebugData.h

375–377

@dblaikie What do you think?

[dblaikie]

bolt/include/bolt/Core/DebugData.h

375–377

Could you use the offset consistently? The debug_addr section is always in the executable - the offset of the skeleton CU would be unique?

[ayermolo]

bolt/include/bolt/Core/DebugData.h

375–377

In theory yes, if I always use offset of the CU/Skeleton CU in the main binary. For that I still need to do a check of CU that is passed in is DWO CU, get it skeleton CU, then get it's offset. At the end what we get is offset all the time. Is it really better? Sure we always getting an offset, but intent of this API is not really get an offset but the unique ID of the CU. Are you concern that offset and DWO ID will collide?

[ayermolo]

updated so that getCUID consistently returns CU/SkeletonCU offset.

[maksfb]

Awesome!

bolt/include/bolt/Core/DebugData.h

public:
 
   /// Add ranges and return offset into section.
   virtual uint64_t addRanges(const DebugAddressRangesVector &Ranges) override;
 
   virtual std::unique_ptr<DebugBufferVector> finalize() override {
     return std::move(RangesBuffer);
   }
 
-  /// Needs to be invoked before each CU is processed.
-  /// \p CUID is a unique ID of each CU.
-  void initSection(uint64_t CUID);
+  /// Needs to be invoked before each \p CU is processed.
+  void initSection(DWARFUnit &CU);
 
   /// Writes out range lists for a current CU being processed.
   void finalizeSection();
 
+  // Returns true if section is empty.
+  bool empty() { return RangesBuffer->empty(); }
+
+  RangesWriterKind getKind() const {
+    return DebugRangesSectionWriter::getKind();
+  }
+
   static bool classof(const DebugRangesSectionWriter *Writer) {
     return Writer->getKind() == RangesWriterKind::DebugRangeListsWriter;
   }
 
 private:
   static DebugAddrWriter *AddrWriter;
-  /// Unique ID of CU being processed.
-  uint64_t CUID{0};
+  /// Used to find unique CU ID.
+  DWARFUnit *CU;
   /// Current relative offset of range list entry within this CUs rangelist
   /// body.
   uint32_t CurrentOffset{0};
   /// Contains relative offset of each range list entry.
   SmallVector<uint32_t, 1> RangeEntries;
 
   std::unique_ptr<DebugBufferVector> CUBodyBuffer;
   std::unique_ptr<raw_svector_ostream> CUBodyStream;

 using AddressSectionBuffer = SmallVector<char, 4>;
 class DebugAddrWriter {
 public:
   DebugAddrWriter() = delete;
   DebugAddrWriter(BinaryContext *BC_);
   virtual ~DebugAddrWriter(){};
   /// Given an address returns an index in .debug_addr.
   /// Adds Address to map.
-  uint32_t getIndexFromAddress(uint64_t Address, uint64_t CUID);
+  uint32_t getIndexFromAddress(uint64_t Address, DWARFUnit &CU);
 
-  /// Adds {Address, Index} to DWO ID CU.
-  void addIndexAddress(uint64_t Address, uint32_t Index, uint64_t CUID);
+  /// Adds {\p Address, \p Index} to \p CU.
+  void addIndexAddress(uint64_t Address, uint32_t Index, DWARFUnit &CU);
 
   /// Creates consolidated .debug_addr section, and builds DWOID to offset map.
   virtual AddressSectionBuffer finalize();
 
   /// Given DWARFUnit \p Unit returns offset of this CU in to .debug_addr
   /// section.
   virtual uint64_t getOffset(DWARFUnit &Unit);
 
public:
 
     void dump();
 
   private:
     AddressToIndexMap AddressToIndex;
     IndexToAddressMap IndexToAddress;
     uint32_t CurrentIndex{0};
   };
+
+  virtual uint64_t getCUId(DWARFUnit &Unit) {
+    assert(Unit.getDWOId() && "Unit is not Skeleton CU.");
+    return *Unit.getDWOId();
+  }
+
   BinaryContext *BC;
   /// Maps DWOID to AddressForDWOCU.
   std::unordered_map<uint64_t, AddressForDWOCU> AddressMaps;
   /// Maps DWOID to offset within .debug_addr section.
   std::unordered_map<uint64_t, uint64_t> DWOIdToOffsetMap;
   /// Mutex used for parallel processing of debug info.
   std::mutex WriterMutex;
 };
 
 class DebugAddrWriterDwarf5 : public DebugAddrWriter {
 public:
   DebugAddrWriterDwarf5() = delete;
   DebugAddrWriterDwarf5(BinaryContext *BC) : DebugAddrWriter(BC) {}
 
   /// Creates consolidated .debug_addr section, and builds DWOID to offset map.
   virtual AddressSectionBuffer finalize() override;
   /// Given DWARFUnit \p Unit returns offset of this CU in to .debug_addr
   /// section.
   virtual uint64_t getOffset(DWARFUnit &Unit) override;
+
+protected:
+  virtual uint64_t getCUId(DWARFUnit &Unit) override {
+    if (Optional<uint64_t> DWOId = Unit.getDWOId())
+      return *DWOId;
+    return Unit.getOffset();
+  }
+};
+
+/// This class is NOT thread safe.
+using DebugStrOffsetsBufferVector = SmallVector<char, 16>;
+class DebugStrOffsetsWriter {
+public:
+  DebugStrOffsetsWriter() = delete;
+  DebugStrOffsetsWriter(BinaryContext *Bc) : BC(Bc) { create(); }
+
+  /// Initializes Buffer and Stream.
+  void initialize(const DWARFSection &StrOffsetsSection,
+                  const Optional<StrOffsetsContributionDescriptor> Contr);
+
+  /// Update Str offset in .debug_str in .debug_str_offsets.
+  void updateAddressMap(uint32_t Index, uint32_t Address);
+
+  /// Writes out current sections entry into .debug_str_offsets.
+  void finalizeSection();
+
+  /// Returns False if no strings were added to .debug_str.
+  bool isInitialized() const { return !StrOffsetsBuffer->empty(); }
+
+  /// Returns buffer containing .debug_str_offsets.
+  std::unique_ptr<DebugStrOffsetsBufferVector> finalize() {
+    return std::move(StrOffsetsBuffer);
+  }
+
+private:
+  /// Creats internal data stractures.
+  void create();
+  std::unique_ptr<DebugStrOffsetsBufferVector> StrOffsetsBuffer;
+  std::unique_ptr<raw_svector_ostream> StrOffsetsStream;
+  BinaryContext *BC;
+  std::map<uint32_t, uint32_t> IndexToAddressMap;
+  // Section size not including header.
+  uint32_t CurrentSectionSize{0};
 };
 
 using DebugStrBufferVector = SmallVector<char, 16>;
 class DebugStrWriter {
 public:
   DebugStrWriter() = delete;
   DebugStrWriter(BinaryContext *Bc) : BC(Bc) { create(); }
   std::unique_ptr<DebugStrBufferVector> finalize() {
private:
   /// Contains all the attributes pointing to empty location list.
   VectorEmptyLocListAttributes EmptyAttrLists;
 };
 
 class DebugLoclistWriter : public DebugLocWriter {
 public:
   ~DebugLoclistWriter() {}
   DebugLoclistWriter() = delete;
-  DebugLoclistWriter(BinaryContext *BC, uint64_t CID,
+  DebugLoclistWriter(BinaryContext *BC, DWARFUnit &Unit,
                      uint32_t LocListsBaseAttrOffset, uint8_t DV, bool SD)
-      : DebugLocWriter(BC), CUID(CID),
+      : DebugLocWriter(BC), CU(Unit),
         LocListsBaseAttrOffset(LocListsBaseAttrOffset), IsSplitDwarf(SD) {
     Kind = LocWriterKind::DebugLoclistWriter;
     DwarfVersion = DV;
     assert(DebugLoclistWriter::AddrWriter &&
            "Please use SetAddressWriter to initialize "
            "DebugAddrWriter before instantiation.");
   }
 
   static void setAddressWriter(DebugAddrWriter *AddrW) { AddrWriter = AddrW; }
 
   /// Stores location lists internally to be written out during finalize phase.
   virtual void addList(uint64_t AttrOffset, uint32_t LocListIndex,
                        DebugLocationsVector &&LocList) override;
 
   /// Writes out locations in to a local buffer and applies debug info patches.
   void finalize(uint64_t SectionOffset,
                 SimpleBinaryPatcher &DebugInfoPatcher) override;
 
-  /// Returns DWO ID.
-  uint64_t getCUID() const { return CUID; }
+  /// Returns CU ID.
+  /// For Skelton CU it is a CU Offset.
+  /// For DWO CU it is a DWO ID.
+  uint64_t getCUID() const {
+    return CU.isDWOUnit() ? *CU.getDWOId() : CU.getOffset();
+  }
 
   LocWriterKind getKind() const { return DebugLocWriter::getKind(); }
 
   static bool classof(const DebugLocWriter *Writer) {
     return Writer->getKind() == LocWriterKind::DebugLoclistWriter;
   }
 
   bool isSplitDwarf() const { return IsSplitDwarf; }
private:
   class Patch {
   public:
     Patch() = delete;
     Patch(uint64_t O, uint64_t A) : Offset(O), Address(A) {}
     uint64_t Offset{0};
     uint64_t Address{0};
   };
   static DebugAddrWriter *AddrWriter;
-  uint64_t CUID{0};
+  DWARFUnit &CU;
   uint32_t LocListsBaseAttrOffset{InvalidLocListsBaseAttrOffset};
   bool IsSplitDwarf{false};
 };
 
 enum class PatcherKind { SimpleBinaryPatcher, DebugInfoBinaryPatcher };
 /// Abstract interface for classes that apply modifications to a binary string.
 class BinaryPatcher {
 public:

bolt/include/bolt/Rewrite/DWARFRewriter.h

class DWARFRewriter {
   /// .debug_addr DWARF section.
   std::unique_ptr<DebugAddrWriter> AddrWriter;
 
   /// Stores and serializes information that will be put in to the
   /// .debug_addr DWARF section.
   /// Does not do de-duplication.
   std::unique_ptr<DebugStrWriter> StrWriter;
 
+  /// Stores and serializes information that will be put in to the
+  /// .debug_str_offsets DWARF section.
+  std::unique_ptr<DebugStrOffsetsWriter> StrOffstsWriter;
+
   /// .debug_abbrev section writer for the main binary.
   std::unique_ptr<DebugAbbrevWriter> AbbrevWriter;
 
   using LocWriters = std::map<uint64_t, std::unique_ptr<DebugLocWriter>>;
   /// Use a separate location list writer for each compilation unit
   LocWriters LocListWritersByCU;
 
+  using RangeListsDWOWriers =
+      std::unordered_map<uint64_t,
+                         std::unique_ptr<DebugRangeListsSectionWriter>>;
+  /// Store Rangelists writer for each DWO CU.
+  RangeListsDWOWriers RangeListsWritersByCU;
+
   using DebugAbbrevDWOWriters =
       std::unordered_map<uint64_t, std::unique_ptr<DebugAbbrevWriter>>;
   /// Abbrev section writers for DWOs.
   DebugAbbrevDWOWriters BinaryDWOAbbrevWriters;
 
   using DebugInfoDWOPatchers =
       std::unordered_map<uint64_t, std::unique_ptr<SimpleBinaryPatcher>>;
   /// Binary patchers for DWO debug_info sections.
if (Iter == BinaryPatchers.end()) {
       Iter = BinaryPatchers
                  .insert(std::make_pair(DwoId, std::make_unique<Patcher>()))
                  .first;
     }
 
     return static_cast<Patcher *>(Iter->second.get());
   }
 
+  /// Adds a \p Str to .debug_str section.
+  /// Uses \p AttrInfoVal to either update entry in a DIE for legacy DWARF using
+  /// \p DebugInfoPatcher, or for DWARF5 update an index in .debug_str_offsets
+  /// for this contribution of \p Unit.
+  void addStringHelper(DebugInfoBinaryPatcher &DebugInfoPatcher,
+                       DWARFUnit &Unit, AttrInfo &AttrInfoVal, StringRef Str);
+
 public:
   DWARFRewriter(BinaryContext &BC) : BC(BC) {}
 
   /// Main function for updating the DWARF debug info.
   void updateDebugInfo();
 
   /// Update stmt_list for CUs based on the new .debug_line \p Layout.
   void updateLineTableOffsets(const MCAsmLayout &Layout);

bolt/lib/Core/DebugData.cpp

 #include "llvm/Support/EndianStream.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/SHA1.h"
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <limits>
 #include <unordered_map>
+#include <vector>
 
 #define DEBUG_TYPE "bolt-debug-info"
 
 namespace opts {
 extern llvm::cl::opt<unsigned> Verbosity;
 } // namespace opts
 
 namespace llvm {
uint64_t DebugRangeListsSectionWriter::addRanges(
     const DebugAddressRangesVector &Ranges) {
   std::lock_guard<std::mutex> Lock(WriterMutex);
 
   RangeEntries.push_back(CurrentOffset);
   for (const DebugAddressRange &Range : Ranges) {
     support::endian::write(*CUBodyStream,
                            static_cast<uint8_t>(dwarf::DW_RLE_startx_length),
                            support::little);
-    const uint32_t Index = AddrWriter->getIndexFromAddress(Range.LowPC, CUID);
+    uint32_t Index = AddrWriter->getIndexFromAddress(Range.LowPC, *CU);
     encodeULEB128(Index, *CUBodyStream);
     encodeULEB128(Range.HighPC - Range.LowPC, *CUBodyStream);
   }
   support::endian::write(*CUBodyStream,
                          static_cast<uint8_t>(dwarf::DW_RLE_end_of_list),
                          support::little);
   CurrentOffset = CUBodyBuffer->size();
   return RangeEntries.size() - 1;
std::unique_ptr<DebugBufferVector> Header = getDWARF5Header(
       {static_cast<uint32_t>(SizeOfArraySection + CUBodyBuffer.get()->size()),
        5, 8, 0, static_cast<uint32_t>(RangeEntries.size())});
   *RangesStream << *Header;
   *RangesStream << *CUArrayBuffer;
   *RangesStream << *CUBodyBuffer;
   SectionOffset = RangesBuffer->size();
 }
 
-void DebugRangeListsSectionWriter::initSection(uint64_t CUId_) {
+void DebugRangeListsSectionWriter::initSection(DWARFUnit &Unit) {
   CUBodyBuffer = std::make_unique<DebugBufferVector>();
   CUBodyStream = std::make_unique<raw_svector_ostream>(*CUBodyBuffer);
   RangeEntries.clear();
   CurrentOffset = 0;
-  CUID = CUId_;
+  CU = &Unit;
 }
 
 void DebugARangesSectionWriter::addCURanges(uint64_t CUOffset,
                                             DebugAddressRangesVector &&Ranges) {
   std::lock_guard<std::mutex> Lock(CUAddressRangesMutex);
   CUAddressRanges.emplace(CUOffset, std::move(Ranges));
 }
 
void DebugAddrWriter::AddressForDWOCU::dump() {
   // Sorting address in increasing order of indices.
   std::sort(SortedMap.begin(), SortedMap.end(),
             [](const IndexAddressPair &A, const IndexAddressPair &B) {
               return A.first < B.first;
             });
   for (auto &Pair : SortedMap)
     dbgs() << Twine::utohexstr(Pair.second) << "\t" << Pair.first << "\n";
 }
-uint32_t DebugAddrWriter::getIndexFromAddress(uint64_t Address, uint64_t CUID) {
+uint32_t DebugAddrWriter::getIndexFromAddress(uint64_t Address, DWARFUnit &CU) {
   std::lock_guard<std::mutex> Lock(WriterMutex);
+  const uint64_t CUID = getCUId(CU);
   if (!AddressMaps.count(CUID))
     AddressMaps[CUID] = AddressForDWOCU();
 
   AddressForDWOCU &Map = AddressMaps[CUID];
   auto Entry = Map.find(Address);
   if (Entry == Map.end()) {
     auto Index = Map.getNextIndex();
     Entry = Map.insert(Address, Index).first;
   }
   return Entry->second;
 }
 
 // Case1) Address is not in map insert in to AddresToIndex and IndexToAddres
 // Case2) Address is in the map but Index is higher or equal. Need to update
 // IndexToAddrss. Case3) Address is in the map but Index is lower. Need to
 // update AddressToIndex and IndexToAddress
 void DebugAddrWriter::addIndexAddress(uint64_t Address, uint32_t Index,
-                                      uint64_t CUID) {
+                                      DWARFUnit &CU) {
   std::lock_guard<std::mutex> Lock(WriterMutex);
+  const uint64_t CUID = getCUId(CU);
   AddressForDWOCU &Map = AddressMaps[CUID];
   auto Entry = Map.find(Address);
   if (Entry != Map.end()) {
     if (Entry->second > Index)
       Map.updateAddressToIndex(Address, Index);
     Map.updateIndexToAddrss(Address, Index);
   } else {
     Map.insert(Address, Index);
   }
 }
 
 AddressSectionBuffer DebugAddrWriter::finalize() {
   // Need to layout all sections within .debug_addr
   // Within each section sort Address by index.
   AddressSectionBuffer Buffer;
   raw_svector_ostream AddressStream(Buffer);
   for (std::unique_ptr<DWARFUnit> &CU : BC->DwCtx->compile_units()) {
-    Optional<uint64_t> DWOId = CU->getDWOId();
     // Handling the case wehre debug information is a mix of Debug fission and
     // monolitic.
-    if (!DWOId)
+    if (!CU->getDWOId())
       continue;
-    auto AM = AddressMaps.find(*DWOId);
+    uint64_t CUId = getCUId(*CU.get());
+    auto AM = AddressMaps.find(CUId);
     assert(AM != AddressMaps.end() && "Address Map not found.");
     // Adding to map even if it did not contribute to .debug_addr.
     // The Skeleton CU will still have DW_AT_GNU_addr_base.
-    DWOIdToOffsetMap[*DWOId] = Buffer.size();
+    DWOIdToOffsetMap[CUId] = Buffer.size();
     // If does not exist this CUs DWO section didn't contribute to .debug_addr.
     if (AM == AddressMaps.end())
       continue;
     std::vector<IndexAddressPair> SortedMap(AM->second.indexToAddressBegin(),
                                             AM->second.indexToAdddessEnd());
     // Sorting address in increasing order of indices.
     std::sort(SortedMap.begin(), SortedMap.end(),
               [](const IndexAddressPair &A, const IndexAddressPair &B) {
AddressSectionBuffer DebugAddrWriterDwarf5::finalize() {
   const endianness Endian =
       BC->DwCtx->isLittleEndian() ? support::little : support::big;
   const DWARFSection &AddrSec = BC->DwCtx->getDWARFObj().getAddrSection();
   DWARFDataExtractor AddrData(BC->DwCtx->getDWARFObj(), AddrSec, Endian, 0);
   DWARFDebugAddrTable AddrTable;
   DIDumpOptions DumpOpts;
   constexpr uint32_t HeaderSize = 8;
   for (std::unique_ptr<DWARFUnit> &CU : BC->DwCtx->compile_units()) {
-    const uint64_t CUID = CU->getOffset();
+    const uint64_t CUID = getCUId(*CU.get());
     const uint8_t AddrSize = CU->getAddressByteSize();
-    auto Iter = AddressMaps.find(CUID);
+    auto AM = AddressMaps.find(CUID);
     // A case where CU has entry in .debug_addr, but we don't modify addresses
     // for it.
-    if (Iter == AddressMaps.end()) {
-      Iter = AddressMaps.insert({CUID, AddressForDWOCU()}).first;
+    if (AM == AddressMaps.end()) {
+      AM = AddressMaps.insert({CUID, AddressForDWOCU()}).first;
       Optional<uint64_t> BaseOffset = CU->getAddrOffsetSectionBase();
       if (!BaseOffset)
         continue;
       // Address base offset is to the first entry.
       // The size of header is 8 bytes.
       uint64_t Offset = *BaseOffset - HeaderSize;
       if (Error Err = AddrTable.extract(AddrData, &Offset, 5, AddrSize,
                                         DumpOpts.WarningHandler)) {
         DumpOpts.RecoverableErrorHandler(std::move(Err));
         continue;
       }
       uint32_t Index = 0;
       for (uint64_t Addr : AddrTable.getAddressEntries())
-        Iter->second.insert(Addr, Index++);
+        AM->second.insert(Addr, Index++);
     }
 
     DWOIdToOffsetMap[CUID] = Buffer.size() + HeaderSize;
 
-    std::vector<IndexAddressPair> SortedMap(Iter->second.indexToAddressBegin(),
-                                            Iter->second.indexToAdddessEnd());
+    std::vector<IndexAddressPair> SortedMap(AM->second.indexToAddressBegin(),
+                                            AM->second.indexToAdddessEnd());
     // Sorting address in increasing order of indices.
     std::sort(SortedMap.begin(), SortedMap.end(),
               [](const IndexAddressPair &A, const IndexAddressPair &B) {
                 return A.first < B.first;
               });
     // Writing out Header
     const uint32_t Length = SortedMap.size() * AddrSize + 4;
     support::endian::write(AddressStream, Length, Endian);
for (const IndexAddressPair &Val : SortedMap) {
       writeAddress(Val.second);
     }
   }
 
   return Buffer;
 }
 
 uint64_t DebugAddrWriter::getOffset(DWARFUnit &Unit) {
-  Optional<uint64_t> DWOId = Unit.getDWOId();
-  assert(DWOId && "Can't get offset, not a skeleton CU.");
-  auto Iter = DWOIdToOffsetMap.find(*DWOId);
+  uint64_t CUId = getCUId(Unit);
+  assert(CUId && "Can't get offset, not a skeleton CU.");
+  auto Iter = DWOIdToOffsetMap.find(CUId);
   assert(Iter != DWOIdToOffsetMap.end() &&
          "Offset in to.debug_addr was not found for DWO ID.");
   return Iter->second;
 }
 
 uint64_t DebugAddrWriterDwarf5::getOffset(DWARFUnit &Unit) {
-  auto Iter = DWOIdToOffsetMap.find(Unit.getOffset());
+  auto Iter = DWOIdToOffsetMap.find(getCUId(Unit));
   assert(Iter != DWOIdToOffsetMap.end() &&
          "Offset in to.debug_addr was not found for DWO ID.");
   return Iter->second;
 }
 
 DebugLocWriter::DebugLocWriter(BinaryContext *BC) {
   LocBuffer = std::make_unique<DebugBufferVector>();
   LocStream = std::make_unique<raw_svector_ostream>(*LocBuffer);
for (LocPatch &Patch : Patches) {
     assert(Patch.Index == DebugLoclistWriter::InvalidIndex ||
            Patch.Index == Index++ && "Gap in LocList Index Array.");
 
     std::vector<uint64_t> OffsetsArray;
     for (const DebugLocationEntry &Entry : Patch.LocList) {
       support::endian::write(*LocBodyStream,
                              static_cast<uint8_t>(dwarf::DW_LLE_startx_length),
                              support::little);
-      const uint32_t Index = AddrWriter->getIndexFromAddress(Entry.LowPC, CUID);
+      const uint32_t Index = AddrWriter->getIndexFromAddress(Entry.LowPC, CU);
       encodeULEB128(Index, *LocBodyStream);
       encodeULEB128(Entry.HighPC - Entry.LowPC, *LocBodyStream);
       encodeULEB128(Entry.Expr.size(), *LocBodyStream);
       *LocBodyStream << StringRef(
           reinterpret_cast<const char *>(Entry.Expr.data()), Entry.Expr.size());
     }
     support::endian::write(*LocBodyStream,
                            static_cast<uint8_t>(dwarf::DW_LLE_end_of_list),
if (Patch.LocList.empty()) {
                                     DebugLocWriter::EmptyListOffset);
       continue;
     }
     const uint32_t EntryOffset = LocBuffer->size();
     for (const DebugLocationEntry &Entry : Patch.LocList) {
       support::endian::write(*LocStream,
                              static_cast<uint8_t>(dwarf::DW_LLE_startx_length),
                              support::little);
-      const uint32_t Index = AddrWriter->getIndexFromAddress(Entry.LowPC, CUID);
+      const uint32_t Index = AddrWriter->getIndexFromAddress(Entry.LowPC, CU);
       encodeULEB128(Index, *LocStream);
 
       // TODO: Support DWARF5
       support::endian::write(*LocStream,
                              static_cast<uint32_t>(Entry.HighPC - Entry.LowPC),
                              support::little);
       support::endian::write(*LocStream,
                              static_cast<uint16_t>(Entry.Expr.size()),
for (uint32_t J = 1, Size = LengthPatches.size(); J < Size; ++J) {
     Offset = Patch.first;
     for (uint64_t I = 0, Size = ByteSequence.size(); I < Size; ++I)
       NewBinaryContents[Offset + I] = ByteSequence[I];
   }
 
   return NewBinaryContents;
 }
 
+void DebugStrOffsetsWriter::create() {
+  StrOffsetsBuffer = std::make_unique<DebugStrOffsetsBufferVector>();
+  StrOffsetsStream = std::make_unique<raw_svector_ostream>(*StrOffsetsBuffer);
+}
+
+void DebugStrOffsetsWriter::initialize(
+    const DWARFSection &StrOffsetsSection,
+    const Optional<StrOffsetsContributionDescriptor> Contr) {
+  if (!Contr)
+    return;
+
+  uint8_t DwarfOffsetByteSize = Contr->getDwarfOffsetByteSize();
+  assert(DwarfOffsetByteSize == 4 &&
+         "Darf String Offsets Byte Size is not supported.");
+  uint32_t Index = 0;
+  for (uint64_t Offset = 0; Offset < Contr->Size; Offset += DwarfOffsetByteSize)
+    IndexToAddressMap[Index++] = *(
+        const uint32_t *)(StrOffsetsSection.Data.data() + Contr->Base + Offset);
+}
+
+void DebugStrOffsetsWriter::updateAddressMap(uint32_t Index, uint32_t Address) {
+  assert(IndexToAddressMap.count(Index) > 0 && "Index is not found.");
+  IndexToAddressMap[Index] = Address;
+}
+
+void DebugStrOffsetsWriter::finalizeSection() {
+  if (IndexToAddressMap.empty())
+    return;
+  // Writing out the header for each section.
+  support::endian::write(*StrOffsetsStream, CurrentSectionSize + 4,
+                         support::little);
+  support::endian::write(*StrOffsetsStream, static_cast<uint16_t>(5),
+                         support::little);
+  support::endian::write(*StrOffsetsStream, static_cast<uint16_t>(0),
+                         support::little);
+  for (const auto &Entry : IndexToAddressMap) {
+    support::endian::write(*StrOffsetsStream, Entry.second, support::little);
+  }
+  IndexToAddressMap.clear();
+}
+
 void DebugStrWriter::create() {
   StrBuffer = std::make_unique<DebugStrBufferVector>();
   StrStream = std::make_unique<raw_svector_ostream>(*StrBuffer);
 }
 
 void DebugStrWriter::initialize() {
   auto StrSection = BC->DwCtx->getDWARFObj().getStrSection();
   (*StrStream) << StrSection;

bolt/lib/Rewrite/DWARFRewriter.cpp

if (NameToIndexMap && !opts::DwarfOutputPath.empty()) {
     DWOName.append(std::to_string(Iter->second));
     ++Iter->second;
   }
   DWOName.append(".dwo");
   DWOIdToName[*DWOId] = DWOName;
   return DWOName;
 }
 
+void DWARFRewriter::addStringHelper(DebugInfoBinaryPatcher &DebugInfoPatcher,
+                                    DWARFUnit &Unit, AttrInfo &AttrInfoVal,
+                                    StringRef Str) {
+  uint32_t NewOffset = StrWriter->addString(Str);
+  if (Unit.getVersion() == 5) {
+    StrOffstsWriter->updateAddressMap(AttrInfoVal.V.getRawUValue(), NewOffset);
+    return;
+  }
+  DebugInfoPatcher.addLE32Patch(AttrInfoVal.Offset, NewOffset,
+                                AttrInfoVal.Size);
+}
+
 void DWARFRewriter::updateDebugInfo() {
   ErrorOr<BinarySection &> DebugInfo = BC.getUniqueSectionByName(".debug_info");
   if (!DebugInfo)
     return;
 
   auto *DebugInfoPatcher =
       static_cast<DebugInfoBinaryPatcher *>(DebugInfo->getPatcher());
 
   ARangesSectionWriter = std::make_unique<DebugARangesSectionWriter>();
   StrWriter = std::make_unique<DebugStrWriter>(&BC);
+
+  StrOffstsWriter = std::make_unique<DebugStrOffsetsWriter>(&BC);
+
   AbbrevWriter = std::make_unique<DebugAbbrevWriter>(*BC.DwCtx);
 
   if (BC.isDWARF5Used()) {
     // Disabling none deterministic mode for dwarf5, to keep implementation
     // simpler.
     opts::DeterministicDebugInfo = true;
     AddrWriter = std::make_unique<DebugAddrWriterDwarf5>(&BC);
     RangesSectionWriter = std::make_unique<DebugRangeListsSectionWriter>();
     DebugRangeListsSectionWriter::setAddressWriter(AddrWriter.get());
   } else {
     AddrWriter = std::make_unique<DebugAddrWriter>(&BC);
     RangesSectionWriter = std::make_unique<DebugRangesSectionWriter>();
   }
 
   DebugLoclistWriter::setAddressWriter(AddrWriter.get());
 
   size_t CUIndex = 0;
   for (std::unique_ptr<DWARFUnit> &CU : BC.DwCtx->compile_units()) {
-    if (CU->getVersion() == 5) {
+    uint16_t Dwarfversion = CU->getVersion();
+    if (Dwarfversion == 5) {
       uint32_t AttrInfoOffset =
           DebugLoclistWriter::InvalidLocListsBaseAttrOffset;
       if (Optional<AttrInfo> AttrInfoVal =
-              findAttributeInfo(CU->getUnitDIE(), dwarf::DW_AT_loclists_base))
+              findAttributeInfo(CU->getUnitDIE(), dwarf::DW_AT_loclists_base)) {
         AttrInfoOffset = AttrInfoVal->Offset;
-
         LocListWritersByCU[CUIndex] = std::make_unique<DebugLoclistWriter>(
-          &BC, CU->isDWOUnit() ? *CU->getDWOId() : CU->getOffset(),
-          AttrInfoOffset, 5, false);
+            &BC, *CU.get(), AttrInfoOffset, Dwarfversion, false);
+      }
+      if (Optional<uint64_t> DWOId = CU->getDWOId()) {
+        assert(LocListWritersByCU.count(*DWOId) == 0 &&
+               "RangeLists writer for DWO unit already exists.");
+        auto RangeListsSectionWriter =
+            std::make_unique<DebugRangeListsSectionWriter>();
+        RangeListsSectionWriter->initSection(*CU.get());
+        RangeListsWritersByCU[*DWOId] = std::move(RangeListsSectionWriter);
+      }
+
     } else {
       LocListWritersByCU[CUIndex] = std::make_unique<DebugLocWriter>(&BC);
     }
+
+    if (Optional<uint64_t> DWOId = CU->getDWOId()) {
+      assert(LocListWritersByCU.count(*DWOId) == 0 &&
+             "LocList writer for DWO unit already exists.");
+      LocListWritersByCU[*DWOId] = std::make_unique<DebugLoclistWriter>(
+          &BC, *CU.get(), DebugLoclistWriter::InvalidLocListsBaseAttrOffset,
+          Dwarfversion, true);
+    }
     ++CUIndex;
   }
 
   // Unordered maps to handle name collision if output DWO directory is
   // specified.
   std::unordered_map<std::string, uint32_t> NameToIndexMap;
   std::unordered_map<uint64_t, std::string> DWOIdToName;
   std::mutex AccessMutex;
 
   auto updateDWONameCompDir = [&](DWARFUnit &Unit) -> void {
     const DWARFDie &DIE = Unit.getUnitDIE();
     Optional<AttrInfo> AttrInfoVal = findAttributeInfo(
         DIE, {dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name});
     (void)AttrInfoVal;
     assert(AttrInfoVal && "Skeleton CU doesn't have dwo_name.");
 
     std::string ObjectName = "";
 
     {
       std::lock_guard<std::mutex> Lock(AccessMutex);
       ObjectName = getDWOName(Unit, &NameToIndexMap, DWOIdToName);
     }
-
-    uint32_t NewOffset = StrWriter->addString(ObjectName.c_str());
-    DebugInfoPatcher->addLE32Patch(AttrInfoVal->Offset, NewOffset,
-                                   AttrInfoVal->Size);
+    addStringHelper(*DebugInfoPatcher, Unit, *AttrInfoVal, ObjectName.c_str());
 
     AttrInfoVal = findAttributeInfo(DIE, dwarf::DW_AT_comp_dir);
     (void)AttrInfoVal;
     assert(AttrInfoVal && "DW_AT_comp_dir is not in Skeleton CU.");
 
     if (!opts::DwarfOutputPath.empty()) {
-      uint32_t NewOffset = StrWriter->addString(opts::DwarfOutputPath.c_str());
-      DebugInfoPatcher->addLE32Patch(AttrInfoVal->Offset, NewOffset,
-                                     AttrInfoVal->Size);
+      addStringHelper(*DebugInfoPatcher, Unit, *AttrInfoVal,
+                      opts::DwarfOutputPath.c_str());
     }
   };
 
   auto processUnitDIE = [&](size_t CUIndex, DWARFUnit *Unit) {
     // Check if the unit is a skeleton and we need special updates for it and
     // its matching split/DWO CU.
     Optional<DWARFUnit *> SplitCU;
     Optional<uint64_t> RangesBase;
     llvm::Optional<uint64_t> DWOId = Unit->getDWOId();
+    StrOffstsWriter->initialize(Unit->getStringOffsetSection(),
+                                Unit->getStringOffsetsTableContribution());
     if (DWOId)
       SplitCU = BC.getDWOCU(*DWOId);
 
     DebugLocWriter *DebugLocWriter = nullptr;
     // Skipping CUs that failed to load.
     if (SplitCU) {
       updateDWONameCompDir(*Unit);
 
-      // Assuming there is unique DWOID per binary. i.e. two or more CUs don't
-      // have same DWO ID.
-      assert(LocListWritersByCU.count(*DWOId) == 0 &&
-             "LocList writer for DWO unit already exists.");
-      {
-        std::lock_guard<std::mutex> Lock(AccessMutex);
-        DebugLocWriter =
-            LocListWritersByCU
-                .insert({*DWOId, std::make_unique<DebugLoclistWriter>(
-                                     &BC, *DWOId, 0, Unit->getVersion(), true)})
-                .first->second.get();
-      }
       DebugInfoBinaryPatcher *DwoDebugInfoPatcher =
           llvm::cast<DebugInfoBinaryPatcher>(
               getBinaryDWODebugInfoPatcher(*DWOId));
-      RangesBase = RangesSectionWriter->getSectionOffset();
       DWARFContext *DWOCtx = BC.getDWOContext();
       // Setting this CU offset with DWP to normalize DIE offsets to uint32_t
       if (DWOCtx && !DWOCtx->getCUIndex().getRows().empty())
         DwoDebugInfoPatcher->setDWPOffset((*SplitCU)->getOffset());
+
+      {
+        std::lock_guard<std::mutex> Lock(AccessMutex);
+        DebugLocWriter = LocListWritersByCU[*DWOId].get();
+      }
+      DebugRangesSectionWriter *TempRangesSectionWriter =
+          RangesSectionWriter.get();
+      if (Unit->getVersion() == 5) {
+        TempRangesSectionWriter = RangeListsWritersByCU[*DWOId].get();
+      } else {
+        RangesBase = RangesSectionWriter->getSectionOffset();
+        // For DWARF5 there is now .debug_rangelists.dwo, so don't need to
+        // update rnglists base.
         DwoDebugInfoPatcher->setRangeBase(*RangesBase);
+      }
+
       DwoDebugInfoPatcher->addUnitBaseOffsetLabel((*SplitCU)->getOffset());
       DebugAbbrevWriter *DWOAbbrevWriter =
           createBinaryDWOAbbrevWriter((*SplitCU)->getContext(), *DWOId);
       updateUnitDebugInfo(*(*SplitCU), *DwoDebugInfoPatcher, *DWOAbbrevWriter,
-                          *DebugLocWriter, *RangesSectionWriter);
+                          *DebugLocWriter, *TempRangesSectionWriter);
       DwoDebugInfoPatcher->clearDestinationLabels();
       if (!DwoDebugInfoPatcher->getWasRangBasedUsed())
         RangesBase = None;
+      if (Unit->getVersion() == 5)
+        reinterpret_cast<DebugRangeListsSectionWriter *>(
+            TempRangesSectionWriter)
+            ->finalizeSection();
     }
 
     {
       std::lock_guard<std::mutex> Lock(AccessMutex);
+      if (LocListWritersByCU.count(CUIndex))
         DebugLocWriter = LocListWritersByCU[CUIndex].get();
     }
     if (Unit->getVersion() == 5) {
       RangesBase = RangesSectionWriter->getSectionOffset() +
                    getDWARF5RngListLocListHeaderSize();
       reinterpret_cast<DebugRangeListsSectionWriter *>(
           RangesSectionWriter.get())
-          ->initSection(Unit->getOffset());
+          ->initSection(*Unit);
+      StrOffstsWriter->finalizeSection();
     }
 
     DebugInfoPatcher->addUnitBaseOffsetLabel(Unit->getOffset());
     updateUnitDebugInfo(*Unit, *DebugInfoPatcher, *AbbrevWriter,
                         *DebugLocWriter, *RangesSectionWriter, RangesBase);
     if (Unit->getVersion() == 5)
       reinterpret_cast<DebugRangeListsSectionWriter *>(
           RangesSectionWriter.get())
void DWARFRewriter::updateDebugInfo() {
   if (opts::WriteDWP)
     writeDWP(DWOIdToName);
   else
     writeDWOFiles(DWOIdToName);
 
   updateGdbIndexSection(OffsetMap);
 }
 
-static uint64_t getCUId(DWARFUnit &Unit) {
-  if (Unit.getVersion() == 5)
-    return Unit.getOffset();
-
-  assert(Unit.isDWOUnit() && "Unit is not Skeleton CU.");
-  return *Unit.getDWOId();
-}
-
 void DWARFRewriter::updateUnitDebugInfo(
     DWARFUnit &Unit, DebugInfoBinaryPatcher &DebugInfoPatcher,
     DebugAbbrevWriter &AbbrevWriter, DebugLocWriter &DebugLocWriter,
     DebugRangesSectionWriter &RangesSectionWriter,
     Optional<uint64_t> RangesBase) {
   // Cache debug ranges so that the offset for identical ranges could be reused.
   std::map<DebugAddressRangesVector, uint64_t> CachedRanges;
 
if (const DWARFAbbreviationDeclaration *AbbrDecl =
         --Depth;
       if (Depth == 0)
         break;
     }
 
     DWARFDie DIE(&Unit, &Die);
 
     switch (DIE.getTag()) {
-    case dwarf::DW_TAG_compile_unit: {
+    case dwarf::DW_TAG_compile_unit:
+    case dwarf::DW_TAG_skeleton_unit: {
+      // For dwarf5 section 3.1.3
+      // The following attributes are not part of a split full compilation unit
+      // entry but instead are inherited (if present) from the corresponding
+      // skeleton compilation unit: DW_AT_low_pc, DW_AT_high_pc, DW_AT_ranges,
+      // DW_AT_stmt_list, DW_AT_comp_dir, DW_AT_str_offsets_base,
+      // DW_AT_addr_base and DW_AT_rnglists_base.
+      if (Unit.getVersion() == 5 && Unit.isDWOUnit())
+        continue;
       auto ModuleRangesOrError = DIE.getAddressRanges();
       if (!ModuleRangesOrError) {
         consumeError(ModuleRangesOrError.takeError());
         break;
       }
       DWARFAddressRangesVector &ModuleRanges = *ModuleRangesOrError;
       DebugAddressRangesVector OutputRanges =
           BC.translateModuleAddressRanges(ModuleRanges);
default: {
                   assert(Entry.SectionIndex == SectionedAddress::UndefSection &&
                          "absolute address expected");
                   BaseAddress = Entry.Value0;
                   break;
                 }
                 case dwarf::DW_LLE_offset_pair:
                   assert(
                       (Entry.SectionIndex == SectionedAddress::UndefSection &&
-                       !Unit.isDWOUnit()) &&
+                       (!Unit.isDWOUnit() || Unit.getVersion() == 5)) &&
                       "absolute address expected");
                   InputLL.emplace_back(DebugLocationEntry{
                       BaseAddress + Entry.Value0, BaseAddress + Entry.Value1,
                       Entry.Loc});
                   break;
                 case dwarf::DW_RLE_start_length:
                   InputLL.emplace_back(DebugLocationEntry{
                       Entry.Value0, Entry.Value0 + Entry.Value1, Entry.Loc});
default: {
                   Unit.getAddrOffsetSectionItem(Index);
               assert(EntryAddress && "Address is not found.");
               assert(Index <= std::numeric_limits<uint32_t>::max() &&
                      "Invalid Operand Index.");
               if (Expr.getCode() == dwarf::DW_OP_addrx) {
                 const uint32_t EncodingSize =
                     Expr.getOperandEndOffset(0) - PrevOffset - SizeOfOpcode;
                 const uint32_t Index = AddrWriter->getIndexFromAddress(
-                    EntryAddress->Address, getCUId(Unit));
+                    EntryAddress->Address, Unit);
                 DebugInfoPatcher.addUDataPatch(AttrOffset + PrevOffset +
                                                    SizeOfOpcode + SizeOfForm,
                                                Index, EncodingSize);
               } else {
                 // TODO: Re-do this as DWARF5.
                 AddrWriter->addIndexAddress(EntryAddress->Address,
-                                            static_cast<uint32_t>(Index),
-                                            getCUId(Unit));
+                                            static_cast<uint32_t>(Index), Unit);
               }
               if (Expr.getDescription().Op[1] ==
                   DWARFExpression::Operation::SizeNA)
                 PrevOffset = Expr.getOperandEndOffset(0);
               else
                 PrevOffset = Expr.getOperandEndOffset(1);
             }
           }
default: {
             // If there is no new address, storing old address.
             // Re-using Index to make implementation easier.
             // DW_FORM_GNU_addr_index is variable lenght encoding
             // so we either have to create indices of same sizes, or use same
             // index.
             // TODO: We can now re-write .debug_info. This can be simplified to
             // just getting a new index and creating a patch.
             AddrWriter->addIndexAddress(NewAddress ? NewAddress : Address,
-                                        Index, getCUId(Unit));
+                                        Index, Unit);
           } else if (Form == dwarf::DW_FORM_addrx) {
             const uint32_t Index = AddrWriter->getIndexFromAddress(
-                NewAddress ? NewAddress : Address, getCUId(Unit));
+                NewAddress ? NewAddress : Address, Unit);
             DebugInfoPatcher.addUDataPatch(AttrOffset, Index, AttrVal->Size);
           } else {
             DebugInfoPatcher.addLE64Patch(AttrOffset, NewAddress);
           }
         } else if (opts::Verbosity >= 1) {
           errs() << "BOLT-WARNING: unexpected form value for attribute at 0x"
                  << Twine::utohexstr(AttrOffset);
         }
if (StrWriter->isInitialized()) {
     RewriteInstance::addToDebugSectionsToOverwrite(".debug_str");
     std::unique_ptr<DebugStrBufferVector> DebugStrSectionContents =
         StrWriter->finalize();
     BC.registerOrUpdateNoteSection(".debug_str",
                                    copyByteArray(*DebugStrSectionContents),
                                    DebugStrSectionContents->size());
   }
 
+  if (StrOffstsWriter->isInitialized()) {
+    RewriteInstance::addToDebugSectionsToOverwrite(".debug_str_offsets");
+    std::unique_ptr<DebugStrOffsetsBufferVector>
+        DebugStrOffsetsSectionContents = StrOffstsWriter->finalize();
+    BC.registerOrUpdateNoteSection(
+        ".debug_str_offsets", copyByteArray(*DebugStrOffsetsSectionContents),
+        DebugStrOffsetsSectionContents->size());
+  }
+
   std::unique_ptr<DebugBufferVector> RangesSectionContents =
       RangesSectionWriter->finalize();
   BC.registerOrUpdateNoteSection(
       llvm::isa<DebugRangeListsSectionWriter>(*RangesSectionWriter)
           ? ".debug_rnglists"
           : ".debug_ranges",
       copyByteArray(*RangesSectionContents), RangesSectionContents->size());
 
createKnownSectionsMap(const MCObjectFileInfo &MCOFI) {
   StringMap<KnownSectionsEntry> KnownSectionsTemp = {
       {"debug_info.dwo", {MCOFI.getDwarfInfoDWOSection(), DW_SECT_INFO}},
       {"debug_types.dwo", {MCOFI.getDwarfTypesDWOSection(), DW_SECT_EXT_TYPES}},
       {"debug_str_offsets.dwo",
        {MCOFI.getDwarfStrOffDWOSection(), DW_SECT_STR_OFFSETS}},
       {"debug_str.dwo", {MCOFI.getDwarfStrDWOSection(), DW_SECT_EXT_unknown}},
       {"debug_loc.dwo", {MCOFI.getDwarfLocDWOSection(), DW_SECT_EXT_LOC}},
       {"debug_abbrev.dwo", {MCOFI.getDwarfAbbrevDWOSection(), DW_SECT_ABBREV}},
-      {"debug_line.dwo", {MCOFI.getDwarfLineDWOSection(), DW_SECT_LINE}}};
+      {"debug_line.dwo", {MCOFI.getDwarfLineDWOSection(), DW_SECT_LINE}},
+      {"debug_loclists.dwo",
+       {MCOFI.getDwarfLoclistsDWOSection(), DW_SECT_LOCLISTS}},
+      {"debug_rnglists.dwo",
+       {MCOFI.getDwarfRnglistsDWOSection(), DW_SECT_RNGLISTS}}};
   return KnownSectionsTemp;
 }
 
 StringRef getSectionName(const SectionRef &Section) {
   Expected<StringRef> SectionName = Section.getName();
   assert(SectionName && "Invalid section name.");
   StringRef Name = *SectionName;
   Name = Name.substr(Name.find_first_not_of("._"));
   return Name;
 }
 
 // Exctracts an appropriate slice if input is DWP.
 // Applies patches or overwrites the section.
-Optional<StringRef> updateDebugData(
-    DWARFContext &DWCtx, std::string &Storage, const SectionRef &Section,
-    const StringMap<KnownSectionsEntry> &KnownSections, MCStreamer &Streamer,
-    DWARFRewriter &Writer, const DWARFUnitIndex::Entry *DWOEntry,
-    uint64_t DWOId, std::unique_ptr<DebugBufferVector> &OutputBuffer) {
+Optional<StringRef>
+updateDebugData(DWARFContext &DWCtx, std::string &Storage,
+                StringRef SectionName, StringRef SectionContents,
+                const StringMap<KnownSectionsEntry> &KnownSections,
+                MCStreamer &Streamer, DWARFRewriter &Writer,
+                const DWARFUnitIndex::Entry *DWOEntry, uint64_t DWOId,
+                std::unique_ptr<DebugBufferVector> &OutputBuffer,
+                DebugRangeListsSectionWriter *RangeListsWriter) {
   auto applyPatch = [&](DebugInfoBinaryPatcher *Patcher,
                         StringRef Data) -> StringRef {
     Patcher->computeNewOffsets(DWCtx, true);
     Storage = Patcher->patchBinary(Data);
     return StringRef(Storage.c_str(), Storage.size());
   };
 
   using DWOSectionContribution =
       const DWARFUnitIndex::Entry::SectionContribution;
   auto getSliceData = [&](const DWARFUnitIndex::Entry *DWOEntry,
                           StringRef OutData, DWARFSectionKind Sec,
                           uint32_t &DWPOffset) -> StringRef {
     if (DWOEntry) {
       DWOSectionContribution *DWOContrubution = DWOEntry->getContribution(Sec);
       DWPOffset = DWOContrubution->Offset;
       OutData = OutData.substr(DWPOffset, DWOContrubution->Length);
     }
     return OutData;
   };
 
-  StringRef Name = getSectionName(Section);
-  auto SectionIter = KnownSections.find(Name);
+  auto SectionIter = KnownSections.find(SectionName);
   if (SectionIter == KnownSections.end())
     return None;
   Streamer.SwitchSection(SectionIter->second.first);
-  Expected<StringRef> Contents = Section.getContents();
-  assert(Contents && "Invalid contents.");
-  StringRef OutData = *Contents;
+  StringRef OutData = SectionContents;
   uint32_t DWPOffset = 0;
 
   switch (SectionIter->second.second) {
   default: {
-    if (!Name.equals("debug_str.dwo"))
-      errs() << "BOLT-WARNING: Unsupported Debug section: " << Name << "\n";
+    if (!SectionName.equals("debug_str.dwo"))
+      errs() << "BOLT-WARNING: Unsupported Debug section: " << SectionName
+             << "\n";
     return OutData;
   }
   case DWARFSectionKind::DW_SECT_INFO: {
     OutData = getSliceData(DWOEntry, OutData, DWARFSectionKind::DW_SECT_INFO,
                            DWPOffset);
     DebugInfoBinaryPatcher *Patcher = llvm::cast<DebugInfoBinaryPatcher>(
         Writer.getBinaryDWODebugInfoPatcher(DWOId));
     return applyPatch(Patcher, OutData);
case DWARFSectionKind::DW_SECT_ABBREV: {
     DebugAbbrevWriter *AbbrevWriter = Writer.getBinaryDWOAbbrevWriter(DWOId);
     OutputBuffer = AbbrevWriter->finalize();
     // Creating explicit StringRef here, otherwise
     // with impicit conversion it will take null byte as end of
     // string.
     return StringRef(reinterpret_cast<const char *>(OutputBuffer->data()),
                      OutputBuffer->size());
   }
-  case DWARFSectionKind::DW_SECT_EXT_LOC: {
+  case DWARFSectionKind::DW_SECT_EXT_LOC:
+  case DWARFSectionKind::DW_SECT_LOCLISTS: {
     DebugLocWriter *LocWriter = Writer.getDebugLocWriter(DWOId);
     OutputBuffer = LocWriter->getBuffer();
     // Creating explicit StringRef here, otherwise
     // with impicit conversion it will take null byte as end of
     // string.
     return StringRef(reinterpret_cast<const char *>(OutputBuffer->data()),
                      OutputBuffer->size());
   }
   case DWARFSectionKind::DW_SECT_LINE: {
     return getSliceData(DWOEntry, OutData, DWARFSectionKind::DW_SECT_LINE,
                         DWPOffset);
   }
+  case DWARFSectionKind::DW_SECT_RNGLISTS: {
+    OutputBuffer = RangeListsWriter->finalize();
+    return StringRef(reinterpret_cast<const char *>(OutputBuffer->data()),
+                     OutputBuffer->size());
+  }
   }
 }
 
 } // namespace
 
 void DWARFRewriter::writeDWP(
     std::unordered_map<uint64_t, std::string> &DWOIdToName) {
   SmallString<0> OutputNameStr;
for (const std::unique_ptr<DWARFUnit> &CU : BC.DwCtx->compile_units()) {
 
     const DWARFUnitIndex::Entry *DWOEntry = nullptr;
     if (IsDWP)
       DWOEntry = CUIndex->getFromHash(*DWOId);
 
     bool StrSectionWrittenOut = false;
     const object::ObjectFile *DWOFile =
         (*DWOCU)->getContext().getDWARFObj().getFile();
+
+    DebugRangeListsSectionWriter *RangeListssWriter = nullptr;
+    if (CU->getVersion() == 5) {
+      assert(RangeListsWritersByCU.count(*DWOId) != 0 &&
+             "No RangeListsWriter for DWO ID.");
+      RangeListssWriter = RangeListsWritersByCU[*DWOId].get();
+    }
     for (const SectionRef &Section : DWOFile->sections()) {
       std::string Storage = "";
       std::unique_ptr<DebugBufferVector> OutputData;
-      Optional<StringRef> TOutData = updateDebugData(
-          (*DWOCU)->getContext(), Storage, Section, KnownSections, *Streamer,
-          *this, DWOEntry, *DWOId, OutputData);
+      StringRef SectionName = getSectionName(Section);
+      Expected<StringRef> Contents = Section.getContents();
+      assert(Contents && "Invalid contents.");
+      Optional<StringRef> TOutData =
+          updateDebugData((*DWOCU)->getContext(), Storage, SectionName,
+                          *Contents, KnownSections, *Streamer, *this, DWOEntry,
+                          *DWOId, OutputData, RangeListssWriter);
       if (!TOutData)
         continue;
 
       StringRef OutData = *TOutData;
       StringRef Name = getSectionName(Section);
       if (Name.equals("debug_str.dwo")) {
         CurStrSection = OutData;
       } else {
for (const std::unique_ptr<DWARFUnit> &CU : BC.DwCtx->compile_units()) {
 
     const object::ObjectFile *File =
         (*DWOCU)->getContext().getDWARFObj().getFile();
     std::unique_ptr<BinaryContext> TmpBC = createDwarfOnlyBC(*File);
     std::unique_ptr<MCStreamer> Streamer = TmpBC->createStreamer(TempOut->os());
     StringMap<KnownSectionsEntry> KnownSections =
         createKnownSectionsMap(*Streamer->getContext().getObjectFileInfo());
 
-    for (const SectionRef &Section : File->sections()) {
+    DebugRangeListsSectionWriter *RangeListssWriter = nullptr;
+    if (CU->getVersion() == 5) {
+      assert(RangeListsWritersByCU.count(*DWOId) != 0 &&
+             "No RangeListsWriter for DWO ID.");
+      RangeListssWriter = RangeListsWritersByCU[*DWOId].get();
+
+      // Handling .debug_rnglists.dwo seperatly. The original .o/.dwo might not
+      // have .debug_rnglists so won't be part of the loop below.
+      if (!RangeListssWriter->empty()) {
         std::string Storage = "";
         std::unique_ptr<DebugBufferVector> OutputData;
         if (Optional<StringRef> OutData = updateDebugData(
-              (*DWOCU)->getContext(), Storage, Section, KnownSections,
-              *Streamer, *this, DWOEntry, *DWOId, OutputData))
+                (*DWOCU)->getContext(), Storage, "debug_rnglists.dwo", "",
+                KnownSections, *Streamer, *this, DWOEntry, *DWOId, OutputData,
+                RangeListssWriter))
+          Streamer->emitBytes(*OutData);
+      }
+    }
+    for (const SectionRef &Section : File->sections()) {
+      std::string Storage = "";
+      std::unique_ptr<DebugBufferVector> OutputData;
+      StringRef SectionName = getSectionName(Section);
+      if (SectionName == "debug_rnglists.dwo")
+        continue;
+      Expected<StringRef> Contents = Section.getContents();
+      assert(Contents && "Invalid contents.");
+      if (Optional<StringRef> OutData =
+              updateDebugData((*DWOCU)->getContext(), Storage, SectionName,
+                              *Contents, KnownSections, *Streamer, *this,
+                              DWOEntry, *DWOId, OutputData, RangeListssWriter))
         Streamer->emitBytes(*OutData);
     }
     Streamer->Finish();
     TempOut->keep();
   }
 }
 
 void DWARFRewriter::updateGdbIndexSection(CUOffsetMap &CUMap) {
if (LowForm == dwarf::DW_FORM_GNU_addr_index) {
     DebugInfoPatcher.addUDataPatch(LowPCOffset, 0, LowPCVal->Size);
     // Ranges are relative to DW_AT_GNU_ranges_base.
     BaseOffset = DebugInfoPatcher.getRangeBase();
   } else {
     // In DWARF 5 we can have DW_AT_low_pc either as DW_FORM_addr, or
     // DW_FORM_addrx. Former is when DW_AT_rnglists_base is present. Latter is
     // when it's absent.
     if (LowForm == dwarf::DW_FORM_addrx) {
-      uint32_t Index =
-          AddrWriter->getIndexFromAddress(0, DIE.getDwarfUnit()->getOffset());
+      uint32_t Index = AddrWriter->getIndexFromAddress(0, *DIE.getDwarfUnit());
       DebugInfoPatcher.addUDataPatch(LowPCOffset, Index, LowPCVal->Size);
     } else
       DebugInfoPatcher.addLE64Patch(LowPCOffset, 0);
 
     // Original CU didn't have DW_AT_*_base. We converted it's children (or
     // dwo), so need to insert it into CU.
     if (RangesBase)
       reinterpret_cast<DebugInfoBinaryPatcher &>(DebugInfoPatcher)

bolt/test/X86/Inputs/dwarf4-df-dualcu-helper.ll

+; clang++ -g -gdwarf-4 -emit-llvm -S helper.cpp
+; int z = 0;
+; int d = 0;
+;
+; int helper(int z_, int d_) {
+;  z += z_;
+;  d += d_;
+;  return z * d;
+; }
+
+; ModuleID = 'helper.cpp'
+source_filename = "helper.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@z = dso_local global i32 0, align 4, !dbg !0
+@d = dso_local global i32 0, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z6helperii(i32 noundef %z_, i32 noundef %d_) #0 !dbg !14 {
+entry:
+  %z_.addr = alloca i32, align 4
+  %d_.addr = alloca i32, align 4
+  store i32 %z_, i32* %z_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %z_.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store i32 %d_, i32* %d_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %d_.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  %0 = load i32, i32* %z_.addr, align 4, !dbg !22
+  %1 = load i32, i32* @z, align 4, !dbg !23
+  %add = add nsw i32 %1, %0, !dbg !23
+  store i32 %add, i32* @z, align 4, !dbg !23
+  %2 = load i32, i32* %d_.addr, align 4, !dbg !24
+  %3 = load i32, i32* @d, align 4, !dbg !25
+  %add1 = add nsw i32 %3, %2, !dbg !25
+  store i32 %add1, i32* @d, align 4, !dbg !25
+  %4 = load i32, i32* @z, align 4, !dbg !26
+  %5 = load i32, i32* @d, align 4, !dbg !27
+  %mul = mul nsw i32 %4, %5, !dbg !28
+  ret i32 %mul, !dbg !29
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "z", scope: !2, file: !3, line: 1, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "helper.cpp", directory: ".")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "d", scope: !2, file: !3, line: 2, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !17)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!7, !7, !7}
+!17 = !{}
+!18 = !DILocalVariable(name: "z_", arg: 1, scope: !14, file: !3, line: 4, type: !7)
+!19 = !DILocation(line: 4, column: 16, scope: !14)
+!20 = !DILocalVariable(name: "d_", arg: 2, scope: !14, file: !3, line: 4, type: !7)
+!21 = !DILocation(line: 4, column: 24, scope: !14)
+!22 = !DILocation(line: 5, column: 7, scope: !14)
+!23 = !DILocation(line: 5, column: 4, scope: !14)
+!24 = !DILocation(line: 6, column: 7, scope: !14)
+!25 = !DILocation(line: 6, column: 4, scope: !14)
+!26 = !DILocation(line: 7, column: 9, scope: !14)
+!27 = !DILocation(line: 7, column: 13, scope: !14)
+!28 = !DILocation(line: 7, column: 11, scope: !14)
+!29 = !DILocation(line: 7, column: 2, scope: !14)

bolt/test/X86/Inputs/dwarf4-df-dualcu-loclist-helper.ll

+; ModuleID = 'helper.cpp'
+source_filename = "helper.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@z = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+@d = dso_local local_unnamed_addr global i32 0, align 4, !dbg !5
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn uwtable
+define dso_local noundef i32 @_Z6helperii(i32 noundef %z_, i32 noundef %d_) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %z_, metadata !17, metadata !DIExpression()), !dbg !19
+  call void @llvm.dbg.value(metadata i32 %d_, metadata !18, metadata !DIExpression()), !dbg !19
+  %0 = load i32, i32* @z, align 4, !dbg !20, !tbaa !21
+  %add = add nsw i32 %0, %z_, !dbg !20
+  store i32 %add, i32* @z, align 4, !dbg !20, !tbaa !21
+  %1 = load i32, i32* @d, align 4, !dbg !25, !tbaa !21
+  %add1 = add nsw i32 %1, %d_, !dbg !25
+  store i32 %add1, i32* @d, align 4, !dbg !25, !tbaa !21
+  %mul = mul nsw i32 %add1, %add, !dbg !26
+  ret i32 %mul, !dbg !27
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "z", scope: !2, file: !3, line: 1, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "helper.cpp", directory: ".")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "d", scope: !2, file: !3, line: 2, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{!"clang version 15.0.0"}
+!13 = distinct !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 4, type: !14, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !16)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7, !7, !7}
+!16 = !{!17, !18}
+!17 = !DILocalVariable(name: "z_", arg: 1, scope: !13, file: !3, line: 4, type: !7)
+!18 = !DILocalVariable(name: "d_", arg: 2, scope: !13, file: !3, line: 4, type: !7)
+!19 = !DILocation(line: 0, scope: !13)
+!20 = !DILocation(line: 5, column: 4, scope: !13)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"int", !23, i64 0}
+!23 = !{!"omnipotent char", !24, i64 0}
+!24 = !{!"Simple C++ TBAA"}
+!25 = !DILocation(line: 6, column: 4, scope: !13)
+!26 = !DILocation(line: 7, column: 11, scope: !13)
+!27 = !DILocation(line: 7, column: 2, scope: !13)

bolt/test/X86/Inputs/dwarf4-df-dualcu-loclist-main.ll

+; ModuleID = 'main.cpp'
+source_filename = "main.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+@y = dso_local local_unnamed_addr global i32 1, align 4, !dbg !5
+
+; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind willreturn uwtable
+define dso_local void @_Z3usePiS_(i32* nocapture noundef %x, i32* nocapture noundef %y) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i32* %x, metadata !18, metadata !DIExpression()), !dbg !20
+  call void @llvm.dbg.value(metadata i32* %y, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = load i32, i32* %x, align 4, !dbg !21, !tbaa !22
+  %add = add nsw i32 %0, 4, !dbg !21
+  store i32 %add, i32* %x, align 4, !dbg !21, !tbaa !22
+  %1 = load i32, i32* %y, align 4, !dbg !26, !tbaa !22
+  %sub = add nsw i32 %1, -2, !dbg !26
+  store i32 %sub, i32* %y, align 4, !dbg !26, !tbaa !22
+  ret void, !dbg !27
+}
+
+; Function Attrs: mustprogress norecurse uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** nocapture noundef readnone %argv) local_unnamed_addr #1 !dbg !28 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %argc, metadata !35, metadata !DIExpression()), !dbg !37
+  call void @llvm.dbg.value(metadata i8** %argv, metadata !36, metadata !DIExpression()), !dbg !37
+  call void @llvm.dbg.value(metadata i32* @x, metadata !18, metadata !DIExpression()), !dbg !38
+  call void @llvm.dbg.value(metadata i32* @y, metadata !19, metadata !DIExpression()), !dbg !38
+  %add.i = add nsw i32 %argc, 4, !dbg !40
+  store i32 %add.i, i32* @x, align 4, !dbg !40, !tbaa !22
+  %sub.i = add nsw i32 %argc, 1, !dbg !41
+  store i32 %sub.i, i32* @y, align 4, !dbg !41, !tbaa !22
+  %call = tail call noundef i32 @_Z6helperii(i32 noundef %add.i, i32 noundef %sub.i), !dbg !42
+  ret i32 %call, !dbg !43
+}
+
+declare !dbg !44 dso_local noundef i32 @_Z6helperii(i32 noundef, i32 noundef) local_unnamed_addr #2
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { argmemonly mustprogress nofree norecurse nosync nounwind willreturn uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { mustprogress norecurse uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #2 = { "frame-pointer"="none" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "main.cpp", directory: ".")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 8, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{!"clang version 15.0.0"}
+!13 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !14, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !17)
+!14 = !DISubroutineType(types: !15)
+!15 = !{null, !16, !16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!17 = !{!18, !19}
+!18 = !DILocalVariable(name: "x", arg: 1, scope: !13, file: !3, line: 1, type: !16)
+!19 = !DILocalVariable(name: "y", arg: 2, scope: !13, file: !3, line: 1, type: !16)
+!20 = !DILocation(line: 0, scope: !13)
+!21 = !DILocation(line: 2, column: 4, scope: !13)
+!22 = !{!23, !23, i64 0}
+!23 = !{!"int", !24, i64 0}
+!24 = !{!"omnipotent char", !25, i64 0}
+!25 = !{!"Simple C++ TBAA"}
+!26 = !DILocation(line: 3, column: 4, scope: !13)
+!27 = !DILocation(line: 4, column: 1, scope: !13)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !34)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !{!35, !36}
+!35 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 9, type: !7)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 9, type: !31)
+!37 = !DILocation(line: 0, scope: !28)
+!38 = !DILocation(line: 0, scope: !13, inlinedAt: !39)
+!39 = distinct !DILocation(line: 12, column: 4, scope: !28)
+!40 = !DILocation(line: 2, column: 4, scope: !13, inlinedAt: !39)
+!41 = !DILocation(line: 3, column: 4, scope: !13, inlinedAt: !39)
+!42 = !DILocation(line: 13, column: 11, scope: !28)
+!43 = !DILocation(line: 13, column: 4, scope: !28)
+!44 = !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 6, type: !45, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !47)
+!45 = !DISubroutineType(types: !46)
+!46 = !{!7, !7, !7}
+!47 = !{}

bolt/test/X86/Inputs/dwarf4-df-dualcu-main.ll

+; clang++ -g -gdwarf-4 -emit-llvm -S main.cpp
+; void use(int * x, int * y) {
+; *x += 4;
+; *y -= 2;
+; }
+;
+; int helper(int z_, int d_);
+; int x = 0;
+; int y = 1;
+; int  main(int argc, char *argv[]) {
+;    x = argc;
+;    y = argc + 3;
+;    use(&x, &y);
+;    return helper(x, y);
+; }
+
+; ModuleID = 'main.cpp'
+source_filename = "main.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local global i32 0, align 4, !dbg !0
+@y = dso_local global i32 1, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3usePiS_(i32* noundef %x, i32* noundef %y) #0 !dbg !14 {
+entry:
+  %x.addr = alloca i32*, align 8
+  %y.addr = alloca i32*, align 8
+  store i32* %x, i32** %x.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %x.addr, metadata !19, metadata !DIExpression()), !dbg !20
+  store i32* %y, i32** %y.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %y.addr, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = load i32*, i32** %x.addr, align 8, !dbg !23
+  %1 = load i32, i32* %0, align 4, !dbg !24
+  %add = add nsw i32 %1, 4, !dbg !24
+  store i32 %add, i32* %0, align 4, !dbg !24
+  %2 = load i32*, i32** %y.addr, align 8, !dbg !25
+  %3 = load i32, i32* %2, align 4, !dbg !26
+  %sub = sub nsw i32 %3, 2, !dbg !26
+  store i32 %sub, i32* %2, align 4, !dbg !26
+  ret void, !dbg !27
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** noundef %argv) #2 !dbg !28 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca i8**, align 8
+  store i32 0, i32* %retval, align 4
+  store i32 %argc, i32* %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %argc.addr, metadata !34, metadata !DIExpression()), !dbg !35
+  store i8** %argv, i8*** %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata i8*** %argv.addr, metadata !36, metadata !DIExpression()), !dbg !37
+  %0 = load i32, i32* %argc.addr, align 4, !dbg !38
+  store i32 %0, i32* @x, align 4, !dbg !39
+  %1 = load i32, i32* %argc.addr, align 4, !dbg !40
+  %add = add nsw i32 %1, 3, !dbg !41
+  store i32 %add, i32* @y, align 4, !dbg !42
+  call void @_Z3usePiS_(i32* noundef @x, i32* noundef @y), !dbg !43
+  %2 = load i32, i32* @x, align 4, !dbg !44
+  %3 = load i32, i32* @y, align 4, !dbg !45
+  %call = call noundef i32 @_Z6helperii(i32 noundef %2, i32 noundef %3), !dbg !46
+  ret i32 %call, !dbg !47
+}
+
+declare dso_local noundef i32 @_Z6helperii(i32 noundef, i32 noundef) #3
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "main.cpp", directory: ".")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 8, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 4}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !15, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!15 = !DISubroutineType(types: !16)
+!16 = !{null, !17, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!18 = !{}
+!19 = !DILocalVariable(name: "x", arg: 1, scope: !14, file: !3, line: 1, type: !17)
+!20 = !DILocation(line: 1, column: 16, scope: !14)
+!21 = !DILocalVariable(name: "y", arg: 2, scope: !14, file: !3, line: 1, type: !17)
+!22 = !DILocation(line: 1, column: 25, scope: !14)
+!23 = !DILocation(line: 2, column: 2, scope: !14)
+!24 = !DILocation(line: 2, column: 4, scope: !14)
+!25 = !DILocation(line: 3, column: 2, scope: !14)
+!26 = !DILocation(line: 3, column: 4, scope: !14)
+!27 = !DILocation(line: 4, column: 1, scope: !14)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 9, type: !7)
+!35 = !DILocation(line: 9, column: 15, scope: !28)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 9, type: !31)
+!37 = !DILocation(line: 9, column: 27, scope: !28)
+!38 = !DILocation(line: 10, column: 8, scope: !28)
+!39 = !DILocation(line: 10, column: 6, scope: !28)
+!40 = !DILocation(line: 11, column: 8, scope: !28)
+!41 = !DILocation(line: 11, column: 13, scope: !28)
+!42 = !DILocation(line: 11, column: 6, scope: !28)
+!43 = !DILocation(line: 12, column: 4, scope: !28)
+!44 = !DILocation(line: 13, column: 18, scope: !28)
+!45 = !DILocation(line: 13, column: 21, scope: !28)
+!46 = !DILocation(line: 13, column: 11, scope: !28)
+!47 = !DILocation(line: 13, column: 4, scope: !28)

bolt/test/X86/Inputs/dwarf5-df-dualcu-helper.ll

+; clang++ -g -gdwarf-5 -emit-llvm -S helper.cpp
+; int z = 0;
+; int d = 0;
+;
+; int helper(int z_, int d_) {
+;  z += z_;
+;  d += d_;
+;  return z * d;
+; }
+
+; ModuleID = 'helper.cpp'
+source_filename = "helper.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@z = dso_local global i32 0, align 4, !dbg !0
+@d = dso_local global i32 0, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z6helperii(i32 noundef %z_, i32 noundef %d_) #0 !dbg !14 {
+entry:
+  %z_.addr = alloca i32, align 4
+  %d_.addr = alloca i32, align 4
+  store i32 %z_, i32* %z_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %z_.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store i32 %d_, i32* %d_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %d_.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  %0 = load i32, i32* %z_.addr, align 4, !dbg !22
+  %1 = load i32, i32* @z, align 4, !dbg !23
+  %add = add nsw i32 %1, %0, !dbg !23
+  store i32 %add, i32* @z, align 4, !dbg !23
+  %2 = load i32, i32* %d_.addr, align 4, !dbg !24
+  %3 = load i32, i32* @d, align 4, !dbg !25
+  %add1 = add nsw i32 %3, %2, !dbg !25
+  store i32 %add1, i32* @d, align 4, !dbg !25
+  %4 = load i32, i32* @z, align 4, !dbg !26
+  %5 = load i32, i32* @d, align 4, !dbg !27
+  %mul = mul nsw i32 %4, %5, !dbg !28
+  ret i32 %mul, !dbg !29
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "z", scope: !2, file: !3, line: 1, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, splitDebugFilename: "helper.dwo", emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: GNU)
+!3 = !DIFile(filename: "helper.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "e635924a35b65444173d0c76a54b866f")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "d", scope: !2, file: !3, line: 2, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !17)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!7, !7, !7}
+!17 = !{}
+!18 = !DILocalVariable(name: "z_", arg: 1, scope: !14, file: !3, line: 4, type: !7)
+!19 = !DILocation(line: 4, column: 16, scope: !14)
+!20 = !DILocalVariable(name: "d_", arg: 2, scope: !14, file: !3, line: 4, type: !7)
+!21 = !DILocation(line: 4, column: 24, scope: !14)
+!22 = !DILocation(line: 5, column: 7, scope: !14)
+!23 = !DILocation(line: 5, column: 4, scope: !14)
+!24 = !DILocation(line: 6, column: 7, scope: !14)
+!25 = !DILocation(line: 6, column: 4, scope: !14)
+!26 = !DILocation(line: 7, column: 9, scope: !14)
+!27 = !DILocation(line: 7, column: 13, scope: !14)
+!28 = !DILocation(line: 7, column: 11, scope: !14)
+!29 = !DILocation(line: 7, column: 2, scope: !14)

bolt/test/X86/Inputs/dwarf5-df-dualcu-loclist-helper.ll

+; ModuleID = 'helper.cpp'
+source_filename = "helper.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@z = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+@d = dso_local local_unnamed_addr global i32 0, align 4, !dbg !5
+
+; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn uwtable
+define dso_local noundef i32 @_Z6helperii(i32 noundef %z_, i32 noundef %d_) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %z_, metadata !17, metadata !DIExpression()), !dbg !19
+  call void @llvm.dbg.value(metadata i32 %d_, metadata !18, metadata !DIExpression()), !dbg !19
+  %0 = load i32, i32* @z, align 4, !dbg !20, !tbaa !21
+  %add = add nsw i32 %0, %z_, !dbg !20
+  store i32 %add, i32* @z, align 4, !dbg !20, !tbaa !21
+  %1 = load i32, i32* @d, align 4, !dbg !25, !tbaa !21
+  %add1 = add nsw i32 %1, %d_, !dbg !25
+  store i32 %add1, i32* @d, align 4, !dbg !25, !tbaa !21
+  %mul = mul nsw i32 %add1, %add, !dbg !26
+  ret i32 %mul, !dbg !27
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "z", scope: !2, file: !3, line: 1, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "helper.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "e635924a35b65444173d0c76a54b866f")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "d", scope: !2, file: !3, line: 2, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{!"clang version 15.0.0"}
+!13 = distinct !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 4, type: !14, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !16)
+!14 = !DISubroutineType(types: !15)
+!15 = !{!7, !7, !7}
+!16 = !{!17, !18}
+!17 = !DILocalVariable(name: "z_", arg: 1, scope: !13, file: !3, line: 4, type: !7)
+!18 = !DILocalVariable(name: "d_", arg: 2, scope: !13, file: !3, line: 4, type: !7)
+!19 = !DILocation(line: 0, scope: !13)
+!20 = !DILocation(line: 5, column: 4, scope: !13)
+!21 = !{!22, !22, i64 0}
+!22 = !{!"int", !23, i64 0}
+!23 = !{!"omnipotent char", !24, i64 0}
+!24 = !{!"Simple C++ TBAA"}
+!25 = !DILocation(line: 6, column: 4, scope: !13)
+!26 = !DILocation(line: 7, column: 11, scope: !13)
+!27 = !DILocation(line: 7, column: 2, scope: !13)

bolt/test/X86/Inputs/dwarf5-df-dualcu-loclist-main.ll

+; ModuleID = 'main.cpp'
+source_filename = "main.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local local_unnamed_addr global i32 0, align 4, !dbg !0
+@y = dso_local local_unnamed_addr global i32 1, align 4, !dbg !5
+
+; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind willreturn uwtable
+define dso_local void @_Z3usePiS_(i32* nocapture noundef %x, i32* nocapture noundef %y) local_unnamed_addr #0 !dbg !13 {
+entry:
+  call void @llvm.dbg.value(metadata i32* %x, metadata !18, metadata !DIExpression()), !dbg !20
+  call void @llvm.dbg.value(metadata i32* %y, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = load i32, i32* %x, align 4, !dbg !21, !tbaa !22
+  %add = add nsw i32 %0, 4, !dbg !21
+  store i32 %add, i32* %x, align 4, !dbg !21, !tbaa !22
+  %1 = load i32, i32* %y, align 4, !dbg !26, !tbaa !22
+  %sub = add nsw i32 %1, -2, !dbg !26
+  store i32 %sub, i32* %y, align 4, !dbg !26, !tbaa !22
+  ret void, !dbg !27
+}
+
+; Function Attrs: mustprogress norecurse uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** nocapture noundef readnone %argv) local_unnamed_addr #1 !dbg !28 {
+entry:
+  call void @llvm.dbg.value(metadata i32 %argc, metadata !35, metadata !DIExpression()), !dbg !37
+  call void @llvm.dbg.value(metadata i8** %argv, metadata !36, metadata !DIExpression()), !dbg !37
+  call void @llvm.dbg.value(metadata i32* @x, metadata !18, metadata !DIExpression()), !dbg !38
+  call void @llvm.dbg.value(metadata i32* @y, metadata !19, metadata !DIExpression()), !dbg !38
+  %add.i = add nsw i32 %argc, 4, !dbg !40
+  store i32 %add.i, i32* @x, align 4, !dbg !40, !tbaa !22
+  %sub.i = add nsw i32 %argc, 1, !dbg !41
+  store i32 %sub.i, i32* @y, align 4, !dbg !41, !tbaa !22
+  %call = tail call noundef i32 @_Z6helperii(i32 noundef %add.i, i32 noundef %sub.i), !dbg !42
+  ret i32 %call, !dbg !43
+}
+
+declare !dbg !44 dso_local noundef i32 @_Z6helperii(i32 noundef, i32 noundef) local_unnamed_addr #2
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata) #3
+
+attributes #0 = { argmemonly mustprogress nofree norecurse nosync nounwind willreturn uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { mustprogress norecurse uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #2 = { "frame-pointer"="none" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11}
+!llvm.ident = !{!12}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "main.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "1f627913a0daee879e00a3a51726f0ef")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 8, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{!"clang version 15.0.0"}
+!13 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !14, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !17)
+!14 = !DISubroutineType(types: !15)
+!15 = !{null, !16, !16}
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!17 = !{!18, !19}
+!18 = !DILocalVariable(name: "x", arg: 1, scope: !13, file: !3, line: 1, type: !16)
+!19 = !DILocalVariable(name: "y", arg: 2, scope: !13, file: !3, line: 1, type: !16)
+!20 = !DILocation(line: 0, scope: !13)
+!21 = !DILocation(line: 2, column: 4, scope: !13)
+!22 = !{!23, !23, i64 0}
+!23 = !{!"int", !24, i64 0}
+!24 = !{!"omnipotent char", !25, i64 0}
+!25 = !{!"Simple C++ TBAA"}
+!26 = !DILocation(line: 3, column: 4, scope: !13)
+!27 = !DILocation(line: 4, column: 1, scope: !13)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !2, retainedNodes: !34)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !{!35, !36}
+!35 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 9, type: !7)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 9, type: !31)
+!37 = !DILocation(line: 0, scope: !28)
+!38 = !DILocation(line: 0, scope: !13, inlinedAt: !39)
+!39 = distinct !DILocation(line: 12, column: 4, scope: !28)
+!40 = !DILocation(line: 2, column: 4, scope: !13, inlinedAt: !39)
+!41 = !DILocation(line: 3, column: 4, scope: !13, inlinedAt: !39)
+!42 = !DILocation(line: 13, column: 11, scope: !28)
+!43 = !DILocation(line: 13, column: 4, scope: !28)
+!44 = !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 6, type: !45, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !47)
+!45 = !DISubroutineType(types: !46)
+!46 = !{!7, !7, !7}
+!47 = !{}

bolt/test/X86/Inputs/dwarf5-df-dualcu-main.ll

+; clang++ -g -gdwarf-5 -emit-llvm -S main.cpp
+; void use(int * x, int * y) {
+; *x += 4;
+; *y -= 2;
+; }
+;
+; int helper(int z_, int d_);
+; int x = 0;
+; int y = 1;
+; int  main(int argc, char *argv[]) {
+;    x = argc;
+;    y = argc + 3;
+;    use(&x, &y);
+;    return helper(x, y);
+; }
+
+; ModuleID = 'main.cpp'
+source_filename = "main.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local global i32 0, align 4, !dbg !0
+@y = dso_local global i32 1, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3usePiS_(i32* noundef %x, i32* noundef %y) #0 !dbg !14 {
+entry:
+  %x.addr = alloca i32*, align 8
+  %y.addr = alloca i32*, align 8
+  store i32* %x, i32** %x.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %x.addr, metadata !19, metadata !DIExpression()), !dbg !20
+  store i32* %y, i32** %y.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %y.addr, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = load i32*, i32** %x.addr, align 8, !dbg !23
+  %1 = load i32, i32* %0, align 4, !dbg !24
+  %add = add nsw i32 %1, 4, !dbg !24
+  store i32 %add, i32* %0, align 4, !dbg !24
+  %2 = load i32*, i32** %y.addr, align 8, !dbg !25
+  %3 = load i32, i32* %2, align 4, !dbg !26
+  %sub = sub nsw i32 %3, 2, !dbg !26
+  store i32 %sub, i32* %2, align 4, !dbg !26
+  ret void, !dbg !27
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** noundef %argv) #2 !dbg !28 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca i8**, align 8
+  store i32 0, i32* %retval, align 4
+  store i32 %argc, i32* %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %argc.addr, metadata !34, metadata !DIExpression()), !dbg !35
+  store i8** %argv, i8*** %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata i8*** %argv.addr, metadata !36, metadata !DIExpression()), !dbg !37
+  %0 = load i32, i32* %argc.addr, align 4, !dbg !38
+  store i32 %0, i32* @x, align 4, !dbg !39
+  %1 = load i32, i32* %argc.addr, align 4, !dbg !40
+  %add = add nsw i32 %1, 3, !dbg !41
+  store i32 %add, i32* @y, align 4, !dbg !42
+  call void @_Z3usePiS_(i32* noundef @x, i32* noundef @y), !dbg !43
+  %2 = load i32, i32* @x, align 4, !dbg !44
+  %3 = load i32, i32* @y, align 4, !dbg !45
+  %call = call noundef i32 @_Z6helperii(i32 noundef %2, i32 noundef %3), !dbg !46
+  ret i32 %call, !dbg !47
+}
+
+declare dso_local noundef i32 @_Z6helperii(i32 noundef, i32 noundef) #3
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, splitDebugFilename: "main.dwo", emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: GNU)
+!3 = !DIFile(filename: "main.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "1f627913a0daee879e00a3a51726f0ef")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 8, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !15, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!15 = !DISubroutineType(types: !16)
+!16 = !{null, !17, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!18 = !{}
+!19 = !DILocalVariable(name: "x", arg: 1, scope: !14, file: !3, line: 1, type: !17)
+!20 = !DILocation(line: 1, column: 16, scope: !14)
+!21 = !DILocalVariable(name: "y", arg: 2, scope: !14, file: !3, line: 1, type: !17)
+!22 = !DILocation(line: 1, column: 25, scope: !14)
+!23 = !DILocation(line: 2, column: 2, scope: !14)
+!24 = !DILocation(line: 2, column: 4, scope: !14)
+!25 = !DILocation(line: 3, column: 2, scope: !14)
+!26 = !DILocation(line: 3, column: 4, scope: !14)
+!27 = !DILocation(line: 4, column: 1, scope: !14)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 9, type: !7)
+!35 = !DILocation(line: 9, column: 15, scope: !28)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 9, type: !31)
+!37 = !DILocation(line: 9, column: 27, scope: !28)
+!38 = !DILocation(line: 10, column: 8, scope: !28)
+!39 = !DILocation(line: 10, column: 6, scope: !28)
+!40 = !DILocation(line: 11, column: 8, scope: !28)
+!41 = !DILocation(line: 11, column: 13, scope: !28)
+!42 = !DILocation(line: 11, column: 6, scope: !28)
+!43 = !DILocation(line: 12, column: 4, scope: !28)
+!44 = !DILocation(line: 13, column: 18, scope: !28)
+!45 = !DILocation(line: 13, column: 21, scope: !28)
+!46 = !DILocation(line: 13, column: 11, scope: !28)
+!47 = !DILocation(line: 13, column: 4, scope: !28)

bolt/test/X86/Inputs/dwarf5-df-mono-helper.ll

+; clang++ -g -gdwarf-5 -emit-llvm -S helper.cpp
+; int z = 0;
+; int d = 0;
+;
+; int helper(int z_, int d_) {
+;  z += z_;
+;  d += d_;
+;  return z * d;
+; }
+
+; ModuleID = 'helper.cpp'
+source_filename = "helper.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@z = dso_local global i32 0, align 4, !dbg !0
+@d = dso_local global i32 0, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z6helperii(i32 noundef %z_, i32 noundef %d_) #0 !dbg !14 {
+entry:
+  %z_.addr = alloca i32, align 4
+  %d_.addr = alloca i32, align 4
+  store i32 %z_, i32* %z_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %z_.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store i32 %d_, i32* %d_.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %d_.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  %0 = load i32, i32* %z_.addr, align 4, !dbg !22
+  %1 = load i32, i32* @z, align 4, !dbg !23
+  %add = add nsw i32 %1, %0, !dbg !23
+  store i32 %add, i32* @z, align 4, !dbg !23
+  %2 = load i32, i32* %d_.addr, align 4, !dbg !24
+  %3 = load i32, i32* @d, align 4, !dbg !25
+  %add1 = add nsw i32 %3, %2, !dbg !25
+  store i32 %add1, i32* @d, align 4, !dbg !25
+  %4 = load i32, i32* @z, align 4, !dbg !26
+  %5 = load i32, i32* @d, align 4, !dbg !27
+  %mul = mul nsw i32 %4, %5, !dbg !28
+  ret i32 %mul, !dbg !29
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "z", scope: !2, file: !3, line: 1, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "helper.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "e635924a35b65444173d0c76a54b866f")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "d", scope: !2, file: !3, line: 2, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "helper", linkageName: "_Z6helperii", scope: !3, file: !3, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !17)
+!15 = !DISubroutineType(types: !16)
+!16 = !{!7, !7, !7}
+!17 = !{}
+!18 = !DILocalVariable(name: "z_", arg: 1, scope: !14, file: !3, line: 4, type: !7)
+!19 = !DILocation(line: 4, column: 16, scope: !14)
+!20 = !DILocalVariable(name: "d_", arg: 2, scope: !14, file: !3, line: 4, type: !7)
+!21 = !DILocation(line: 4, column: 24, scope: !14)
+!22 = !DILocation(line: 5, column: 7, scope: !14)
+!23 = !DILocation(line: 5, column: 4, scope: !14)
+!24 = !DILocation(line: 6, column: 7, scope: !14)
+!25 = !DILocation(line: 6, column: 4, scope: !14)
+!26 = !DILocation(line: 7, column: 9, scope: !14)
+!27 = !DILocation(line: 7, column: 13, scope: !14)
+!28 = !DILocation(line: 7, column: 11, scope: !14)
+!29 = !DILocation(line: 7, column: 2, scope: !14)

bolt/test/X86/Inputs/dwarf5-df-mono-main.ll

+; clang++ -g -gdwarf-5 -gsplit-dwarf=split -emit-llvm -S  main.cpp
+; void use(int * x, int * y) {
+; *x += 4;
+; *y -= 2;
+; }
+;
+; int helper(int z_, int d_);
+; int x = 0;
+; int y = 1;
+; int  main(int argc, char *argv[]) {
+;    x = argc;
+;    y = argc + 3;
+;    use(&x, &y);
+;    return helper(x, y);
+; }
+
+; ModuleID = 'main.cpp'
+source_filename = "main.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local global i32 0, align 4, !dbg !0
+@y = dso_local global i32 1, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3usePiS_(i32* noundef %x, i32* noundef %y) #0 !dbg !14 {
+entry:
+  %x.addr = alloca i32*, align 8
+  %y.addr = alloca i32*, align 8
+  store i32* %x, i32** %x.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %x.addr, metadata !19, metadata !DIExpression()), !dbg !20
+  store i32* %y, i32** %y.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %y.addr, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = load i32*, i32** %x.addr, align 8, !dbg !23
+  %1 = load i32, i32* %0, align 4, !dbg !24
+  %add = add nsw i32 %1, 4, !dbg !24
+  store i32 %add, i32* %0, align 4, !dbg !24
+  %2 = load i32*, i32** %y.addr, align 8, !dbg !25
+  %3 = load i32, i32* %2, align 4, !dbg !26
+  %sub = sub nsw i32 %3, 2, !dbg !26
+  store i32 %sub, i32* %2, align 4, !dbg !26
+  ret void, !dbg !27
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** noundef %argv) #2 !dbg !28 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca i8**, align 8
+  store i32 0, i32* %retval, align 4
+  store i32 %argc, i32* %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %argc.addr, metadata !34, metadata !DIExpression()), !dbg !35
+  store i8** %argv, i8*** %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata i8*** %argv.addr, metadata !36, metadata !DIExpression()), !dbg !37
+  %0 = load i32, i32* %argc.addr, align 4, !dbg !38
+  store i32 %0, i32* @x, align 4, !dbg !39
+  %1 = load i32, i32* %argc.addr, align 4, !dbg !40
+  %add = add nsw i32 %1, 3, !dbg !41
+  store i32 %add, i32* @y, align 4, !dbg !42
+  call void @_Z3usePiS_(i32* noundef @x, i32* noundef @y), !dbg !43
+  %2 = load i32, i32* @x, align 4, !dbg !44
+  %3 = load i32, i32* @y, align 4, !dbg !45
+  %call = call noundef i32 @_Z6helperii(i32 noundef %2, i32 noundef %3), !dbg !46
+  ret i32 %call, !dbg !47
+}
+
+declare dso_local noundef i32 @_Z6helperii(i32 noundef, i32 noundef) #3
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, splitDebugFilename: "main.dwo", emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: GNU)
+!3 = !DIFile(filename: "main.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "1f627913a0daee879e00a3a51726f0ef")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 8, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !15, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!15 = !DISubroutineType(types: !16)
+!16 = !{null, !17, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!18 = !{}
+!19 = !DILocalVariable(name: "x", arg: 1, scope: !14, file: !3, line: 1, type: !17)
+!20 = !DILocation(line: 1, column: 16, scope: !14)
+!21 = !DILocalVariable(name: "y", arg: 2, scope: !14, file: !3, line: 1, type: !17)
+!22 = !DILocation(line: 1, column: 25, scope: !14)
+!23 = !DILocation(line: 2, column: 2, scope: !14)
+!24 = !DILocation(line: 2, column: 4, scope: !14)
+!25 = !DILocation(line: 3, column: 2, scope: !14)
+!26 = !DILocation(line: 3, column: 4, scope: !14)
+!27 = !DILocation(line: 4, column: 1, scope: !14)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 9, type: !29, scopeLine: 9, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 9, type: !7)
+!35 = !DILocation(line: 9, column: 15, scope: !28)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 9, type: !31)
+!37 = !DILocation(line: 9, column: 27, scope: !28)
+!38 = !DILocation(line: 10, column: 8, scope: !28)
+!39 = !DILocation(line: 10, column: 6, scope: !28)
+!40 = !DILocation(line: 11, column: 8, scope: !28)
+!41 = !DILocation(line: 11, column: 13, scope: !28)
+!42 = !DILocation(line: 11, column: 6, scope: !28)
+!43 = !DILocation(line: 12, column: 4, scope: !28)
+!44 = !DILocation(line: 13, column: 18, scope: !28)
+!45 = !DILocation(line: 13, column: 21, scope: !28)
+!46 = !DILocation(line: 13, column: 11, scope: !28)
+!47 = !DILocation(line: 13, column: 4, scope: !28)

bolt/test/X86/debug-fission-single.s

 # RUN:   -nostartfiles \
 # RUN:   -Wl,--script=%p/Inputs/debug-fission-script.txt \
 # RUN:   %t.o -o %t.exe
 # RUN: llvm-bolt %t.exe \
 # RUN:   --reorder-blocks=reverse \
 # RUN:   --update-debug-sections \
 # RUN:   --dwarf-output-path=%T \
 # RUN:   -o %t.bolt.1.exe 2>&1 | FileCheck %s
-# RUN: not llvm-dwarfdump --show-form --verbose --debug-info %T/debug-fission-simple.dwo0.dwo -o %tAddrIndexTest 2> /dev/null
-# RUN: cat %tAddrIndexTest | grep DW_FORM_GNU_addr_index | FileCheck %s --check-prefix=CHECK-ADDR-INDEX
+# RUN: llvm-dwarfdump --show-form --verbose --debug-ranges %t.bolt.1.exe &> %tAddrIndexTest
+# RUN: not llvm-dwarfdump --show-form --verbose --debug-info %T/debug-fission-simple.dwo0.dwo >> %tAddrIndexTest
+# RUN: cat %tAddrIndexTest | FileCheck %s --check-prefix=CHECK-DWO-DWO
 # RUN: llvm-dwarfdump --show-form --verbose   --debug-addr  %t.bolt.1.exe | FileCheck %s --check-prefix=CHECK-ADDR-SEC
 
 # CHECK-NOT: warning: DWARF unit from offset {{.*}} incl. to offset {{.*}} excl. tries to read DIEs at offset {{.*}}
 
-# CHECK-ADDR-INDEX: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
-# CHECK-ADDR-INDEX: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
-# CHECK-ADDR-INDEX: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+# CHECK-DWO-DWO: 00000010
+# CHECK-DWO-DWO: 00000010
+# CHECK-DWO-DWO: 00000050
+# CHECK-DWO-DWO: DW_TAG_subprogram
+# CHECK-DWO-DWO-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
+# CHECK-DWO-DWO: DW_TAG_subprogram
+# CHECK-DWO-DWO-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
+# CHECK-DWO-DWO: DW_TAG_subprogram
+# CHECK-DWO-DWO-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
 
 # CHECK-ADDR-SEC: .debug_addr contents:
 # CHECK-ADDR-SEC: 0x00000000: Addrs: [
 # CHECK-ADDR-SEC: 0x0000000000601000
 
 # RUN: llvm-bolt %t.exe --reorder-blocks=reverse -update-debug-sections -dwarf-output-path=%T -o %t.bolt.2.exe --write-dwp=true
-# RUN: not llvm-dwarfdump --show-form --verbose --debug-info %t.bolt.2.exe.dwp -o %tAddrIndexTestDwp 2> /dev/null
+# RUN: not llvm-dwarfdump --show-form --verbose --debug-info %t.bolt.2.exe.dwp &> %tAddrIndexTestDwp
 # RUN: cat %tAddrIndexTestDwp | FileCheck %s --check-prefix=CHECK-DWP-DEBUG
 
 # CHECK-DWP-DEBUG: DW_TAG_compile_unit [1] *
 # CHECK-DWP-DEBUG:  DW_AT_producer [DW_FORM_GNU_str_index]  (indexed (0000000a) string = "clang version 13.0.0")
 # CHECK-DWP-DEBUG:  DW_AT_language [DW_FORM_data2]  (DW_LANG_C_plus_plus)
 # CHECK-DWP-DEBUG:  DW_AT_name [DW_FORM_GNU_str_index]  (indexed (0000000b) string = "foo")
 # CHECK-DWP-DEBUG:  DW_AT_GNU_dwo_name [DW_FORM_GNU_str_index]  (indexed (0000000c) string = "foo")
 # CHECK-DWP-DEBUG:  DW_AT_GNU_dwo_id [DW_FORM_data8]  (0x06105e732fad3796)

bolt/test/X86/dwarf4-df-dualcu-loclist.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=main.dwo -split-dwarf-output=main.dwo -O2 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf4-df-dualcu-loclist-main.ll -o=main.o
+; RUN: llc -split-dwarf-file=helper.dwo -split-dwarf-output=helper.dwo -O2 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf4-df-dualcu-loclist-helper.ll -o=helper.o
+; RUN: %clang %cflags -gdwarf-5 -O2 -gsplit-dwarf=split main.o helper.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
+; RUN: not llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-HELPER %s
+; RUN: not llvm-dwarfdump --show-form --verbose --debug-info helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-HELPER %s
+
+; Testing dwarf4 split dwarf for two CUs. Making sure DW_AT_location [DW_FORM_sec_offset] is updated correctly.
+
+; PRE-BOLT-DWO-MAIN: version = 0x0004
+; PRE-BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000000:
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000003, 0x0000000000000014)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000005, 0x0000000000000005)
+; PRE-BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000016:
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000003, 0x000000000000000c)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000006, 0x000000000000000d)
+
+; BOLT-DWO-MAIN: version = 0x0004
+; BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000000:
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000002, 0x0000000000000014)
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000003, 0x0000000000000005)
+; BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000016:
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000002, 0x000000000000000c)
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length   (0x0000000000000005, 0x000000000000000d)
+
+
+; PRE-BOLT-DWO-HELPER: version = 0x0004
+; PRE-BOLT-DWO-HELPER: DW_TAG_formal_parameter [5]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000000:
+; PRE-BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000002, 0x0000000000000008)
+; PRE-BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000003, 0x0000000000000016)
+
+; BOLT-DWO-HELPER: version = 0x0004
+; BOLT-DWO-HELPER: DW_TAG_formal_parameter [5]
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_sec_offset] (0x00000000:
+; BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000002, 0x0000000000000008): DW_OP_reg5 RDI
+; BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000003, 0x0000000000000016)

bolt/test/X86/dwarf4-df-dualcu.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=main.dwo -split-dwarf-output=main.dwo -O0 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf4-df-dualcu-main.ll -o=main.o
+; RUN: llc -split-dwarf-file=helper.dwo -split-dwarf-output=helper.dwo -O0 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf4-df-dualcu-helper.ll -o=helper.o
+; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe | FileCheck -check-prefix=PRE-BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-ranges main.exe.bolt &> %t/foo.txt
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
+; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo &> maindwo.txt
+; RUN cat maindwo.txt | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
+; RUN: not llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo &> mainddwodwo.txt
+; RUN: cat mainddwodwo.txt | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo &> helperdwo.txt
+; RUN: cat helperdwo.txt | FileCheck -check-prefix=PRE-BOLT-DWO-HELPER %s
+; RUN: not llvm-dwarfdump --show-form --verbose --debug-info helper.dwo.dwo &> helperdwodwo.txt
+; RUN: cat helperdwodwo.txt | FileCheck -check-prefix=BOLT-DWO-HELPER %s
+
+; Testing dwarf5 split dwarf for two CUs. Making sure DW_AT_low_pc/DW_AT_high_pc are converted correctly in the binary and in dwo.
+; Checking that DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx ##) are updated correctly.
+
+; PRE-BOLT: version = 0x0004
+; PRE-BOLT: DW_TAG_compile_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addr]
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4]
+; PRE-BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset]  (0x00000000)
+; PRE-BOLT-NEXT: Compile
+; PRE-BOLT: version = 0x0004
+; PRE-BOLT: DW_TAG_compile_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addr]
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4]
+; PRE-BOLT: DW_AT_GNU_addr_base [DW_FORM_sec_offset]  (0x00000020)
+
+; BOLT: .debug_ranges
+; BOLT-NEXT: 00000000 <End of list>
+; BOLT-NEXT: 00000010 [[#%.16x,ADDR:]] [[#%.16x,ADDRB:]]
+; BOLT-NEXT: 00000010 <End of list>
+; BOLT-NEXT: 00000030 [[#%.16x,ADDR1:]] [[#%.16x,ADDR1B:]]
+; BOLT-NEXT: 00000030 <End of list>
+; BOLT-NEXT: 00000050 [[#%.16x,ADDR2:]] [[#%.16x,ADDR2B:]]
+; BOLT-NEXT: 00000050 [[#%.16x,ADDR3:]] [[#%.16x,ADDR3B:]]
+; BOLT-NEXT: 00000050 <End of list>
+; BOLT-NEXT: 00000080 [[#%.16x,ADDR4:]] [[#%.16x,ADDR4B:]]
+; BOLT-NEXT: 00000080 <End of list>
+; BOLT-NEXT: 000000a0 [[#%.16x,ADDR5:]] [[#%.16x,ADDR5B:]]
+; BOLT-NEXT: 000000a0 <End of list>
+
+; BOLT: DW_TAG_compile_unit
+; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000016] = "main.dwo.dwo")
+; BOLT-NEXT: DW_AT_GNU_dwo_id
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
+; BOLT-NEXT: [0x[[#ADDR2]], 0x[[#ADDR2B]])
+; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDR3B]]))
+; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset]  (0x00000000)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset]  (0x00000010)
+; BOLT-NEXT: Compile
+; BOLT: DW_TAG_compile_unit
+; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000023] = "helper.dwo.dwo")
+; BOLT-NEXT: DW_AT_GNU_dwo_id
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x000000a0
+; BOLT-NEXT: [0x[[#ADDR5]], 0x[[#ADDR5B]])
+; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset]  (0x00000010)
+; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset]  (0x00000080)
+
+; PRE-BOLT-DWO-MAIN: version = 0x0004
+; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000000) string = "x")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x0)
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000002) string = "y")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x1)
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000002)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x00000024)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_GNU_str_index]  (indexed (00000003) string = "_Z3usePiS_")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000004) string = "use")
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000003)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000005f)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000005) string = "main")
+
+; BOLT-DWO-MAIN: version = 0x0004
+; BOLT-DWO-MAIN: DW_TAG_compile_unit
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000000) string = "x")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x0)
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000002) string = "y")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x1)
+; BOLT-DWO-MAIN: DW_TAG_subprogram [4]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
+; BOLT-DWO-MAIN-NEXT: )
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_GNU_str_index]  (indexed (00000003) string = "_Z3usePiS_")
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000004) string = "use")
+; BOLT-DWO-MAIN: DW_TAG_subprogram [6]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
+; BOLT-DWO-MAIN-NEXT: )
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base [DW_FORM_exprloc]  (DW_OP_reg6 RBP)
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000005) string = "main")
+
+
+; PRE-BOLT-DWO-HELPER: version = 0x0004
+; PRE-BOLT-DWO-HELPER: DW_TAG_variable [2]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000000) string = "z")
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_type
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_external
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x0)
+; PRE-BOLT-DWO-HELPER: DW_TAG_variable [2]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000002) string = "d")
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_type
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_external
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x1)
+; PRE-BOLT-DWO-HELPER: DW_TAG_subprogram [4]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000002)
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000003d)
+
+; BOLT-DWO-HELPER: version = 0x0004
+; BOLT-DWO-HELPER: DW_TAG_variable [2]
+; BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000000) string = "z")
+; BOLT-DWO-HELPER-NEXT: DW_AT_type
+; BOLT-DWO-HELPER-NEXT: DW_AT_external
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x0)
+; BOLT-DWO-HELPER: DW_TAG_variable [2]
+; BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_GNU_str_index]  (indexed (00000002) string = "d")
+; BOLT-DWO-HELPER-NEXT: DW_AT_type
+; BOLT-DWO-HELPER-NEXT: DW_AT_external
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_GNU_addr_index 0x1)
+; BOLT-DWO-HELPER: DW_TAG_subprogram [4]
+; BOLT-DWO-HELPER-NEXT: DW_AT_low_pc [DW_FORM_GNU_addr_index] (indexed (00000000)
+; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000

bolt/test/X86/dwarf5-df-dualcu-loclist.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=main.dwo -split-dwarf-output=main.dwo -O2 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf5-df-dualcu-loclist-main.ll -o=main.o
+; RUN: llc -split-dwarf-file=helper.dwo -split-dwarf-output=helper.dwo -O2 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf5-df-dualcu-loclist-helper.ll -o=helper.o
+; RUN: %clang %cflags -gdwarf-5 -O2 -gsplit-dwarf=split main.o helper.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-HELPER %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-HELPER %s
+
+; Testing dwarf5 split dwarf for two CUs. Making sure DW_AT_location [DW_FORM_loclistx] is updated correctly.
+
+; PRE-BOLT-DWO-MAIN: version = 0x0005
+; PRE-BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x0) loclist = 0x00000014:
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_base_addressx   (0x0000000000000002)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_offset_pair     (0x0000000000000010, 0x0000000000000024)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_offset_pair     (0x0000000000000024, 0x0000000000000029)
+; PRE-BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x1) loclist = 0x00000024:
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_base_addressx   (0x0000000000000002)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_offset_pair     (0x0000000000000010, 0x000000000000001c)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_LLE_offset_pair     (0x000000000000001c, 0x0000000000000029)
+
+; BOLT-DWO-MAIN: version = 0x0005
+; BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x0) loclist = 0x00000014:
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length     (0x0000000000000004, 0x0000000000000014)
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length     (0x0000000000000005, 0x0000000000000005)
+; BOLT-DWO-MAIN: DW_TAG_formal_parameter [10]
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x1) loclist = 0x00000022:
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length     (0x0000000000000004, 0x000000000000000c)
+; BOLT-DWO-MAIN-NEXT: DW_LLE_startx_length     (0x0000000000000006, 0x000000000000000d)
+
+
+; PRE-BOLT-DWO-HELPER: version = 0x0005
+; PRE-BOLT-DWO-HELPER: DW_TAG_formal_parameter [5]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x0) loclist = 0x00000010:
+; PRE-BOLT-DWO-HELPER-NEXT: DW_LLE_base_addressx   (0x0000000000000002)
+; PRE-BOLT-DWO-HELPER-NEXT: DW_LLE_offset_pair     (0x0000000000000000, 0x0000000000000008)
+; PRE-BOLT-DWO-HELPER-NEXT: DW_LLE_offset_pair     (0x0000000000000008, 0x000000000000001e)
+
+; BOLT-DWO-HELPER: version = 0x0005
+; BOLT-DWO-HELPER: DW_TAG_formal_parameter [5]
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_loclistx] (indexed (0x0) loclist = 0x00000010:
+; BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000002, 0x0000000000000008)
+; BOLT-DWO-HELPER-NEXT: DW_LLE_startx_length   (0x0000000000000004, 0x0000000000000016)

bolt/test/X86/dwarf5-df-dualcu.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=main.dwo -split-dwarf-output=main.dwo -O0 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf5-df-dualcu-main.ll -o=main.o
+; RUN: llc -split-dwarf-file=helper.dwo -split-dwarf-output=helper.dwo -O0 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf5-df-dualcu-helper.ll -o=helper.o
+; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe | FileCheck -check-prefix=PRE-BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-addr main.exe.bolt &> %t/foo.txt
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
+; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-HELPER %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-HELPER %s
+
+; Testing dwarf5 split dwarf for two CUs. Making sure DW_AT_low_pc/DW_AT_high_pc are converted correctly in the binary and in dwo.
+; Checking that DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx ##) are updated correctly.
+
+; PRE-BOLT: version = 0x0005
+; PRE-BOLT: DW_TAG_skeleton_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addrx]
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4]
+; PRE-BOLT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+
+; BOLT: Addrs: [
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR:]]
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR2:]]
+; BOLT: Addrs: [
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR3:]]
+; BOLT: DW_TAG_skeleton_unit
+; BOLT: DW_AT_dwo_name [DW_FORM_strx1]  (indexed (00000001) string = "main.dwo.dwo")
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000010
+; BOLT-NEXT: [0x[[#ADDR]]
+; BOLT-SAME: 0x[[#ADDR + 0x24]]
+; BOLT-NEXT: [0x[[#ADDR2]]
+; BOLT-SAME: 0x[[#ADDR2 + 0x59]]
+; BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+; BOLT-NEXT: DW_AT_rnglists_base [DW_FORM_sec_offset]  (0x0000000c)
+; BOLT: DW_TAG_skeleton_unit
+; BOLT: DW_AT_dwo_name [DW_FORM_strx1]  (indexed (00000001) string = "helper.dwo.dwo")
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000027
+; BOLT-NEXT: [0x[[#ADDR3]]
+; BOLT-SAME: 0x[[#ADDR3 + 0x3D]]
+; BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000038)
+; BOLT-NEXT: DW_AT_rnglists_base [DW_FORM_sec_offset]  (0x00000023)
+
+; PRE-BOLT-DWO-MAIN: version = 0x0005
+; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "x")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "y")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000002)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x00000024)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_strx1]  (indexed (00000003) string = "_Z3usePiS_")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000004) string = "use")
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000005f)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000005) string = "main")
+
+; BOLT-DWO-MAIN: DW_TAG_compile_unit
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "x")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "y")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; BOLT-DWO-MAIN: DW_TAG_subprogram [4]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000014
+; BOLT-DWO-MAIN-NEXT: [0x0000000000000000, 0x0000000000000024))
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_strx1]  (indexed (00000003) string = "_Z3usePiS_")
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000004) string = "use")
+; BOLT-DWO-MAIN: DW_TAG_subprogram [6]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x1) rangelist = 0x00000018
+; BOLT-DWO-MAIN-NEXT: [0x0000000000000000, 0x0000000000000059))
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base [DW_FORM_exprloc]  (DW_OP_reg6 RBP)
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000005) string = "main")
+
+
+; PRE-BOLT-DWO-HELPER: version = 0x0005
+; PRE-BOLT-DWO-HELPER: DW_TAG_variable [2]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "z")
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_type
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_external
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; PRE-BOLT-DWO-HELPER: DW_TAG_variable [2]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "d")
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_type
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_external
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; PRE-BOLT-DWO-HELPER: DW_TAG_subprogram [4]
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000002)
+; PRE-BOLT-DWO-HELPER-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000003d)
+
+; BOLT-DWO-HELPER: version = 0x0005
+; BOLT-DWO-HELPER: DW_TAG_variable [2]
+; BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "z")
+; BOLT-DWO-HELPER-NEXT: DW_AT_type
+; BOLT-DWO-HELPER-NEXT: DW_AT_external
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; BOLT-DWO-HELPER: DW_TAG_variable [2]
+; BOLT-DWO-HELPER-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "d")
+; BOLT-DWO-HELPER-NEXT: DW_AT_type
+; BOLT-DWO-HELPER-NEXT: DW_AT_external
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_file
+; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
+; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; BOLT-DWO-HELPER: DW_TAG_subprogram [4]
+; BOLT-DWO-HELPER-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000010
+; BOLT-DWO-HELPER-NEXT: [0x0000000000000000, 0x000000000000003d))

bolt/test/X86/dwarf5-df-mono-dualcu.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=main.dwo -split-dwarf-output=main.dwo -O0 -mtriple=x86_64-unknown-linux-gnu \
+; RUN: -filetype=obj %p/Inputs/dwarf5-df-mono-main.ll -o=main.o
+; RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu -filetype=obj %p/Inputs/dwarf5-df-mono-helper.ll -o=helper.o
+; RUN: %clang %cflags -gdwarf-5 main.o helper.o -o main.exe
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe | FileCheck -check-prefix=PRE-BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-addr main.exe.bolt &> %t/foo.txt
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
+; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-MAIN %s
+
+; Testing dwarf5 mix of split dwarf and monolithic CUs.
+
+; PRE-BOLT: version = 0x0005
+; PRE-BOLT: DW_TAG_skeleton_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addrx]
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4]
+; PRE-BOLT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+; PRE-BOLT: version = 0x0005
+; PRE-BOLT: DW_TAG_compile_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000002)
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000003d)
+; PRE-BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000030)
+
+; BOLT: Addrs: [
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR:]]
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR2:]]
+; BOLT: Addrs: [
+; BOLT-NEXT: 0x[[#%.16x,ADDR3:]]
+; BOLT: DW_TAG_skeleton_unit
+; BOLT: DW_AT_dwo_name [DW_FORM_strx1]  (indexed (00000001) string = "main.dwo.dwo")
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000010
+; BOLT-NEXT: [0x[[#ADDR]]
+; BOLT-SAME: 0x[[#ADDR + 0x24]]
+; BOLT-NEXT: [0x[[#ADDR2]]
+; BOLT-SAME: 0x[[#ADDR2 + 0x59]]
+; BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+; BOLT-NEXT: DW_AT_rnglists_base [DW_FORM_sec_offset]  (0x0000000c)
+; BOLT: DW_TAG_compile_unit
+; BOLT: DW_AT_name [DW_FORM_strx1]  (indexed (00000001) string = "helper.cpp")
+; BOLT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000001) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x0000002b
+; BOLT-NEXT: [0x[[#ADDR3]]
+; BOLT-SAME: 0x[[#ADDR3 + 0x3D]]
+; BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000038)
+; BOLT-NEXT: DW_AT_rnglists_base [DW_FORM_sec_offset]  (0x00000023)
+; BOLT: DW_TAG_variable
+; BOLT-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000003) string = "z")
+; BOLT-NEXT: DW_AT_type
+; BOLT-NEXT: DW_AT_external
+; BOLT-NEXT: DW_AT_decl_file
+; BOLT-NEXT: DW_AT_decl_line
+; BOLT-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x2)
+; BOLT: DW_TAG_variable
+; BOLT-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000005) string = "d")
+; BOLT-NEXT: DW_AT_type
+; BOLT-NEXT: DW_AT_external
+; BOLT-NEXT: DW_AT_decl_file
+; BOLT-NEXT: DW_AT_decl_line
+; BOLT-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x3)
+; BOLT: DW_TAG_subprogram
+; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000001) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x1) rangelist = 0x0000002f
+; BOLT-NEXT: [0x[[#ADDR3]]
+; BOLT-SAME: 0x[[#ADDR3 + 0x3D]]
+
+; PRE-BOLT-DWO-MAIN: version = 0x0005
+; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "x")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; PRE-BOLT-DWO-MAIN: DW_TAG_variable [2]
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "y")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_type
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_external
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000002)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x00000024)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_strx1]  (indexed (00000003) string = "_Z3usePiS_")
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000004) string = "use")
+; PRE-BOLT-DWO-MAIN: DW_TAG_subprogram
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_high_pc [DW_FORM_data4] (0x0000005f)
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; PRE-BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000005) string = "main")
+
+; BOLT-DWO-MAIN: DW_TAG_compile_unit
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000000) string = "x")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0)
+; BOLT-DWO-MAIN: DW_TAG_variable [2]
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000002) string = "y")
+; BOLT-DWO-MAIN-NEXT: DW_AT_type
+; BOLT-DWO-MAIN-NEXT: DW_AT_external
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_file
+; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
+; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x1)
+; BOLT-DWO-MAIN: DW_TAG_subprogram [4]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000014
+; BOLT-DWO-MAIN-NEXT: [0x0000000000000000, 0x0000000000000024))
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
+; BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_strx1]  (indexed (00000003) string = "_Z3usePiS_")
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000004) string = "use")
+; BOLT-DWO-MAIN: DW_TAG_subprogram [6]
+; BOLT-DWO-MAIN-NEXT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003)
+; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x1) rangelist = 0x00000018
+; BOLT-DWO-MAIN-NEXT: [0x0000000000000000, 0x0000000000000059))
+; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base [DW_FORM_exprloc]  (DW_OP_reg6 RBP)
+; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_strx1]  (indexed (00000005) string = "main")

bolt/test/X86/dwarf5-locaddrx.test

+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llc -split-dwarf-file=mainlocadddrx.dwo -split-dwarf-output=mainlocadddrx.dwo -O0 -mtriple=x86_64-unknown-linux-gnu -filetype=obj %s -o=mainlocadddrx.o
+; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split mainlocadddrx.o -o mainlocadddrx.exe
+; RUN: llvm-bolt mainlocadddrx.exe -o mainlocadddrx.exe.bolt --update-debug-sections
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info mainlocadddrx.exe | FileCheck -check-prefix=PRE-BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-addr mainlocadddrx.exe.bolt &> %t/foo.txt
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info mainlocadddrx.exe.bolt >> %t/foo.txt
+; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info mainlocadddrx.dwo | FileCheck -check-prefix=PRE-BOLT-DWO %s
+; RUN: llvm-dwarfdump --show-form --verbose --debug-info mainlocadddrx.dwo.dwo | FileCheck -check-prefix=BOLT-DWO %s
+
+; Testing dwarf5 split dwarf. Making sure DW_AT_low_pc/DW_AT_high_pc are converted correctly in the binary and in dwo.
+; Checking that DW_AT_location [DW_FORM_exprloc]  (DW_OP_addrx 0x0) is updated correctly.
+
+; PRE-BOLT: version = 0x0005
+; PRE-BOLT: DW_TAG_skeleton_unit
+; PRE-BOLT: DW_AT_low_pc [DW_FORM_addrx]
+; PRE-BOLT-NEXT: DW_AT_high_pc [DW_FORM_data4]
+; PRE-BOLT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+
+; BOLT: Addrs: [
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR:]]
+; BOLT-NEXT: 0x
+; BOLT-NEXT: 0x[[#%.16x,ADDR2:]]
+; BOLT: DW_TAG_skeleton_unit
+; BOLT: DW_AT_low_pc [DW_FORM_addrx]  (indexed (00000003) address = 0x0000000000000000)
+; BOLT-NEXT: DW_AT_ranges [DW_FORM_rnglistx] (indexed (0x0) rangelist = 0x00000010
+; BOLT-NEXT: [0x[[#ADDR]]
+; BOLT-SAME: 0x[[#ADDR + 0x24]]
+; BOLT-NEXT: [0x[[#ADDR2]]
+; BOLT-SAME: 0x[[#ADDR2 + 0x54]]
+; BOLT-NEXT: DW_AT_addr_base [DW_FORM_sec_offset]  (0x00000008)
+; BOLT-NEXT: DW_AT_rnglists_base [DW_FORM_sec_offset]  (0x0000000c)
+
+; PRE-BOLT-DWO: version = 0x0005
+; PRE-BOLT-DWO: DW_TAG_compile_unit
+; PRE-BOLT-DWO: DW_TAG_variable [2]
+; PRE-BOLT-DWO-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000000) string = "x")
+; PRE-BOLT-DWO-NEXT: DW_AT_type
+; PRE-BOLT-DWO-NEXT: DW_AT_external
+; PRE-BOLT-DWO-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addrx 0x0)
+; PRE-BOLT-DWO: DW_TAG_variable [2]
+; PRE-BOLT-DWO-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000002) string = "y")
+; PRE-BOLT-DWO-NEXT: DW_AT_type
+; PRE-BOLT-DWO-NEXT: DW_AT_external
+; PRE-BOLT-DWO-NEXT: DW_AT_decl_file
+; PRE-BOLT-DWO-NEXT: DW_AT_decl_line
+; PRE-BOLT-DWO-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addrx 0x1)
+; PRE-BOLT-DWO: DW_TAG_subprogram
+; PRE-BOLT-DWO-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000002)
+; PRE-BOLT-DWO-NEXT: DW_AT_high_pc [DW_FORM_data4]  (0x00000024)
+; PRE-BOLT-DWO: DW_TAG_subprogram
+; PRE-BOLT-DWO-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003)
+; PRE-BOLT-DWO-NEXT: DW_AT_high_pc [DW_FORM_data4]  (0x0000005a)
+
+; BOLT-DWO: DW_TAG_compile_unit
+; BOLT-DWO: DW_TAG_variable [2]
+; BOLT-DWO-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000000) string = "x")
+; BOLT-DWO-NEXT: DW_AT_type
+; BOLT-DWO-NEXT: DW_AT_external
+; BOLT-DWO-NEXT: DW_AT_decl_file
+; BOLT-DWO-NEXT: DW_AT_decl_line
+; BOLT-DWO-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addrx 0x0)
+; BOLT-DWO: DW_TAG_variable [2]
+; BOLT-DWO-NEXT: DW_AT_name [DW_FORM_strx1] (indexed (00000002) string = "y")
+; BOLT-DWO-NEXT: DW_AT_type
+; BOLT-DWO-NEXT: DW_AT_external
+; BOLT-DWO-NEXT: DW_AT_decl_file
+; BOLT-DWO-NEXT: DW_AT_decl_line
+; BOLT-DWO-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_addrx 0x1)
+; BOLT-DWO: DW_TAG_subprogram [4]
+; BOLT-DWO-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003)
+; BOLT-DWO-NEXT: DW_AT_ranges [DW_FORM_rnglistx]  (indexed (0x0) rangelist = 0x00000014
+; BOLT-DWO-NEXT: [0x0000000000000000, 0x0000000000000024))
+; BOLT-DWO: DW_TAG_subprogram [6]
+; BOLT-DWO-NEXT: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000003)
+; BOLT-DWO-NEXT: DW_AT_ranges [DW_FORM_rnglistx]  (indexed (0x1) rangelist = 0x00000018
+; BOLT-DWO-NEXT: [0x0000000000000000, 0x0000000000000054))
+
+; void use(int * x, int * y) {
+; *x += 4;
+; *y -= 2;
+; }
+;
+; int x = 0;
+; int y = 1;
+; int  main(int argc, char *argv[]) {
+;    x = argc;
+;    y = argc + 3;
+;    use(&x, &y);
+;    return x + y;
+; }
+
+; ModuleID = 'mainlocadddrx.cpp'
+source_filename = "mainlocadddrx.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@x = dso_local global i32 0, align 4, !dbg !0
+@y = dso_local global i32 1, align 4, !dbg !5
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3usePiS_(i32* noundef %x, i32* noundef %y) #0 !dbg !14 {
+entry:
+  %x.addr = alloca i32*, align 8
+  %y.addr = alloca i32*, align 8
+  store i32* %x, i32** %x.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %x.addr, metadata !19, metadata !DIExpression()), !dbg !20
+  store i32* %y, i32** %y.addr, align 8
+  call void @llvm.dbg.declare(metadata i32** %y.addr, metadata !21, metadata !DIExpression()), !dbg !22
+  %0 = load i32*, i32** %x.addr, align 8, !dbg !23
+  %1 = load i32, i32* %0, align 4, !dbg !24
+  %add = add nsw i32 %1, 4, !dbg !24
+  store i32 %add, i32* %0, align 4, !dbg !24
+  %2 = load i32*, i32** %y.addr, align 8, !dbg !25
+  %3 = load i32, i32* %2, align 4, !dbg !26
+  %sub = sub nsw i32 %3, 2, !dbg !26
+  store i32 %sub, i32* %2, align 4, !dbg !26
+  ret void, !dbg !27
+}
+
+; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, i8** noundef %argv) #2 !dbg !28 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca i8**, align 8
+  store i32 0, i32* %retval, align 4
+  store i32 %argc, i32* %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata i32* %argc.addr, metadata !34, metadata !DIExpression()), !dbg !35
+  store i8** %argv, i8*** %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata i8*** %argv.addr, metadata !36, metadata !DIExpression()), !dbg !37
+  %0 = load i32, i32* %argc.addr, align 4, !dbg !38
+  store i32 %0, i32* @x, align 4, !dbg !39
+  %1 = load i32, i32* %argc.addr, align 4, !dbg !40
+  %add = add nsw i32 %1, 3, !dbg !41
+  store i32 %add, i32* @y, align 4, !dbg !42
+  call void @_Z3usePiS_(i32* noundef @x, i32* noundef @y), !dbg !43
+  %2 = load i32, i32* @x, align 4, !dbg !44
+  %3 = load i32, i32* @y, align 4, !dbg !45
+  %add1 = add nsw i32 %2, %3, !dbg !46
+  ret i32 %add1, !dbg !47
+}
+
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!8, !9, !10, !11, !12}
+!llvm.ident = !{!13}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !3, line: 6, type: !7, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.0", isOptimized: false, runtimeVersion: 0, splitDebugFilename: "mainlocadddrx.dwo", emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: GNU)
+!3 = !DIFile(filename: "mainlocadddrx.cpp", directory: ".", checksumkind: CSK_MD5, checksum: "d4fd79ce0087c4cefd089752bf2182c6")
+!4 = !{!0, !5}
+!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression())
+!6 = distinct !DIGlobalVariable(name: "y", scope: !2, file: !3, line: 7, type: !7, isLocal: false, isDefinition: true)
+!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!8 = !{i32 7, !"Dwarf Version", i32 5}
+!9 = !{i32 2, !"Debug Info Version", i32 3}
+!10 = !{i32 1, !"wchar_size", i32 4}
+!11 = !{i32 7, !"uwtable", i32 2}
+!12 = !{i32 7, !"frame-pointer", i32 2}
+!13 = !{!"clang version 15.0.0"}
+!14 = distinct !DISubprogram(name: "use", linkageName: "_Z3usePiS_", scope: !3, file: !3, line: 1, type: !15, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!15 = !DISubroutineType(types: !16)
+!16 = !{null, !17, !17}
+!17 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !7, size: 64)
+!18 = !{}
+!19 = !DILocalVariable(name: "x", arg: 1, scope: !14, file: !3, line: 1, type: !17)
+!20 = !DILocation(line: 1, column: 16, scope: !14)
+!21 = !DILocalVariable(name: "y", arg: 2, scope: !14, file: !3, line: 1, type: !17)
+!22 = !DILocation(line: 1, column: 25, scope: !14)
+!23 = !DILocation(line: 2, column: 2, scope: !14)
+!24 = !DILocation(line: 2, column: 4, scope: !14)
+!25 = !DILocation(line: 3, column: 2, scope: !14)
+!26 = !DILocation(line: 3, column: 4, scope: !14)
+!27 = !DILocation(line: 4, column: 1, scope: !14)
+!28 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 8, type: !29, scopeLine: 8, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !18)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!7, !7, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !33, size: 64)
+!33 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!34 = !DILocalVariable(name: "argc", arg: 1, scope: !28, file: !3, line: 8, type: !7)
+!35 = !DILocation(line: 8, column: 15, scope: !28)
+!36 = !DILocalVariable(name: "argv", arg: 2, scope: !28, file: !3, line: 8, type: !31)
+!37 = !DILocation(line: 8, column: 27, scope: !28)
+!38 = !DILocation(line: 9, column: 8, scope: !28)
+!39 = !DILocation(line: 9, column: 6, scope: !28)
+!40 = !DILocation(line: 10, column: 8, scope: !28)
+!41 = !DILocation(line: 10, column: 13, scope: !28)
+!42 = !DILocation(line: 10, column: 6, scope: !28)
+!43 = !DILocation(line: 11, column: 4, scope: !28)
+!44 = !DILocation(line: 12, column: 11, scope: !28)
+!45 = !DILocation(line: 12, column: 15, scope: !28)
+!46 = !DILocation(line: 12, column: 13, scope: !28)
+!47 = !DILocation(line: 12, column: 4, scope: !28)