Subzero: Cleanup Inst==>Instr.

src/IceSwitchLowering.cpp

 //===- subzero/src/IceSwitchLowering.cpp - Switch lowering ----------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Implements platform independent analysis of switch cases to improve
 /// the generated code.
 ///
 //===----------------------------------------------------------------------===//
 #include "IceSwitchLowering.h"
 
 #include "IceCfgNode.h"
 #include "IceTargetLowering.h"
 
 #include <algorithm>
 
 namespace Ice {
 
 CaseClusterArray CaseCluster::clusterizeSwitch(Cfg *Func,
-                                               const InstSwitch *Inst) {
+                                               const InstSwitch *Instr) {
   CaseClusterArray CaseClusters;
 
   // Load the cases
-  SizeT NumCases = Inst->getNumCases();
+  SizeT NumCases = Instr->getNumCases();
   CaseClusters.reserve(NumCases);
   for (SizeT I = 0; I < NumCases; ++I)
-    CaseClusters.emplace_back(Inst->getValue(I), Inst->getLabel(I));
+    CaseClusters.emplace_back(Instr->getValue(I), Instr->getLabel(I));
 
   // Sort the cases
   std::sort(CaseClusters.begin(), CaseClusters.end(),
             [](const CaseCluster &x, const CaseCluster &y) {
               return x.High < y.Low;
             });
 
   // Merge adjacent case ranges
   auto Active = CaseClusters.begin();
   std::for_each(Active + 1, CaseClusters.end(),
@@ skipping 25 matching lines @@
   // Might be too sparse for the jump table
   if (NumCases * 2 <= TotalRange)
     return CaseClusters;
   // Unlikely. Would mean can't store size of jump table.
   if (TotalRange == UINT64_MAX)
     return CaseClusters;
   ++TotalRange;
 
   // Replace everything with a jump table
   InstJumpTable *JumpTable =
-      InstJumpTable::create(Func, TotalRange, Inst->getLabelDefault());
+      InstJumpTable::create(Func, TotalRange, Instr->getLabelDefault());
   for (const CaseCluster &Case : CaseClusters) {
     // Case.High could be UINT64_MAX which makes the loop awkward. Unwrap the
     // last iteration to avoid wrap around problems.
     for (uint64_t I = Case.Low; I < Case.High; ++I)
       JumpTable->addTarget(I - MinValue, Case.Target);
     JumpTable->addTarget(Case.High - MinValue, Case.Target);
     Case.Target->setNeedsAlignment();
   }
   Func->addJumpTable(JumpTable);
 
   CaseClusters.clear();
   CaseClusters.emplace_back(MinValue, MaxValue, JumpTable);
 
   return CaseClusters;
 }
 
 bool CaseCluster::tryAppend(const CaseCluster &New) {
   // Can only append ranges with the same target and are adjacent
   bool CanAppend = this->Target == New.Target && this->High + 1 == New.Low;
   if (CanAppend)
     this->High = New.High;
   return CanAppend;
 }
 
 } // end of namespace Ice