danix800 updated this revision to Diff 543387.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155661/new/
https://reviews.llvm.org/D155661
Files:
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,31 @@
EXPECT_EQ(ToDef->getPreviousDecl(), ToProto);
}
-
-struct ImportFriendClasses : ASTImporterOptionSpecificTestBase {};
+struct ImportFriendClasses : ASTImporterOptionSpecificTestBase {
+ void testRecursiveFriendClassTemplate(Decl *FromTu) {
+ 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));
+
+ auto *FromFriend =
+ FirstDeclMatcher<FriendDecl>().match(FromD, friendDecl());
+ auto *FromClass =
+ FirstDeclMatcher<ClassTemplateDecl>().match(FromD, classTemplateDecl());
+ EXPECT_NE(FromFriend->getFriendDecl(), FromClass);
+ EXPECT_TRUE(FromFriend->getFriendDecl()->getPreviousDecl() == nullptr);
+
+ auto *Class =
+ FirstDeclMatcher<ClassTemplateDecl>().match(ToD, classTemplateDecl());
+ auto *Friend = FirstDeclMatcher<FriendDecl>().match(ToD, friendDecl());
+ EXPECT_NE(Friend->getFriendDecl(), Class);
+ EXPECT_TRUE(Friend->getFriendDecl()->getPreviousDecl() == nullptr);
+ }
+};
TEST_P(ImportFriendClasses, ImportOfFriendRecordDoesNotMergeDefinition) {
Decl *FromTU = getTuDecl(
@@ -4074,20 +4097,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> 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,6 +2857,10 @@
} else if (Importer.getToContext().getLangOpts().CPlusPlus)
IDNS |= Decl::IDNS_Ordinary | Decl::IDNS_TagFriend;
+ bool IsDependentContext = DC != LexicalDC ? LexicalDC->isDependentContext()
+ : DC->isDependentContext();
+ bool ShouldAddRedecl = !(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()) {
@@ -2897,7 +2901,7 @@
if (!hasSameVisibilityContextAndLinkage(FoundRecord, D))
continue;
- if (IsStructuralMatch(D, FoundRecord)) {
+ if (IsFriendTemplate || IsStructuralMatch(D, FoundRecord)) {
RecordDecl *FoundDef = FoundRecord->getDefinition();
if (D->isThisDeclarationADefinition() && FoundDef) {
// FIXME: Structural equivalence check should check for same
@@ -2955,7 +2959,7 @@
return CDeclOrErr.takeError();
Numbering.ContextDecl = *CDeclOrErr;
D2CXX->setLambdaNumbering(Numbering);
- } else if (DCXX->isInjectedClassName()) {
+ } else if (DCXX->isInjectedClassName()) {
// We have to be careful to do a similar dance to the one in
// Sema::ActOnStartCXXMemberDeclarations
const bool DelayTypeCreation = true;
@@ -2967,10 +2971,11 @@
Importer.getToContext().getTypeDeclType(
D2CXX, dyn_cast<CXXRecordDecl>(DC));
} else {
- if (GetImportedOrCreateDecl(D2CXX, D, Importer.getToContext(),
- D->getTagKind(), DC, *BeginLocOrErr, Loc,
- Name.getAsIdentifierInfo(),
- cast_or_null<CXXRecordDecl>(PrevDecl)))
+ if (GetImportedOrCreateDecl(
+ D2CXX, D, Importer.getToContext(), D->getTagKind(), DC,
+ *BeginLocOrErr, Loc, Name.getAsIdentifierInfo(),
+ ShouldAddRedecl ? cast_or_null<CXXRecordDecl>(PrevDecl)
+ : nullptr))
return D2CXX;
}
@@ -5785,6 +5790,11 @@
if (ToD)
return ToD;
+ bool IsFriendTemplate = D->getFriendObjectKind() != Decl::FOK_None;
+ bool IsDependentContext = DC != LexicalDC ? LexicalDC->isDependentContext()
+ : DC->isDependentContext();
+ bool ShouldAddRedecl = !(IsFriendTemplate && IsDependentContext);
+
ClassTemplateDecl *FoundByLookup = nullptr;
// We may already have a template of the same name; try to find and match it.
@@ -5802,7 +5812,7 @@
if (!hasSameVisibilityContextAndLinkage(FoundTemplate, D))
continue;
- if (IsStructuralMatch(D, FoundTemplate)) {
+ if (IsFriendTemplate || IsStructuralMatch(D, FoundTemplate)) {
ClassTemplateDecl *TemplateWithDef =
getTemplateDefinition(FoundTemplate);
if (D->isThisDeclarationADefinition() && TemplateWithDef)
@@ -5853,7 +5863,7 @@
addDeclToContexts(D, D2);
updateLookupTableForTemplateParameters(**TemplateParamsOrErr);
- if (FoundByLookup) {
+ if (ShouldAddRedecl && FoundByLookup) {
auto *Recent =
const_cast<ClassTemplateDecl *>(FoundByLookup->getMostRecentDecl());
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
