6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-27 15:57:13 +00:00
Code Issues Projects Releases Wiki Activity

Bug fix: cannot modify Phi operands while iterating over them!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1203 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vikram S. Adve 2001-11-08 05:25:33 +00:00
parent 9b19894da9
commit ddf5ff6f8c
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Transforms/HoistPHIConstants.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/BasicBlock.h"
#include "llvm/Method.h"
#include <map>
#include <vector>
typedef pair<BasicBlock *, Value*> BBConstTy;
typedef map<BBConstTy, CastInst *> CachedCopyMap;
@ -53,23 +54,29 @@ bool HoistPHIConstants::doHoistPHIConstants(Method *M) {
bool Changed = false;
for (Method::iterator BI = M->begin(), BE = M->end(); BI != BE; ++BI)
for (BasicBlock::iterator II = (*BI)->begin(); II != (*BI)->end(); ++II) {
Instruction *Inst = *II;
if (!isa<PHINode>(Inst)) break; // All PHIs occur at top of BB!
{
vector<PHINode*> phis; // normalizing invalidates BB iterator
PHINode *PN = cast<PHINode>(Inst);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) {
Value *Op = PN->getIncomingValue(i);
//if (isa<ConstPoolVal>(Op)) { --- Do for all phi args -- Ruchira
PN->setIncomingValue(i,
NormalizePhiOperand(PN, Op, PN->getIncomingBlock(i), Cache));
Changed = true;
//}
}
for (BasicBlock::iterator II = (*BI)->begin(); II != (*BI)->end(); ++II)
{
if (PHINode *PN = dyn_cast<PHINode>(*II))
phis.push_back(PN);
else
break; // All PHIs occur at top of BB!
}
for (vector<PHINode*>::iterator PI=phis.begin(); PI != phis.end(); ++PI)
for (unsigned i = 0; i < (*PI)->getNumIncomingValues(); ++i)
{
//if (isa<ConstPoolVal>(Op)) {--- Do for all phi args -- Ruchira
(*PI)->setIncomingValue(i,
NormalizePhiOperand((*PI),
(*PI)->getIncomingValue(i),
(*PI)->getIncomingBlock(i), Cache));
Changed = true;
//}
}
}
return Changed;
}