Use a single location for calculating the alignments.

[oota-llvm.git] / lib / VMCore / Attributes.cpp

diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp
index 4024410b42f6b58f04ad18285dfd23b53a09ea45..c176fed584bf816817bf674678c4866c32671a7d 100644 (file)
--- a/lib/VMCore/Attributes.cpp
+++ b/lib/VMCore/Attributes.cpp
@@ -65,27 +65,23 @@ Attributes Attributes::get(LLVMContext &Context, Attributes::Builder &B) {
   return Attributes(PA);
 }
 
-bool Attributes::hasAttributes(const Attributes &A) const {
-  return Attrs.hasAttributes(A);
-}
-
 bool Attributes::hasAttribute(AttrVal Val) const {
   return Attrs.hasAttribute(Val);
 }
 
+bool Attributes::hasAttributes(const Attributes &A) const {
+  return Attrs.hasAttributes(A);
+}
+
 /// 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 {
@@ -120,20 +116,18 @@ uint64_t Attributes::Raw() const {
 Attributes Attributes::typeIncompatible(Type *Ty) {
   Attributes::Builder Incompatible;
   
-  if (!Ty->isIntegerTy()) {
+  if (!Ty->isIntegerTy())
     // Attributes that only apply to integers.
-    Incompatible.addSExtAttr();
-    Incompatible.addZExtAttr();
-  }
+    Incompatible.addAttribute(Attributes::SExt)
+      .addAttribute(Attributes::ZExt);
   
-  if (!Ty->isPointerTy()) {
+  if (!Ty->isPointerTy())
     // Attributes that only apply to pointers.
-    Incompatible.addByValAttr();
-    Incompatible.addNestAttr();
-    Incompatible.addNoAliasAttr();
-    Incompatible.addNoCaptureAttr();
-    Incompatible.addStructRetAttr();
-  }
+    Incompatible.addAttribute(Attributes::ByVal)
+      .addAttribute(Attributes::Nest)
+      .addAttribute(Attributes::NoAlias)
+      .addAttribute(Attributes::NoCapture)
+      .addAttribute(Attributes::StructRet);
   
   return Attributes(Incompatible.Bits); // FIXME: Use Attributes::get().
 }
@@ -210,80 +204,10 @@ std::string Attributes::getAsString() const {
 // Attributes::Builder Implementation
 //===----------------------------------------------------------------------===//
 
-void Attributes::Builder::addAddressSafetyAttr() {
-  Bits |= Attribute::AddressSafety_i;
-}
-void Attributes::Builder::addAlwaysInlineAttr() {
-  Bits |= Attribute::AlwaysInline_i;
-}
-void Attributes::Builder::addByValAttr() {
-  Bits |= Attribute::ByVal_i;
-}
-void Attributes::Builder::addInlineHintAttr() {
-  Bits |= Attribute::InlineHint_i;
-}
-void Attributes::Builder::addInRegAttr() {
-  Bits |= Attribute::InReg_i;
-}
-void Attributes::Builder::addNakedAttr() {
-  Bits |= Attribute::Naked_i;
-}
-void Attributes::Builder::addNestAttr() {
-  Bits |= Attribute::Nest_i;
-}
-void Attributes::Builder::addNoAliasAttr() {
-  Bits |= Attribute::NoAlias_i;
-}
-void Attributes::Builder::addNoCaptureAttr() {
-  Bits |= Attribute::NoCapture_i;
-}
-void Attributes::Builder::addNoImplicitFloatAttr() {
-  Bits |= Attribute::NoImplicitFloat_i;
-}
-void Attributes::Builder::addNoInlineAttr() {
-  Bits |= Attribute::NoInline_i;
-}
-void Attributes::Builder::addNonLazyBindAttr() {
-  Bits |= Attribute::NonLazyBind_i;
-}
-void Attributes::Builder::addNoRedZoneAttr() {
-  Bits |= Attribute::NoRedZone_i;
-}
-void Attributes::Builder::addNoReturnAttr() {
-  Bits |= Attribute::NoReturn_i;
-}
-void Attributes::Builder::addNoUnwindAttr() {
-  Bits |= Attribute::NoUnwind_i;
-}
-void Attributes::Builder::addOptimizeForSizeAttr() {
-  Bits |= Attribute::OptimizeForSize_i;
-}
-void Attributes::Builder::addReadNoneAttr() {
-  Bits |= Attribute::ReadNone_i;
-}
-void Attributes::Builder::addReadOnlyAttr() {
-  Bits |= Attribute::ReadOnly_i;
-}
-void Attributes::Builder::addReturnsTwiceAttr() {
-  Bits |= Attribute::ReturnsTwice_i;
-}
-void Attributes::Builder::addSExtAttr() {
-  Bits |= Attribute::SExt_i;
-}
-void Attributes::Builder::addStackProtectAttr() {
-  Bits |= Attribute::StackProtect_i;
-}
-void Attributes::Builder::addStackProtectReqAttr() {
-  Bits |= Attribute::StackProtectReq_i;
-}
-void Attributes::Builder::addStructRetAttr() {
-  Bits |= Attribute::StructRet_i;
-}
-void Attributes::Builder::addUWTableAttr() {
-  Bits |= Attribute::UWTable_i;
-}
-void Attributes::Builder::addZExtAttr() {
-  Bits |= Attribute::ZExt_i;
+Attributes::Builder &Attributes::Builder::
+addAttribute(Attributes::AttrVal Val) {
+  Bits |= AttributesImpl::getAttrMask(Val);
+  return *this;
 }
 
 void Attributes::Builder::addAlignmentAttr(unsigned Align) {
@@ -300,91 +224,14 @@ void Attributes::Builder::addStackAlignmentAttr(unsigned Align) {
   Bits |= (Log2_32(Align) + 1) << 26;
 }
 
-void Attributes::Builder::removeAttributes(const Attributes &A) {
-  Bits &= ~A.Raw();
-}
-
-void Attributes::Builder::removeAddressSafetyAttr() {
-  Bits &= ~Attribute::AddressSafety_i;
-}
-void Attributes::Builder::removeAlwaysInlineAttr() {
-  Bits &= ~Attribute::AlwaysInline_i;
-}
-void Attributes::Builder::removeByValAttr() {
-  Bits &= ~Attribute::ByVal_i;
-}
-void Attributes::Builder::removeInlineHintAttr() {
-  Bits &= ~Attribute::InlineHint_i;
-}
-void Attributes::Builder::removeInRegAttr() {
-  Bits &= ~Attribute::InReg_i;
-}
-void Attributes::Builder::removeNakedAttr() {
-  Bits &= ~Attribute::Naked_i;
-}
-void Attributes::Builder::removeNestAttr() {
-  Bits &= ~Attribute::Nest_i;
-}
-void Attributes::Builder::removeNoAliasAttr() {
-  Bits &= ~Attribute::NoAlias_i;
-}
-void Attributes::Builder::removeNoCaptureAttr() {
-  Bits &= ~Attribute::NoCapture_i;
-}
-void Attributes::Builder::removeNoImplicitFloatAttr() {
-  Bits &= ~Attribute::NoImplicitFloat_i;
-}
-void Attributes::Builder::removeNoInlineAttr() {
-  Bits &= ~Attribute::NoInline_i;
-}
-void Attributes::Builder::removeNonLazyBindAttr() {
-  Bits &= ~Attribute::NonLazyBind_i;
-}
-void Attributes::Builder::removeNoRedZoneAttr() {
-  Bits &= ~Attribute::NoRedZone_i;
-}
-void Attributes::Builder::removeNoReturnAttr() {
-  Bits &= ~Attribute::NoReturn_i;
-}
-void Attributes::Builder::removeNoUnwindAttr() {
-  Bits &= ~Attribute::NoUnwind_i;
-}
-void Attributes::Builder::removeOptimizeForSizeAttr() {
-  Bits &= ~Attribute::OptimizeForSize_i;
-}
-void Attributes::Builder::removeReadNoneAttr() {
-  Bits &= ~Attribute::ReadNone_i;
-}
-void Attributes::Builder::removeReadOnlyAttr() {
-  Bits &= ~Attribute::ReadOnly_i;
-}
-void Attributes::Builder::removeReturnsTwiceAttr() {
-  Bits &= ~Attribute::ReturnsTwice_i;
-}
-void Attributes::Builder::removeSExtAttr() {
-  Bits &= ~Attribute::SExt_i;
-}
-void Attributes::Builder::removeStackProtectAttr() {
-  Bits &= ~Attribute::StackProtect_i;
-}
-void Attributes::Builder::removeStackProtectReqAttr() {
-  Bits &= ~Attribute::StackProtectReq_i;
-}
-void Attributes::Builder::removeStructRetAttr() {
-  Bits &= ~Attribute::StructRet_i;
-}
-void Attributes::Builder::removeUWTableAttr() {
-  Bits &= ~Attribute::UWTable_i;
-}
-void Attributes::Builder::removeZExtAttr() {
-  Bits &= ~Attribute::ZExt_i;
+Attributes::Builder &Attributes::Builder::
+removeAttribute(Attributes::AttrVal Val) {
+  Bits &= ~AttributesImpl::getAttrMask(Val);
+  return *this;
 }
 
-void Attributes::Builder::removeAlignmentAttr() {
-  Bits &= ~Attribute::Alignment_i;
-}
-void Attributes::Builder::removeStackAlignmentAttr() {
-  Bits &= ~Attribute::StackAlignment_i;
+void Attributes::Builder::removeAttributes(const Attributes &A) {
+  Bits &= ~A.Raw();
 }
 
 bool Attributes::Builder::hasAttributes() const {
@@ -394,20 +241,19 @@ 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);
 }
 
 //===----------------------------------------------------------------------===//
 // AttributeImpl Definition
 //===----------------------------------------------------------------------===//
 
-uint64_t AttributesImpl::getAttrMask(uint64_t Val) const {
+uint64_t AttributesImpl::getAttrMask(uint64_t Val) {
   switch (Val) {
   case Attributes::None:            return 0;
   case Attributes::ZExt:            return 1 << 0;
@@ -454,11 +300,11 @@ bool AttributesImpl::hasAttributes(const Attributes &A) const {
 }
 
 uint64_t AttributesImpl::getAlignment() const {
-  return Bits & Attribute::Alignment_i;
+  return 1U << (((Bits & getAttrMask(Attributes::Alignment)) >> 16) - 1);
 }
 
 uint64_t AttributesImpl::getStackAlignment() const {
-  return Bits & Attribute::StackAlignment_i;
+  return 1U << (((Bits & getAttrMask(Attributes::StackAlignment)) >> 26) - 1);
 }
 
 bool AttributesImpl::isEmptyOrSingleton() const {