diff options
author | Bill Wendling <isanbard@gmail.com> | 2013-01-25 21:46:52 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2013-01-25 21:46:52 +0000 |
commit | 85875647d6f85cbcbe506809640b9857eaaa26a4 (patch) | |
tree | 401571a10584a70f4a879debb71611165cf08488 /lib | |
parent | 767295f1143db4ed844ea9d25f9758e624c35302 (diff) | |
download | llvm-85875647d6f85cbcbe506809640b9857eaaa26a4.tar.gz llvm-85875647d6f85cbcbe506809640b9857eaaa26a4.tar.bz2 llvm-85875647d6f85cbcbe506809640b9857eaaa26a4.tar.xz |
Use the new 'getSlotIndex' method to retrieve the attribute's slot index.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173499 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 2 | ||||
-rw-r--r-- | lib/IR/Attributes.cpp | 4 | ||||
-rw-r--r-- | lib/Target/CppBackend/CPPBackend.cpp | 2 | ||||
-rw-r--r-- | lib/Transforms/IPO/DeadArgumentElimination.cpp | 4 | ||||
-rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 2 | ||||
-rw-r--r-- | lib/Transforms/InstCombine/InstCombineCalls.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 4ee762eae1..cc6b8b39fb 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -174,7 +174,7 @@ static void WriteAttributeTable(const ValueEnumerator &VE, const AttributeSet &A = Attrs[i]; for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) { const AttributeWithIndex &PAWI = A.getSlot(i); - Record.push_back(PAWI.Index); + Record.push_back(A.getSlotIndex(i)); Record.push_back(Attribute::encodeLLVMAttributesForBitcode(PAWI.Attrs)); } diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp index b09d55db90..538d9fee76 100644 --- a/lib/IR/Attributes.cpp +++ b/lib/IR/Attributes.cpp @@ -853,8 +853,8 @@ AttributeSet AttributeSet::removeAttr(LLVMContext &C, unsigned Idx, void AttributeSet::dump() const { dbgs() << "PAL[ "; for (unsigned i = 0; i < getNumSlots(); ++i) { - const AttributeWithIndex &PAWI = getSlot(i); - dbgs() << "{ " << PAWI.Index << ", " << PAWI.Attrs.getAsString() << " } "; + unsigned Index = getSlotIndex(i); + dbgs() << "{ " << Index << " => " << getAsString(Index) << " } "; } dbgs() << "]\n"; diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index 50bfef5127..2560c6e6c4 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -473,7 +473,7 @@ void CppWriter::printAttributes(const AttributeSet &PAL, Out << "SmallVector<AttributeWithIndex, 4> Attrs;"; nl(Out); Out << "AttributeWithIndex PAWI;"; nl(Out); for (unsigned i = 0; i < PAL.getNumSlots(); ++i) { - unsigned index = PAL.getSlot(i).Index; + unsigned index = PAL.getSlotIndex(i); AttrBuilder attrs(PAL.getSlot(i).Attrs); Out << "PAWI.Index = " << index << "U;\n"; Out << " {\n AttrBuilder B;\n"; diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 3a38ca4bb8..4603146ecf 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -272,9 +272,9 @@ bool DAE::DeleteDeadVarargs(Function &Fn) { // Drop any attributes that were on the vararg arguments. AttributeSet PAL = CS.getAttributes(); - if (!PAL.isEmpty() && PAL.getSlot(PAL.getNumSlots() - 1).Index > NumArgs) { + if (!PAL.isEmpty() && PAL.getSlotIndex(PAL.getNumSlots() - 1) > NumArgs) { SmallVector<AttributeWithIndex, 8> AttributesVec; - for (unsigned i = 0; PAL.getSlot(i).Index <= NumArgs; ++i) + for (unsigned i = 0; PAL.getSlotIndex(i) <= NumArgs; ++i) AttributesVec.push_back(PAL.getSlot(i)); if (PAL.hasAttributes(AttributeSet::FunctionIndex)) AttributesVec.push_back(AttributeWithIndex::get(Fn.getContext(), diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 6fe4316d3b..52d4e2fbba 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -2072,7 +2072,7 @@ static AttributeSet StripNest(LLVMContext &C, const AttributeSet &Attrs) { continue; // There can be only one. - return Attrs.removeAttribute(C, Attrs.getSlot(i).Index, Attribute::Nest); + return Attrs.removeAttribute(C, Attrs.getSlotIndex(i), Attribute::Nest); } return Attrs; diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp index 2fd35494b3..8555c2f030 100644 --- a/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -1101,7 +1101,7 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { // won't be dropping them. Check that these extra arguments have attributes // that are compatible with being a vararg call argument. for (unsigned i = CallerPAL.getNumSlots(); i; --i) { - if (CallerPAL.getSlot(i - 1).Index <= FT->getNumParams()) + if (CallerPAL.getSlotIndex(i - 1) <= FT->getNumParams()) break; Attribute PAttrs = CallerPAL.getSlot(i - 1).Attrs; // Check if it has an attribute that's incompatible with varargs. |