maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use the new 'getSlotIndex' method to retrieve the attribute's slot index. 

llvm-svn: 173499
This commit is contained in:
Bill Wendling 2013-01-25 21:46:52 +00:00
parent e6abe83258
commit 8649283e75
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@ -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));
}

4
llvm/lib/IR/Attributes.cpp
View File

@ -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";

2
llvm/lib/Target/CppBackend/CPPBackend.cpp
View File

@ -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";

4
llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
View File

@ -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(),

2
llvm/lib/Transforms/IPO/GlobalOpt.cpp
View File

@ -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;

2
llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
View File

@ -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.