balazske created this revision.
Herald added subscribers: steakhal, martong, gamesh411, Szelethus, dkrupp.
Herald added a reviewer: a.sidorin.
Herald added a reviewer: shafik.
Herald added a project: All.
balazske requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Fix a case of importing a function with auto return type
that is resolved with a type template argument that is declared
inside the function.
This is a fix for issue #55500 .
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D127396
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
@@ -6319,6 +6319,61 @@
struct ImportAutoFunctions : ASTImporterOptionSpecificTestBase {};
+TEST_P(ImportAutoFunctions, ReturnWithTemplateWithStructDeclaredInside1) {
+ Decl *FromTU = getTuDecl(
+ R"(
+ template<class> struct Tmpl {};
+ auto foo() {
+ struct X {};
+ return Tmpl<X>();
+ }
+ )",
+ Lang_CXX14, "input0.cc");
+ FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
+ FromTU, functionDecl(hasName("foo")));
+
+ FunctionDecl *To = Import(From, Lang_CXX14);
+ EXPECT_TRUE(To);
+ EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
+}
+
+TEST_P(ImportAutoFunctions, ReturnWithTemplateWithStructDeclaredInside2) {
+ Decl *FromTU = getTuDecl(
+ R"(
+ template<class> struct Tmpl {};
+ auto foo() {
+ struct X {};
+ return Tmpl<Tmpl<X>>();
+ }
+ )",
+ Lang_CXX14, "input0.cc");
+ FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
+ FromTU, functionDecl(hasName("foo")));
+
+ FunctionDecl *To = Import(From, Lang_CXX14);
+ EXPECT_TRUE(To);
+ EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
+}
+
+TEST_P(ImportAutoFunctions, ReturnWithTemplateWithTypedefDeclaredInside) {
+ Decl *FromTU = getTuDecl(
+ R"(
+ template<class> struct Tmpl {};
+ auto foo() {
+ struct X {};
+ using x_type = X;
+ return Tmpl<x_type>();
+ }
+ )",
+ Lang_CXX14, "input0.cc");
+ FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
+ FromTU, functionDecl(hasName("foo")));
+
+ FunctionDecl *To = Import(From, Lang_CXX14);
+ EXPECT_TRUE(To);
+ EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
+}
+
TEST_P(ImportAutoFunctions, ReturnWithTypedefDeclaredInside) {
Decl *FromTU = getTuDecl(
R"(
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -3227,23 +3227,32 @@
return false;
}
+static bool hasTypeDeclaredInsideFunction(QualType T, const FunctionDecl *FD) {
+ if (T.isNull())
+ return false;
+ if (const auto *RecordT = T->getAs<RecordType>()) {
+ const RecordDecl *RD = RecordT->getDecl();
+ assert(RD);
+ if (isAncestorDeclContextOf(FD, RD)) {
+ assert(RD->getLexicalDeclContext() == RD->getDeclContext());
+ return true;
+ }
+ if (const auto *RDTempl = dyn_cast<ClassTemplateSpecializationDecl>(RD))
+ return llvm::count_if(RDTempl->getTemplateArgs().asArray(),
+ [FD](const TemplateArgument &Arg) {
+ return hasTypeDeclaredInsideFunction(
+ Arg.getAsType(), FD);
+ });
+ }
+ return false;
+}
+
bool ASTNodeImporter::hasAutoReturnTypeDeclaredInside(FunctionDecl *D) {
QualType FromTy = D->getType();
const auto *FromFPT = FromTy->getAs<FunctionProtoType>();
assert(FromFPT && "Must be called on FunctionProtoType");
- if (const AutoType *AutoT =
- FromFPT->getReturnType()->getContainedAutoType()) {
- QualType DeducedT = AutoT->getDeducedType();
- if (const auto *RecordT =
- !DeducedT.isNull() ? DeducedT->getAs<RecordType>() : nullptr) {
- const RecordDecl *RD = RecordT->getDecl();
- assert(RD);
- if (isAncestorDeclContextOf(D, RD)) {
- assert(RD->getLexicalDeclContext() == RD->getDeclContext());
- return true;
- }
- }
- }
+ if (const AutoType *AutoT = FromFPT->getReturnType()->getContainedAutoType())
+ return hasTypeDeclaredInsideFunction(AutoT->getDeducedType(), D);
if (const auto *TypedefT = FromFPT->getReturnType()->getAs<TypedefType>()) {
const TypedefNameDecl *TD = TypedefT->getDecl();
assert(TD);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
