This revision was automatically updated to reflect the committed changes.
Closed by commit rG5f2157f8fcae: [clang][ASTImporter] Fix friend class template
import within dependent context (authored by dingfei <fd...@feysh.com>).
Changed prior to commit:
https://reviews.llvm.org/D155661?vs=545913&id=546303#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155661/new/
https://reviews.llvm.org/D155661
Files:
clang/docs/ReleaseNotes.rst
clang/lib/AST/ASTImporter.cpp
clang/unittests/AST/ASTImporterTest.cpp
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -3968,8 +3968,58 @@
EXPECT_EQ(ToDef->getPreviousDecl(), ToProto);
}
-
-struct ImportFriendClasses : ASTImporterOptionSpecificTestBase {};
+struct ImportFriendClasses : ASTImporterOptionSpecificTestBase {
+ void testRecursiveFriendClassTemplate(Decl *FromTu) {
+ auto *FromD = FirstDeclMatcher<ClassTemplateDecl>().match(
+ FromTu, classTemplateDecl());
+
+ auto Pattern = classTemplateDecl(
+ has(cxxRecordDecl(has(friendDecl(has(classTemplateDecl()))))));
+ ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromD, Pattern));
+
+ auto *FromFriend =
+ FirstDeclMatcher<FriendDecl>().match(FromD, friendDecl());
+ auto *FromRecordOfFriend =
+ cast<ClassTemplateDecl>(FromFriend->getFriendDecl())
+ ->getTemplatedDecl();
+ EXPECT_NE(FromRecordOfFriend, FromD->getTemplatedDecl());
+ EXPECT_TRUE(FromRecordOfFriend->getPreviousDecl() == nullptr);
+
+ auto *FromDC = FromRecordOfFriend->getDeclContext();
+ auto *FromLexicalDC = FromRecordOfFriend->getLexicalDeclContext();
+ ASSERT_EQ(FromDC, cast<DeclContext>(FromTu));
+ ASSERT_EQ(FromLexicalDC, cast<DeclContext>(FromD->getTemplatedDecl()));
+
+ ASSERT_FALSE(FromDC->containsDecl(FromRecordOfFriend));
+ ASSERT_FALSE(FromLexicalDC->containsDecl(FromRecordOfFriend));
+ ASSERT_FALSE(cast<RecordDecl>(FromRecordOfFriend)
+ ->getLookupParent()
+ ->lookup(FromRecordOfFriend->getDeclName())
+ .empty());
+
+ auto *ToD = Import(FromD, Lang_CXX03);
+ EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToD, Pattern));
+
+ auto *ToFriend = FirstDeclMatcher<FriendDecl>().match(ToD, friendDecl());
+ auto *ToRecordOfFriend =
+ cast<ClassTemplateDecl>(ToFriend->getFriendDecl())->getTemplatedDecl();
+
+ EXPECT_NE(ToRecordOfFriend, ToD->getTemplatedDecl());
+ EXPECT_TRUE(ToRecordOfFriend->getPreviousDecl() == nullptr);
+
+ auto *ToDC = ToRecordOfFriend->getDeclContext();
+ auto *ToLexicalDC = ToRecordOfFriend->getLexicalDeclContext();
+ ASSERT_EQ(ToDC, cast<DeclContext>(ToD->getTranslationUnitDecl()));
+ ASSERT_EQ(ToLexicalDC, cast<DeclContext>(ToD->getTemplatedDecl()));
+
+ ASSERT_FALSE(ToDC->containsDecl(ToRecordOfFriend));
+ ASSERT_FALSE(ToLexicalDC->containsDecl(ToRecordOfFriend));
+ ASSERT_FALSE(cast<RecordDecl>(ToRecordOfFriend)
+ ->getLookupParent()
+ ->lookup(ToRecordOfFriend->getDeclName())
+ .empty());
+ }
+};
TEST_P(ImportFriendClasses, ImportOfFriendRecordDoesNotMergeDefinition) {
Decl *FromTU = getTuDecl(
@@ -4074,20 +4124,19 @@
)",
Lang_CXX03, "input.cc");
- auto *FromD =
- FirstDeclMatcher<ClassTemplateDecl>().match(FromTu, classTemplateDecl());
- auto *ToD = Import(FromD, Lang_CXX03);
-
- auto Pattern = classTemplateDecl(
- has(cxxRecordDecl(has(friendDecl(has(classTemplateDecl()))))));
- ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromD, Pattern));
- EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToD, Pattern));
+ testRecursiveFriendClassTemplate(FromTu);
+}
- auto *Class =
- FirstDeclMatcher<ClassTemplateDecl>().match(ToD, classTemplateDecl());
- auto *Friend = FirstDeclMatcher<FriendDecl>().match(ToD, friendDecl());
- EXPECT_NE(Friend->getFriendDecl(), Class);
- EXPECT_EQ(Friend->getFriendDecl()->getPreviousDecl(), Class);
+TEST_P(ImportFriendClasses,
+ ImportOfRecursiveFriendClassTemplateWithNonTypeParm) {
+ Decl *FromTu = getTuDecl(
+ R"(
+ template<class A1, A1 A> class declToImport {
+ template<class B1, B1> friend class declToImport;
+ };
+ )",
+ Lang_CXX03, "input.cc");
+ testRecursiveFriendClassTemplate(FromTu);
}
TEST_P(ImportFriendClasses, ProperPrevDeclForClassTemplateDecls) {
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -2857,9 +2857,13 @@
} else if (Importer.getToContext().getLangOpts().CPlusPlus)
IDNS |= Decl::IDNS_Ordinary | Decl::IDNS_TagFriend;
+ bool IsDependentContext = DC != LexicalDC ? LexicalDC->isDependentContext()
+ : DC->isDependentContext();
+ bool DependentFriend = IsFriendTemplate && IsDependentContext;
+
// We may already have a record of the same name; try to find and match it.
RecordDecl *PrevDecl = nullptr;
- if (!DC->isFunctionOrMethod() && !D->isLambda()) {
+ if (!DependentFriend && !DC->isFunctionOrMethod() && !D->isLambda()) {
SmallVector<NamedDecl *, 4> ConflictingDecls;
auto FoundDecls =
Importer.findDeclsInToCtx(DC, SearchName);
@@ -5796,10 +5800,15 @@
if (ToD)
return ToD;
+ bool IsFriendTemplate = D->getFriendObjectKind() != Decl::FOK_None;
+ bool IsDependentContext = DC != LexicalDC ? LexicalDC->isDependentContext()
+ : DC->isDependentContext();
+ bool DependentFriend = IsFriendTemplate && IsDependentContext;
+
ClassTemplateDecl *FoundByLookup = nullptr;
// We may already have a template of the same name; try to find and match it.
- if (!DC->isFunctionOrMethod()) {
+ if (!DependentFriend && !DC->isFunctionOrMethod()) {
SmallVector<NamedDecl *, 4> ConflictingDecls;
auto FoundDecls = Importer.findDeclsInToCtx(DC, Name);
for (auto *FoundDecl : FoundDecls) {
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -131,6 +131,8 @@
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
+- Fixed an import failure of recursive friend class template.
+ `Issue 64169 <https://github.com/llvm/llvm-project/issues/64169>`_
Miscellaneous Bug Fixes
^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
