diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp --- a/clang/lib/AST/ASTImporter.cpp +++ b/clang/lib/AST/ASTImporter.cpp @@ -8100,6 +8100,16 @@ ToAttr = To; break; } + case attr::Format: { + const auto *From = cast(FromAttr); + FormatAttr *To; + IdentifierInfo *ToAttrType = Import(From->getType()); + To = FormatAttr::Create(ToContext, ToAttrType, From->getFormatIdx(), + From->getFirstArg(), ToRange, From->getSyntax()); + To->setInherited(From->isInherited()); + ToAttr = To; + break; + } default: // FIXME: 'clone' copies every member but some of them should be imported. // Handle other Attrs that have parameters that should be imported. diff --git a/clang/test/ASTMerge/attr/Inputs/FormatAttr.cpp b/clang/test/ASTMerge/attr/Inputs/FormatAttr.cpp new file mode 100644 --- /dev/null +++ b/clang/test/ASTMerge/attr/Inputs/FormatAttr.cpp @@ -0,0 +1 @@ +int foo(const char *fmt, ...) __attribute__((__format__(__scanf__, 1, 2))); diff --git a/clang/test/ASTMerge/attr/testFormatAttr.cpp b/clang/test/ASTMerge/attr/testFormatAttr.cpp new file mode 100644 --- /dev/null +++ b/clang/test/ASTMerge/attr/testFormatAttr.cpp @@ -0,0 +1,2 @@ +// RUN: %clang -x c++-header -o %t.a.ast %S/Inputs/FormatAttr.cpp +// RUN: %clang_cc1 -x c++ -ast-merge %t.a.ast /dev/null -ast-dump diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp --- a/clang/unittests/AST/ASTImporterTest.cpp +++ b/clang/unittests/AST/ASTImporterTest.cpp @@ -5767,6 +5767,31 @@ EXPECT_TRUE(ToA); } +TEST_P(ASTImporterOptionSpecificTestBase, ImportFormatAttr) { + Decl *FromTU = getTuDecl( + R"( + int foo(const char * fmt, ...) + __attribute__ ((__format__ (__scanf__, 1, 2))); + )", + Lang_CXX03, "input.cc"); + auto *FromD = FirstDeclMatcher().match( + FromTU, functionDecl(hasName("foo"))); + ASSERT_TRUE(FromD); + + auto *ToD = Import(FromD, Lang_CXX03); + ASSERT_TRUE(ToD); + ToD->dump(); // Should not crash! + + auto *FromAttr = FromD->getAttr(); + auto *ToAttr = ToD->getAttr(); + EXPECT_EQ(FromAttr->isInherited(), ToAttr->isInherited()); + EXPECT_EQ(FromAttr->isPackExpansion(), ToAttr->isPackExpansion()); + EXPECT_EQ(FromAttr->isImplicit(), ToAttr->isImplicit()); + EXPECT_EQ(FromAttr->getSyntax(), ToAttr->getSyntax()); + EXPECT_EQ(FromAttr->getAttributeSpellingListIndex(), + ToAttr->getAttributeSpellingListIndex()); + EXPECT_EQ(FromAttr->getType()->getName(), ToAttr->getType()->getName()); +} template auto ExtendWithOptions(const T &Values, const std::vector &Args) { auto Copy = Values;