Push the calculation of the 'Raw' attribute mask down into the implementation. It in turn uses the correct list for calculating the 'Raw' value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173637 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index b4fb0c0..babc14e 100644
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -165,6 +165,9 @@
ID.AddPointer(Nodes[i].second);
}
}
+
+ // FIXME: This atrocity is temporary.
+ uint64_t Raw(uint64_t Index) const;
};
} // end llvm namespace
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 1b057bb..81390f0 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -574,6 +574,24 @@
#endif
}
+uint64_t AttributeSetImpl::Raw(uint64_t Index) const {
+ for (unsigned I = 0, E = getNumAttributes(); I != E; ++I) {
+ if (getSlotIndex(I) != Index) continue;
+ const AttributeSetNode *ASN = AttrNodes[I].second;
+ AttrBuilder B;
+
+ for (AttributeSetNode::const_iterator II = ASN->begin(),
+ IE = ASN->end(); II != IE; ++II)
+ B.addAttributes(*II);
+
+ assert(B.Raw() == AttrList[I].Attrs.Raw() &&
+ "Attributes aren't the same!");
+ return B.Raw();
+ }
+
+ return 0;
+}
+
//===----------------------------------------------------------------------===//
// AttributeSet Method Implementations
//===----------------------------------------------------------------------===//
@@ -669,14 +687,9 @@
return get(C, AttrList);
}
-const AttributeSet &AttributeSet::operator=(const AttributeSet &RHS) {
- pImpl = RHS.pImpl;
- return *this;
-}
-
-/// getNumSlots - Return the number of slots used in this attribute list.
-/// This is the number of arguments that have an attribute set on them
-/// (including the function itself).
+/// \brief Return the number of slots used in this attribute list. This is the
+/// number of arguments that have an attribute set on them (including the
+/// function itself).
unsigned AttributeSet::getNumSlots() const {
return pImpl ? pImpl->getNumAttributes() : 0;
}
@@ -715,7 +728,7 @@
uint64_t AttributeSet::Raw(unsigned Index) const {
// FIXME: Remove this.
- return getAttributes(Index).Raw();
+ return pImpl ? pImpl->Raw(Index) : 0;
}
/// getAttributes - The attributes for the specified index are returned.