Index: llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h =================================================================== --- llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h +++ llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h @@ -21,7 +21,7 @@ class DWARFDebugAranges { public: void generate(DWARFContext *CTX); - uint32_t findAddress(uint64_t Address) const; + uint64_t findAddress(uint64_t Address) const; private: void clear(); @@ -33,7 +33,7 @@ struct Range { explicit Range(uint64_t LowPC = -1ULL, uint64_t HighPC = -1ULL, - uint32_t CUOffset = -1U) + uint64_t CUOffset = -1U) : LowPC(LowPC), Length(HighPC - LowPC), CUOffset(CUOffset) {} void setHighPC(uint64_t HighPC) { @@ -54,8 +54,8 @@ } 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 { Index: llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp @@ -113,7 +113,7 @@ 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)