RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-05-13 10:36:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix assertion when merging multiple empty AttributeLists

Browse Source 
Patch by Nicholas Wilson!

Differential Revision: https://reviews.llvm.org/D33627

llvm-svn: 304300
This commit is contained in:
Reid Kleckner 2017-05-31 14:24:06 +00:00
parent 11fda41d0b
commit ee913d8457
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/IR/Attributes.cpp
View File

@ -1006,6 +1006,10 @@ AttributeList AttributeList::get(LLVMContext &C,
for (AttributeList List : Attrs)
MaxSize = std::max(MaxSize, List.getNumAttrSets());
// If every list was empty, there is no point in merging the lists.
if (MaxSize == 0)
return AttributeList();
SmallVector<AttributeSet, 8> NewAttrSets(MaxSize);
for (unsigned I = 0; I < MaxSize; ++I) {
AttrBuilder CurBuilder;

7
unittests/IR/AttributesTest.cpp
View File

@ -82,4 +82,11 @@ TEST(Attributes, AddMatchingAlignAttr) {
EXPECT_TRUE(AL.hasParamAttribute(0, Attribute::NonNull));
}
TEST(Attributes, EmptyGet) {
LLVMContext C;
AttributeList EmptyLists[] = {AttributeList(), AttributeList()};
AttributeList AL = AttributeList::get(C, EmptyLists);
EXPECT_TRUE(AL.isEmpty());
}
} // end anonymous namespace