Add methods which query for the specific attribute instead of using the

enums. This allows for better encapsulation of the Attributes class.

llvm-svn: 165132

2 files changed, 36 insertions, 0 deletions

diff --git a/llvm/include/llvm/Instructions.h b/llvm/include/llvm/Instructions.h
index 7a0379e371b..a607c84c5bc 100644
--- a/llvm/include/llvm/Instructions.h
+++ b/llvm/include/llvm/Instructions.h
@@ -1272,6 +1272,14 @@ public:
     return paramHasAttr(~0, N);
   }
 
+  /// @brief Determine whether the call or the callee has the given attributes.
+  bool paramHasSExtAttr(unsigned i) const;
+  bool paramHasZExtAttr(unsigned i) const;
+  bool paramHasInRegAttr(unsigned i) const;
+  bool paramHasStructRetAttr(unsigned i) const;
+  bool paramHasNestAttr(unsigned i) const;
+  bool paramHasByValAttr(unsigned i) const;
+
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, Attributes attr) const;
 
@@ -3034,6 +3042,14 @@ public:
     return paramHasAttr(~0, N);
   }
 
+  /// @brief Determine whether the call or the callee has the given attributes.
+  bool paramHasSExtAttr(unsigned i) const;
+  bool paramHasZExtAttr(unsigned i) const;
+  bool paramHasInRegAttr(unsigned i) const;
+  bool paramHasStructRetAttr(unsigned i) const;
+  bool paramHasNestAttr(unsigned i) const;
+  bool paramHasByValAttr(unsigned i) const;
+
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, Attributes attr) const;
 
diff --git a/llvm/include/llvm/Support/CallSite.h b/llvm/include/llvm/Support/CallSite.h
index 8905e1e33b7..3e1a2f58227 100644
--- a/llvm/include/llvm/Support/CallSite.h
+++ b/llvm/include/llvm/Support/CallSite.h
@@ -189,6 +189,26 @@ public:
     CALLSITE_DELEGATE_GETTER(hasFnAttr(N));
   }
 
+  /// paramHas*Attr - whether the call or the callee has the given attribute.
+  bool paramHasSExtAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasSExtAttr(i));
+  }
+  bool paramHasZExtAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasZExtAttr(i));
+  }
+  bool paramHasInRegAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasInRegAttr(i));
+  }
+  bool paramHasStructRetAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasStructRetAttr(i));
+  }
+  bool paramHasNestAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasNestAttr(i));
+  }
+  bool paramHasByValAttr(unsigned i) const {
+    CALLSITE_DELEGATE_GETTER(paramHasByValAttr(i));
+  }
+
   /// paramHasAttr - whether the call or the callee has the given attribute.
   bool paramHasAttr(uint16_t i, Attributes attr) const {
     CALLSITE_DELEGATE_GETTER(paramHasAttr(i, attr));