maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix crash in AttributeList::addAttributes, add test 

llvm-svn: 300614
This commit is contained in:
Reid Kleckner 2017-04-18 22:10:18 +00:00
parent f09c1e346e
commit fe64c0137e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/IR/Attributes.cpp
View File

@ -988,6 +988,9 @@ AttributeList AttributeList::addAttributes(LLVMContext &C, unsigned Index,
if (!AS.hasAttributes())
return *this;
if (!pImpl)
return AttributeList::get(C, {{Index, AS}});
#ifndef NDEBUG
// FIXME it is not obvious how this should work for alignment. For now, say
// we can't change a known alignment.

9
llvm/unittests/IR/AttributesTest.cpp
View File

@ -49,4 +49,13 @@ TEST(Attributes, Ordering) {
EXPECT_NE(SetA, SetB);
}
TEST(Attributes, AddAttributes) {
LLVMContext C;
AttributeList AL;
AttrBuilder B;
B.addAttribute(Attribute::NoReturn);
AL = AL.addAttributes(C, AttributeList::FunctionIndex, AttributeSet::get(C, B));
EXPECT_TRUE(AL.hasFnAttribute(Attribute::NoReturn));
}
} // end anonymous namespace