@@ -505,53 +505,53 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
505
505
}
506
506
507
507
if (MD && AA->onlyReadsMemory (C)) {
508
- Expression exp = createExpr (C);
509
- auto ValNum = assignExpNewValueNum (exp );
508
+ Expression Exp = createExpr (C);
509
+ auto ValNum = assignExpNewValueNum (Exp );
510
510
if (ValNum.second ) {
511
511
valueNumbering[C] = ValNum.first ;
512
512
return ValNum.first ;
513
513
}
514
514
515
- MemDepResult local_dep = MD->getDependency (C);
515
+ MemDepResult LocalDep = MD->getDependency (C);
516
516
517
- if (!local_dep .isDef () && !local_dep .isNonLocal ()) {
517
+ if (!LocalDep .isDef () && !LocalDep .isNonLocal ()) {
518
518
valueNumbering[C] = nextValueNumber;
519
519
return nextValueNumber++;
520
520
}
521
521
522
- if (local_dep .isDef ()) {
522
+ if (LocalDep .isDef ()) {
523
523
// For masked load/store intrinsics, the local_dep may actually be
524
524
// a normal load or store instruction.
525
- CallInst *local_cdep = dyn_cast<CallInst>(local_dep .getInst ());
525
+ CallInst *LocalDepCall = dyn_cast<CallInst>(LocalDep .getInst ());
526
526
527
- if (!local_cdep || local_cdep ->arg_size () != C->arg_size ()) {
527
+ if (!LocalDepCall || LocalDepCall ->arg_size () != C->arg_size ()) {
528
528
valueNumbering[C] = nextValueNumber;
529
529
return nextValueNumber++;
530
530
}
531
531
532
- for (unsigned i = 0 , e = C->arg_size (); i < e ; ++i ) {
533
- uint32_t c_vn = lookupOrAdd (C->getArgOperand (i ));
534
- uint32_t cd_vn = lookupOrAdd (local_cdep ->getArgOperand (i ));
535
- if (c_vn != cd_vn ) {
532
+ for (unsigned I = 0 , E = C->arg_size (); I < E ; ++I ) {
533
+ uint32_t CVN = lookupOrAdd (C->getArgOperand (I ));
534
+ uint32_t LocalDepCallVN = lookupOrAdd (LocalDepCall ->getArgOperand (I ));
535
+ if (CVN != LocalDepCallVN ) {
536
536
valueNumbering[C] = nextValueNumber;
537
537
return nextValueNumber++;
538
538
}
539
539
}
540
540
541
- uint32_t v = lookupOrAdd (local_cdep );
542
- valueNumbering[C] = v ;
543
- return v ;
541
+ uint32_t V = lookupOrAdd (LocalDepCall );
542
+ valueNumbering[C] = V ;
543
+ return V ;
544
544
}
545
545
546
546
// Non-local case.
547
- const MemoryDependenceResults::NonLocalDepInfo &deps =
547
+ const MemoryDependenceResults::NonLocalDepInfo &Deps =
548
548
MD->getNonLocalCallDependency (C);
549
549
// FIXME: Move the checking logic to MemDep!
550
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.
554
- for (const NonLocalDepEntry &I : deps ) {
554
+ for (const NonLocalDepEntry &I : Deps ) {
555
555
if (I.getResult ().isNonLocal ())
556
556
continue ;
557
557
@@ -582,9 +582,9 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
582
582
valueNumbering[C] = nextValueNumber;
583
583
return nextValueNumber++;
584
584
}
585
- for (unsigned i = 0 , e = C->arg_size (); i < e ; ++i ) {
586
- uint32_t CVN = lookupOrAdd (C->getArgOperand (i ));
587
- uint32_t CDepVN = lookupOrAdd (CDep->getArgOperand (i ));
585
+ for (unsigned I = 0 , E = C->arg_size (); I < E ; ++I ) {
586
+ uint32_t CVN = lookupOrAdd (C->getArgOperand (I ));
587
+ uint32_t CDepVN = lookupOrAdd (CDep->getArgOperand (I ));
588
588
if (CVN != CDepVN) {
589
589
valueNumbering[C] = nextValueNumber;
590
590
return nextValueNumber++;
@@ -702,8 +702,8 @@ uint32_t GVNPass::ValueTable::lookup(Value *V, bool Verify) const {
702
702
uint32_t GVNPass::ValueTable::lookupOrAddCmp (unsigned Opcode,
703
703
CmpInst::Predicate Predicate,
704
704
Value *LHS, Value *RHS) {
705
- Expression exp = createCmpExpr (Opcode, Predicate, LHS, RHS);
706
- return assignExpNewValueNum (exp ).first ;
705
+ Expression Exp = createCmpExpr (Opcode, Predicate, LHS, RHS);
706
+ return assignExpNewValueNum (Exp ).first ;
707
707
}
708
708
709
709
// / Remove all entries from the ValueTable.
0 commit comments