3 files changed, 12 insertions, 19 deletions

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);