Subzero: Cleanup Inst==>Instr.

src/IceTargetLoweringX86Base.h

 //===- subzero/src/IceTargetLoweringX86Base.h - x86 lowering ----*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 223 matching lines @@
     dispatchToConcrete(&Traits::ConcreteTarget::initRebasePtr);
   }
 
   /// Emit code that initializes the value of the RebasePtr near the start of
   /// the function -- if so required by SandboxingType for the concrete type.
   void initSandbox() {
     assert(SandboxingType != ST_None);
     dispatchToConcrete(&Traits::ConcreteTarget::initSandbox);
   }
 
-  void lowerAlloca(const InstAlloca *Inst) override;
+  void lowerAlloca(const InstAlloca *Instr) override;
   void lowerArguments() override;
-  void lowerArithmetic(const InstArithmetic *Inst) override;
-  void lowerAssign(const InstAssign *Inst) override;
-  void lowerBr(const InstBr *Inst) override;
-  void lowerCall(const InstCall *Inst) override;
-  void lowerCast(const InstCast *Inst) override;
-  void lowerExtractElement(const InstExtractElement *Inst) override;
-  void lowerFcmp(const InstFcmp *Inst) override;
-  void lowerIcmp(const InstIcmp *Inst) override;
+  void lowerArithmetic(const InstArithmetic *Instr) override;
+  void lowerAssign(const InstAssign *Instr) override;
+  void lowerBr(const InstBr *Instr) override;
+  void lowerCall(const InstCall *Instr) override;
+  void lowerCast(const InstCast *Instr) override;
+  void lowerExtractElement(const InstExtractElement *Instr) override;
+  void lowerFcmp(const InstFcmp *Instr) override;
+  void lowerIcmp(const InstIcmp *Instr) override;
 
-  void lowerIntrinsicCall(const InstIntrinsicCall *Inst) override;
-  void lowerInsertElement(const InstInsertElement *Inst) override;
-  void lowerLoad(const InstLoad *Inst) override;
-  void lowerPhi(const InstPhi *Inst) override;
-  void lowerRet(const InstRet *Inst) override;
-  void lowerSelect(const InstSelect *Inst) override;
-  void lowerStore(const InstStore *Inst) override;
-  void lowerSwitch(const InstSwitch *Inst) override;
-  void lowerUnreachable(const InstUnreachable *Inst) override;
+  void lowerIntrinsicCall(const InstIntrinsicCall *Instr) override;
+  void lowerInsertElement(const InstInsertElement *Instr) override;
+  void lowerLoad(const InstLoad *Instr) override;
+  void lowerPhi(const InstPhi *Instr) override;
+  void lowerRet(const InstRet *Instr) override;
+  void lowerSelect(const InstSelect *Instr) override;
+  void lowerStore(const InstStore *Instr) override;
+  void lowerSwitch(const InstSwitch *Instr) override;
+  void lowerUnreachable(const InstUnreachable *Instr) override;
   void lowerOther(const Inst *Instr) override;
   void lowerRMW(const InstX86FakeRMW *RMW);
   void prelowerPhis() override;
   uint32_t getCallStackArgumentsSizeBytes(const std::vector<Type> &ArgTypes,
                                           Type ReturnType);
   uint32_t getCallStackArgumentsSizeBytes(const InstCall *Instr) override;
   void genTargetHelperCallFor(Inst *Instr) override;
 
   /// OptAddr wraps all the possible operands that an x86 address might have.
   struct OptAddr {
@@ skipping 772 matching lines @@
   /// specialized version of Consumer.
   void setccOrConsumer(BrCond Condition, Variable *Dest, const Inst *Consumer);
 
   /// Emit a mov [1|0] instruction if Consumer == nullptr; otherwise emit a
   /// specialized version of Consumer.
   void movOrConsumer(bool IcmpResult, Variable *Dest, const Inst *Consumer);
 
   /// Emit the code for instructions with a vector type.
   void lowerIcmpVector(const InstIcmp *Icmp);
   void lowerFcmpVector(const InstFcmp *Icmp);
-  void lowerSelectVector(const InstSelect *Inst);
+  void lowerSelectVector(const InstSelect *Instr);
 
   /// Helpers for select lowering.
   void lowerSelectMove(Variable *Dest, BrCond Cond, Operand *SrcT,
                        Operand *SrcF);
   void lowerSelectIntMove(Variable *Dest, BrCond Cond, Operand *SrcT,
                           Operand *SrcF);
   /// Generic helper to move an arbitrary type from Src to Dest.
   void lowerMove(Variable *Dest, Operand *Src, bool IsRedefinition);
 
   /// Optimizations for idiom recognition.
@@ skipping 61 matching lines @@
 
   explicit TargetHeaderX86(GlobalContext *Ctx) : TargetHeaderLowering(Ctx) {}
 };
 
 } // end of namespace X86NAMESPACE
 } // end of namespace Ice
 
 #include "IceTargetLoweringX86BaseImpl.h"
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX86BASE_H