6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-13 08:26:02 +00:00
Code Issues Projects Releases Wiki Activity

tidy up code.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123564 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2011-01-16 04:37:29 +00:00
parent 66f708f7e5
commit 5aac83288c
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Transforms/InstCombine/InstructionCombining.cpp
View File

@@ -520,12 +520,13 @@ Instruction *InstCombiner::FoldOpIntoPhi(Instruction &I,
AllowAggressive = false; AllowAggressive = false;
PHINode *PN = cast<PHINode>(I.getOperand(0)); PHINode *PN = cast<PHINode>(I.getOperand(0));
unsigned NumPHIValues = PN->getNumIncomingValues(); unsigned NumPHIValues = PN->getNumIncomingValues();
if (NumPHIValues == 0 || if (NumPHIValues == 0)
// We normally only transform phis with a single use, unless we're trying
// hard to make jump threading happen.
(!PN->hasOneUse() && !AllowAggressive))
return 0; return 0;
// We normally only transform phis with a single use, unless we're trying
// hard to make jump threading happen.
if (!PN->hasOneUse() && !AllowAggressive)
return 0;
// Check to see if all of the operands of the PHI are simple constants // Check to see if all of the operands of the PHI are simple constants
// (constantint/constantfp/undef). If there is one non-constant value, // (constantint/constantfp/undef). If there is one non-constant value,
@@ -533,18 +534,21 @@ Instruction *InstCombiner::FoldOpIntoPhi(Instruction &I,
// bail out. We don't do arbitrary constant expressions here because moving // bail out. We don't do arbitrary constant expressions here because moving
// their computation can be expensive without a cost model. // their computation can be expensive without a cost model.
BasicBlock *NonConstBB = 0; BasicBlock *NonConstBB = 0;
for (unsigned i = 0; i != NumPHIValues; ++i) for (unsigned i = 0; i != NumPHIValues; ++i) {
if (!isa<Constant>(PN->getIncomingValue(i)) || Value *InVal = PN->getIncomingValue(i);
isa<ConstantExpr>(PN->getIncomingValue(i))) { if (isa<Constant>(InVal) && !isa<ConstantExpr>(InVal))
if (NonConstBB) return 0; // More than one non-const value. continue;
if (isa<PHINode>(PN->getIncomingValue(i))) return 0; // Itself a phi.
NonConstBB = PN->getIncomingBlock(i); if (isa<PHINode>(InVal)) return 0; // Itself a phi.
if (NonConstBB) return 0; // More than one non-const value.
// If the incoming non-constant value is in I's block, we have an infinite
// loop. NonConstBB = PN->getIncomingBlock(i);
if (NonConstBB == I.getParent())
return 0; // If the incoming non-constant value is in I's block, we have an infinite
} // loop.
if (NonConstBB == I.getParent())
return 0;
}
// If there is exactly one non-constant value, we can insert a copy of the // If there is exactly one non-constant value, we can insert a copy of the
// operation in that block. However, if this is a critical edge, we would be // operation in that block. However, if this is a critical edge, we would be