1 files changed, 2 insertions, 1 deletions
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
index 556b27348e5..4b398631fd4 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
@@ -866,7 +866,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context)
                                  current_id);
     }
 
-    if (!context.m_found.variable)
+    if (!context.m_found.variable && !context.m_found.local_vars_nsp)
         ClangASTSource::FindExternalVisibleDecls(context);
 }
 
@@ -1199,6 +1199,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                         context.AddNamedDecl(namespace_decl);
                         clang::DeclContext *clang_decl_ctx = clang::Decl::castToDeclContext(namespace_decl);
                         clang_decl_ctx->setHasExternalVisibleStorage(true);
+                        context.m_found.local_vars_nsp = true;
                     }
                 }
             }