[nfc] [lldb] Refactor out DWARFUnit::ContainsDIERef

[jankratochvil]

Summary

There is just a difference of comparing DIERef::die_offset() with originally GetOffset() while now with GetFirstDIEOffset().

[labath]

Are you planning to use this anywhere else? Could we maybe keep this function inside NameToDIE? There's no such thing as a DIERef in llvm (and I doubt there will be), so it'd be nice to keep this in code which is not destined to be merged some day...

[jankratochvil]

I wrote it originally as the function was used at more places. But it no longer is so I just found it as some code cleanup. OK, I will try to update it.

[jankratochvil]

It is no longer too much pretty, feel free to drop it if you think so.

[labath]

If the DWZ stuff makes this more complicated then it may be worth it. Otherwise, let's just drop it.

lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.h

53–54

Make this a file-level static (in the cpp file) instead?

[jankratochvil]

DWZ is no longer using this. OK, dropped. Thanks for the review.

lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.h

public:
 
   void
   ForEach(std::function<bool(lldb_private::ConstString name,
                              const DIERef &die_ref)> const
               &callback) const;
 
 protected:
   lldb_private::UniqueCStringMap<DIERef> m_map;
+
+private:
+  static bool DWARFUnitContainsDIERef(const DWARFUnit &unit, DIERef die_ref);
 };
 
 #endif // LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_NAMETODIE_H

lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp

 }
 
 void NameToDIE::FindAllEntriesForUnit(
     const DWARFUnit &unit,
     llvm::function_ref<bool(DIERef ref)> callback) const {
   const uint32_t size = m_map.GetSize();
   for (uint32_t i = 0; i < size; ++i) {
     const DIERef &die_ref = m_map.GetValueAtIndexUnchecked(i);
-    if (unit.GetSymbolFileDWARF().GetDwoNum() == die_ref.dwo_num() &&
-        unit.GetDebugSection() == die_ref.section() &&
-        unit.GetOffset() <= die_ref.die_offset() &&
-        die_ref.die_offset() < unit.GetNextUnitOffset()) {
+    if (DWARFUnitContainsDIERef(unit, die_ref)) {
       if (!callback(die_ref))
         return;
     }
   }
 }
 
 void NameToDIE::Dump(Stream *s) {
   const uint32_t size = m_map.GetSize();

 
 void NameToDIE::Append(const NameToDIE &other) {
   const uint32_t size = other.m_map.GetSize();
   for (uint32_t i = 0; i < size; ++i) {
     m_map.Append(other.m_map.GetCStringAtIndexUnchecked(i),
                  other.m_map.GetValueAtIndexUnchecked(i));
   }
 }
+
+bool NameToDIE::DWARFUnitContainsDIERef(const DWARFUnit &unit, DIERef die_ref) {
+  if (unit.GetSymbolFileDWARF().GetDwoNum() != die_ref.dwo_num())
+    return false;
+  if (unit.GetDebugSection() != die_ref.section())
+    return false;
+  return unit.ContainsDIEOffset(die_ref.die_offset());
+}