Subzero: Pull the node name out of the node structure.

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.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file 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
 
 namespace Ice {
 
 class CfgNode {
   CfgNode(const CfgNode &) = delete;
   CfgNode &operator=(const CfgNode &) = delete;
 
 public:
-  static CfgNode *create(Cfg *Func, SizeT LabelIndex, IceString Name = "") {
-    return new (Func->allocate<CfgNode>()) CfgNode(Func, LabelIndex, Name);
+  static CfgNode *create(Cfg *Func, SizeT LabelIndex) {
+    return new (Func->allocate<CfgNode>()) CfgNode(Func, LabelIndex);
   }
 
   // Access the label number and name for this node.
   SizeT getIndex() const { return Number; }
   IceString getName() const;
-  void setName(IceString &NewName) {
+  void setName(const IceString &NewName) {
     // Make sure that the name can only be set once.
-    assert(Name.empty());
-    Name = NewName;
+    assert(NameIndex < 0);
+    if (!NewName.empty())
+      NameIndex = Func->addNodeName(NewName);
   }
   IceString getAsmName() const {
     return ".L" + Func->getFunctionName() + "$" + getName();
   }
 
   // The HasReturn flag indicates that this node contains a return
   // instruction and therefore needs an epilog.
   void setHasReturn() { HasReturn = true; }
   bool getHasReturn() const { return HasReturn; }
 
@@ skipping 30 matching lines @@
   void livenessLightweight();
   bool liveness(Liveness *Liveness);
   void livenessPostprocess(LivenessMode Mode, Liveness *Liveness);
   void contractIfEmpty();
   void doBranchOpt(const CfgNode *NextNode);
   void emit(Cfg *Func) const;
   void emitIAS(Cfg *Func) const;
   void dump(Cfg *Func) const;
 
 private:
-  CfgNode(Cfg *Func, SizeT LabelIndex, IceString Name);
+  CfgNode(Cfg *Func, SizeT LabelIndex);
   Cfg *const Func;
   const SizeT Number; // label index
-  IceString Name;     // for dumping only
+  int32_t NameIndex;  // index into Cfg::NodeNames table
   bool HasReturn;     // does this block need an epilog?
   bool NeedsPlacement;
   InstNumberT InstCountEstimate; // 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