Remove addRetAttributes and addFnAttributes, which aren't useful abstractions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173992 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-01-30 23:40:31 +00:00
parent e74365462a
commit ac72eb264c
4 changed files with 13 additions and 23 deletions

View File

@ -230,18 +230,6 @@ public:
AttributeSet addAttributes(LLVMContext &C, unsigned Idx,
AttributeSet Attrs) const;
/// \brief Add return attributes to this attribute set. Since attribute sets
/// are immutable, this returns a new set.
AttributeSet addRetAttributes(LLVMContext &C, AttributeSet Attrs) const {
return addAttributes(C, ReturnIndex, Attrs);
}
/// \brief Add function attributes to this attribute set. Since attribute sets
/// are immutable, this returns a new set.
AttributeSet addFnAttributes(LLVMContext &C, AttributeSet Attrs) const {
return addAttributes(C, FunctionIndex, Attrs);
}
/// \brief Remove the specified attribute at the specified index from this
/// attribute list. Since attribute lists are immutable, this returns the new
/// list.

View File

@ -1383,9 +1383,9 @@ void LLVMAddFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA) {
const AttributeSet PAL = Func->getAttributes();
AttrBuilder B(PA);
const AttributeSet PALnew =
PAL.addFnAttributes(Func->getContext(),
AttributeSet::get(Func->getContext(),
AttributeSet::FunctionIndex, B));
PAL.addAttributes(Func->getContext(), AttributeSet::FunctionIndex,
AttributeSet::get(Func->getContext(),
AttributeSet::FunctionIndex, B));
Func->setAttributes(PALnew);
}

View File

@ -147,10 +147,10 @@ bool PruneEH::runOnSCC(CallGraphSCC &SCC) {
Function *F = (*I)->getFunction();
const AttributeSet &PAL = F->getAttributes();
const AttributeSet &NPAL =
PAL.addFnAttributes(F->getContext(),
AttributeSet::get(F->getContext(),
AttributeSet::FunctionIndex,
NewAttributes));
PAL.addAttributes(F->getContext(), AttributeSet::FunctionIndex,
AttributeSet::get(F->getContext(),
AttributeSet::FunctionIndex,
NewAttributes));
if (PAL != NPAL) {
MadeChange = true;
F->setAttributes(NPAL);

View File

@ -98,11 +98,13 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
Anew->addAttr(OldFunc->getAttributes()
.getParamAttributes(I->getArgNo() + 1));
NewFunc->setAttributes(NewFunc->getAttributes()
.addRetAttributes(NewFunc->getContext(),
OldFunc->getAttributes()));
.addAttributes(NewFunc->getContext(),
AttributeSet::ReturnIndex,
OldFunc->getAttributes()));
NewFunc->setAttributes(NewFunc->getAttributes()
.addFnAttributes(NewFunc->getContext(),
OldFunc->getAttributes()));
.addAttributes(NewFunc->getContext(),
AttributeSet::FunctionIndex,
OldFunc->getAttributes()));
}