Revert "[ASTImporter] Fix crash caused by unset AttributeSpellingListIndex"
This broke the GreenDragon build, due to the following error while running
TestImportBuiltinFileID:
```
Ignored/unknown shouldn't get here
UNREACHABLE executed at tools/clang/include/clang/Sema/AttrSpellingListIndex.inc:13!
```
See http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/24213/
This reverts commit 73c6beb2f7
.
This reverts https://reviews.llvm.org/D89318
This commit is contained in:
parent
8e7b108e80
commit
4cb4db11ee
|
@ -8094,6 +8094,9 @@ Expected<Attr *> ASTImporter::Import(const Attr *FromAttr) {
|
||||||
else
|
else
|
||||||
return ToTOrErr.takeError();
|
return ToTOrErr.takeError();
|
||||||
}
|
}
|
||||||
|
To->setInherited(From->isInherited());
|
||||||
|
To->setPackExpansion(From->isPackExpansion());
|
||||||
|
To->setImplicit(From->isImplicit());
|
||||||
ToAttr = To;
|
ToAttr = To;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -8103,6 +8106,7 @@ Expected<Attr *> ASTImporter::Import(const Attr *FromAttr) {
|
||||||
IdentifierInfo *ToAttrType = Import(From->getType());
|
IdentifierInfo *ToAttrType = Import(From->getType());
|
||||||
To = FormatAttr::Create(ToContext, ToAttrType, From->getFormatIdx(),
|
To = FormatAttr::Create(ToContext, ToAttrType, From->getFormatIdx(),
|
||||||
From->getFirstArg(), ToRange, From->getSyntax());
|
From->getFirstArg(), ToRange, From->getSyntax());
|
||||||
|
To->setInherited(From->isInherited());
|
||||||
ToAttr = To;
|
ToAttr = To;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -8113,15 +8117,8 @@ Expected<Attr *> ASTImporter::Import(const Attr *FromAttr) {
|
||||||
ToAttr->setRange(ToRange);
|
ToAttr->setRange(ToRange);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(ToAttr && "Attribute should be created.");
|
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;
|
return ToAttr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
void *foo(unsigned, unsigned) __attribute__((__malloc__));
|
|
|
@ -1,2 +0,0 @@
|
||||||
// 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
|
|
|
@ -5767,35 +5767,11 @@ TEST_P(ASTImporterOptionSpecificTestBase, ImportExprOfAlignmentAttr) {
|
||||||
EXPECT_TRUE(ToA);
|
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) {
|
TEST_P(ASTImporterOptionSpecificTestBase, ImportFormatAttr) {
|
||||||
Decl *FromTU = getTuDecl(
|
Decl *FromTU = getTuDecl(
|
||||||
R"(
|
R"(
|
||||||
int foo(const char * fmt, ...)
|
int foo(const char * fmt, ...)
|
||||||
__attribute__ ((__format__ (__scanf__, 1, 2)));
|
__attribute__ ((__format__ (__scanf__, 1, 2)));
|
||||||
)",
|
)",
|
||||||
Lang_CXX03, "input.cc");
|
Lang_CXX03, "input.cc");
|
||||||
auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
|
auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
|
||||||
|
@ -5816,7 +5792,6 @@ TEST_P(ASTImporterOptionSpecificTestBase, ImportFormatAttr) {
|
||||||
ToAttr->getAttributeSpellingListIndex());
|
ToAttr->getAttributeSpellingListIndex());
|
||||||
EXPECT_EQ(FromAttr->getType()->getName(), ToAttr->getType()->getName());
|
EXPECT_EQ(FromAttr->getType()->getName(), ToAttr->getType()->getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto ExtendWithOptions(const T &Values, const std::vector<std::string> &Args) {
|
auto ExtendWithOptions(const T &Values, const std::vector<std::string> &Args) {
|
||||||
auto Copy = Values;
|
auto Copy = Values;
|
||||||
|
|
Loading…
Reference in New Issue