[nfc] [lldb] DWZ 04/17: Use DIERef for DIEToModuleMap m_die_to_module

[jankratochvil]

Summary

After D96236 using just DWARFDebugInfoEntry * is ambiguous as it does not contain MainCU. DIERef (after D96239) does contain it and it has the same sizeof as DWARFDebugInfoEntry *. This replacement should have no real performance disadvantage.

My question about upstreaming of this patchset.

[jankratochvil]

I will be no longer involved with this patchset.

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

protected:
   /// @{
   class DelayedAddObjCClassProperty;
   typedef std::vector<DelayedAddObjCClassProperty> DelayedPropertyList;
 
   typedef llvm::DenseMap<DIERef, clang::DeclContext *> DIERefToDeclContextMap;
   typedef std::multimap<const clang::DeclContext *,
                         std::pair<SymbolFileDWARF *, DIERef>>
       DeclContextToFileDIERefMap;
-  typedef llvm::DenseMap<const DWARFDebugInfoEntry *,
-                         lldb_private::OptionalClangModuleID>
-      DIEToModuleMap;
+  typedef llvm::DenseMap<DIERef, lldb_private::OptionalClangModuleID>
+      DIERefToModuleMap;
   typedef llvm::DenseMap<const DWARFDebugInfoEntry *, clang::Decl *>
       DIEToDeclMap;
 
   lldb_private::TypeSystemClang &m_ast;
   DIEToDeclMap m_die_to_decl;
   DIERefToDeclContextMap m_dieref_to_decl_ctx;
   DeclContextToFileDIERefMap m_decl_ctx_to_filedieref;
-  DIEToModuleMap m_die_to_module;
+  DIERefToModuleMap m_dieref_to_module;
   std::unique_ptr<lldb_private::ClangASTImporter> m_clang_ast_importer_up;
   /// @}
 
   clang::DeclContext *GetDeclContextForBlock(const DWARFDIE &die);
 
   clang::BlockDecl *ResolveBlockDIE(const DWARFDIE &die);
 
   clang::NamespaceDecl *ResolveNamespaceDIE(const DWARFDIE &die);

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

DWARFASTParserClang::GetOwningClangModule(const DWARFDIE &die) {
   if (!die.IsValid())
     return {};
 
   for (DWARFDIE parent = die.GetParent(); parent.IsValid();
        parent = parent.GetParent()) {
     const dw_tag_t tag = parent.Tag();
     if (tag == DW_TAG_module) {
       DWARFDIE module_die = parent;
-      auto it = m_die_to_module.find(module_die.GetDIE());
-      if (it != m_die_to_module.end())
+      DIERef module_dieref = *module_die.GetDIERef();
+      auto it = m_dieref_to_module.find(module_dieref);
+      if (it != m_dieref_to_module.end())
         return it->second;
       const char *name = module_die.GetAttributeValueAsString(DW_AT_name, 0);
       if (!name)
         return {};
 
       OptionalClangModuleID id =
           m_ast.GetOrCreateClangModule(name, GetOwningClangModule(module_die));
-      m_die_to_module.insert({module_die.GetDIE(), id});
+      m_dieref_to_module.insert({module_dieref, id});
       return id;
     }
   }
   return {};
 }
 
 static bool IsSubroutine(const DWARFDIE &die) {
   switch (die.Tag()) {