[Lldb-commits] [lldb] r251282 - Fix a fission expression evaluation issue

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Mon Oct 26 05:53:58 2015
New Revision: 251282

URL: http://llvm.org/viewvc/llvm-project?rev=251282&view=rev
Log:
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.

Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=251282&r1=251281&r2=251282&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Mon Oct 26 05:53:58 2015
@@ -457,7 +457,7 @@ protected:
     DWARFDIE
     FindBlockContainingSpecification (const DWARFDIE &die, dw_offset_t spec_block_die_offset);
     
-    UniqueDWARFASTTypeMap &
+    virtual UniqueDWARFASTTypeMap &
     GetUniqueDWARFASTTypeMap ();
     
     bool

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp?rev=251282&r1=251281&r2=251282&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp Mon Oct 26 05:53:58 2015
@@ -100,6 +100,12 @@ SymbolFileDWARFDwo::GetForwardDeclClangT
     return GetBaseSymbolFile()->GetForwardDeclClangTypeToDie();
 }
 
+UniqueDWARFASTTypeMap&
+SymbolFileDWARFDwo::GetUniqueDWARFASTTypeMap()
+{
+    return GetBaseSymbolFile()->GetUniqueDWARFASTTypeMap();
+}
+
 lldb::TypeSP
 SymbolFileDWARFDwo::FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext &die_decl_ctx)
 {

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h?rev=251282&r1=251281&r2=251282&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h Mon Oct 26 05:53:58 2015
@@ -54,6 +54,9 @@ protected:
     ClangTypeToDIE&
     GetForwardDeclClangTypeToDie() override;
 
+    UniqueDWARFASTTypeMap&
+    GetUniqueDWARFASTTypeMap() override;
+
     lldb::TypeSP
     FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext &die_decl_ctx) override;