[llvm] r247220 - [RewriteStatepointsForGC] One last bit of naming [NFCI]

[Philip Reames via llvm-commits]

Author: reames
Date: Wed Sep  9 19:27:50 2015
New Revision: 247220

URL: http://llvm.org/viewvc/llvm-project?rev=247220&view=rev
Log:
[RewriteStatepointsForGC] One last bit of naming [NFCI]


Modified:
    llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp?rev=247220&r1=247219&r2=247220&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp Wed Sep  9 19:27:50 2015
@@ -957,14 +957,14 @@ static Value *findBasePointer(Value *I,
   // instructions.
   for (auto Pair : States) {
     Instruction *BDV = cast<Instruction>(Pair.first);
-    BDVState state = Pair.second;
+    BDVState State = Pair.second;
 
     assert(!isKnownBaseResult(BDV) && "why did it get added?");
-    assert(!state.isUnknown() && "Optimistic algorithm didn't complete!");
-    if (!state.isConflict())
+    assert(!State.isUnknown() && "Optimistic algorithm didn't complete!");
+    if (!State.isConflict())
       continue;
 
-    if (PHINode *basephi = dyn_cast<PHINode>(state.getBase())) {
+    if (PHINode *basephi = dyn_cast<PHINode>(State.getBase())) {
       PHINode *phi = cast<PHINode>(BDV);
       unsigned NumPHIValues = phi->getNumIncomingValues();
       for (unsigned i = 0; i < NumPHIValues; i++) {
@@ -1007,7 +1007,7 @@ static Value *findBasePointer(Value *I,
         basephi->addIncoming(Base, InBB);
       }
       assert(basephi->getNumIncomingValues() == NumPHIValues);
-    } else if (SelectInst *BaseSel = dyn_cast<SelectInst>(state.getBase())) {
+    } else if (SelectInst *BaseSel = dyn_cast<SelectInst>(State.getBase())) {
       SelectInst *Sel = cast<SelectInst>(BDV);
       // Operand 1 & 2 are true, false path respectively. TODO: refactor to
       // something more safe and less hacky.
@@ -1018,14 +1018,14 @@ static Value *findBasePointer(Value *I,
         Value *Base = getBaseForInput(InVal, BaseSel);
         BaseSel->setOperand(i, Base);
       }
-    } else if (auto *BaseEE = dyn_cast<ExtractElementInst>(state.getBase())) {
+    } else if (auto *BaseEE = dyn_cast<ExtractElementInst>(State.getBase())) {
       Value *InVal = cast<ExtractElementInst>(BDV)->getVectorOperand();
       // Find the instruction which produces the base for each input.  We may
       // need to insert a bitcast.
       Value *Base = getBaseForInput(InVal, BaseEE);
       BaseEE->setOperand(0, Base);
     } else {
-      auto *BaseIE = cast<InsertElementInst>(state.getBase());
+      auto *BaseIE = cast<InsertElementInst>(State.getBase());
       auto *BdvIE = cast<InsertElementInst>(BDV);
       auto UpdateOperand = [&](int OperandIdx) {
         Value *InVal = BdvIE->getOperand(OperandIdx);