Mid-air collision. reapply r173656.

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

diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index 63f9d08837577ac926f11daaad810c9bd02dc2ec..e6de2bf50bab17e6e8fa7a51e56d9d85cdcf4f22 100644 (file)
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -287,19 +287,19 @@ public:
   AttributeSet getFnAttributes() const;
 
   /// \brief Return true if the attribute exists at the given index.
-  bool hasAttribute(uint64_t Index, Attribute::AttrKind Kind) const;
+  bool hasAttribute(unsigned Index, Attribute::AttrKind Kind) const;
 
   /// \brief Return true if attribute exists at the given index.
-  bool hasAttributes(uint64_t Index) const;
+  bool hasAttributes(unsigned Index) const;
 
   /// \brief Return the alignment for the specified function parameter.
-  unsigned getParamAlignment(uint64_t Idx) const;
+  unsigned getParamAlignment(unsigned Idx) const;
 
   /// \brief Get the stack alignment.
-  unsigned getStackAlignment(uint64_t Index) const;
+  unsigned getStackAlignment(unsigned Index) const;
 
   /// \brief Return the attributes at the index as a string.
-  std::string getAsString(uint64_t Index) const;
+  std::string getAsString(unsigned Index) const;
 
   uint64_t Raw(unsigned Index) const;
 

diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 67fab83d2e09536c78af1cfac002e52558b4e906..3f0038b6fbf6aabaa45b5a6825e661a408ec9815 100644 (file)
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -710,23 +710,23 @@ AttributeSet AttributeSet::getSlotAttributes(unsigned Slot) const {
   return pImpl->getSlotAttributes(Slot);
 }
 
-bool AttributeSet::hasAttribute(uint64_t Index, Attribute::AttrKind Kind) const{
+bool AttributeSet::hasAttribute(unsigned Index, Attribute::AttrKind Kind) const{
   return getAttributes(Index).hasAttribute(Kind);
 }
 
-bool AttributeSet::hasAttributes(uint64_t Index) const {
+bool AttributeSet::hasAttributes(unsigned Index) const {
   return getAttributes(Index).hasAttributes();
 }
 
-std::string AttributeSet::getAsString(uint64_t Index) const {
+std::string AttributeSet::getAsString(unsigned Index) const {
   return getAttributes(Index).getAsString();
 }
 
-unsigned AttributeSet::getParamAlignment(uint64_t Idx) const {
+unsigned AttributeSet::getParamAlignment(unsigned Idx) const {
   return getAttributes(Idx).getAlignment();
 }
 
-unsigned AttributeSet::getStackAlignment(uint64_t Index) const {
+unsigned AttributeSet::getStackAlignment(unsigned Index) const {
   return getAttributes(Index).getStackAlignment();
 }