6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 19:31:58 +00:00
Code Issues Projects Releases Wiki Activity

Changes to support PHINode::removeIncoming changes

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4080 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-10-08 21:36:34 +00:00
parent bb190ac8da
commit dee430d26e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Transforms/ExprTypeConvert.cpp
View File

@ -392,7 +392,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
BasicBlock *BB = OldPN->getIncomingBlock(0); BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0); Value *OldVal = OldPN->getIncomingValue(0);
ValueHandle OldValHandle(VMC, OldVal); ValueHandle OldValHandle(VMC, OldVal);
OldPN->removeIncomingValue(BB); OldPN->removeIncomingValue(BB, false);
Value *V = ConvertExpressionToType(OldVal, Ty, VMC); Value *V = ConvertExpressionToType(OldVal, Ty, VMC);
NewPN->addIncoming(V, BB); NewPN->addIncoming(V, BB);
} }
@ -1097,7 +1097,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
while (OldPN->getNumOperands()) { while (OldPN->getNumOperands()) {
BasicBlock *BB = OldPN->getIncomingBlock(0); BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0); Value *OldVal = OldPN->getIncomingValue(0);
OldPN->removeIncomingValue(BB); OldPN->removeIncomingValue(BB, false);
Value *V = ConvertExpressionToType(OldVal, NewTy, VMC); Value *V = ConvertExpressionToType(OldVal, NewTy, VMC);
NewPN->addIncoming(V, BB); NewPN->addIncoming(V, BB);
} }

13
lib/VMCore/BasicBlock.cpp
View File

@ -183,16 +183,15 @@ void BasicBlock::removePredecessor(BasicBlock *Pred) {
// Yup, loop through and nuke the PHI nodes // Yup, loop through and nuke the PHI nodes
while (PHINode *PN = dyn_cast<PHINode>(&front())) { while (PHINode *PN = dyn_cast<PHINode>(&front())) {
PN->removeIncomingValue(Pred); // Remove the predecessor first... PN->removeIncomingValue(Pred); // Remove the predecessor first...
assert(PN->getNumIncomingValues() == max_idx-1 &&
"PHI node shouldn't have this many values!!!");
// If the PHI _HAD_ two uses, replace PHI node with its now *single* value // If the PHI _HAD_ two uses, replace PHI node with its now *single* value
if (max_idx == 2) if (max_idx == 2) {
PN->replaceAllUsesWith(PN->getOperand(0)); PN->replaceAllUsesWith(PN->getOperand(0));
else // Otherwise there are no incoming values/edges, replace with dummy getInstList().pop_front(); // Remove the PHI node
PN->replaceAllUsesWith(Constant::getNullValue(PN->getType())); }
getInstList().pop_front(); // Remove the PHI node
// If the PHI node already only had one entry, it got deleted by
// removeIncomingValue.
} }
} else { } else {
// Okay, now we know that we need to remove predecessor #pred_idx from all // Okay, now we know that we need to remove predecessor #pred_idx from all