@@ -547,7 +547,7 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
547
547
const MemoryDependenceResults::NonLocalDepInfo &deps =
548
548
MD->getNonLocalCallDependency (C);
549
549
// FIXME: Move the checking logic to MemDep!
550
- CallInst* cdep = nullptr ;
550
+ CallInst *CDep = nullptr ;
551
551
552
552
// Check to see if we have a single dominating call instruction that is
553
553
// identical to C.
@@ -557,43 +557,43 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
557
557
558
558
// We don't handle non-definitions. If we already have a call, reject
559
559
// instruction dependencies.
560
- if (!I.getResult ().isDef () || cdep != nullptr ) {
561
- cdep = nullptr ;
560
+ if (!I.getResult ().isDef () || CDep != nullptr ) {
561
+ CDep = nullptr ;
562
562
break ;
563
563
}
564
564
565
565
CallInst *NonLocalDepCall = dyn_cast<CallInst>(I.getResult ().getInst ());
566
566
// FIXME: All duplicated with non-local case.
567
567
if (NonLocalDepCall && DT->properlyDominates (I.getBB (), C->getParent ())) {
568
- cdep = NonLocalDepCall;
568
+ CDep = NonLocalDepCall;
569
569
continue ;
570
570
}
571
571
572
- cdep = nullptr ;
572
+ CDep = nullptr ;
573
573
break ;
574
574
}
575
575
576
- if (!cdep ) {
576
+ if (!CDep ) {
577
577
valueNumbering[C] = nextValueNumber;
578
578
return nextValueNumber++;
579
579
}
580
580
581
- if (cdep ->arg_size () != C->arg_size ()) {
581
+ if (CDep ->arg_size () != C->arg_size ()) {
582
582
valueNumbering[C] = nextValueNumber;
583
583
return nextValueNumber++;
584
584
}
585
585
for (unsigned i = 0 , e = C->arg_size (); i < e; ++i) {
586
- uint32_t c_vn = lookupOrAdd (C->getArgOperand (i));
587
- uint32_t cd_vn = lookupOrAdd (cdep ->getArgOperand (i));
588
- if (c_vn != cd_vn ) {
586
+ uint32_t CVN = lookupOrAdd (C->getArgOperand (i));
587
+ uint32_t CDepVN = lookupOrAdd (CDep ->getArgOperand (i));
588
+ if (CVN != CDepVN ) {
589
589
valueNumbering[C] = nextValueNumber;
590
590
return nextValueNumber++;
591
591
}
592
592
}
593
593
594
- uint32_t v = lookupOrAdd (cdep );
595
- valueNumbering[C] = v ;
596
- return v ;
594
+ uint32_t V = lookupOrAdd (CDep );
595
+ valueNumbering[C] = V ;
596
+ return V ;
597
597
}
598
598
599
599
valueNumbering[C] = nextValueNumber;
@@ -618,7 +618,7 @@ uint32_t GVNPass::ValueTable::lookupOrAdd(Value *V) {
618
618
return nextValueNumber++;
619
619
}
620
620
621
- Expression exp ;
621
+ Expression Exp ;
622
622
switch (I->getOpcode ()) {
623
623
case Instruction::Call:
624
624
return lookupOrAddCall (cast<CallInst>(I));
@@ -662,13 +662,13 @@ uint32_t GVNPass::ValueTable::lookupOrAdd(Value *V) {
662
662
case Instruction::InsertElement:
663
663
case Instruction::ShuffleVector:
664
664
case Instruction::InsertValue:
665
- exp = createExpr (I);
665
+ Exp = createExpr (I);
666
666
break ;
667
667
case Instruction::GetElementPtr:
668
- exp = createGEPExpr (cast<GetElementPtrInst>(I));
668
+ Exp = createGEPExpr (cast<GetElementPtrInst>(I));
669
669
break ;
670
670
case Instruction::ExtractValue:
671
- exp = createExtractvalueExpr (cast<ExtractValueInst>(I));
671
+ Exp = createExtractvalueExpr (cast<ExtractValueInst>(I));
672
672
break ;
673
673
case Instruction::PHI:
674
674
valueNumbering[V] = nextValueNumber;
@@ -679,9 +679,9 @@ uint32_t GVNPass::ValueTable::lookupOrAdd(Value *V) {
679
679
return nextValueNumber++;
680
680
}
681
681
682
- uint32_t e = assignExpNewValueNum (exp ).first ;
683
- valueNumbering[V] = e ;
684
- return e ;
682
+ uint32_t E = assignExpNewValueNum (Exp ).first ;
683
+ valueNumbering[V] = E ;
684
+ return E ;
685
685
}
686
686
687
687
// / Returns the value number of the specified value. Fails if
@@ -2317,15 +2317,15 @@ uint32_t GVNPass::ValueTable::phiTranslateImpl(const BasicBlock *Pred,
2317
2317
return Num;
2318
2318
Expression Exp = Expressions[ExprIdx[Num]];
2319
2319
2320
- for (unsigned i = 0 ; i < Exp.varargs .size (); i ++) {
2320
+ for (unsigned I = 0 ; I < Exp.varargs .size (); I ++) {
2321
2321
// For InsertValue and ExtractValue, some varargs are index numbers
2322
2322
// instead of value numbers. Those index numbers should not be
2323
2323
// translated.
2324
- if ((i > 1 && Exp.opcode == Instruction::InsertValue) ||
2325
- (i > 0 && Exp.opcode == Instruction::ExtractValue) ||
2326
- (i > 1 && Exp.opcode == Instruction::ShuffleVector))
2324
+ if ((I > 1 && Exp.opcode == Instruction::InsertValue) ||
2325
+ (I > 0 && Exp.opcode == Instruction::ExtractValue) ||
2326
+ (I > 1 && Exp.opcode == Instruction::ShuffleVector))
2327
2327
continue ;
2328
- Exp.varargs [i ] = phiTranslate (Pred, PhiBlock, Exp.varargs [i ], Gvn);
2328
+ Exp.varargs [I ] = phiTranslate (Pred, PhiBlock, Exp.varargs [I ], Gvn);
2329
2329
}
2330
2330
2331
2331
if (Exp.commutative ) {
0 commit comments