X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FAttributes.h;h=8ce7651ae9449b9db9f9f6f2b21fd8a796cf46b3;hb=39cd0c8e477255a7296b2bd1dc67193f8d38c003;hp=5adbb49696a8596b08593e8a8a42d29748edf6c0;hpb=27107f6ab4627fa38bcacad6757ed6d52910f880;p=oota-llvm.git

diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h
index 5adbb49696a..8ce7651ae94 100644
--- a/include/llvm/Attributes.h
+++ b/include/llvm/Attributes.h
@@ -53,7 +53,7 @@ public:
   ///                      an exception might pass by.
   /// uwtable + nounwind = Needs an entry because the ABI says so.
 
-  enum AttrVal {
+  enum AttrKind {
     // IR-Level Attributes
     None,                  ///< No attributes have been set
     AddressSafety,         ///< Address safety checking is on.
@@ -100,11 +100,11 @@ public:
 
   /// \brief Return a uniquified Attribute object. This takes the uniquified
   /// value from the Builder and wraps it in the Attribute class.
-  static Attribute get(LLVMContext &Context, ArrayRef<AttrVal> Vals);
+  static Attribute get(LLVMContext &Context, ArrayRef<AttrKind> Vals);
   static Attribute get(LLVMContext &Context, AttrBuilder &B);
 
   /// \brief Return true if the attribute is present.
-  bool hasAttribute(AttrVal Val) const;
+  bool hasAttribute(AttrKind Val) const;
 
   /// \brief Return true if attributes exist
   bool hasAttributes() const;
@@ -127,7 +127,7 @@ public:
     return pImpl != A.pImpl;
   }
 
-  uint64_t Raw() const;
+  uint64_t getBitMask() const;
 
   /// \brief Which attributes cannot be applied to a type.
   static Attribute typeIncompatible(Type *Ty);
@@ -160,15 +160,15 @@ class AttrBuilder {
 public:
   AttrBuilder() : Bits(0) {}
   explicit AttrBuilder(uint64_t B) : Bits(B) {}
-  AttrBuilder(const Attribute &A) : Bits(A.Raw()) {}
+  AttrBuilder(const Attribute &A) : Bits(A.getBitMask()) {}
 
   void clear() { Bits = 0; }
 
   /// addAttribute - Add an attribute to the builder.
-  AttrBuilder &addAttribute(Attribute::AttrVal Val);
+  AttrBuilder &addAttribute(Attribute::AttrKind Val);
 
   /// removeAttribute - Remove an attribute from the builder.
-  AttrBuilder &removeAttribute(Attribute::AttrVal Val);
+  AttrBuilder &removeAttribute(Attribute::AttrKind Val);
 
   /// addAttribute - Add the attributes from A to the builder.
   AttrBuilder &addAttributes(const Attribute &A);
@@ -176,8 +176,8 @@ public:
   /// removeAttribute - Remove the attributes from A from the builder.
   AttrBuilder &removeAttributes(const Attribute &A);
 
-  /// contains - Return true if the builder has the specified attribute.
-  bool hasAttribute(Attribute::AttrVal A) const;
+  /// \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;
@@ -231,7 +231,7 @@ public:
       .removeAttribute(Attribute::NoDuplicate);
   }
 
-  uint64_t Raw() const { return Bits; }
+  uint64_t getBitMask() const { return Bits; }
 
   bool operator==(const AttrBuilder &B) {
     return Bits == B.Bits;
@@ -252,7 +252,7 @@ struct AttributeWithIndex {
                     ///< Index ~0U is used for function attributes.
 
   static AttributeWithIndex get(LLVMContext &C, unsigned Idx,
-                                ArrayRef<Attribute::AttrVal> Attrs) {
+                                ArrayRef<Attribute::AttrKind> Attrs) {
     return get(Idx, Attribute::get(C, Attrs));
   }
   static AttributeWithIndex get(unsigned Idx, Attribute Attrs) {
@@ -341,9 +341,23 @@ public:
     return getAttributes(Idx).getAlignment();
   }
 
+  /// \brief Return true if the attribute exists at the given index.
+  bool hasAttribute(unsigned Index, Attribute::AttrKind Kind) const;
+
+  /// \brief Return true if attribute exists at the given index.
+  bool hasAttributes(unsigned Index) const;
+
+  /// \brief Get the stack alignment.
+  unsigned getStackAlignment(unsigned Index) const;
+
+  /// \brief Return the attributes at the index as a string.
+  std::string getAsString(unsigned Index) const;
+
+  uint64_t getBitMask(unsigned Index) const;
+
   /// \brief Return true if the specified attribute is set for at least one
   /// parameter or for the return value.
-  bool hasAttrSomewhere(Attribute::AttrVal Attr) const;
+  bool hasAttrSomewhere(Attribute::AttrKind Attr) const;
 
   unsigned getNumAttrs() const;
   Attribute &getAttributesAtIndex(unsigned i) const;