Added some strength to the checks that prevent

"id" from being found by the parser as an
externally-defined type.  Before, "id" would
sometimes make it through if it was defined in
a namespace, but this sometimes caused
confusion, for example when it conflicted with
std::locale::id.

llvm-svn: 146891

1 files changed, 4 insertions, 3 deletions

diff --git a/lldb/source/Expression/ClangASTSource.cpp b/lldb/source/Expression/ClangASTSource.cpp
index 1f84185042a..d368408f1f5 100644
--- a/lldb/source/Expression/ClangASTSource.cpp
+++ b/lldb/source/Expression/ClangASTSource.cpp
@@ -574,12 +574,13 @@ ClangASTSource::FindExternalVisibleDecls (NameSearchContext &context,
         TypeList types;
         SymbolContext null_sc;
         
+        if (name == id_name || name == Class_name)
+            break;
+      
         if (module_sp && namespace_decl)
             module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
-        else if(name != id_name && name != Class_name)
+        else 
             m_target->GetImages().FindTypes(null_sc, name, true, 1, types);
-        else
-            break;
         
         if (types.GetSize())
         {