Changed FindExternalVisibleDecls() to use the module

level FindFunctions() where appropriate and not use
SymbolContext::FindFunctionsByName().

llvm-svn: 141789

1 files changed, 19 insertions, 6 deletions

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 5e5422f2731..4256a1827e8 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -2360,12 +2360,25 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
         {
             const bool include_symbols = true;
             const bool append = false;
-            m_parser_vars->m_sym_ctx.FindFunctionsByName (name,
-                                                          eFunctionNameTypeBase,
-                                                          include_symbols, 
-                                                          append, 
-                                                          sc_list);
-        
+            
+            if (namespace_decl && module)
+            {
+                module->FindFunctions(name,
+                                      &namespace_decl,
+                                      eFunctionNameTypeBase, 
+                                      include_symbols,
+                                      append,
+                                      sc_list);
+            }
+            else
+            {
+                target->GetImages().FindFunctions(name,
+                                                  eFunctionNameTypeBase,
+                                                  include_symbols,
+                                                  append, 
+                                                  sc_list);
+            }
+            
             if (sc_list.GetSize())
             {
                 bool found_specific = false;