Remove a use of AttributeWithIndex.
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
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 361f3d6..59d3ef0 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -197,17 +197,21 @@
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 @@
}
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)