Subzero: Remove IceString.

src/IceCfgNode.h

 //===- subzero/src/IceCfgNode.h - Control flow graph node -------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Declares the CfgNode class, which represents a single basic block as
 /// its instruction list, in-edge list, and out-edge list.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICECFGNODE_H
 #define SUBZERO_SRC_ICECFGNODE_H
 
 #include "IceDefs.h"
 #include "IceInst.h" // InstList traits
+#include "IceStringPool.h"
 
 namespace Ice {
 
 class CfgNode {
   CfgNode() = delete;
   CfgNode(const CfgNode &) = delete;
   CfgNode &operator=(const CfgNode &) = delete;
 
 public:
-  static CfgNode *create(Cfg *Func, SizeT LabelIndex) {
-    return new (Func->allocate<CfgNode>()) CfgNode(Func, LabelIndex);
+  static CfgNode *create(Cfg *Func, SizeT Number) {
+    return new (Func->allocate<CfgNode>()) CfgNode(Func, Number);
   }
 
   Cfg *getCfg() const { return Func; }
 
   /// Access the label number and name for this node.
   SizeT getIndex() const { return Number; }
   void resetIndex(SizeT NewNumber) { Number = NewNumber; }
-  IceString getName() const;
-  void setName(const IceString &NewName) {
-    // Make sure that the name can only be set once.
-    assert(NameIndex == Cfg::IdentifierIndexInvalid);
-    if (!NewName.empty())
-      NameIndex = Func->addIdentifierName(NewName);
+  NodeString getName() const { return Name; }
+  void setName(const std::string &NewName) {
+    if (NewName.empty())
+      return;
+    Name = NodeString::createWithString(Func, NewName);
   }
-  IceString getAsmName() const {
+  std::string getAsmName() const {
     return ".L" + Func->getFunctionName() + "$" + getName();
   }
 
   void incrementLoopNestDepth() { ++LoopNestDepth; }
   void setLoopNestDepth(SizeT NewDepth) { LoopNestDepth = NewDepth; }
   SizeT getLoopNestDepth() const { return LoopNestDepth; }
 
   /// The HasReturn flag indicates that this node contains a return instruction
   /// and therefore needs an epilog.
   void setHasReturn() { HasReturn = true; }
@@ skipping 47 matching lines @@
                             InstNumberT LastInstNum);
   void contractIfEmpty();
   void doBranchOpt(const CfgNode *NextNode);
   void emit(Cfg *Func) const;
   void emitIAS(Cfg *Func) const;
   void dump(Cfg *Func) const;
 
   void profileExecutionCount(VariableDeclaration *Var);
 
 private:
-  CfgNode(Cfg *Func, SizeT LabelIndex);
+  CfgNode(Cfg *Func, SizeT Number);
   bool livenessValidateIntervals(Liveness *Liveness) const;
   Cfg *const Func;
-  SizeT Number;            /// invariant: Func->Nodes[Number]==this
-  const SizeT LabelNumber; /// persistent number for label generation
-  Cfg::IdentifierIndexType NameIndex =
-      Cfg::IdentifierIndexInvalid; /// index into Cfg::NodeNames table
-  SizeT LoopNestDepth = 0;         /// the loop nest depth of this node
-  bool HasReturn = false;          /// does this block need an epilog?
+  SizeT Number; /// invariant: Func->Nodes[Number]==this
+  NodeString Name;
+  SizeT LoopNestDepth = 0; /// the loop nest depth of this node
+  bool HasReturn = false;  /// does this block need an epilog?
   bool NeedsPlacement = false;
   bool NeedsAlignment = false;       /// is sandboxing required?
   InstNumberT InstCountEstimate = 0; /// rough instruction count estimate
   NodeList InEdges;                  /// in no particular order
   NodeList OutEdges;                 /// in no particular order
   PhiList Phis;                      /// unordered set of phi instructions
   InstList Insts;                    /// ordered list of non-phi instructions
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFGNODE_H