diff options
| -rw-r--r-- | llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h | 8 | ||||
| -rw-r--r-- | llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h index 172f1d2c9db..89b15d26358 100644 --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h @@ -21,7 +21,7 @@ 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(); @@ -33,7 +33,7 @@ private: 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) { @@ -54,8 +54,8 @@ private: } 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 { diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp index ca6043109cd..fa157e86885 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp @@ -113,10 +113,10 @@ void DWARFDebugAranges::construct() { 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; } |
