Subzero: Merge SpillVariable functionality directly into Variable.

src/IceCfg.h

 //===- subzero/src/IceCfg.h - Control flow graph ----------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 93 matching lines @@
   /// @{
   InstNumberT newInstNumber() { return NextInstNumber++; }
   InstNumberT getNextInstNumber() const { return NextInstNumber; }
   /// @}
 
   /// \name Manage Variables.
   /// @{
 
   /// Create a new Variable with a particular type and an optional name. The
   /// Node argument is the node where the variable is defined.
-  // TODO(jpp): untemplate this with separate methods: makeVariable,
-  // makeSpillVariable, and makeStackVariable.
+  // TODO(jpp): untemplate this with separate methods: makeVariable and
+  // makeStackVariable.
   template <typename T = Variable> T *makeVariable(Type Ty) {
     SizeT Index = Variables.size();
     auto *Var = T::create(this, Ty, Index);
     Variables.push_back(Var);
     return Var;
   }
   SizeT getNumVariables() const { return Variables.size(); }
   const VarList &getVariables() const { return Variables; }
   /// @}
 
@@ skipping 229 matching lines @@
   using OwnerType = Cfg;
   static StringPool *getStrings(const OwnerType *PoolOwner) {
     return PoolOwner->getVarStrings();
   }
 };
 using VariableString = StringID<VariableStringPoolTraits>;
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFG_H