diff options
-rw-r--r-- | lldb/include/lldb/Core/Module.h | 7 | ||||
-rw-r--r-- | lldb/source/API/SBAddress.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectTarget.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Core/Address.cpp | 12 | ||||
-rw-r--r-- | lldb/source/Core/Module.cpp | 17 | ||||
-rw-r--r-- | lldb/source/Core/SearchFilter.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 12 | ||||
-rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp | 3 | ||||
-rw-r--r-- | lldb/source/Symbol/Symbol.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Target/StackFrame.cpp | 4 |
10 files changed, 25 insertions, 40 deletions
diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h index 670ffe68a90..c4784530e1f 100644 --- a/lldb/include/lldb/Core/Module.h +++ b/lldb/include/lldb/Core/Module.h @@ -103,13 +103,6 @@ public: ~Module (); //------------------------------------------------------------------ - /// If you have an instance of Module, get its corresponding shared - /// pointer if it has one in the shared module list. - //------------------------------------------------------------------ - lldb::ModuleSP - GetSP () const; - - //------------------------------------------------------------------ /// @copydoc SymbolContextScope::CalculateSymbolContext(SymbolContext*) /// /// @see SymbolContextScope diff --git a/lldb/source/API/SBAddress.cpp b/lldb/source/API/SBAddress.cpp index 110ef2ddfb2..e4161a2bebc 100644 --- a/lldb/source/API/SBAddress.cpp +++ b/lldb/source/API/SBAddress.cpp @@ -221,9 +221,9 @@ SBAddress::GetModule () SBModule sb_module; if (m_opaque_ap.get()) { - const Module *module = m_opaque_ap->GetModule(); + Module *module = m_opaque_ap->GetModule(); if (module) - *sb_module = module->GetSP(); + *sb_module = module; } return sb_module; } diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index 93ed631dc21..dd5f166b7c6 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -2725,7 +2725,7 @@ public: if (use_global_module_list) { module = Module::GetAllocatedModuleAtIndex(image_idx); - module_sp = module->GetSP(); + module_sp = module; } else { diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp index d6e851c25b1..c07901cc0d9 100644 --- a/lldb/source/Core/Address.cpp +++ b/lldb/source/Core/Address.cpp @@ -737,7 +737,7 @@ Address::CalculateSymbolContext (SymbolContext *sc, uint32_t resolve_scope) Module *address_module = m_section->GetModule(); if (address_module) { - sc->module_sp = address_module->GetSP(); + sc->module_sp = address_module; if (sc->module_sp) return sc->module_sp->ResolveSymbolContextForAddress (*this, resolve_scope, *sc); } @@ -759,7 +759,7 @@ Address::CalculateSymbolContextCompileUnit () if (m_section) { SymbolContext sc; - sc.module_sp = m_section->GetModule()->GetSP(); + sc.module_sp = m_section->GetModule(); if (sc.module_sp) { sc.module_sp->ResolveSymbolContextForAddress (*this, eSymbolContextCompUnit, sc); @@ -775,7 +775,7 @@ Address::CalculateSymbolContextFunction () if (m_section) { SymbolContext sc; - sc.module_sp = m_section->GetModule()->GetSP(); + sc.module_sp = m_section->GetModule(); if (sc.module_sp) { sc.module_sp->ResolveSymbolContextForAddress (*this, eSymbolContextFunction, sc); @@ -791,7 +791,7 @@ Address::CalculateSymbolContextBlock () if (m_section) { SymbolContext sc; - sc.module_sp = m_section->GetModule()->GetSP(); + sc.module_sp = m_section->GetModule(); if (sc.module_sp) { sc.module_sp->ResolveSymbolContextForAddress (*this, eSymbolContextBlock, sc); @@ -807,7 +807,7 @@ Address::CalculateSymbolContextSymbol () if (m_section) { SymbolContext sc; - sc.module_sp = m_section->GetModule()->GetSP(); + sc.module_sp = m_section->GetModule(); if (sc.module_sp) { sc.module_sp->ResolveSymbolContextForAddress (*this, eSymbolContextSymbol, sc); @@ -823,7 +823,7 @@ Address::CalculateSymbolContextLineEntry (LineEntry &line_entry) if (m_section) { SymbolContext sc; - sc.module_sp = m_section->GetModule()->GetSP(); + sc.module_sp = m_section->GetModule(); if (sc.module_sp) { sc.module_sp->ResolveSymbolContextForAddress (*this, eSymbolContextLineEntry, sc); diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index 2786600b380..66195780020 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -128,13 +128,6 @@ Module::~Module() } -ModuleSP -Module::GetSP () const -{ - ModuleSP module_sp(const_cast<Module*>(this)); - return module_sp; -} - const lldb_private::UUID& Module::GetUUID() { @@ -177,8 +170,8 @@ Module::ParseAllDebugSymbols() if (num_comp_units == 0) return; - TargetSP null_target; - SymbolContext sc(null_target, GetSP()); + SymbolContext sc; + sc.module_sp = this; uint32_t cu_idx; SymbolVendor *symbols = GetSymbolVendor (); @@ -212,7 +205,7 @@ Module::ParseAllDebugSymbols() void Module::CalculateSymbolContext(SymbolContext* sc) { - sc->module_sp = GetSP(); + sc->module_sp = this; } Module * @@ -282,7 +275,7 @@ Module::ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve { // If the section offset based address resolved itself, then this // is the right module. - sc.module_sp = GetSP(); + sc.module_sp = this; resolved_flags |= eSymbolContextModule; // Resolve the compile unit, function, block, line table or line @@ -384,7 +377,7 @@ Module::FindCompileUnits (const FileSpec &path, const uint32_t start_size = sc_list.GetSize(); const uint32_t num_compile_units = GetNumCompileUnits(); SymbolContext sc; - sc.module_sp = GetSP(); + sc.module_sp = this; const bool compare_directory = path.GetDirectory(); for (uint32_t i=0; i<num_compile_units; ++i) { diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp index b0934b45d5c..adcc1caf314 100644 --- a/lldb/source/Core/SearchFilter.cpp +++ b/lldb/source/Core/SearchFilter.cpp @@ -401,7 +401,7 @@ SearchFilterByModule::Search (Searcher &searcher) Module* module = m_target_sp->GetImages().GetModulePointerAtIndex(i); if (FileSpec::Compare (m_module_spec, module->GetFileSpec(), false) == 0) { - SymbolContext matchingContext(m_target_sp, module->GetSP()); + SymbolContext matchingContext(m_target_sp, ModuleSP(module)); Searcher::CallbackReturn shouldContinue; shouldContinue = DoModuleIteration(matchingContext, searcher); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 2e0b956e708..9a2c10e26f5 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -1664,7 +1664,7 @@ SymbolFileDWARF::GetFunction (DWARFCompileUnit* curr_cu, const DWARFDebugInfoEnt { sc.Clear(); // Check if the symbol vendor already knows about this compile unit? - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); sc.comp_unit = GetCompUnitForDWARFCompUnit(curr_cu, UINT32_MAX); sc.function = sc.comp_unit->FindFunctionByUID (func_die->GetOffset()).get(); @@ -1969,7 +1969,7 @@ SymbolFileDWARF::FindGlobalVariables (const ConstString &name, bool append, uint Index (); SymbolContext sc; - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); assert (sc.module_sp); DWARFCompileUnit* dwarf_cu = NULL; @@ -2018,7 +2018,7 @@ SymbolFileDWARF::FindGlobalVariables(const RegularExpression& regex, bool append Index (); SymbolContext sc; - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); assert (sc.module_sp); DWARFCompileUnit* dwarf_cu = NULL; @@ -2057,7 +2057,7 @@ SymbolFileDWARF::ResolveFunctions (const DIEArray &die_offsets, const uint32_t sc_list_initial_size = sc_list.GetSize(); SymbolContext sc; - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); assert (sc.module_sp); DWARFCompileUnit* dwarf_cu = NULL; @@ -2130,7 +2130,7 @@ SymbolFileDWARF::FindFunctions return; SymbolContext sc; - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); assert (sc.module_sp); DWARFCompileUnit* dwarf_cu = NULL; @@ -2208,7 +2208,7 @@ SymbolFileDWARF::FindFunctions return; SymbolContext sc; - sc.module_sp = m_obj_file->GetModule()->GetSP(); + sc.module_sp = m_obj_file->GetModule(); assert (sc.module_sp); DWARFCompileUnit* dwarf_cu = NULL; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index cc7ff1b0f27..f615dc4342b 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -168,8 +168,7 @@ SymbolFileDWARFDebugMap::GetModuleByCompUnitInfo (CompileUnitInfo *comp_unit_inf FileSpec oso_file_spec(oso_symbol->GetMangled().GetName().AsCString(), true); // Don't allow cached .o files since we dress up each .o file with // new sections. We want them to be in the module list so we can - // always find a shared pointer to the module (in Module::GetSP()), - // but just don't share them. + // always find a shared pointer to the module but just don't share them. const bool always_create = true; ModuleList::GetSharedModule (oso_file_spec, m_obj_file->GetModule()->GetArchitecture(), diff --git a/lldb/source/Symbol/Symbol.cpp b/lldb/source/Symbol/Symbol.cpp index 7b44d7736fb..71caa5e3aa0 100644 --- a/lldb/source/Symbol/Symbol.cpp +++ b/lldb/source/Symbol/Symbol.cpp @@ -359,7 +359,7 @@ Symbol::CalculateSymbolContext (SymbolContext *sc) Module *module = range->GetBaseAddress().GetModule (); if (module) { - sc->module_sp = module->GetSP(); + sc->module_sp = module; return; } } diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 862e4c99082..2b13fe8c364 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -147,7 +147,7 @@ StackFrame::StackFrame { if (pc_module) { - m_sc.module_sp = pc_module->GetSP(); + m_sc.module_sp = pc_module; m_flags.Set (eSymbolContextModule); } else @@ -227,7 +227,7 @@ StackFrame::GetFrameCodeAddress() Module *module = section->GetModule(); if (module) { - m_sc.module_sp = module->GetSP(); + m_sc.module_sp = module; if (m_sc.module_sp) m_flags.Set(eSymbolContextModule); } |