[llvm-commits] [llvm] r171448 - in /llvm/trunk: include/llvm/IR/Attributes.h lib/IR/AttributeImpl.h lib/IR/Attributes.cpp
Hal Finkel
hfinkel at anl.gov
Wed Jan 2 18:01:51 PST 2013
----- Original Message -----
> From: "Bill Wendling" <isanbard at gmail.com>
> To: llvm-commits at cs.uiuc.edu
> Sent: Wednesday, January 2, 2013 7:54:39 PM
> Subject: [llvm-commits] [llvm] r171448 - in /llvm/trunk: include/llvm/IR/Attributes.h lib/IR/AttributeImpl.h
> lib/IR/Attributes.cpp
>
> Author: void
> Date: Wed Jan 2 19:54:39 2013
> New Revision: 171448
>
> URL: http://llvm.org/viewvc/llvm-project?rev=171448&view=rev
> Log:
> Try again to revert the bad patch. The tree was reverted for some
> unknown reason
> before the last time.
My builds are now failing:
/src/llvm-trunk-writable/lib/IR/Attributes.cpp:236:6: error: redefinition of ‘void llvm::AttrBuilder::clear()’
/src/llvm-trunk-writable/include/llvm/IR/Attributes.h:168:8: error: ‘void llvm::AttrBuilder::clear()’ previously defined here
/src/llvm-trunk-writable/lib/IR/Attributes.cpp: In member function ‘llvm::AttrBuilder& llvm::AttrBuilder::addAttribute(llvm::Attribute::AttrKind)’:
/src/llvm-trunk-writable/lib/IR/Attributes.cpp:244:3: error: ‘AttrSet’ was not declared in this scope
...
-Hal
>
> --- Reverse-merging r171442 into '.':
> U include/llvm/IR/Attributes.h
> U lib/IR/Attributes.cpp
> U lib/IR/AttributeImpl.h
>
>
> Modified:
> llvm/trunk/include/llvm/IR/Attributes.h
> llvm/trunk/lib/IR/AttributeImpl.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=171448&r1=171447&r2=171448&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/IR/Attributes.h (original)
> +++ llvm/trunk/include/llvm/IR/Attributes.h Wed Jan 2 19:54:39 2013
> @@ -17,7 +17,8 @@
> #define LLVM_ATTRIBUTES_H
>
> #include "llvm/ADT/ArrayRef.h"
> -#include "llvm/ADT/DenseSet.h"
> +#include "llvm/Support/MathExtras.h"
> +#include <cassert>
> #include <string>
>
> namespace llvm {
> @@ -153,85 +154,63 @@
>
> //===----------------------------------------------------------------------===//
> /// \class
> -/// \brief Provide DenseMapInfo for Attribute::AttrKind.
> -template<> struct DenseMapInfo<Attribute::AttrKind> {
> - static inline Attribute::AttrKind getEmptyKey() {
> - return Attribute::AttrKind(-1);
> - }
> - static inline Attribute::AttrKind getTombstoneKey() {
> - return Attribute::AttrKind(~0UL - 1L);
> - }
> - static unsigned getHashValue(const Attribute::AttrKind &Val) {
> - return (unsigned)(Val * 37UL);
> - }
> - static bool isEqual(const Attribute::AttrKind &LHS,
> - const Attribute::AttrKind &RHS) {
> - return LHS == RHS;
> - }
> -};
> -
> -//===----------------------------------------------------------------------===//
> -/// \class
> /// \brief This class is used in conjunction with the Attribute::get
> method to
> /// create an Attribute object. The object itself is uniquified. The
> Builder's
> /// value, however, is not. So this can be used as a quick way to
> test for
> /// equality, presence of attributes, etc.
> class AttrBuilder {
> - DenseSet<Attribute::AttrKind> AttrSet;
> - uint64_t Alignment;
> - uint64_t StackAlignment;
> -
> - uint64_t Bits; // FIXME: Remove after encoding the attr list in
> the bc file.
> + uint64_t Bits;
> public:
> - AttrBuilder() : Alignment(0), StackAlignment(0), Bits(0) {}
> + AttrBuilder() : Bits(0) {}
> explicit AttrBuilder(uint64_t B) : Bits(B) {}
> AttrBuilder(const Attribute &A) : Bits(A.getBitMask()) {}
>
> - /// \brief Clear out the builder's internals.
> - void clear();
> + void clear() { Bits = 0; }
>
> - /// \brief Add an attribute to the builder.
> + /// addAttribute - Add an attribute to the builder.
> AttrBuilder &addAttribute(Attribute::AttrKind Val);
>
> - /// \brief Remove an attribute from the builder.
> + /// removeAttribute - Remove an attribute from the builder.
> AttrBuilder &removeAttribute(Attribute::AttrKind Val);
>
> - /// \brief Add the attributes from A to the builder.
> + /// addAttribute - Add the attributes from A to the builder.
> AttrBuilder &addAttributes(const Attribute &A);
>
> - /// \brief Remove the attributes from A from the builder.
> + /// removeAttribute - Remove the attributes from A from the
> builder.
> AttrBuilder &removeAttributes(const Attribute &A);
>
> - /// \brief Return true if the builder has IR-level attributes.
> + /// \brief Return true if the builder has the specified attribute.
> + bool contains(Attribute::AttrKind A) const;
> +
> + /// hasAttributes - Return true if the builder has IR-level
> attributes.
> bool hasAttributes() const;
>
> - /// \brief Return true if the builder has any attribute that's in
> the
> + /// hasAttributes - Return true if the builder has any attribute
> that's in the
> /// specified attribute.
> bool hasAttributes(const Attribute &A) const;
>
> - /// \brief Return true if the builder has an alignment attribute.
> + /// hasAlignmentAttr - Return true if the builder has an alignment
> attribute.
> bool hasAlignmentAttr() const;
>
> - /// \brief Retrieve the alignment attribute, if it exists.
> + /// getAlignment - Retrieve the alignment attribute, if it exists.
> uint64_t getAlignment() const;
>
> - /// \brief Retrieve the stack alignment attribute, if it exists.
> + /// getStackAlignment - Retrieve the stack alignment attribute, if
> it exists.
> uint64_t getStackAlignment() const;
>
> - /// \brief This turns an int alignment (which must be a power of
> 2) into the
> - /// form used internally in Attribute.
> + /// addAlignmentAttr - This turns an int alignment (which must be
> a power of
> + /// 2) into the form used internally in Attribute.
> AttrBuilder &addAlignmentAttr(unsigned Align);
>
> - /// \brief This turns an int stack alignment (which must be a
> power of 2) into
> - /// the form used internally in Attribute.
> + /// addStackAlignmentAttr - This turns an int stack alignment
> (which must be a
> + /// power of 2) into the form used internally in Attribute.
> AttrBuilder &addStackAlignmentAttr(unsigned Align);
>
> - /// \brief Add the raw value to the internal representation.
> - ///
> + /// addRawValue - Add the raw value to the internal
> representation.
> /// N.B. This should be used ONLY for decoding LLVM bitcode!
> AttrBuilder &addRawValue(uint64_t Val);
>
> - /// \brief Remove attributes that are used on functions only.
> + /// @brief Remove attributes that are used on functions only.
> void removeFunctionOnlyAttrs() {
> removeAttribute(Attribute::NoReturn)
> .removeAttribute(Attribute::NoUnwind)
> @@ -257,15 +236,12 @@
>
> uint64_t getBitMask() const { return Bits; }
>
> - bool operator==(const AttrBuilder &B) const {
> + bool operator==(const AttrBuilder &B) {
> return Bits == B.Bits;
> }
> - bool operator!=(const AttrBuilder &B) const {
> + bool operator!=(const AttrBuilder &B) {
> return Bits != B.Bits;
> }
> -
> - bool operator==(Attribute::AttrKind A) const;
> - bool operator!=(Attribute::AttrKind A) const;
> };
>
> //===----------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/IR/AttributeImpl.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AttributeImpl.h?rev=171448&r1=171447&r2=171448&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/AttributeImpl.h (original)
> +++ llvm/trunk/lib/IR/AttributeImpl.h Wed Jan 2 19:54:39 2013
> @@ -42,6 +42,9 @@
> return Vals;
> }
>
> + bool contains(Attribute::AttrKind Kind) const;
> + bool contains(StringRef Kind) const;
> +
> bool hasAttribute(Attribute::AttrKind A) const;
>
> bool hasAttributes() const;
> @@ -50,11 +53,19 @@
> uint64_t getAlignment() const;
> uint64_t getStackAlignment() const;
>
> - bool operator==(Attribute::AttrKind Kind) const;
> - bool operator!=(Attribute::AttrKind Kind) const;
> + bool operator==(Attribute::AttrKind Kind) const {
> + return contains(Kind);
> + }
> + bool operator!=(Attribute::AttrKind Kind) const {
> + return !contains(Kind);
> + }
>
> - bool operator==(StringRef Kind) const;
> - bool operator!=(StringRef Kind) const;
> + bool operator==(StringRef Kind) const {
> + return contains(Kind);
> + }
> + bool operator!=(StringRef Kind) const {
> + return !contains(Kind);
> + }
>
> uint64_t getBitMask() const; // FIXME: Remove.
>
>
> Modified: llvm/trunk/lib/IR/Attributes.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Attributes.cpp?rev=171448&r1=171447&r2=171448&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/Attributes.cpp (original)
> +++ llvm/trunk/lib/IR/Attributes.cpp Wed Jan 2 19:54:39 2013
> @@ -89,11 +89,11 @@
> }
>
> bool Attribute::operator==(AttrKind K) const {
> - return pImpl && *pImpl == K;
> + return pImpl && pImpl->contains(K);
> }
>
> bool Attribute::operator!=(AttrKind K) const {
> - return !(pImpl && *pImpl == K);
> + return !(pImpl && pImpl->contains(K));
> }
>
> uint64_t Attribute::getBitMask() const {
> @@ -293,14 +293,10 @@
> return *this;
> }
>
> -bool AttrBuilder::operator==(Attribute::AttrKind A) const {
> +bool AttrBuilder::contains(Attribute::AttrKind A) const {
> return Bits & AttributeImpl::getAttrMask(A);
> }
>
> -bool AttrBuilder::operator!=(Attribute::AttrKind A) const {
> - return !(*this == A);
> -}
> -
> bool AttrBuilder::hasAttributes() const {
> return Bits != 0;
> }
> @@ -345,24 +341,18 @@
> Data = ConstantDataArray::getString(C, data);
> }
>
> -bool AttributeImpl::operator==(Attribute::AttrKind Kind) const {
> +bool AttributeImpl::contains(Attribute::AttrKind Kind) const {
> if (ConstantInt *CI = dyn_cast<ConstantInt>(Data))
> return CI->getZExtValue() == Kind;
> return false;
> }
> -bool AttributeImpl::operator!=(Attribute::AttrKind Kind) const {
> - return !(*this == Kind);
> -}
>
> -bool AttributeImpl::operator==(StringRef Kind) const {
> +bool AttributeImpl::contains(StringRef Kind) const {
> if (ConstantDataArray *CDA = dyn_cast<ConstantDataArray>(Data))
> if (CDA->isString())
> return CDA->getAsString() == Kind;
> return false;
> }
> -bool AttributeImpl::operator!=(StringRef Kind) const {
> - return !(*this == Kind);
> -}
>
> uint64_t AttributeImpl::getBitMask() const {
> // FIXME: Remove this.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
--
Hal Finkel
Postdoctoral Appointee
Leadership Computing Facility
Argonne National Laboratory
More information about the llvm-commits
mailing list