diff options
| author | Frits van Bommel <fvbommel@gmail.com> | 2011-04-16 14:32:34 +0000 |
|---|---|---|
| committer | Frits van Bommel <fvbommel@gmail.com> | 2011-04-16 14:32:34 +0000 |
| commit | d6d4f987b487109878cf961d933caee925bc3036 (patch) | |
| tree | bec2681011249e6453e619a4b32c9c464e8c12b7 | |
| parent | d097212a0849f5937152141f6ee94bce8af0c870 (diff) | |
| download | bcm5719-llvm-d6d4f987b487109878cf961d933caee925bc3036.tar.gz bcm5719-llvm-d6d4f987b487109878cf961d933caee925bc3036.zip | |
Rename a misleadingly-named variable.
llvm-svn: 129644
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp b/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp index 37c3cd9a04c..8419db68f4f 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp @@ -824,18 +824,18 @@ Instruction *InstCombiner::visitPHINode(PHINode &PN) { // quick check to see if the PHI node only contains a single non-phi value, if // so, scan to see if the phi cycle is actually equal to that value. { - unsigned InValNo = 0, NumOperandVals = PN.getNumIncomingValues(); + unsigned InValNo = 0, NumIncomingVals = PN.getNumIncomingValues(); // Scan for the first non-phi operand. - while (InValNo != NumOperandVals && + while (InValNo != NumIncomingVals && isa<PHINode>(PN.getIncomingValue(InValNo))) ++InValNo; - if (InValNo != NumOperandVals) { + if (InValNo != NumIncomingVals) { Value *NonPhiInVal = PN.getIncomingValue(InValNo); // Scan the rest of the operands to see if there are any conflicts, if so // there is no need to recursively scan other phis. - for (++InValNo; InValNo != NumOperandVals; ++InValNo) { + for (++InValNo; InValNo != NumIncomingVals; ++InValNo) { Value *OpVal = PN.getIncomingValue(InValNo); if (OpVal != NonPhiInVal && !isa<PHINode>(OpVal)) break; @@ -844,7 +844,7 @@ Instruction *InstCombiner::visitPHINode(PHINode &PN) { // If we scanned over all operands, then we have one unique value plus // phi values. Scan PHI nodes to see if they all merge in each other or // the value. - if (InValNo == NumOperandVals) { + if (InValNo == NumIncomingVals) { SmallPtrSet<PHINode*, 16> ValueEqualPHIs; if (PHIsEqualValue(&PN, NonPhiInVal, ValueEqualPHIs)) return ReplaceInstUsesWith(PN, NonPhiInVal); |

