1 files changed, 7 insertions, 1 deletions
diff --git a/lldb/source/Expression/ClangASTSource.cpp b/lldb/source/Expression/ClangASTSource.cpp
index 3d71da5341f..0808b4ccde5 100644
--- a/lldb/source/Expression/ClangASTSource.cpp
+++ b/lldb/source/Expression/ClangASTSource.cpp
@@ -70,7 +70,13 @@ DeclContext::lookup_result ClangASTSource::FindExternalVisibleDeclsByName(const
     
     NameSearchContext NSC(*this, Decls, Name, DC);
     
-    DeclMap.GetDecls(NSC, Name.getAsString().c_str());
+    std::string name (Name.getAsString());
+    // TODO: Figure out what to do here, after recent changes to the DWARF 
+    // parser where more types are now in type by name index, we were sometimes
+    // finding our own version of a builtin? Skip it for now until we figure out
+    // how to get around this properly.
+    if (name.compare("__va_list_tag") != 0)
+        DeclMap.GetDecls(NSC, name.c_str());
     return SetExternalVisibleDeclsForName(DC, Name, Decls);
 }