[llvm] r174010 - Remove the AttrBuilder version of the Attribute::get function.
Bill Wendling
isanbard at gmail.com
Wed Jan 30 16:53:22 PST 2013
Author: void
Date: Wed Jan 30 18:53:21 2013
New Revision: 174010
URL: http://llvm.org/viewvc/llvm-project?rev=174010&view=rev
Log:
Remove the AttrBuilder version of the Attribute::get function.
The AttrBuilder is there to build up multiple attributes. The Attribute class
represents only one attribute at a time. So remove this unnecessary builder
creator method.
Modified:
llvm/trunk/include/llvm/IR/Attributes.h
llvm/trunk/lib/IR/Attributes.cpp
llvm/trunk/lib/IR/Verifier.cpp
Modified: llvm/trunk/include/llvm/IR/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Attributes.h?rev=174010&r1=174009&r2=174010&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/Attributes.h (original)
+++ llvm/trunk/include/llvm/IR/Attributes.h Wed Jan 30 18:53:21 2013
@@ -113,8 +113,7 @@ public:
//===--------------------------------------------------------------------===//
/// \brief Return a uniquified Attribute object.
- static Attribute get(LLVMContext &Context, AttrKind Kind);
- static Attribute get(LLVMContext &Context, AttrBuilder &B);
+ static Attribute get(LLVMContext &Context, AttrKind Kind, Constant *Val = 0);
/// \brief Return a uniquified Attribute object that has the specific
/// alignment set.
Modified: llvm/trunk/lib/IR/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=174010&r1=174009&r2=174010&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Attributes.cpp (original)
+++ llvm/trunk/lib/IR/Attributes.cpp Wed Jan 30 18:53:21 2013
@@ -30,24 +30,15 @@ using namespace llvm;
// Attribute Construction Methods
//===----------------------------------------------------------------------===//
-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!");
+Attribute Attribute::get(LLVMContext &Context, AttrKind Kind,
+ Constant *Val) {
+ if (Kind == None) return Attribute();
// Otherwise, build a key to look up the existing attributes.
LLVMContextImpl *pImpl = Context.pImpl;
FoldingSetNodeID ID;
- ConstantInt *CI = ConstantInt::get(Type::getInt64Ty(Context), B.Raw());
- ID.AddPointer(CI);
+ ID.AddInteger(Kind);
+ ID.AddPointer(Val);
void *InsertPoint;
AttributeImpl *PA = pImpl->AttrsSet.FindNodeOrInsertPos(ID, InsertPoint);
@@ -55,7 +46,9 @@ Attribute Attribute::get(LLVMContext &Co
if (!PA) {
// If we didn't find any existing attributes of the same shape then create a
// new one and insert it.
- PA = new AttributeImpl(Context, CI);
+ PA = (!Val) ?
+ new AttributeImpl(Context, Kind) :
+ new AttributeImpl(Context, Kind, Val);
pImpl->AttrsSet.InsertNode(PA, InsertPoint);
}
@@ -64,14 +57,14 @@ Attribute Attribute::get(LLVMContext &Co
}
Attribute Attribute::getWithAlignment(LLVMContext &Context, uint64_t Align) {
- AttrBuilder B;
- return get(Context, B.addAlignmentAttr(Align));
+ return get(Context, Attribute::Alignment,
+ ConstantInt::get(Type::getInt64Ty(Context), Align));
}
Attribute Attribute::getWithStackAlignment(LLVMContext &Context,
uint64_t Align) {
- AttrBuilder B;
- return get(Context, B.addStackAlignmentAttr(Align));
+ return get(Context, Attribute::StackAlignment,
+ ConstantInt::get(Type::getInt64Ty(Context), Align));
}
//===----------------------------------------------------------------------===//
Modified: llvm/trunk/lib/IR/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=174010&r1=174009&r2=174010&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Verifier.cpp (original)
+++ llvm/trunk/lib/IR/Verifier.cpp Wed Jan 30 18:53:21 2013
@@ -745,7 +745,9 @@ void Verifier::VerifyFunctionAttrs(Funct
AttrBuilder NotFn(Attrs, AttributeSet::FunctionIndex);
NotFn.removeFunctionOnlyAttrs();
Assert1(!NotFn.hasAttributes(), "Attribute '" +
- Attribute::get(V->getContext(), NotFn).getAsString() +
+ AttributeSet::get(V->getContext(),
+ AttributeSet::FunctionIndex,
+ NotFn).getAsString(AttributeSet::FunctionIndex) +
"' do not apply to the function!", V);
// Check for mutually incompatible attributes.
More information about the llvm-commits
mailing list