[llvm-commits] [llvm] r173628 - s/AttrList/pImpl/g in AttributeSet. No functionality change.
Bill Wendling
isanbard at gmail.com
Sun Jan 27 13:23:46 PST 2013
Author: void
Date: Sun Jan 27 15:23:46 2013
New Revision: 173628
URL: http://llvm.org/viewvc/llvm-project?rev=173628&view=rev
Log:
s/AttrList/pImpl/g in AttributeSet. No functionality change.
Modified:
llvm/trunk/include/llvm/IR/Attributes.h
llvm/trunk/lib/IR/Attributes.cpp
Modified: llvm/trunk/include/llvm/IR/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Attributes.h?rev=173628&r1=173627&r2=173628&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/Attributes.h (original)
+++ llvm/trunk/include/llvm/IR/Attributes.h Sun Jan 27 15:23:46 2013
@@ -210,7 +210,7 @@ private:
/// \brief The attributes that we are managing. This can be null to represent
/// the empty attributes list.
- AttributeSetImpl *AttrList;
+ AttributeSetImpl *pImpl;
/// \brief The attributes for the specified index are returned. Attributes
/// for the result are denoted with Idx = 0.
@@ -230,10 +230,10 @@ private:
/// N.B. this is only temporary. It will be disappearing in the future.
static AttributeSet get(LLVMContext &C, ArrayRef<AttributeWithIndex> Attrs);
- explicit AttributeSet(AttributeSetImpl *LI) : AttrList(LI) {}
+ explicit AttributeSet(AttributeSetImpl *LI) : pImpl(LI) {}
public:
- AttributeSet() : AttrList(0) {}
- AttributeSet(const AttributeSet &P) : AttrList(P.AttrList) {}
+ AttributeSet() : pImpl(0) {}
+ AttributeSet(const AttributeSet &P) : pImpl(P.pImpl) {}
const AttributeSet &operator=(const AttributeSet &RHS);
//===--------------------------------------------------------------------===//
@@ -320,10 +320,10 @@ public:
/// operator==/!= - Provide equality predicates.
bool operator==(const AttributeSet &RHS) const {
- return AttrList == RHS.AttrList;
+ return pImpl == RHS.pImpl;
}
bool operator!=(const AttributeSet &RHS) const {
- return AttrList != RHS.AttrList;
+ return pImpl != RHS.pImpl;
}
//===--------------------------------------------------------------------===//
@@ -332,7 +332,7 @@ public:
/// \brief Return a raw pointer that uniquely identifies this attribute list.
void *getRawPointer() const {
- return AttrList;
+ return pImpl;
}
// Attributes are stored as a dense set of slots, where there is one slot for
@@ -341,7 +341,7 @@ public:
/// \brief Return true if there are no attributes.
bool isEmpty() const {
- return AttrList == 0;
+ return pImpl == 0;
}
/// \brief Return the number of slots used in this attribute list. This is
Modified: llvm/trunk/lib/IR/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=173628&r1=173627&r2=173628&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Attributes.cpp (original)
+++ llvm/trunk/lib/IR/Attributes.cpp Sun Jan 27 15:23:46 2013
@@ -183,7 +183,7 @@ std::string Attribute::getAsString() con
AttrBuilder::AttrBuilder(AttributeSet AS, unsigned Idx)
: Alignment(0), StackAlignment(0) {
- AttributeSetImpl *pImpl = AS.AttrList;
+ AttributeSetImpl *pImpl = AS.pImpl;
if (!pImpl) return;
ArrayRef<AttributeWithIndex> AttrList = pImpl->getAttributes();
@@ -569,16 +569,16 @@ AttributeSetImpl(LLVMContext &C,
AttributeSet AttributeSet::getParamAttributes(unsigned Idx) const {
// FIXME: Remove.
- return AttrList && hasAttributes(Idx) ?
- AttributeSet::get(AttrList->getContext(),
+ return pImpl && hasAttributes(Idx) ?
+ AttributeSet::get(pImpl->getContext(),
AttributeWithIndex::get(Idx, getAttributes(Idx))) :
AttributeSet();
}
AttributeSet AttributeSet::getRetAttributes() const {
// FIXME: Remove.
- return AttrList && hasAttributes(ReturnIndex) ?
- AttributeSet::get(AttrList->getContext(),
+ return pImpl && hasAttributes(ReturnIndex) ?
+ AttributeSet::get(pImpl->getContext(),
AttributeWithIndex::get(ReturnIndex,
getAttributes(ReturnIndex))) :
AttributeSet();
@@ -586,8 +586,8 @@ AttributeSet AttributeSet::getRetAttribu
AttributeSet AttributeSet::getFnAttributes() const {
// FIXME: Remove.
- return AttrList && hasAttributes(FunctionIndex) ?
- AttributeSet::get(AttrList->getContext(),
+ return pImpl && hasAttributes(FunctionIndex) ?
+ AttributeSet::get(pImpl->getContext(),
AttributeWithIndex::get(FunctionIndex,
getAttributes(FunctionIndex))) :
AttributeSet();
@@ -651,15 +651,15 @@ AttributeSet AttributeSet::get(LLVMConte
for (ArrayRef<AttributeSet>::iterator I = Attrs.begin(), E = Attrs.end();
I != E; ++I) {
AttributeSet AS = *I;
- if (!AS.AttrList) continue;
- AttrList.append(AS.AttrList->AttrList.begin(), AS.AttrList->AttrList.end());
+ if (!AS.pImpl) continue;
+ AttrList.append(AS.pImpl->AttrList.begin(), AS.pImpl->AttrList.end());
}
return get(C, AttrList);
}
const AttributeSet &AttributeSet::operator=(const AttributeSet &RHS) {
- AttrList = RHS.AttrList;
+ pImpl = RHS.pImpl;
return *this;
}
@@ -667,19 +667,19 @@ const AttributeSet &AttributeSet::operat
/// This is the number of arguments that have an attribute set on them
/// (including the function itself).
unsigned AttributeSet::getNumSlots() const {
- return AttrList ? AttrList->getNumAttributes() : 0;
+ return pImpl ? pImpl->getNumAttributes() : 0;
}
unsigned AttributeSet::getSlotIndex(unsigned Slot) const {
- assert(AttrList && Slot < AttrList->getNumAttributes() &&
+ assert(pImpl && Slot < pImpl->getNumAttributes() &&
"Slot # out of range!");
- return AttrList->getSlotIndex(Slot);
+ return pImpl->getSlotIndex(Slot);
}
AttributeSet AttributeSet::getSlotAttributes(unsigned Slot) const {
- assert(AttrList && Slot < AttrList->getNumAttributes() &&
+ assert(pImpl && Slot < pImpl->getNumAttributes() &&
"Slot # out of range!");
- return AttrList->getSlotAttributes(Slot);
+ return pImpl->getSlotAttributes(Slot);
}
bool AttributeSet::hasAttribute(unsigned Index, Attribute::AttrKind Kind) const{
@@ -709,9 +709,9 @@ uint64_t AttributeSet::Raw(unsigned Inde
/// getAttributes - The attributes for the specified index are returned.
Attribute AttributeSet::getAttributes(unsigned Idx) const {
- if (AttrList == 0) return Attribute();
+ if (pImpl == 0) return Attribute();
- ArrayRef<AttributeWithIndex> Attrs = AttrList->getAttributes();
+ ArrayRef<AttributeWithIndex> Attrs = pImpl->getAttributes();
for (unsigned i = 0, e = Attrs.size(); i != e && Attrs[i].Index <= Idx; ++i)
if (Attrs[i].Index == Idx)
return Attrs[i].Attrs;
@@ -722,9 +722,9 @@ Attribute AttributeSet::getAttributes(un
/// hasAttrSomewhere - Return true if the specified attribute is set for at
/// least one parameter or for the return value.
bool AttributeSet::hasAttrSomewhere(Attribute::AttrKind Attr) const {
- if (AttrList == 0) return false;
+ if (pImpl == 0) return false;
- ArrayRef<AttributeWithIndex> Attrs = AttrList->getAttributes();
+ ArrayRef<AttributeWithIndex> Attrs = pImpl->getAttributes();
for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
if (Attrs[i].Attrs.hasAttribute(Attr))
return true;
@@ -760,10 +760,10 @@ AttributeSet AttributeSet::addAttr(LLVMC
return *this;
SmallVector<AttributeWithIndex, 8> NewAttrList;
- if (AttrList == 0)
+ if (pImpl == 0)
NewAttrList.push_back(AttributeWithIndex::get(Idx, Attrs));
else {
- ArrayRef<AttributeWithIndex> OldAttrList = AttrList->getAttributes();
+ ArrayRef<AttributeWithIndex> OldAttrList = pImpl->getAttributes();
unsigned i = 0, e = OldAttrList.size();
// Copy attributes for arguments before this one.
for (; i != e && OldAttrList[i].Index < Idx; ++i)
@@ -805,7 +805,7 @@ AttributeSet AttributeSet::removeAttr(LL
assert(!Attrs.hasAttribute(Attribute::Alignment) &&
"Attempt to exclude alignment!");
#endif
- if (AttrList == 0) return AttributeSet();
+ if (pImpl == 0) return AttributeSet();
Attribute OldAttrs = getAttributes(Idx);
AttrBuilder NewAttrs =
@@ -814,7 +814,7 @@ AttributeSet AttributeSet::removeAttr(LL
return *this;
SmallVector<AttributeWithIndex, 8> NewAttrList;
- ArrayRef<AttributeWithIndex> OldAttrList = AttrList->getAttributes();
+ ArrayRef<AttributeWithIndex> OldAttrList = pImpl->getAttributes();
unsigned i = 0, e = OldAttrList.size();
// Copy attributes for arguments before this one.
More information about the llvm-commits
mailing list