Add and remove the attribute from the correct slot.

The slot that we're adding/removing the attribute from may not be the same as
the attribute coming in. Make sure that they match up before we try to
add/remove them.
PR15313

llvm-svn: 175684

1 files changed, 12 insertions, 2 deletions

diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp
index 839e496f92b..15c05e71e22 100644
--- a/llvm/lib/IR/Function.cpp
+++ b/llvm/lib/IR/Function.cpp
@@ -125,12 +125,22 @@ bool Argument::hasStructRetAttr() const {
 
 /// addAttr - Add attributes to an argument.
 void Argument::addAttr(AttributeSet AS) {
-  getParent()->addAttributes(getArgNo() + 1, AS);
+  assert(AS.getNumSlots() == 1 &&
+         "Trying to add more than one attribute set to an argument!");
+  AttrBuilder B(AS, AS.getSlotIndex(0));
+  getParent()->addAttributes(getArgNo() + 1,
+                             AttributeSet::get(Parent->getContext(),
+                                               getArgNo() + 1, B));
 }
 
 /// removeAttr - Remove attributes from an argument.
 void Argument::removeAttr(AttributeSet AS) {
-  getParent()->removeAttributes(getArgNo() + 1, AS);
+  assert(AS.getNumSlots() == 1 &&
+         "Trying to remove more than one attribute set from an argument!");
+  AttrBuilder B(AS, AS.getSlotIndex(0));
+  getParent()->removeAttributes(getArgNo() + 1,
+                                AttributeSet::get(Parent->getContext(),
+                                                  getArgNo() + 1, B));
 }
 
 //===----------------------------------------------------------------------===//