jcsxky updated this revision to Diff 550030.
jcsxky added a comment.
fixed according to the review and add testcase to StructuralEquivalenceTest.cpp.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D156693/new/
https://reviews.llvm.org/D156693
Files:
clang/include/clang/AST/ASTStructuralEquivalence.h
clang/lib/AST/ASTImporter.cpp
clang/lib/AST/ASTStructuralEquivalence.cpp
clang/unittests/AST/ASTImporterTest.cpp
clang/unittests/AST/StructuralEquivalenceTest.cpp
Index: clang/unittests/AST/StructuralEquivalenceTest.cpp
===================================================================
--- clang/unittests/AST/StructuralEquivalenceTest.cpp
+++ clang/unittests/AST/StructuralEquivalenceTest.cpp
@@ -1,5 +1,6 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/ASTStructuralEquivalence.h"
+#include "clang/AST/DeclTemplate.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Frontend/ASTUnit.h"
#include "clang/Testing/CommandLineArgs.h"
@@ -130,15 +131,18 @@
return makeStmts(Wrap(SrcCode0), Wrap(SrcCode1), Lang, AMatcher);
}
- bool testStructuralMatch(Decl *D0, Decl *D1) {
+ bool testStructuralMatch(Decl *D0, Decl *D1,
+ bool IgnoreTemplateParmDepth = false) {
llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls01;
llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls10;
StructuralEquivalenceContext Ctx01(
- D0->getASTContext(), D1->getASTContext(),
- NonEquivalentDecls01, StructuralEquivalenceKind::Default, false, false);
+ D0->getASTContext(), D1->getASTContext(), NonEquivalentDecls01,
+ StructuralEquivalenceKind::Default, false, false, false,
+ IgnoreTemplateParmDepth);
StructuralEquivalenceContext Ctx10(
- D1->getASTContext(), D0->getASTContext(),
- NonEquivalentDecls10, StructuralEquivalenceKind::Default, false, false);
+ D1->getASTContext(), D0->getASTContext(), NonEquivalentDecls10,
+ StructuralEquivalenceKind::Default, false, false, false,
+ IgnoreTemplateParmDepth);
bool Eq01 = Ctx01.IsEquivalent(D0, D1);
bool Eq10 = Ctx10.IsEquivalent(D1, D0);
EXPECT_EQ(Eq01, Eq10);
@@ -1689,6 +1693,45 @@
EXPECT_FALSE(testStructuralMatch(t));
}
+TEST_F(StructuralEquivalenceTemplateTest,
+ ClassTemplateEquivalentFriendClassTemplate) {
+ auto t = makeDecls<Decl>(
+ R"(
+ template <class T, T U>
+ class A {
+ public:
+ template <class P, P Q>
+ friend class A;
+
+ A(T x) :x(x) {}
+
+ private:
+ T x;
+ };
+ )",
+
+ R"(
+ template <class T, T U>
+ class A {
+ public:
+ template <class P, P Q>
+ friend class A;
+
+ A(T x) : x(x) {}
+
+ private:
+ T x;
+ };
+
+ A<int,3> a1(0);
+ )",
+ Lang_CXX03, friendDecl(),
+ classTemplateDecl(has(cxxRecordDecl(hasDefinition(), hasName("A")))));
+ auto *Friend = cast<FriendDecl>(get<0>(t));
+ EXPECT_FALSE(testStructuralMatch(Friend->getFriendDecl(), get<1>(t)));
+ EXPECT_TRUE(testStructuralMatch(Friend->getFriendDecl(), get<1>(t), true));
+}
+
TEST_F(
StructuralEquivalenceTemplateTest,
ClassTemplSpecWithInequivalentShadowedTemplArg) {
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -4246,6 +4246,58 @@
EXPECT_TRUE(Imported->getPreviousDecl());
}
+TEST_P(ImportFriendClasses, SkipComparingFriendTemplateDepth) {
+ Decl *ToTU = getToTuDecl(
+ R"(
+ template <class T, T U>
+ class A;
+
+ template <class T, T U>
+ class A {
+ public:
+ template <class P, P Q>
+ friend class A;
+
+ A(T x) :x(x) {}
+
+ private:
+ T x;
+ };
+ )",
+ Lang_CXX11);
+
+ auto *Fwd = FirstDeclMatcher<ClassTemplateDecl>().match(
+ ToTU,
+ classTemplateDecl(has(cxxRecordDecl(hasDefinition(), hasName("A")))));
+ Decl *FromTU = getTuDecl(
+ R"(
+ template <class T, T U>
+ class A;
+
+ template <class T, T U>
+ class A {
+ public:
+ template <class P, P Q>
+ friend class A;
+
+ A(T x) : x(x) {}
+
+ private:
+ T x;
+ };
+
+ A<int,3> a1(0);
+ )",
+ Lang_CXX11, "input1.cc");
+ auto *FromA = FirstDeclMatcher<ClassTemplateDecl>().match(
+ FromTU,
+ classTemplateDecl(has(cxxRecordDecl(hasDefinition(), hasName("A")))));
+ auto *ToA = Import(FromA, Lang_CXX11);
+ EXPECT_TRUE(ToA);
+ EXPECT_EQ(Fwd->getTemplatedDecl()->getTypeForDecl(),
+ ToA->getTemplatedDecl()->getTypeForDecl());
+}
+
TEST_P(ImportFriendClasses,
ImportOfClassTemplateDefinitionShouldConnectToFwdFriend) {
Decl *ToTU = getToTuDecl(
Index: clang/lib/AST/ASTStructuralEquivalence.cpp
===================================================================
--- clang/lib/AST/ASTStructuralEquivalence.cpp
+++ clang/lib/AST/ASTStructuralEquivalence.cpp
@@ -1092,7 +1092,8 @@
case Type::TemplateTypeParm: {
const auto *Parm1 = cast<TemplateTypeParmType>(T1);
const auto *Parm2 = cast<TemplateTypeParmType>(T2);
- if (Parm1->getDepth() != Parm2->getDepth())
+ if (!Context.IgnoreTemplateParmDepth &&
+ Parm1->getDepth() != Parm2->getDepth())
return false;
if (Parm1->getIndex() != Parm2->getIndex())
return false;
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -34,6 +34,7 @@
#include "clang/AST/LambdaCapture.h"
#include "clang/AST/NestedNameSpecifier.h"
#include "clang/AST/OperationKinds.h"
+#include "clang/AST/ParentMapContext.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/StmtCXX.h"
#include "clang/AST/StmtObjC.h"
@@ -507,7 +508,8 @@
template <typename T>
bool hasSameVisibilityContextAndLinkage(T *Found, T *From);
- bool IsStructuralMatch(Decl *From, Decl *To, bool Complain = true);
+ bool IsStructuralMatch(Decl *From, Decl *To, bool Complain = true,
+ bool IgnoreTemplateParmDepth = false);
ExpectedDecl VisitDecl(Decl *D);
ExpectedDecl VisitImportDecl(ImportDecl *D);
ExpectedDecl VisitEmptyDecl(EmptyDecl *D);
@@ -2257,7 +2259,8 @@
: StructuralEquivalenceKind::Default;
}
-bool ASTNodeImporter::IsStructuralMatch(Decl *From, Decl *To, bool Complain) {
+bool ASTNodeImporter::IsStructuralMatch(Decl *From, Decl *To, bool Complain,
+ bool IgnoreTemplateParmDepth) {
// Eliminate a potential failure point where we attempt to re-import
// something we're trying to import while completing ToRecord.
Decl *ToOrigin = Importer.GetOriginalDecl(To);
@@ -2268,7 +2271,7 @@
StructuralEquivalenceContext Ctx(
Importer.getFromContext(), Importer.getToContext(),
Importer.getNonEquivalentDecls(), getStructuralEquivalenceKind(Importer),
- false, Complain);
+ false, Complain, false, IgnoreTemplateParmDepth);
return Ctx.IsEquivalent(From, To);
}
@@ -5836,7 +5839,12 @@
if (!hasSameVisibilityContextAndLinkage(FoundTemplate, D))
continue;
- if (IsStructuralMatch(D, FoundTemplate)) {
+ // FIXME: sufficient conditon for 'IgnoreTemplateParmDepth'?
+ bool IgnoreTemplateParmDepth =
+ FoundTemplate->getFriendObjectKind() != Decl::FOK_None &&
+ !D->specializations().empty();
+ if (IsStructuralMatch(D, FoundTemplate, true,
+ IgnoreTemplateParmDepth)) {
ClassTemplateDecl *TemplateWithDef =
getTemplateDefinition(FoundTemplate);
if (D->isThisDeclarationADefinition() && TemplateWithDef)
Index: clang/include/clang/AST/ASTStructuralEquivalence.h
===================================================================
--- clang/include/clang/AST/ASTStructuralEquivalence.h
+++ clang/include/clang/AST/ASTStructuralEquivalence.h
@@ -69,15 +69,19 @@
/// \c true if the last diagnostic came from ToCtx.
bool LastDiagFromC2 = false;
+ /// Whether to ignore comparing the depth of template param(TemplateTypeParm)
+ bool IgnoreTemplateParmDepth;
+
StructuralEquivalenceContext(
ASTContext &FromCtx, ASTContext &ToCtx,
llvm::DenseSet<std::pair<Decl *, Decl *>> &NonEquivalentDecls,
- StructuralEquivalenceKind EqKind,
- bool StrictTypeSpelling = false, bool Complain = true,
- bool ErrorOnTagTypeMismatch = false)
+ StructuralEquivalenceKind EqKind, bool StrictTypeSpelling = false,
+ bool Complain = true, bool ErrorOnTagTypeMismatch = false,
+ bool IgnoreTemplateParmDepth = false)
: FromCtx(FromCtx), ToCtx(ToCtx), NonEquivalentDecls(NonEquivalentDecls),
EqKind(EqKind), StrictTypeSpelling(StrictTypeSpelling),
- ErrorOnTagTypeMismatch(ErrorOnTagTypeMismatch), Complain(Complain) {}
+ ErrorOnTagTypeMismatch(ErrorOnTagTypeMismatch), Complain(Complain),
+ IgnoreTemplateParmDepth(IgnoreTemplateParmDepth) {}
DiagnosticBuilder Diag1(SourceLocation Loc, unsigned DiagID);
DiagnosticBuilder Diag2(SourceLocation Loc, unsigned DiagID);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
