Remove the Attribute::hasAttributes() function.

That function doesn't make sense anymore because there's only one attribute per
Attribute object now.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174044 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index e854da7313ee429ac0a70686a3beea7daba10637..3950d9322012847bbdf7184cb2687678d466cb36 100644 (file)
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -129,9 +129,6 @@ public:
   /// \brief Return true if the attribute is present.
   bool hasAttribute(AttrKind Val) const;
 
-  /// \brief Return true if attributes exist
-  bool hasAttributes() const;
-
   /// \brief Return the kind of this attribute.
   Constant *getAttributeKind() const;
 

diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index 7be5a162f125d6e923c373836ba0f55da0d4d72a..af9d4fa285c3b3c94ba3e26609c3de90225e4569 100644 (file)
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -46,7 +46,6 @@ public:
   AttributeImpl(LLVMContext &C, StringRef data);
 
   bool hasAttribute(Attribute::AttrKind A) const;
-  bool hasAttributes() const;
 
   Constant *getAttributeKind() const { return Kind; }
   ArrayRef<Constant*> getAttributeValues() const { return Vals; }

diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 98c12b5d85590d13d7a512bb57f449153f62fa9a..3a8cfe5ba6950823bbea78f52425af3bf118ce57 100644 (file)
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -82,10 +82,6 @@ bool Attribute::hasAttribute(AttrKind Val) const {
   return pImpl && pImpl->hasAttribute(Val);
 }
 
-bool Attribute::hasAttributes() const {
-  return pImpl && pImpl->hasAttributes();
-}
-
 Constant *Attribute::getAttributeKind() const {
   return pImpl ? pImpl->getAttributeKind() : 0;
 }
@@ -226,10 +222,6 @@ bool AttributeImpl::hasAttribute(Attribute::AttrKind A) const {
   return (Raw() & getAttrMask(A)) != 0;
 }
 
-bool AttributeImpl::hasAttributes() const {
-  return Raw() != 0;
-}
-
 uint64_t AttributeImpl::getAlignment() const {
   uint64_t Mask = Raw() & getAttrMask(Attribute::Alignment);
   return 1ULL << ((Mask >> 16) - 1);
@@ -454,7 +446,7 @@ AttributeSet AttributeSet::get(LLVMContext &C,
   for (unsigned i = 0, e = Attrs.size(); i != e; ++i) {
     assert((!i || Attrs[i-1].first <= Attrs[i].first) &&
            "Misordered Attributes list!");
-    assert(Attrs[i].second.hasAttributes() &&
+    assert(Attrs[i].second != Attribute::None &&
            "Pointless attribute!");
   }
 #endif