Fixed a bug where we did not properly use the complete versions of Objective-C classes.

Also added a test case, thanks to Greg Clayton.

<rdar://problem/18913551>

llvm-svn: 301993

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
index 3c3a2cd9c3f..7622791778b 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
@@ -348,7 +348,7 @@ void ClangASTSource::CompleteType(clang::ObjCInterfaceDecl *interface_decl) {
           GetCompleteObjCInterface(original_iface_decl);
 
       if (complete_iface_decl && (complete_iface_decl != original_iface_decl)) {
-        m_ast_importer_sp->SetDeclOrigin(interface_decl, original_iface_decl);
+        m_ast_importer_sp->SetDeclOrigin(interface_decl, complete_iface_decl);
       }
     }
   }
@@ -472,7 +472,7 @@ void ClangASTSource::FindExternalLexicalDecls(
       original_decl = complete_iface_decl;
       original_ctx = &complete_iface_decl->getASTContext();
 
-      m_ast_importer_sp->SetDeclOrigin(context_decl, original_iface_decl);
+      m_ast_importer_sp->SetDeclOrigin(context_decl, complete_iface_decl);
     }
   }