Subzero: Remove IceString.

src/IceAssembler.h

 //===- subzero/src/IceAssembler.h - Integrated assembler --------*- C++ -*-===//
 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 //
 // Modified by the Subzero authors.
 //
 //===----------------------------------------------------------------------===//
 //
 //                        The Subzero Code Generator
@@ skipping 10 matching lines @@
 /// from this base class. This base class manages buffers and fixups for
 /// emitting code, etc.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICEASSEMBLER_H
 #define SUBZERO_SRC_ICEASSEMBLER_H
 
 #include "IceDefs.h"
 #include "IceFixups.h"
+#include "IceStringPool.h"
 #include "IceUtils.h"
 
 #include "llvm/Support/Allocator.h"
 
 namespace Ice {
 
 class Assembler;
 
 /// A Label can be in one of three states:
 ///  - Unused.
@@ skipping 275 matching lines @@
   void bindRelocOffset(RelocOffset *Offset);
 
   void setNeedsTextFixup() { Buffer.setNeedsTextFixup(); }
   void resetNeedsTextFixup() { Buffer.resetNeedsTextFixup(); }
 
   bool needsTextFixup() const { return Buffer.needsTextFixup(); }
 
   void emitIASBytes(GlobalContext *Ctx) const;
   bool getInternal() const { return IsInternal; }
   void setInternal(bool Internal) { IsInternal = Internal; }
-  const IceString &getFunctionName() { return FunctionName; }
-  void setFunctionName(const IceString &NewName) { FunctionName = NewName; }
+  GlobalString getFunctionName() const { return FunctionName; }
+  void setFunctionName(GlobalString NewName) { FunctionName = NewName; }
   intptr_t getBufferSize() const { return Buffer.size(); }
   /// Roll back to a (smaller) size.
   void setBufferSize(intptr_t NewSize) { Buffer.setSize(NewSize); }
   void setPreliminary(bool Value) { Preliminary = Value; }
   bool getPreliminary() const { return Preliminary; }
 
   AssemblerKind getKind() const { return Kind; }
 
 protected:
   explicit Assembler(AssemblerKind Kind)
       : Kind(Kind), Allocator(), Buffer(*this) {}
 
 private:
   const AssemblerKind Kind;
 
   using AssemblerAllocator =
       llvm::BumpPtrAllocatorImpl<llvm::MallocAllocator, /*SlabSize=*/32 * 1024>;
   AssemblerAllocator Allocator;
 
   /// FunctionName and IsInternal are transferred from the original Cfg object,
   /// since the Cfg object may be deleted by the time the assembler buffer is
   /// emitted.
-  IceString FunctionName = "";
+  GlobalString FunctionName;
   bool IsInternal = false;
   /// Preliminary indicates whether a preliminary pass is being made for
   /// calculating bundle padding (Preliminary=true), versus the final pass where
   /// all changes to label bindings, label links, and relocation fixups are
   /// fully committed (Preliminary=false).
   bool Preliminary = false;
 
   /// Installs a created fixup, after it has been allocated.
   void installFixup(AssemblerFixup *F) { Buffer.installFixup(F); }
 
 protected:
   // Buffer's constructor uses the Allocator, so it needs to appear after it.
   // TODO(jpp): dependencies on construction order are a nice way of shooting
   // yourself in the foot. Fix this.
   AssemblerBuffer Buffer;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEASSEMBLER_H_