danix800 updated this revision to Diff 550160.
danix800 added a comment.
1. Add unit testcase
2. Use better API
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D157691/new/
https://reviews.llvm.org/D157691
Files:
clang/lib/AST/ASTImporter.cpp
clang/test/Import/templated-friend/Inputs/T.cpp
clang/test/Import/templated-friend/test.cpp
clang/unittests/AST/ASTImporterTest.cpp
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -5634,6 +5634,42 @@
EXPECT_EQ(Imported->getPreviousDecl(), Friend);
}
+TEST_P(ImportFriendFunctionTemplates, ImportFriendFunctionInsideClassTemplate)
{
+ Decl *From, *To;
+ std::tie(From, To) = getImportedDecl(R"(
+ template <typename T> struct X {
+ template <typename U> friend void f();
+ };
+ )",
+ Lang_CXX03, "", Lang_CXX03, "X");
+
+ auto *FromFriend = FirstDeclMatcher<FriendDecl>().match(From, friendDecl());
+ auto *ToFriend = FirstDeclMatcher<FriendDecl>().match(To, friendDecl());
+
+ EXPECT_TRUE(FromFriend ==
+ LastDeclMatcher<FriendDecl>().match(From, friendDecl()));
+ EXPECT_TRUE(ToFriend ==
+ LastDeclMatcher<FriendDecl>().match(To, friendDecl()));
+
+ auto *FromDecl = FromFriend->getFriendDecl();
+ auto *FromDC = FromFriend->getDeclContext();
+ auto *FromLexicalDC = FromFriend->getLexicalDeclContext();
+
+ EXPECT_TRUE(FromDC->containsDecl(FromFriend));
+ EXPECT_FALSE(FromDC->containsDecl(FromDecl));
+ EXPECT_TRUE(FromLexicalDC->containsDecl(FromFriend));
+ EXPECT_FALSE(FromLexicalDC->containsDecl(FromDecl));
+
+ auto *ToDecl = ToFriend->getFriendDecl();
+ auto *ToDC = ToFriend->getDeclContext();
+ auto *ToLexicalDC = ToFriend->getLexicalDeclContext();
+
+ EXPECT_TRUE(ToDC->containsDecl(ToFriend));
+ EXPECT_FALSE(ToDC->containsDecl(ToDecl));
+ EXPECT_TRUE(ToLexicalDC->containsDecl(ToFriend));
+ EXPECT_FALSE(ToLexicalDC->containsDecl(ToDecl));
+}
+
struct ASTImporterWithFakeErrors : ASTImporter {
using ASTImporter::ASTImporter;
bool returnWithErrorInTest() override { return true; }
Index: clang/test/Import/templated-friend/test.cpp
===================================================================
--- /dev/null
+++ clang/test/Import/templated-friend/test.cpp
@@ -0,0 +1,5 @@
+// RUN: clang-import-test -import %S/Inputs/T.cpp -expression %s
+
+void expr() {
+ A<int> a;
+}
Index: clang/test/Import/templated-friend/Inputs/T.cpp
===================================================================
--- /dev/null
+++ clang/test/Import/templated-friend/Inputs/T.cpp
@@ -0,0 +1,3 @@
+template <typename T> struct A {
+ template <typename U> friend void f();
+};
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -6447,7 +6447,7 @@
ToFunc->setAccess(D->getAccess());
ToFunc->setLexicalDeclContext(LexicalDC);
- LexicalDC->addDeclInternal(ToFunc);
+ addDeclToContexts(D, ToFunc);
ASTImporterLookupTable *LT = Importer.SharedState->getLookupTable();
if (LT && !OldParamDC.empty()) {
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -5634,6 +5634,42 @@
EXPECT_EQ(Imported->getPreviousDecl(), Friend);
}
+TEST_P(ImportFriendFunctionTemplates, ImportFriendFunctionInsideClassTemplate) {
+ Decl *From, *To;
+ std::tie(From, To) = getImportedDecl(R"(
+ template <typename T> struct X {
+ template <typename U> friend void f();
+ };
+ )",
+ Lang_CXX03, "", Lang_CXX03, "X");
+
+ auto *FromFriend = FirstDeclMatcher<FriendDecl>().match(From, friendDecl());
+ auto *ToFriend = FirstDeclMatcher<FriendDecl>().match(To, friendDecl());
+
+ EXPECT_TRUE(FromFriend ==
+ LastDeclMatcher<FriendDecl>().match(From, friendDecl()));
+ EXPECT_TRUE(ToFriend ==
+ LastDeclMatcher<FriendDecl>().match(To, friendDecl()));
+
+ auto *FromDecl = FromFriend->getFriendDecl();
+ auto *FromDC = FromFriend->getDeclContext();
+ auto *FromLexicalDC = FromFriend->getLexicalDeclContext();
+
+ EXPECT_TRUE(FromDC->containsDecl(FromFriend));
+ EXPECT_FALSE(FromDC->containsDecl(FromDecl));
+ EXPECT_TRUE(FromLexicalDC->containsDecl(FromFriend));
+ EXPECT_FALSE(FromLexicalDC->containsDecl(FromDecl));
+
+ auto *ToDecl = ToFriend->getFriendDecl();
+ auto *ToDC = ToFriend->getDeclContext();
+ auto *ToLexicalDC = ToFriend->getLexicalDeclContext();
+
+ EXPECT_TRUE(ToDC->containsDecl(ToFriend));
+ EXPECT_FALSE(ToDC->containsDecl(ToDecl));
+ EXPECT_TRUE(ToLexicalDC->containsDecl(ToFriend));
+ EXPECT_FALSE(ToLexicalDC->containsDecl(ToDecl));
+}
+
struct ASTImporterWithFakeErrors : ASTImporter {
using ASTImporter::ASTImporter;
bool returnWithErrorInTest() override { return true; }
Index: clang/test/Import/templated-friend/test.cpp
===================================================================
--- /dev/null
+++ clang/test/Import/templated-friend/test.cpp
@@ -0,0 +1,5 @@
+// RUN: clang-import-test -import %S/Inputs/T.cpp -expression %s
+
+void expr() {
+ A<int> a;
+}
Index: clang/test/Import/templated-friend/Inputs/T.cpp
===================================================================
--- /dev/null
+++ clang/test/Import/templated-friend/Inputs/T.cpp
@@ -0,0 +1,3 @@
+template <typename T> struct A {
+ template <typename U> friend void f();
+};
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -6447,7 +6447,7 @@
ToFunc->setAccess(D->getAccess());
ToFunc->setLexicalDeclContext(LexicalDC);
- LexicalDC->addDeclInternal(ToFunc);
+ addDeclToContexts(D, ToFunc);
ASTImporterLookupTable *LT = Importer.SharedState->getLookupTable();
if (LT && !OldParamDC.empty()) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
