[ASTImporter] Fix handling of not defined FromRecord in ImportContext(...)
In ImportContext(…) we may call into CompleteDecl(…) which if FromRecrord is not
defined will start the definition of a ToRecord but from what I can tell at least
one of the paths though here don't ensure we complete the definition.
For a RecordDecl this can be problematic since this means we won’t import base
classes and we won’t have any of the methods or types we inherit from these bases.
Differential Revision: https://reviews.llvm.org/D78000
diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp
index 9f35a86..8ed6c48 100644
--- a/clang/unittests/AST/ASTImporterTest.cpp
+++ b/clang/unittests/AST/ASTImporterTest.cpp
@@ -5942,6 +5942,70 @@
return ::testing::ValuesIn(Copy);
}
+struct ImportWithExternalSource : ASTImporterOptionSpecificTestBase {
+ ImportWithExternalSource() {
+ Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
+ ASTContext &FromContext, FileManager &FromFileManager,
+ bool MinimalImport,
+ const std::shared_ptr<ASTImporterSharedState> &SharedState) {
+ return new ASTImporter(ToContext, ToFileManager, FromContext,
+ FromFileManager, MinimalImport,
+ // We use the regular lookup.
+ /*SharedState=*/nullptr);
+ };
+ }
+};
+
+/// An ExternalASTSource that keeps track of the tags is completed.
+struct SourceWithCompletedTagList : clang::ExternalASTSource {
+ std::vector<clang::TagDecl *> &CompletedTags;
+ SourceWithCompletedTagList(std::vector<clang::TagDecl *> &CompletedTags)
+ : CompletedTags(CompletedTags) {}
+ void CompleteType(TagDecl *Tag) override {
+ auto *Record = cast<CXXRecordDecl>(Tag);
+ Record->startDefinition();
+ Record->completeDefinition();
+ CompletedTags.push_back(Tag);
+ }
+ void
+ FindExternalLexicalDecls(const DeclContext *DC,
+ llvm::function_ref<bool(Decl::Kind)> IsKindWeWant,
+ SmallVectorImpl<Decl *> &Result) override {}
+};
+
+TEST_P(ImportWithExternalSource, CompleteRecordBeforeImporting) {
+ // Create an empty TU.
+ TranslationUnitDecl *FromTU = getTuDecl("", Lang_CXX, "input.cpp");
+
+ // Create and add the test ExternalASTSource.
+ std::vector<clang::TagDecl *> CompletedTags;
+ IntrusiveRefCntPtr<ExternalASTSource> source =
+ new SourceWithCompletedTagList(CompletedTags);
+ clang::ASTContext &Context = FromTU->getASTContext();
+ Context.setExternalSource(std::move(source));
+
+ // Create a dummy class by hand with external lexical storage.
+ IdentifierInfo &Ident = Context.Idents.get("test_class");
+ auto *Record = CXXRecordDecl::Create(
+ Context, TTK_Class, FromTU, SourceLocation(), SourceLocation(), &Ident);
+ Record->setHasExternalLexicalStorage();
+ FromTU->addDecl(Record);
+
+ // Do a minimal import of the created class.
+ EXPECT_EQ(0U, CompletedTags.size());
+ Import(Record, Lang_CXX);
+ EXPECT_EQ(0U, CompletedTags.size());
+
+ // Import the definition of the created class.
+ llvm::Error Err = findFromTU(Record)->Importer->ImportDefinition(Record);
+ EXPECT_FALSE((bool)Err);
+ consumeError(std::move(Err));
+
+ // Make sure the class was completed once.
+ EXPECT_EQ(1U, CompletedTags.size());
+ EXPECT_EQ(Record, CompletedTags.front());
+}
+
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ASTImporterLookupTableTest,
DefaultTestValuesForRunOptions, );
@@ -6007,5 +6071,8 @@
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportSourceLocations,
DefaultTestValuesForRunOptions, );
+INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportWithExternalSource,
+ DefaultTestValuesForRunOptions, );
+
} // end namespace ast_matchers
} // end namespace clang