6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-05 13:09:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove a use of AttributeWithIndex.

Browse Source 
We want to remove AttributeWithIndex because it provides a non-encapsulated view
of the AttributeSetImpl object. Instead, use accessor methods and iterators.

Eventually, this code can be simplified because the Attribute object will hold
only one attribute instead of multiple attributes.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173641 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-01-28 00:21:34 +00:00
parent 49716e5d84
commit 73bc452bcd
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/IR/AttributeImpl.h
View File

@ -117,7 +117,8 @@ class AttributeSetImpl : public FoldingSetNode {
LLVMContext &Context;
SmallVector<AttributeWithIndex, 4> AttrList;
SmallVector<std::pair<uint64_t, AttributeSetNode*>, 4> AttrNodes;
typedef std::pair<uint64_t, AttributeSetNode*> IndexAttrPair;
SmallVector<IndexAttrPair, 4> AttrNodes;
// AttributesSet is uniqued, these should not be publicly available.
void operator=(const AttributeSetImpl &) LLVM_DELETED_FUNCTION;
@ -137,7 +138,9 @@ public:
/// is the index of the return, parameter, or function object that the
/// attributes are applied to, not the index into the AttrNodes list where the
/// attributes reside.
uint64_t getSlotIndex(unsigned Slot) const { return AttrNodes[Slot].first; }
uint64_t getSlotIndex(unsigned Slot) const {
return AttrNodes[Slot].first;
}
/// \brief Retrieve the attributes for the given "slot" in the AttrNode list.
/// \p Slot is an index into the AttrNodes list, not the index of the return /
@ -147,6 +150,19 @@ public:
return AttributeSet::get(Context, AttrList[Slot]);
}
typedef AttributeSetNode::iterator iterator;
typedef AttributeSetNode::const_iterator const_iterator;
iterator begin(unsigned Idx)
{ return AttrNodes[Idx].second->begin(); }
iterator end(unsigned Idx)
{ return AttrNodes[Idx].second->end(); }
const_iterator begin(unsigned Idx) const
{ return AttrNodes[Idx].second->begin(); }
const_iterator end(unsigned Idx) const
{ return AttrNodes[Idx].second->end(); }
void Profile(FoldingSetNodeID &ID) const {
Profile(ID, AttrList);
}

26
lib/IR/Attributes.cpp
View File

@ -197,17 +197,21 @@ AttrBuilder::AttrBuilder(AttributeSet AS, unsigned Idx)
AttributeSetImpl *pImpl = AS.pImpl;
if (!pImpl) return;
ArrayRef<AttributeWithIndex> AttrList = pImpl->getAttributes();
const AttributeWithIndex *AWI = 0;
for (unsigned I = 0, E = AttrList.size(); I != E; ++I)
if (AttrList[I].Index == Idx) {
AWI = &AttrList[I];
break;
}
AttrBuilder B;
if (!AWI) return;
for (unsigned I = 0, E = pImpl->getNumAttributes(); I != E; ++I) {
if (pImpl->getSlotIndex(I) != Idx) continue;
uint64_t Mask = AWI->Attrs.Raw();
for (AttributeSetNode::const_iterator II = pImpl->begin(I),
IE = pImpl->end(I); II != IE; ++II)
B.addAttributes(*II);
break;
}
if (!B.hasAttributes()) return;
uint64_t Mask = B.Raw();
for (Attribute::AttrKind I = Attribute::None; I != Attribute::EndAttrKinds;
I = Attribute::AttrKind(I + 1)) {
@ -861,8 +865,8 @@ AttributeSet AttributeSet::removeAttr(LLVMContext &C, unsigned Idx,
}
void AttributeSet::dump() const {
dbgs() << "PAL[ ";
for (unsigned i = 0; i < getNumSlots(); ++i) {
dbgs() << "PAL[\n";
for (unsigned i = 0, e = getNumSlots(); i < e; ++i) {
uint64_t Index = getSlotIndex(i);
dbgs() << " { ";
if (Index == ~0U)