[ASTImporter] Fix missing implict CXXRecordDecl

martong · martong · commit de8bf2678b05 · 2018-05-17T09:46:07.000Z
Summary: Implicit CXXRecordDecl is not added to its DeclContext during import, but in the original AST it is. This patch fixes this. Reviewers: xazax.hun, a.sidorin, szepet Subscribers: rnkovacs, dkrupp, cfe-commits Differential Revision: https://reviews.llvm.org/D46958 llvm-svn: 332588
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
@@ -2110,7 +2110,7 @@ Decl *ASTNodeImporter::VisitRecordDecl(RecordDecl *D) {
       D2 = D2CXX;
       D2->setAccess(D->getAccess());
       D2->setLexicalDeclContext(LexicalDC);
-      if (!DCXX->getDescribedClassTemplate())
+      if (!DCXX->getDescribedClassTemplate() || DCXX->isImplicit())
         LexicalDC->addDeclInternal(D2);
 
       Importer.Imported(D, D2);
diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp
@@ -1348,7 +1348,7 @@ TEST_P(ASTImporterTestBase,
       Verifier.match(To, cxxRecordDecl(hasFieldOrder({"a", "b", "c"}))));
 }
 
-TEST_P(ASTImporterTestBase, DISABLED_ShouldImportImplicitCXXRecordDecl) {
+TEST_P(ASTImporterTestBase, ShouldImportImplicitCXXRecordDecl) {
   Decl *From, *To;
   std::tie(From, To) = getImportedDecl(
       R"(

Original file line number	Diff line number	Diff line change
`@@ -1348,7 +1348,7 @@ TEST_P(ASTImporterTestBase,`
`1348`	`1348`	`Verifier.match(To, cxxRecordDecl(hasFieldOrder({"a", "b", "c"}))));`
`1349`	`1349`	`}`
`1350`	`1350`
`1351`		`-TEST_P(ASTImporterTestBase, DISABLED_ShouldImportImplicitCXXRecordDecl) {`
	`1351`	`+TEST_P(ASTImporterTestBase, ShouldImportImplicitCXXRecordDecl) {`
`1352`	`1352`	`Decl From, To;`
`1353`	`1353`	`std::tie(From, To) = getImportedDecl(`
`1354`	`1354`	`R"(`