Skip to content

Commit 9deed7d

Browse files
authored
[GVN][NFC] Fix some more coding standard violations (#130046)
1 parent f7c0f33 commit 9deed7d

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

llvm/lib/Transforms/Scalar/GVN.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -505,53 +505,53 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
505505
}
506506

507507
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);
510510
if (ValNum.second) {
511511
valueNumbering[C] = ValNum.first;
512512
return ValNum.first;
513513
}
514514

515-
MemDepResult local_dep = MD->getDependency(C);
515+
MemDepResult LocalDep = MD->getDependency(C);
516516

517-
if (!local_dep.isDef() && !local_dep.isNonLocal()) {
517+
if (!LocalDep.isDef() && !LocalDep.isNonLocal()) {
518518
valueNumbering[C] = nextValueNumber;
519519
return nextValueNumber++;
520520
}
521521

522-
if (local_dep.isDef()) {
522+
if (LocalDep.isDef()) {
523523
// For masked load/store intrinsics, the local_dep may actually be
524524
// a normal load or store instruction.
525-
CallInst *local_cdep = dyn_cast<CallInst>(local_dep.getInst());
525+
CallInst *LocalDepCall = dyn_cast<CallInst>(LocalDep.getInst());
526526

527-
if (!local_cdep || local_cdep->arg_size() != C->arg_size()) {
527+
if (!LocalDepCall || LocalDepCall->arg_size() != C->arg_size()) {
528528
valueNumbering[C] = nextValueNumber;
529529
return nextValueNumber++;
530530
}
531531

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) {
536536
valueNumbering[C] = nextValueNumber;
537537
return nextValueNumber++;
538538
}
539539
}
540540

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;
544544
}
545545

546546
// Non-local case.
547-
const MemoryDependenceResults::NonLocalDepInfo &deps =
547+
const MemoryDependenceResults::NonLocalDepInfo &Deps =
548548
MD->getNonLocalCallDependency(C);
549549
// FIXME: Move the checking logic to MemDep!
550550
CallInst *CDep = nullptr;
551551

552552
// Check to see if we have a single dominating call instruction that is
553553
// identical to C.
554-
for (const NonLocalDepEntry &I : deps) {
554+
for (const NonLocalDepEntry &I : Deps) {
555555
if (I.getResult().isNonLocal())
556556
continue;
557557

@@ -582,9 +582,9 @@ uint32_t GVNPass::ValueTable::lookupOrAddCall(CallInst *C) {
582582
valueNumbering[C] = nextValueNumber;
583583
return nextValueNumber++;
584584
}
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));
588588
if (CVN != CDepVN) {
589589
valueNumbering[C] = nextValueNumber;
590590
return nextValueNumber++;
@@ -702,8 +702,8 @@ uint32_t GVNPass::ValueTable::lookup(Value *V, bool Verify) const {
702702
uint32_t GVNPass::ValueTable::lookupOrAddCmp(unsigned Opcode,
703703
CmpInst::Predicate Predicate,
704704
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;
707707
}
708708

709709
/// Remove all entries from the ValueTable.

0 commit comments

Comments
 (0)