Fix a fission expression evaluation issue

This fix should eliminate the duplicate definition errors when debug info is available in multiple dwo symbol file for the same type. llvm-svn: 251282
llvm · Oct 26, 2015 · 29932b0 · 29932b0
1 parent b892e35
commit 29932b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
@@ -457,7 +457,7 @@ class SymbolFileDWARF : public lldb_private::SymbolFile, public lldb_private::Us
     DWARFDIE
     FindBlockContainingSpecification (const DWARFDIE &die, dw_offset_t spec_block_die_offset);
 
-    UniqueDWARFASTTypeMap &
+    virtual UniqueDWARFASTTypeMap &
     GetUniqueDWARFASTTypeMap ();
 
     bool

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
@@ -100,6 +100,12 @@ SymbolFileDWARFDwo::GetForwardDeclClangTypeToDie()
     return GetBaseSymbolFile()->GetForwardDeclClangTypeToDie();
 }
 
+UniqueDWARFASTTypeMap&
+SymbolFileDWARFDwo::GetUniqueDWARFASTTypeMap()
+{
+    return GetBaseSymbolFile()->GetUniqueDWARFASTTypeMap();
+}
+
 lldb::TypeSP
 SymbolFileDWARFDwo::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext &die_decl_ctx)
 {

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h
@@ -54,6 +54,9 @@ class SymbolFileDWARFDwo : public SymbolFileDWARF
     ClangTypeToDIE&
     GetForwardDeclClangTypeToDie() override;
 
+    UniqueDWARFASTTypeMap&
+    GetUniqueDWARFASTTypeMap() override;
+
     lldb::TypeSP
     FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext &die_decl_ctx) override;