This revision was automatically updated to reflect the committed changes.
Closed by commit rL368163: [ASTImporter] Do not import FunctionTemplateDecl in
record twice. (authored by balazske, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D65203?vs=211743&id=213858#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D65203/new/
https://reviews.llvm.org/D65203
Files:
cfe/trunk/lib/AST/ASTImporter.cpp
cfe/trunk/unittests/AST/ASTImporterTest.cpp
Index: cfe/trunk/lib/AST/ASTImporter.cpp
===================================================================
--- cfe/trunk/lib/AST/ASTImporter.cpp
+++ cfe/trunk/lib/AST/ASTImporter.cpp
@@ -3118,9 +3118,19 @@
if (FoundByLookup) {
if (isa<CXXMethodDecl>(FoundByLookup)) {
if (D->getLexicalDeclContext() == D->getDeclContext()) {
- if (!D->doesThisDeclarationHaveABody())
+ if (!D->doesThisDeclarationHaveABody()) {
+ if (FunctionTemplateDecl *DescribedD =
+ D->getDescribedFunctionTemplate()) {
+ // Handle a "templated" function together with its described
+ // template. This avoids need for a similar check at import of the
+ // described template.
+ assert(FoundByLookup->getDescribedFunctionTemplate() &&
+ "Templated function mapped to non-templated?");
+ Importer.MapImported(DescribedD,
+
FoundByLookup->getDescribedFunctionTemplate());
+ }
return Importer.MapImported(D, FoundByLookup);
- else {
+ } else {
// Let's continue and build up the redecl chain in this case.
// FIXME Merge the functions into one decl.
}
Index: cfe/trunk/unittests/AST/ASTImporterTest.cpp
===================================================================
--- cfe/trunk/unittests/AST/ASTImporterTest.cpp
+++ cfe/trunk/unittests/AST/ASTImporterTest.cpp
@@ -2389,6 +2389,49 @@
functionDecl(hasName("f"), hasDescendant(declRefExpr()))))));
}
+struct ImportFunctionTemplates : ASTImporterOptionSpecificTestBase {};
+
+TEST_P(ImportFunctionTemplates, ImportFunctionTemplateInRecordDeclTwice) {
+ auto Code =
+ R"(
+ class X {
+ template <class T>
+ void f(T t);
+ };
+ )";
+ Decl *FromTU1 = getTuDecl(Code, Lang_CXX, "input1.cc");
+ auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU1, functionTemplateDecl(hasName("f")));
+ auto *ToD1 = Import(FromD1, Lang_CXX);
+ Decl *FromTU2 = getTuDecl(Code, Lang_CXX, "input2.cc");
+ auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU2, functionTemplateDecl(hasName("f")));
+ auto *ToD2 = Import(FromD2, Lang_CXX);
+ EXPECT_EQ(ToD1, ToD2);
+}
+
+TEST_P(ImportFunctionTemplates,
+ ImportFunctionTemplateWithDefInRecordDeclTwice) {
+ auto Code =
+ R"(
+ class X {
+ template <class T>
+ void f(T t);
+ };
+ template <class T>
+ void X::f(T t) {};
+ )";
+ Decl *FromTU1 = getTuDecl(Code, Lang_CXX, "input1.cc");
+ auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU1, functionTemplateDecl(hasName("f")));
+ auto *ToD1 = Import(FromD1, Lang_CXX);
+ Decl *FromTU2 = getTuDecl(Code, Lang_CXX, "input2.cc");
+ auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU2, functionTemplateDecl(hasName("f")));
+ auto *ToD2 = Import(FromD2, Lang_CXX);
+ EXPECT_EQ(ToD1, ToD2);
+}
+
struct ImportFriendFunctions : ImportFunctions {};
TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainProto) {
@@ -5223,6 +5266,9 @@
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportClasses,
DefaultTestValuesForRunOptions, );
+INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFunctionTemplates,
+ DefaultTestValuesForRunOptions, );
+
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFriendFunctions,
DefaultTestValuesForRunOptions, );
Index: cfe/trunk/lib/AST/ASTImporter.cpp
===================================================================
--- cfe/trunk/lib/AST/ASTImporter.cpp
+++ cfe/trunk/lib/AST/ASTImporter.cpp
@@ -3118,9 +3118,19 @@
if (FoundByLookup) {
if (isa<CXXMethodDecl>(FoundByLookup)) {
if (D->getLexicalDeclContext() == D->getDeclContext()) {
- if (!D->doesThisDeclarationHaveABody())
+ if (!D->doesThisDeclarationHaveABody()) {
+ if (FunctionTemplateDecl *DescribedD =
+ D->getDescribedFunctionTemplate()) {
+ // Handle a "templated" function together with its described
+ // template. This avoids need for a similar check at import of the
+ // described template.
+ assert(FoundByLookup->getDescribedFunctionTemplate() &&
+ "Templated function mapped to non-templated?");
+ Importer.MapImported(DescribedD,
+ FoundByLookup->getDescribedFunctionTemplate());
+ }
return Importer.MapImported(D, FoundByLookup);
- else {
+ } else {
// Let's continue and build up the redecl chain in this case.
// FIXME Merge the functions into one decl.
}
Index: cfe/trunk/unittests/AST/ASTImporterTest.cpp
===================================================================
--- cfe/trunk/unittests/AST/ASTImporterTest.cpp
+++ cfe/trunk/unittests/AST/ASTImporterTest.cpp
@@ -2389,6 +2389,49 @@
functionDecl(hasName("f"), hasDescendant(declRefExpr()))))));
}
+struct ImportFunctionTemplates : ASTImporterOptionSpecificTestBase {};
+
+TEST_P(ImportFunctionTemplates, ImportFunctionTemplateInRecordDeclTwice) {
+ auto Code =
+ R"(
+ class X {
+ template <class T>
+ void f(T t);
+ };
+ )";
+ Decl *FromTU1 = getTuDecl(Code, Lang_CXX, "input1.cc");
+ auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU1, functionTemplateDecl(hasName("f")));
+ auto *ToD1 = Import(FromD1, Lang_CXX);
+ Decl *FromTU2 = getTuDecl(Code, Lang_CXX, "input2.cc");
+ auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU2, functionTemplateDecl(hasName("f")));
+ auto *ToD2 = Import(FromD2, Lang_CXX);
+ EXPECT_EQ(ToD1, ToD2);
+}
+
+TEST_P(ImportFunctionTemplates,
+ ImportFunctionTemplateWithDefInRecordDeclTwice) {
+ auto Code =
+ R"(
+ class X {
+ template <class T>
+ void f(T t);
+ };
+ template <class T>
+ void X::f(T t) {};
+ )";
+ Decl *FromTU1 = getTuDecl(Code, Lang_CXX, "input1.cc");
+ auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU1, functionTemplateDecl(hasName("f")));
+ auto *ToD1 = Import(FromD1, Lang_CXX);
+ Decl *FromTU2 = getTuDecl(Code, Lang_CXX, "input2.cc");
+ auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
+ FromTU2, functionTemplateDecl(hasName("f")));
+ auto *ToD2 = Import(FromD2, Lang_CXX);
+ EXPECT_EQ(ToD1, ToD2);
+}
+
struct ImportFriendFunctions : ImportFunctions {};
TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainProto) {
@@ -5223,6 +5266,9 @@
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportClasses,
DefaultTestValuesForRunOptions, );
+INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFunctionTemplates,
+ DefaultTestValuesForRunOptions, );
+
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFriendFunctions,
DefaultTestValuesForRunOptions, );
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
