[lldb][Type Completion] Only create importer delegates if definition is valid

Author: Michael137

lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp

@@ -824,23 +824,17 @@ bool ClangASTImporter::CompleteTagDecl(clang::TagDecl *decl) {
   if (!decl_origin.Valid())
     return false;
 
-  ImporterDelegateSP delegate_sp(
-      GetDelegate(&decl->getASTContext(), decl_origin.ctx));
-
-  ASTImporterDelegate::CxxModuleScope std_scope(*delegate_sp,
-                                                &decl->getASTContext());
-
-  if (!TypeSystemClang::UseRedeclCompletion()) {
-    if (!TypeSystemClang::GetCompleteDecl(decl_origin.ctx, decl_origin.decl))
-      return false;
-
-    if (delegate_sp)
-      delegate_sp->ImportDefinitionTo(decl, decl_origin.decl);
-  } else {
+  if (TypeSystemClang::UseRedeclCompletion()) {
     auto *origin_def = llvm::cast<TagDecl>(decl_origin.decl)->getDefinition();
     if (!origin_def)
       return false;
 
+    ImporterDelegateSP delegate_sp(
+        GetDelegate(&decl->getASTContext(), decl_origin.ctx));
+
+    ASTImporterDelegate::CxxModuleScope std_scope(*delegate_sp,
+                                                  &decl->getASTContext());
+
     // This is expected to pull in a definition for result_decl (if in redecl
     // completion mode)
     llvm::Expected<Decl *> result = delegate_sp->Import(origin_def);
@@ -859,6 +853,18 @@ bool ClangASTImporter::CompleteTagDecl(clang::TagDecl *decl) {
     if (!decl->isThisDeclarationADefinition() && result_decl != decl)
       if (result_decl->getPreviousDecl() == nullptr)
         result_decl->setPreviousDecl(decl);
+  } else {
+    if (!TypeSystemClang::GetCompleteDecl(decl_origin.ctx, decl_origin.decl))
+      return false;
+
+    ImporterDelegateSP delegate_sp(
+        GetDelegate(&decl->getASTContext(), decl_origin.ctx));
+
+    ASTImporterDelegate::CxxModuleScope std_scope(*delegate_sp,
+                                                  &decl->getASTContext());
+
+    if (delegate_sp)
+      delegate_sp->ImportDefinitionTo(decl, decl_origin.decl);
   }
 
   return true;
@@ -880,27 +886,15 @@ bool ClangASTImporter::CompleteObjCInterfaceDecl(
   if (!decl_origin.Valid())
     return false;
 
-  ImporterDelegateSP delegate_sp(
-      GetDelegate(&interface_decl->getASTContext(), decl_origin.ctx));
-
-  if (!TypeSystemClang::UseRedeclCompletion()) {
-    if (!TypeSystemClang::GetCompleteDecl(decl_origin.ctx, decl_origin.decl))
-      return false;
-
-    if (delegate_sp)
-      delegate_sp->ImportDefinitionTo(interface_decl, decl_origin.decl);
-
-    if (ObjCInterfaceDecl *super_class = interface_decl->getSuperClass())
-      RequireCompleteType(clang::QualType(super_class->getTypeForDecl(), 0));
-  } else {
+  if (TypeSystemClang::UseRedeclCompletion()) {
     ObjCInterfaceDecl *origin_decl =
         llvm::cast<ObjCInterfaceDecl>(decl_origin.decl);
 
     origin_decl = origin_decl->getDefinition();
     if (!origin_decl)
       return false;
 
-    auto delegate_sp(
+    ImporterDelegateSP delegate_sp(
         GetDelegate(&interface_decl->getASTContext(), decl_origin.ctx));
 
     llvm::Expected<Decl *> result = delegate_sp->Import(origin_decl);
@@ -915,6 +909,18 @@ bool ClangASTImporter::CompleteObjCInterfaceDecl(
     return false;
   }
 
+  if (!TypeSystemClang::GetCompleteDecl(decl_origin.ctx, decl_origin.decl))
+    return false;
+
+  ImporterDelegateSP delegate_sp(
+      GetDelegate(&interface_decl->getASTContext(), decl_origin.ctx));
+
+  if (delegate_sp)
+    delegate_sp->ImportDefinitionTo(interface_decl, decl_origin.decl);
+
+  if (ObjCInterfaceDecl *super_class = interface_decl->getSuperClass())
+    RequireCompleteType(clang::QualType(super_class->getTypeForDecl(), 0));
+
   return true;
 }