Subzero: Cleanup Inst==>Instr. In the beginning, Ice::Inst was called IceInst, and patterns like "IceInst *Inst = ..." made perfect sense. After the Ice:: name change, "Inst *Inst = ..." continued to compile, mostly. However, shadowing a type name is clumsy and newer code tends to use "Inst *Instr", so we might as well switch all the instances over. Some are still called "I" and those are left alone. BUG= none R=kschimpf@google.com Review URL: https://codereview.chromium.org/1665423002 .
diff --git a/src/IceInstX86BaseImpl.h b/src/IceInstX86BaseImpl.h index f360946..5c55bf3 100644 --- a/src/IceInstX86BaseImpl.h +++ b/src/IceInstX86BaseImpl.h
@@ -1034,28 +1034,28 @@ // pblendvb and blendvps take xmm0 as a final implicit argument. template <typename TraitsType> void InstImpl<TraitsType>::emitVariableBlendInst(const char *Opcode, - const Inst *Inst, + const Inst *Instr, const Cfg *Func) { if (!BuildDefs::dump()) return; Ostream &Str = Func->getContext()->getStrEmit(); - assert(Inst->getSrcSize() == 3); - assert(llvm::cast<Variable>(Inst->getSrc(2))->getRegNum() == + assert(Instr->getSrcSize() == 3); + assert(llvm::cast<Variable>(Instr->getSrc(2))->getRegNum() == RegisterSet::Reg_xmm0); Str << "\t" << Opcode << "\t"; - Inst->getSrc(1)->emit(Func); + Instr->getSrc(1)->emit(Func); Str << ", "; - Inst->getDest()->emit(Func); + Instr->getDest()->emit(Func); } template <typename TraitsType> void InstImpl<TraitsType>::emitIASVariableBlendInst( - const Inst *Inst, const Cfg *Func, const XmmEmitterRegOp &Emitter) { - assert(Inst->getSrcSize() == 3); - assert(llvm::cast<Variable>(Inst->getSrc(2))->getRegNum() == + const Inst *Instr, const Cfg *Func, const XmmEmitterRegOp &Emitter) { + assert(Instr->getSrcSize() == 3); + assert(llvm::cast<Variable>(Instr->getSrc(2))->getRegNum() == RegisterSet::Reg_xmm0); - const Variable *Dest = Inst->getDest(); - const Operand *Src = Inst->getSrc(1); + const Variable *Dest = Instr->getDest(); + const Operand *Src = Instr->getSrc(1); emitIASRegOpTyXMM(Func, Dest->getType(), Dest, Src, Emitter); }