diff options
| -rw-r--r-- | include/llvm/IR/Attributes.h | 3 | ||||
| -rw-r--r-- | lib/IR/Attributes.cpp | 31 | ||||
| -rw-r--r-- | lib/IR/Verifier.cpp | 4 |
3 files changed, 22 insertions, 16 deletions
diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h index f53cfd6a08..29eaec1d0d 100644 --- a/include/llvm/IR/Attributes.h +++ b/include/llvm/IR/Attributes.h @@ -113,7 +113,8 @@ public: //===--------------------------------------------------------------------===// /// \brief Return a uniquified Attribute object. - static Attribute get(LLVMContext &Context, AttrKind Kind, Constant *Val = 0); + static Attribute get(LLVMContext &Context, AttrKind Kind); + static Attribute get(LLVMContext &Context, AttrBuilder &B); /// \brief Return a uniquified Attribute object that has the specific /// alignment set. diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp index 59e86f02a0..98c12b5d85 100644 --- a/lib/IR/Attributes.cpp +++ b/lib/IR/Attributes.cpp @@ -30,15 +30,24 @@ using namespace llvm; // Attribute Construction Methods //===----------------------------------------------------------------------===// -Attribute Attribute::get(LLVMContext &Context, AttrKind Kind, - Constant *Val) { - if (Kind == None) return Attribute(); +Attribute Attribute::get(LLVMContext &Context, AttrKind Kind) { + AttrBuilder B; + return Attribute::get(Context, B.addAttribute(Kind)); +} + +Attribute Attribute::get(LLVMContext &Context, AttrBuilder &B) { + // If there are no attributes, return an empty Attribute class. + if (!B.hasAttributes()) + return Attribute(); + + assert(std::distance(B.begin(), B.end()) == 1 && + "The Attribute object should represent one attribute only!"); // Otherwise, build a key to look up the existing attributes. LLVMContextImpl *pImpl = Context.pImpl; FoldingSetNodeID ID; - ID.AddInteger(Kind); - ID.AddPointer(Val); + ConstantInt *CI = ConstantInt::get(Type::getInt64Ty(Context), B.Raw()); + ID.AddPointer(CI); void *InsertPoint; AttributeImpl *PA = pImpl->AttrsSet.FindNodeOrInsertPos(ID, InsertPoint); @@ -46,9 +55,7 @@ Attribute Attribute::get(LLVMContext &Context, AttrKind Kind, if (!PA) { // If we didn't find any existing attributes of the same shape then create a // new one and insert it. - PA = (!Val) ? - new AttributeImpl(Context, Kind) : - new AttributeImpl(Context, Kind, Val); + PA = new AttributeImpl(Context, CI); pImpl->AttrsSet.InsertNode(PA, InsertPoint); } @@ -57,14 +64,14 @@ Attribute Attribute::get(LLVMContext &Context, AttrKind Kind, } Attribute Attribute::getWithAlignment(LLVMContext &Context, uint64_t Align) { - return get(Context, Attribute::Alignment, - ConstantInt::get(Type::getInt64Ty(Context), Align)); + AttrBuilder B; + return get(Context, B.addAlignmentAttr(Align)); } Attribute Attribute::getWithStackAlignment(LLVMContext &Context, uint64_t Align) { - return get(Context, Attribute::StackAlignment, - ConstantInt::get(Type::getInt64Ty(Context), Align)); + AttrBuilder B; + return get(Context, B.addStackAlignmentAttr(Align)); } //===----------------------------------------------------------------------===// diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index babc295126..5da74481e4 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -745,9 +745,7 @@ void Verifier::VerifyFunctionAttrs(FunctionType *FT, AttrBuilder NotFn(Attrs, AttributeSet::FunctionIndex); NotFn.removeFunctionOnlyAttrs(); Assert1(!NotFn.hasAttributes(), "Attribute '" + - AttributeSet::get(V->getContext(), - AttributeSet::FunctionIndex, - NotFn).getAsString(AttributeSet::FunctionIndex) + + Attribute::get(V->getContext(), NotFn).getAsString() + "' do not apply to the function!", V); // Check for mutually incompatible attributes. |