[llvm-commits] [llvm] r165548 - /llvm/trunk/lib/VMCore/Attributes.cpp

[Bill Wendling]

Author: void
Date: Tue Oct  9 15:56:48 2012
New Revision: 165548

URL: http://llvm.org/viewvc/llvm-project?rev=165548&view=rev
Log:
Revert r165547 to fix build.

Modified:
    llvm/trunk/lib/VMCore/Attributes.cpp

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=165548&r1=165547&r2=165548&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Oct  9 15:56:48 2012
@@ -75,13 +75,17 @@
 
 /// This returns the alignment field of an attribute as a byte alignment value.
 unsigned Attributes::getAlignment() const {
-  return Attrs.getAlignment();
+  if (!hasAttribute(Attributes::Alignment))
+    return 0;
+  return 1U << ((Attrs.getAlignment() >> 16) - 1);
 }
 
 /// This returns the stack alignment field of an attribute as a byte alignment
 /// value.
 unsigned Attributes::getStackAlignment() const {
-  return Attrs.getStackAlignment();
+  if (!hasAttribute(Attributes::StackAlignment))
+    return 0;
+  return 1U << ((Attrs.getStackAlignment() >> 26) - 1);
 }
 
 bool Attributes::isEmptyOrSingleton() const {
@@ -245,6 +249,8 @@
 }
 
 uint64_t Attributes::Builder::getAlignment() const {
+  if (!hasAlignmentAttr())
+    return 0;
   return 1U <<
     (((Bits & AttributesImpl::getAttrMask(Attributes::Alignment)) >> 16) - 1);
 }
@@ -300,11 +306,11 @@
 }
 
 uint64_t AttributesImpl::getAlignment() const {
-  return 1U << (((Bits & getAttrMask(Attributes::Alignment)) >> 16) - 1);
+  return Bits & getAttrMask(Attributes::Alignment);
 }
 
 uint64_t AttributesImpl::getStackAlignment() const {
-  return 1U << (((Bits & getAttrMask(Attributes::StackAlignment)) >> 26) - 1);
+  return Bits & getAttrMask(Attributes::StackAlignment);
 }
 
 bool AttributesImpl::isEmptyOrSingleton() const {