6 files changed, 10 insertions, 19 deletions
diff --git a/lldb/source/Breakpoint/BreakpointResolverName.cpp b/lldb/source/Breakpoint/BreakpointResolverName.cpp
index 7a9593b7cb2..77032e9aa47 100644
--- a/lldb/source/Breakpoint/BreakpointResolverName.cpp
+++ b/lldb/source/Breakpoint/BreakpointResolverName.cpp
@@ -140,7 +140,7 @@ BreakpointResolverName::SearchCallback
                 if (num_functions == 0 && !filter_by_cu)
                 {
                     if (m_func_name_type_mask & (eFunctionNameTypeBase | eFunctionNameTypeFull | eFunctionNameTypeAuto))
-                        context.module_sp->FindSymbolsWithNameAndType (m_func_name, NULL, eSymbolTypeCode, sym_list);
+                        context.module_sp->FindSymbolsWithNameAndType (m_func_name, eSymbolTypeCode, sym_list);
                 }
             }
             break;
diff --git a/lldb/source/Core/AddressResolverName.cpp b/lldb/source/Core/AddressResolverName.cpp
index baf62f21a2f..82187004199 100644
--- a/lldb/source/Core/AddressResolverName.cpp
+++ b/lldb/source/Core/AddressResolverName.cpp
@@ -111,7 +111,6 @@ AddressResolverName::SearchCallback
         if (context.module_sp)
         {
             context.module_sp->FindSymbolsWithNameAndType (m_func_name,
-                                                           NULL,
                                                            eSymbolTypeCode, 
                                                            sym_list);
             context.module_sp->FindFunctions (m_func_name,
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 429362c6ab5..3f8a7635144 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -687,7 +687,7 @@ Module::SymbolIndicesToSymbolContextList (Symtab *symtab, std::vector<uint32_t>
 }
 
 size_t
-Module::FindSymbolsWithNameAndType (const ConstString &name, const ClangNamespaceDecl *namespace_decl, SymbolType symbol_type, SymbolContextList &sc_list)
+Module::FindSymbolsWithNameAndType (const ConstString &name, SymbolType symbol_type, SymbolContextList &sc_list)
 {
     // No need to protect this call using m_mutex all other method calls are
     // already thread safe.
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 7c35c9b6ed3..f3a2f0fbfa6 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -254,7 +254,7 @@ ModuleList::FindSymbolsWithNameAndType (const ConstString &name,
     sc_list.Clear();
     collection::iterator pos, end = m_modules.end();
     for (pos = m_modules.begin(); pos != end; ++pos)
-        (*pos)->FindSymbolsWithNameAndType (name, NULL, symbol_type, sc_list);
+        (*pos)->FindSymbolsWithNameAndType (name, symbol_type, sc_list);
     return sc_list.GetSize();
 }
 
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 44f40d6d4af..fbeac4e6f37 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -631,7 +631,7 @@ FindCodeSymbolInContext
 )
 {
     if (sym_ctx.module_sp)
-       sym_ctx.module_sp->FindSymbolsWithNameAndType(name, NULL, eSymbolTypeCode, sc_list);
+       sym_ctx.module_sp->FindSymbolsWithNameAndType(name, eSymbolTypeCode, sc_list);
     
     if (!sc_list.GetSize())
         sym_ctx.target_sp->GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeCode, sc_list);
@@ -1950,22 +1950,14 @@ Symbol *
 ClangExpressionDeclMap::FindGlobalDataSymbol
 (
     Target &target,
-    ModuleSP &module,
-    const ConstString &name,
-    ClangNamespaceDecl *namespace_decl
+    const ConstString &name
 )
 {
     SymbolContextList sc_list;
     
-    if (module && namespace_decl)
-        module->FindSymbolsWithNameAndType(name, 
-                                           namespace_decl, 
-                                           eSymbolTypeData, 
-                                           sc_list);
-    else
-        target.GetImages().FindSymbolsWithNameAndType(name, 
-                                                      eSymbolTypeData, 
-                                                      sc_list);
+    target.GetImages().FindSymbolsWithNameAndType(name, 
+                                                  eSymbolTypeData, 
+                                                  sc_list);
     
     if (sc_list.GetSize())
     {
@@ -2408,7 +2400,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                 // We couldn't find a non-symbol variable for this.  Now we'll hunt for a generic 
                 // data symbol, and -- if it is found -- treat it as a variable.
                 
-                Symbol *data_symbol = FindGlobalDataSymbol(*target, module_sp, name, &namespace_decl);
+                Symbol *data_symbol = FindGlobalDataSymbol(*target, name);
                 
                 if (data_symbol)
                 {
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 5819defb273..0d1289057ce 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -1696,7 +1696,7 @@ ObjectFileMachO::GetEntryPointAddress ()
         
         SymbolContextList contexts;
         SymbolContext context;
-        if (!m_module->FindSymbolsWithNameAndType(ConstString ("start"), NULL, eSymbolTypeCode, contexts))
+        if (!m_module->FindSymbolsWithNameAndType(ConstString ("start"), eSymbolTypeCode, contexts))
             return m_entry_point_address;
         
         contexts.GetContextAtIndex(0, context);