diff options
| -rw-r--r-- | include/llvm/IR/Attributes.h | 12 | ||||
| -rw-r--r-- | lib/IR/Core.cpp | 6 | ||||
| -rw-r--r-- | lib/Transforms/IPO/PruneEH.cpp | 8 | ||||
| -rw-r--r-- | lib/Transforms/Utils/CloneFunction.cpp | 10 |
4 files changed, 13 insertions, 23 deletions
diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h index 5cad4c9e49..1b8195ff05 100644 --- a/include/llvm/IR/Attributes.h +++ b/include/llvm/IR/Attributes.h @@ -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. diff --git a/lib/IR/Core.cpp b/lib/IR/Core.cpp index 1e3258f6aa..aaf661f082 100644 --- a/lib/IR/Core.cpp +++ b/lib/IR/Core.cpp @@ -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); } diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index 98c2602dde..73d9323195 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -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); diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 12311c39a0..a309bce544 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -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())); } |