diff options
author | Bill Wendling <isanbard@gmail.com> | 2012-10-09 20:28:54 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2012-10-09 20:28:54 +0000 |
commit | 6b73e8a2809b28158a8ee10b63a91b3b778f56f9 (patch) | |
tree | 5ad8519d924576f5a57f48f6d773ff5a1eddb577 | |
parent | 4f8d27338e92ae474fa51fd0bcaeffcca4cb15fb (diff) | |
download | external_llvm-6b73e8a2809b28158a8ee10b63a91b3b778f56f9.zip external_llvm-6b73e8a2809b28158a8ee10b63a91b3b778f56f9.tar.gz external_llvm-6b73e8a2809b28158a8ee10b63a91b3b778f56f9.tar.bz2 |
Use appropriate method calls to get the alignment value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165541 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Attributes.h | 3 | ||||
-rw-r--r-- | lib/VMCore/Attributes.cpp | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h index aa7bc32..fcfacb1 100644 --- a/include/llvm/Attributes.h +++ b/include/llvm/Attributes.h @@ -334,8 +334,7 @@ public: // bits. uint64_t EncodedAttrs = Attrs.Raw() & 0xffff; if (Attrs.hasAttribute(Attributes::Alignment)) - EncodedAttrs |= (1ULL << 16) << - (((Attrs.Raw() & Attribute::Alignment_i) - 1) >> 16); + EncodedAttrs |= Attrs.getAlignment() << 16; EncodedAttrs |= (Attrs.Raw() & (0xfffULL << 21)) << 11; return EncodedAttrs; } diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp index 4597263..88f20e9 100644 --- a/lib/VMCore/Attributes.cpp +++ b/lib/VMCore/Attributes.cpp @@ -245,13 +245,14 @@ bool Attributes::Builder::hasAttributes(const Attributes &A) const { return Bits & A.Raw(); } bool Attributes::Builder::hasAlignmentAttr() const { - return Bits & Attribute::Alignment_i; + return Bits & AttributesImpl::getAttrMask(Attributes::Alignment); } uint64_t Attributes::Builder::getAlignment() const { if (!hasAlignmentAttr()) return 0; - return 1U << (((Bits & Attribute::Alignment_i) >> 16) - 1); + return 1U << + (((Bits & AttributesImpl::getAttrMask(Attributes::Alignment)) >> 16) - 1); } //===----------------------------------------------------------------------===// @@ -305,11 +306,11 @@ bool AttributesImpl::hasAttributes(const Attributes &A) const { } uint64_t AttributesImpl::getAlignment() const { - return Bits & Attribute::Alignment_i; + return Bits & getAttrMask(Attributes::Alignment); } uint64_t AttributesImpl::getStackAlignment() const { - return Bits & Attribute::StackAlignment_i; + return Bits & getAttrMask(Attributes::StackAlignment); } bool AttributesImpl::isEmptyOrSingleton() const { |