Use the AttributeSet when adding multiple attributes and an Attribute::AttrKind
when adding a single attribute to the function.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173210 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/IR/Function.cpp b/lib/IR/Function.cpp
index 6a5e616..4d047f6 100644
--- a/lib/IR/Function.cpp
+++ b/lib/IR/Function.cpp
@@ -125,7 +125,10 @@
/// addAttr - Add a Attribute to an argument
void Argument::addAttr(Attribute attr) {
- getParent()->addAttribute(getArgNo() + 1, attr);
+ AttrBuilder B(attr);
+ getParent()->addAttributes(getArgNo() + 1,
+ AttributeSet::get(getParent()->getContext(),
+ getArgNo() + 1, B));
}
/// removeAttr - Remove a Attribute from an argument
@@ -248,17 +251,21 @@
BasicBlocks.begin()->eraseFromParent();
}
-void Function::addAttribute(unsigned i, Attribute attr) {
+void Function::addAttribute(unsigned i, Attribute::AttrKind attr) {
AttributeSet PAL = getAttributes();
- AttrBuilder B(attr);
- PAL = PAL.addAttributes(getContext(), i,
- AttributeSet::get(getContext(), i, B));
+ PAL = PAL.addAttribute(getContext(), i, attr);
setAttributes(PAL);
}
-void Function::removeAttribute(unsigned i, Attribute attr) {
+void Function::addAttributes(unsigned i, AttributeSet attrs) {
AttributeSet PAL = getAttributes();
- PAL = PAL.removeAttr(getContext(), i, attr);
+ PAL = PAL.addAttributes(getContext(), i, attrs);
+ setAttributes(PAL);
+}
+
+void Function::removeAttribute(unsigned i, Attribute attrs) {
+ AttributeSet PAL = getAttributes();
+ PAL = PAL.removeAttr(getContext(), i, attrs);
setAttributes(PAL);
}