Index: include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h =================================================================== --- include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h +++ include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h @@ -10,7 +10,6 @@ #ifndef LLVM_DEBUGINFO_DWARFDEBUGARANGES_H #define LLVM_DEBUGINFO_DWARFDEBUGARANGES_H -#include "llvm/ADT/DenseSet.h" #include "llvm/Support/DataExtractor.h" #include #include @@ -81,7 +80,6 @@ std::vector Endpoints; RangeColl Aranges; - DenseSet ParsedCUOffsets; }; } // end namespace llvm Index: lib/DebugInfo/DWARF/DWARFDebugAranges.cpp =================================================================== --- lib/DebugInfo/DWARF/DWARFDebugAranges.cpp +++ lib/DebugInfo/DWARF/DWARFDebugAranges.cpp @@ -33,7 +33,6 @@ uint64_t HighPC = Desc.getEndAddress(); appendRange(CUOffset, LowPC, HighPC); } - ParsedCUOffsets.insert(CUOffset); } } @@ -52,12 +51,10 @@ // manually build aranges for the rest of them. for (const auto &CU : CTX->compile_units()) { uint32_t CUOffset = CU->getOffset(); - if (ParsedCUOffsets.insert(CUOffset).second) { - DWARFAddressRangesVector CURanges; - CU->collectAddressRanges(CURanges); - for (const auto &R : CURanges) - appendRange(CUOffset, R.LowPC, R.HighPC); - } + DWARFAddressRangesVector CURanges; + CU->collectAddressRanges(CURanges); + for (const auto &R : CURanges) + appendRange(CUOffset, R.LowPC, R.HighPC); } construct(); @@ -66,7 +63,6 @@ void DWARFDebugAranges::clear() { Endpoints.clear(); Aranges.clear(); - ParsedCUOffsets.clear(); } void DWARFDebugAranges::appendRange(uint32_t CUOffset, uint64_t LowPC, Index: lib/DebugInfo/DWARF/DWARFVerifier.cpp =================================================================== --- lib/DebugInfo/DWARF/DWARFVerifier.cpp +++ lib/DebugInfo/DWARF/DWARFVerifier.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "SyntaxHighlighting.h" +#include "llvm/ADT/DenseSet.h" #include "llvm/DebugInfo/DWARF/DWARFVerifier.h" #include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h" Index: tools/llvm-dwarfdump/Statistics.cpp =================================================================== --- tools/llvm-dwarfdump/Statistics.cpp +++ tools/llvm-dwarfdump/Statistics.cpp @@ -1,4 +1,5 @@ #include "llvm/ADT/DenseMap.h" +#include "llvm/ADT/DenseSet.h" #include "llvm/DebugInfo/DIContext.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h" #include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h"