Subzero: Remove IceString.

src/IceFixups.cpp

 //===- subzero/src/IceFixups.cpp - Implementation of Assembler Fixups -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 13 matching lines @@
 RelocOffsetT AssemblerFixup::offset() const {
   if (isNullSymbol())
     return addend_;
   if (!ValueIsSymbol) {
     if (const auto *CR = llvm::dyn_cast<ConstantRelocatable>(ConstValue))
       return CR->getOffset() + addend_;
   }
   return addend_;
 }
 
-IceString AssemblerFixup::symbol() const {
+GlobalString AssemblerFixup::symbol() const {
   assert(!isNullSymbol());
   assert(!ValueIsSymbol);
   const Constant *C = ConstValue;
   if (const auto *CR = llvm::dyn_cast<ConstantRelocatable>(C)) {
     return CR->getName();
   }
   // NOTE: currently only float/doubles are put into constant pools. In the
   // future we may put integers as well.
   assert(llvm::isa<ConstantFloat>(C) || llvm::isa<ConstantDouble>(C));
-  std::string Buffer;
-  llvm::raw_string_ostream Str(Buffer);
-  C->emitPoolLabel(Str);
-  return Str.str();
+  return C->getLabelName();
 }
 
 size_t AssemblerFixup::emit(GlobalContext *Ctx, const Assembler &Asm) const {
   static constexpr const size_t FixupSize = 4;
   if (!BuildDefs::dump())
     return FixupSize;
   Ostream &Str = Ctx->getStrEmit();
   Str << "\t.long ";
-  IceString Symbol;
+  std::string Symbol;
   if (isNullSymbol()) {
     Str << "__Sz_AbsoluteZero";
   } else {
-    Symbol = symbol();
+    Symbol = symbol().toString();
     Str << Symbol;
     assert(!ValueIsSymbol);
     if (const auto *CR = llvm::dyn_cast<ConstantRelocatable>(ConstValue)) {
       if (!Asm.fixupIsPCRel(kind()) &&
           GlobalContext::getFlags().getUseNonsfi() &&
-          CR->getName() != GlobalOffsetTable) {
+          CR->getName().toString() != GlobalOffsetTable) {
         Str << "@GOTOFF";
       }
     }
   }
 
   assert(Asm.load<RelocOffsetT>(position()) == 0);
 
   RelocOffsetT Offset = offset();
   if (Offset != 0) {
     if (Offset > 0) {
@@ skipping 16 matching lines @@
 void AssemblerFixup::emitOffset(Assembler *Asm) const {
   Asm->store(position(), offset());
 }
 
 size_t AssemblerTextFixup::emit(GlobalContext *Ctx, const Assembler &) const {
   Ctx->getStrEmit() << Message << "\n";
   return NumBytes;
 }
 
 } // end of namespace Ice