Merge from head up to r262536.

1 files changed, 6 insertions, 0 deletions

diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 87c984d..198fde9 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -1428,6 +1428,10 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                 
                 if (data_symbol)
                 {
+                    std::string warning("got name from symbols: ");
+                    warning.append(name.AsCString());
+                    const unsigned diag_id = m_ast_context->getDiagnostics().getCustomDiagID(clang::DiagnosticsEngine::Level::Warning, "%0");
+                    m_ast_context->getDiagnostics().Report(diag_id) << warning.c_str();
                     AddOneGenericVariable(context, *data_symbol, current_id);
                     context.m_found.variable = true;
                 }
@@ -1605,6 +1609,8 @@ ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP v
     {
         if (const TagType *tag_type = dyn_cast<TagType>(parser_type))
             CompleteType(tag_type->getDecl());
+        if (const ObjCObjectPointerType *objc_object_ptr_type = dyn_cast<ObjCObjectPointerType>(parser_type))
+            CompleteType(objc_object_ptr_type->getInterfaceDecl());
     }