Use a single location for calculating the alignments.

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

diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp
index 88f20e94a5c5f86623e5c2d8d46d5ac79642d884..c176fed584bf816817bf674678c4866c32671a7d 100644 (file)
--- a/lib/VMCore/Attributes.cpp
+++ b/lib/VMCore/Attributes.cpp
@@ -75,17 +75,13 @@ bool Attributes::hasAttributes(const Attributes &A) const {
 
 /// This returns the alignment field of an attribute as a byte alignment value.
 unsigned Attributes::getAlignment() const {
-  if (!hasAttribute(Attributes::Alignment))
-    return 0;
-  return 1U << ((Attrs.getAlignment() >> 16) - 1);
+  return Attrs.getAlignment();
 }
 
 /// This returns the stack alignment field of an attribute as a byte alignment
 /// value.
 unsigned Attributes::getStackAlignment() const {
-  if (!hasAttribute(Attributes::StackAlignment))
-    return 0;
-  return 1U << ((Attrs.getStackAlignment() >> 26) - 1);
+  return Attrs.getStackAlignment();
 }
 
 bool Attributes::isEmptyOrSingleton() const {
@@ -249,8 +245,6 @@ bool Attributes::Builder::hasAlignmentAttr() const {
 }
 
 uint64_t Attributes::Builder::getAlignment() const {
-  if (!hasAlignmentAttr())
-    return 0;
   return 1U <<
     (((Bits & AttributesImpl::getAttrMask(Attributes::Alignment)) >> 16) - 1);
 }
@@ -306,11 +300,11 @@ bool AttributesImpl::hasAttributes(const Attributes &A) const {
 }
 
 uint64_t AttributesImpl::getAlignment() const {
-  return Bits & getAttrMask(Attributes::Alignment);
+  return 1U << (((Bits & getAttrMask(Attributes::Alignment)) >> 16) - 1);
 }
 
 uint64_t AttributesImpl::getStackAlignment() const {
-  return Bits & getAttrMask(Attributes::StackAlignment);
+  return 1U << (((Bits & getAttrMask(Attributes::StackAlignment)) >> 26) - 1);
 }
 
 bool AttributesImpl::isEmptyOrSingleton() const {