Subzero: Remove IceString.

src/IceTargetLoweringX8632Traits.h

 //===- subzero/src/IceTargetLoweringX8632Traits.h - x86-32 traits -*- C++ -*-=//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 258 matching lines @@
     Begin,
     // SSE2 is the PNaCl baseline instruction set.
     SSE2 = Begin,
     SSE4_1,
     End
   };
 
   static const char *TargetName;
   static constexpr Type WordType = IceType_i32;
 
-  static IceString getRegName(RegNumT RegNum) {
+  static const char *getRegName(RegNumT RegNum) {
     static const char *const RegNames[RegisterSet::Reg_NUM] = {
 #define X(val, encode, name, base, scratch, preserved, stackptr, frameptr,     \
           isGPR, is64, is32, is16, is8, isXmm, is64To8, is32To8, is16To8,      \
           isTrunc8Rcvr, isAhRcvr, aliases)                                     \
   name,
         REGX8632_TABLE
 #undef X
     };
     RegNum.assertIsValid();
     return RegNames[RegNum];
@@ skipping 650 matching lines @@
   /// stack slot only if its linked Variable has a register. If the linked
   /// Variable has a stack slot, then the Variable and SpillVariable share that
   /// slot.
   class SpillVariable : public Variable {
     SpillVariable() = delete;
     SpillVariable(const SpillVariable &) = delete;
     SpillVariable &operator=(const SpillVariable &) = delete;
 
   public:
     static SpillVariable *create(Cfg *Func, Type Ty, SizeT Index) {
-      return new (Func->allocate<SpillVariable>()) SpillVariable(Ty, Index);
+      return new (Func->allocate<SpillVariable>())
+          SpillVariable(Func, Ty, Index);
     }
     constexpr static auto SpillVariableKind =
         static_cast<OperandKind>(kVariable_Target);
     static bool classof(const Operand *Operand) {
       return Operand->getKind() == SpillVariableKind;
     }
     void setLinkedTo(Variable *Var) { LinkedTo = Var; }
     Variable *getLinkedTo() const { return LinkedTo; }
     // Inherit dump() and emit() from Variable.
 
   private:
-    SpillVariable(Type Ty, SizeT Index)
-        : Variable(SpillVariableKind, Ty, Index), LinkedTo(nullptr) {}
+    SpillVariable(const Cfg *Func, Type Ty, SizeT Index)
+        : Variable(Func, SpillVariableKind, Ty, Index), LinkedTo(nullptr) {}
     Variable *LinkedTo;
   };
 
   // Note: The following data structures are defined in IceInstX8632.cpp.
 
   static const struct InstBrAttributesType {
     Cond::BrCond Opposite;
     const char *DisplayString;
     const char *EmitString;
   } InstBrAttributes[];
@@ skipping 16 matching lines @@
 
   static uint8_t InstSegmentPrefixes[];
 };
 
 using Traits = ::Ice::X8632::TargetX8632Traits;
 } // end of namespace X8632
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8632TRAITS_H