diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2015-10-26 10:53:58 +0000 |
|---|---|---|
| committer | Tamas Berghammer <tberghammer@google.com> | 2015-10-26 10:53:58 +0000 |
| commit | 29932b01f613da615fd0ae329222f6ea1e10c5e1 (patch) | |
| tree | efd7079ee52337d9ecdfa97de31a8ff58ec6b218 /lldb/source/Plugins | |
| parent | b892e35520280a64b13e364904a6f7776c873999 (diff) | |
| download | bcm5719-llvm-29932b01f613da615fd0ae329222f6ea1e10c5e1.tar.gz bcm5719-llvm-29932b01f613da615fd0ae329222f6ea1e10c5e1.zip | |
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
Diffstat (limited to 'lldb/source/Plugins')
3 files changed, 10 insertions, 1 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index 8d4205a95a7..ccd85e805e2 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -457,7 +457,7 @@ protected: 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 index ebfea5dfc1d..326c397c83d 100644 --- 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 index 3e61e2314eb..39ed6502229 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h @@ -54,6 +54,9 @@ protected: ClangTypeToDIE& GetForwardDeclClangTypeToDie() override; + UniqueDWARFASTTypeMap& + GetUniqueDWARFASTTypeMap() override; + lldb::TypeSP FindDefinitionTypeForDWARFDeclContext (const DWARFDeclContext &die_decl_ctx) override; |
