RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 04:02:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix an extremely serious thinko I made in revision 1.60 of this file.

Browse Source 
llvm-svn: 13106
This commit is contained in:
Chris Lattner 2004-04-22 14:59:40 +00:00
parent bfc19a576a
commit 507ba1c3c3
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Transforms/Scalar/IndVarSimplify.cpp
View File

@ -390,8 +390,10 @@ void IndVarSimplify::runOnLoop(Loop *L) {
// Compute the type of the largest recurrence expression.
//
const Type *LargestType = IndVars[0].first->getType();
bool DifferingSizes = false;
for (unsigned i = 1, e = IndVars.size(); i != e; ++i) {
const Type *Ty = IndVars[i].first->getType();
DifferingSizes |= Ty->getPrimitiveSize() != LargestType->getPrimitiveSize();
if (Ty->getPrimitiveSize() > LargestType->getPrimitiveSize())
LargestType = Ty;
}
@ -415,29 +417,37 @@ void IndVarSimplify::runOnLoop(Loop *L) {
BasicBlock::iterator InsertPt = Header->begin();
while (isa<PHINode>(InsertPt)) ++InsertPt;
// If there were induction variables of other sizes, cast the primary
// induction variable to the right size for them, avoiding the need for the
// code evaluation methods to insert induction variables of different sizes.
if (DifferingSizes) {
bool InsertedSizes[17] = { false };
InsertedSizes[LargestType->getPrimitiveSize()] = true;
for (unsigned i = 0, e = IndVars.size(); i != e; ++i)
if (!InsertedSizes[IndVars[i].first->getType()->getPrimitiveSize()]) {
PHINode *PN = IndVars[i].first;
InsertedSizes[PN->getType()->getPrimitiveSize()] = true;
Instruction *New = new CastInst(IndVar,
PN->getType()->getUnsignedVersion(),
"indvar", InsertPt);
Rewriter.addInsertedValue(New, SE->getSCEV(New));
}
}
// If there were induction variables of other sizes, cast the primary
// induction variable to the right size for them, avoiding the need for the
// code evaluation methods to insert induction variables of different sizes.
std::map<unsigned, Value*> InsertedSizes;
InsertedSizes[LargestType->getPrimitiveSize()] = IndVar;
while (!IndVars.empty()) {
PHINode *PN = IndVars.back().first;
const Type *Ty = PN->getType()->getUnsignedVersion();
Value *&IV = InsertedSizes[Ty->getPrimitiveSize()];
if (IV == 0) {
// Insert a new cast instruction, which will hold this recurrence.
std::string Name = PN->getName();
PN->setName("");
IV = new CastInst(IndVar, Ty, Name, InsertPt);
}
Value *V = IV;
if (PN->getType() != Ty)
V = new CastInst(V, PN->getType(), V->getName(), InsertPt);
Value *NewVal = Rewriter.ExpandCodeFor(IndVars.back().second, InsertPt,
PN->getType());
std::string Name = PN->getName();
PN->setName("");
NewVal->setName(Name);
// Replace the old PHI Node with the inserted computation.
PN->replaceAllUsesWith(V);
PN->replaceAllUsesWith(NewVal);
DeadInsts.insert(PN);
IndVars.pop_back();
++NumRemoved;
@ -469,6 +479,5 @@ void IndVarSimplify::runOnLoop(Loop *L) {
}
}
DeleteTriviallyDeadInstructions(DeadInsts);
}