[DWARF] Fix DWARFDebugAranges to support 64-bit CU offsets.

[ikudrin]

Summary

DWARFContext, the only user of this class, already can handle such offsets.

[grimar]

llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp

121

-1Ull ?

[ikudrin]

• -1U -> -1ULL. Thanks, @grimar!

[ikudrin]

Ping.

[aprantl]

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h

36

-1ULL? But really, these should be optionals, right?

56–57

Either:

/// Start of address range.
uint64_t LowPC;

or

uint64_t LowPC; ///< Start of address range.

[ikudrin]

Another 1U is changed to 1ULL. Thanks, @aprantl!

[ikudrin]

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h

36

Thanks for catching this!
Apparently, these default values are never used because the only call in DWARFDebugAranges::construct() provides all three arguments. But removing the default values is also seems to be out of the scope of the patch.

56–57

Fixing the style of the existing comments is out of the scope of this patch, no?

[aprantl]

But removing the default values is also seems to be out of the scope of the patch.

Okay, but could you please prepare a follow-up patch that does this?

[ikudrin]

In D71834#1820359, @aprantl wrote:

But removing the default values is also seems to be out of the scope of the patch.

Okay, but could you please prepare a follow-up patch that does this?

Thank you for the review! D72757 is created to remove the default values.

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h

 
 namespace llvm {
 
 class DWARFContext;
 
 class DWARFDebugAranges {
 public:
   void generate(DWARFContext *CTX);
-  uint32_t findAddress(uint64_t Address) const;
+  uint64_t findAddress(uint64_t Address) const;
 
 private:
   void clear();
   void extract(DataExtractor DebugArangesData);
 
   /// Call appendRange multiple times and then call construct.
   void appendRange(uint64_t CUOffset, uint64_t LowPC, uint64_t HighPC);
   void construct();
 
   struct Range {
     explicit Range(uint64_t LowPC = -1ULL, uint64_t HighPC = -1ULL,
-                   uint32_t CUOffset = -1U)
+                   uint64_t CUOffset = -1ULL)
       : LowPC(LowPC), Length(HighPC - LowPC), CUOffset(CUOffset) {}
 
     void setHighPC(uint64_t HighPC) {
       if (HighPC == -1ULL || HighPC <= LowPC)
         Length = 0;
       else
         Length = HighPC - LowPC;
     }
 
     uint64_t HighPC() const {
       if (Length)
         return LowPC + Length;
       return -1ULL;
     }
 
     bool operator<(const Range &other) const {
       return LowPC < other.LowPC;
     }
 
     uint64_t LowPC; /// Start of address range.
-    uint32_t Length; /// End of address range (not including this address).
-    uint32_t CUOffset; /// Offset of the compile unit or die.
+    uint64_t Length; /// End of address range (not including this address).
+    uint64_t CUOffset; /// Offset of the compile unit or die.
   };
 
   struct RangeEndpoint {
     uint64_t Address;
     uint64_t CUOffset;
     bool IsRangeStart;
 
     RangeEndpoint(uint64_t Address, uint64_t CUOffset, bool IsRangeStart)

llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp

void DWARFDebugAranges::construct() {
   }
   assert(ValidCUs.empty());
 
   // Endpoints are not needed now.
   Endpoints.clear();
   Endpoints.shrink_to_fit();
 }
 
-uint32_t DWARFDebugAranges::findAddress(uint64_t Address) const {
+uint64_t DWARFDebugAranges::findAddress(uint64_t Address) const {
   RangeCollIterator It =
       partition_point(Aranges, [=](Range R) { return R.HighPC() <= Address; });
   if (It != Aranges.end() && It->LowPC <= Address)
     return It->CUOffset;
-  return -1U;
+  return -1ULL;
 }