Made LLDB compile with LLVM top-of-tree again.
The results from Clang name lookups changed to
be ArrayRefs, so I had to change the way we
check for the presence of a result and the way
we iterate across results.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@170927 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangASTSource.cpp b/source/Expression/ClangASTSource.cpp
index 8d8fa6e..36f0e84 100644
--- a/source/Expression/ClangASTSource.cpp
+++ b/source/Expression/ClangASTSource.cpp
@@ -854,13 +854,13 @@
ObjCInterfaceDecl::lookup_result result = original_interface_decl->lookup(original_decl_name);
- if (result.first == result.second)
+ if (result.empty())
return false;
- if (!*result.first)
+ if (!result[0])
return false;
- ObjCMethodDecl *result_method = dyn_cast<ObjCMethodDecl>(*result.first);
+ ObjCMethodDecl *result_method = dyn_cast<ObjCMethodDecl>(result[0]);
if (!result_method)
return false;
@@ -1806,10 +1806,8 @@
void
NameSearchContext::AddLookupResult (clang::DeclContextLookupConstResult result)
{
- for (clang::NamedDecl * const *decl_iterator = result.first;
- decl_iterator != result.second;
- ++decl_iterator)
- m_decls.push_back (*decl_iterator);
+ for (clang::NamedDecl *decl : result)
+ m_decls.push_back (decl);
}
void