This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
martong marked an inline comment as done.
Closed by commit rG73c6beb2f705: [ASTImporter] Fix crash caused by unset
AttributeSpellingListIndex (authored by martong).
Changed prior to commit:
https://reviews.llvm.org/D89318?vs=297853&id=298126#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D89318/new/
https://reviews.llvm.org/D89318
Files:
clang/lib/AST/ASTImporter.cpp
clang/test/ASTMerge/attr/Inputs/RestrictAttr.cpp
clang/test/ASTMerge/attr/testRestrictAttr.cpp
clang/unittests/AST/ASTImporterTest.cpp
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -5767,11 +5767,35 @@
EXPECT_TRUE(ToA);
}
+TEST_P(ASTImporterOptionSpecificTestBase, ImportRestrictAttr) {
+ Decl *FromTU = getTuDecl(
+ R"(
+ void *foo(unsigned, unsigned) __attribute__((__malloc__));
+ )",
+ Lang_CXX03, "input.cc");
+ auto *FromD = FirstDeclMatcher<FunctionDecl>().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<RestrictAttr>();
+ auto *ToAttr = ToD->getAttr<RestrictAttr>();
+ 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());
+}
+
TEST_P(ASTImporterOptionSpecificTestBase, ImportFormatAttr) {
Decl *FromTU = getTuDecl(
R"(
int foo(const char * fmt, ...)
- __attribute__ ((__format__ (__scanf__, 1, 2)));
+ __attribute__ ((__format__ (__scanf__, 1, 2)));
)",
Lang_CXX03, "input.cc");
auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
@@ -5792,6 +5816,7 @@
ToAttr->getAttributeSpellingListIndex());
EXPECT_EQ(FromAttr->getType()->getName(), ToAttr->getType()->getName());
}
+
template <typename T>
auto ExtendWithOptions(const T &Values, const std::vector<std::string> &Args) {
auto Copy = Values;
Index: clang/test/ASTMerge/attr/testRestrictAttr.cpp
===================================================================
--- /dev/null
+++ clang/test/ASTMerge/attr/testRestrictAttr.cpp
@@ -0,0 +1,2 @@
+// RUN: %clang -x c++-header -o %t.a.ast %S/Inputs/RestrictAttr.cpp
+// RUN: %clang_cc1 -x c++ -ast-merge %t.a.ast /dev/null -ast-dump
Index: clang/test/ASTMerge/attr/Inputs/RestrictAttr.cpp
===================================================================
--- /dev/null
+++ clang/test/ASTMerge/attr/Inputs/RestrictAttr.cpp
@@ -0,0 +1 @@
+void *foo(unsigned, unsigned) __attribute__((__malloc__));
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -8094,9 +8094,6 @@
else
return ToTOrErr.takeError();
}
- To->setInherited(From->isInherited());
- To->setPackExpansion(From->isPackExpansion());
- To->setImplicit(From->isImplicit());
ToAttr = To;
break;
}
@@ -8106,7 +8103,6 @@
IdentifierInfo *ToAttrType = Import(From->getType());
To = FormatAttr::Create(ToContext, ToAttrType, From->getFormatIdx(),
From->getFirstArg(), ToRange, From->getSyntax());
- To->setInherited(From->isInherited());
ToAttr = To;
break;
}
@@ -8117,8 +8113,15 @@
ToAttr->setRange(ToRange);
break;
}
+
assert(ToAttr && "Attribute should be created.");
-
+ if (const auto *InheritableFromAttr = dyn_cast<InheritableAttr>(FromAttr))
+ cast<InheritableAttr>(ToAttr)->setInherited(
+ InheritableFromAttr->isInherited());
+ ToAttr->setAttributeSpellingListIndex(
+ FromAttr->getAttributeSpellingListIndex());
+ ToAttr->setPackExpansion(FromAttr->isPackExpansion());
+ ToAttr->setImplicit(FromAttr->isImplicit());
return ToAttr;
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
