Subzero: Cleanup Inst==>Instr.

src/IceCfgNode.cpp

 //===- subzero/src/IceCfgNode.cpp - Basic block (node) implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 21 matching lines @@
 // Returns the name the node was created with. If no name was given, it
 // synthesizes a (hopefully) unique name.
 IceString CfgNode::getName() const {
   if (NameIndex >= 0)
     return Func->getIdentifierName(NameIndex);
   return "__" + std::to_string(LabelNumber);
 }
 
 // Adds an instruction to either the Phi list or the regular instruction list.
 // Validates that all Phis are added before all regular instructions.
-void CfgNode::appendInst(Inst *Inst) {
+void CfgNode::appendInst(Inst *Instr) {
   ++InstCountEstimate;
-  if (auto *Phi = llvm::dyn_cast<InstPhi>(Inst)) {
+  if (auto *Phi = llvm::dyn_cast<InstPhi>(Instr)) {
     if (!Insts.empty()) {
       Func->setError("Phi instruction added to the middle of a block");
       return;
     }
     Phis.push_back(Phi);
   } else {
-    Insts.push_back(Inst);
+    Insts.push_back(Instr);
   }
 }
 
 // Renumbers the non-deleted instructions in the node. This needs to be done in
 // preparation for live range analysis. The instruction numbers in a block must
 // be monotonically increasing. The range of instruction numbers in a block,
 // from lowest to highest, must not overlap with the range of any other block.
 void CfgNode::renumberInstructions() {
   InstNumberT FirstNumber = Func->getNextInstNumber();
   for (Inst &I : Phis)
@@ skipping 1360 matching lines @@
   Operand *RMWI64Name = Context->getConstantExternSym(RMW_I64);
   constexpr RelocOffsetT Offset = 0;
   constexpr bool SuppressMangling = true;
   Constant *Counter =
       Context->getConstantSym(Offset, Var->getName(), SuppressMangling);
   Constant *AtomicRMWOp = Context->getConstantInt32(Intrinsics::AtomicAdd);
   Constant *One = Context->getConstantInt64(1);
   Constant *OrderAcquireRelease =
       Context->getConstantInt32(Intrinsics::MemoryOrderAcquireRelease);
 
-  auto *Inst = InstIntrinsicCall::create(
+  auto *Instr = InstIntrinsicCall::create(
       Func, 5, Func->makeVariable(IceType_i64), RMWI64Name, Info->Info);
-  Inst->addArg(AtomicRMWOp);
-  Inst->addArg(Counter);
-  Inst->addArg(One);
-  Inst->addArg(OrderAcquireRelease);
-  Insts.push_front(Inst);
+  Instr->addArg(AtomicRMWOp);
+  Instr->addArg(Counter);
+  Instr->addArg(One);
+  Instr->addArg(OrderAcquireRelease);
+  Insts.push_front(Instr);
 }
 
 } // end of namespace Ice