Subzero: Remove IceString.

src/IceConverter.cpp

 //===- subzero/src/IceConverter.cpp - Converts LLVM to Ice  ---------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 84 matching lines @@
   explicit LLVM2ICEFunctionConverter(Ice::Converter &Converter)
       : LLVM2ICEConverter(Converter), Func(nullptr) {}
 
   void convertFunction(const Function *F) {
     Func = Ice::Cfg::create(Ctx, Converter.getNextSequenceNumber());
     {
       Ice::CfgLocalAllocatorScope _(Func.get());
 
       VarMap.clear();
       NodeMap.clear();
-      Func->setFunctionName(Ice::mangleName(F->getName()));
+      Func->setFunctionName(
+          Ctx->getGlobalString(Ice::mangleName(F->getName())));
       Func->setReturnType(convertToIceType(F->getReturnType()));
       Func->setInternal(F->hasInternalLinkage());
       Ice::TimerMarker T(Ice::TimerStack::TT_llvmConvert, Func.get());
 
       // The initial definition/use of each arg is the entry node.
       for (auto ArgI = F->arg_begin(), ArgE = F->arg_end(); ArgI != ArgE;
            ++ArgI) {
         Func->addArg(mapValueToIceVar(ArgI));
       }
 
@@ skipping 19 matching lines @@
       if (const auto *Func = llvm::dyn_cast<Ice::FunctionDeclaration>(Decl))
         IsUndefined = Func->isProto();
       else if (const auto *Var = llvm::dyn_cast<Ice::VariableDeclaration>(Decl))
         IsUndefined = !Var->hasInitializer();
       else
         report_fatal_error("Unhandled GlobalDeclaration type");
       if (IsUndefined)
         return Ctx->getConstantExternSym(Decl->getName());
       else {
         const Ice::RelocOffsetT Offset = 0;
-        return Ctx->getConstantSym(Offset, Decl->getName());
+        return Ctx->getConstantSym(
+            Offset, Ctx->getGlobalString(Decl->getName().toString()));
       }
     } else if (const auto CI = dyn_cast<ConstantInt>(Const)) {
       Ice::Type Ty = convertToIceType(CI->getType());
       return Ctx->getConstantInt(Ty, CI->getSExtValue());
     } else if (const auto CFP = dyn_cast<ConstantFP>(Const)) {
       Ice::Type Type = convertToIceType(CFP->getType());
       if (Type == Ice::IceType_f32)
         return Ctx->getConstantFloat(CFP->getValueAPF().convertToFloat());
       else if (Type == Ice::IceType_f64)
         return Ctx->getConstantDouble(CFP->getValueAPF().convertToDouble());
@@ skipping 642 matching lines @@
   raw_string_ostream StrBuf(Buffer);
   StrBuf << "Unhandled global initializer: " << Initializer;
   report_fatal_error(StrBuf.str());
 }
 
 } // end of anonymous namespace
 
 namespace Ice {
 
 void Converter::nameUnnamedGlobalVariables(Module *Mod) {
-  const IceString &GlobalPrefix = Ctx->getFlags().getDefaultGlobalPrefix();
+  const std::string GlobalPrefix = Ctx->getFlags().getDefaultGlobalPrefix();
   if (GlobalPrefix.empty())
     return;
   uint32_t NameIndex = 0;
   for (auto V = Mod->global_begin(), E = Mod->global_end(); V != E; ++V) {
     if (!V->hasName()) {
       V->setName(createUnnamedName(GlobalPrefix, NameIndex));
       ++NameIndex;
     } else {
       checkIfUnnamedNameSafe(V->getName(), "global", GlobalPrefix);
     }
   }
 }
 
 void Converter::nameUnnamedFunctions(Module *Mod) {
-  const IceString &FunctionPrefix = Ctx->getFlags().getDefaultFunctionPrefix();
+  const std::string FunctionPrefix = Ctx->getFlags().getDefaultFunctionPrefix();
   if (FunctionPrefix.empty())
     return;
   uint32_t NameIndex = 0;
   for (Function &F : *Mod) {
     if (!F.hasName()) {
       F.setName(createUnnamedName(FunctionPrefix, NameIndex));
       ++NameIndex;
     } else {
       checkIfUnnamedNameSafe(F.getName(), "function", FunctionPrefix);
     }
@@ skipping 27 matching lines @@
     FuncSigType Signature;
     FunctionType *FuncType = Func.getFunctionType();
     Signature.setReturnType(
         Converter.convertToIceType(FuncType->getReturnType()));
     for (size_t I = 0; I < FuncType->getNumParams(); ++I) {
       Signature.appendArgType(
           Converter.convertToIceType(FuncType->getParamType(I)));
     }
     auto *IceFunc = FunctionDeclaration::create(
         Ctx, Signature, Func.getCallingConv(), Func.getLinkage(), Func.empty());
-    IceFunc->setName(Func.getName());
+    IceFunc->setName(Ctx, Func.getName());
     if (!IceFunc->verifyLinkageCorrect(Ctx)) {
       std::string Buffer;
       raw_string_ostream StrBuf(Buffer);
       StrBuf << "Function " << IceFunc->getName()
              << " has incorrect linkage: " << IceFunc->getLinkageName();
       if (IceFunc->isExternal())
         StrBuf << "\n  Use flag -allow-externally-defined-symbols to override";
       report_fatal_error(StrBuf.str());
     }
     if (!IceFunc->validateTypeSignature(Ctx))
       report_fatal_error(IceFunc->getTypeSignatureError(Ctx));
     GlobalDeclarationMap[&Func] = IceFunc;
   }
   // Install global variable declarations.
   for (Module::const_global_iterator I = Mod->global_begin(),
                                      E = Mod->global_end();
        I != E; ++I) {
     const GlobalVariable *GV = I;
     constexpr bool NoSuppressMangling = false;
     auto *Var = VariableDeclaration::create(
         GlobalDeclarationsPool.get(), NoSuppressMangling, GV->getLinkage());
     Var->setAlignment(GV->getAlignment());
     Var->setIsConstant(GV->isConstant());
-    Var->setName(GV->getName());
+    Var->setName(Ctx, GV->getName());
     if (!Var->verifyLinkageCorrect(Ctx)) {
       std::string Buffer;
       raw_string_ostream StrBuf(Buffer);
       StrBuf << "Global " << Var->getName()
              << " has incorrect linkage: " << Var->getLinkageName();
       if (Var->isExternal())
         StrBuf << "\n  Use flag -allow-externally-defined-symbols to override";
       report_fatal_error(StrBuf.str());
     }
     GlobalDeclarationMap[GV] = Var;
@@ skipping 10 matching lines @@
   for (const Function &I : *Mod) {
     if (I.empty())
       continue;
     TimerMarker _(Ctx, I.getName());
     LLVM2ICEFunctionConverter FunctionConverter(*this);
     FunctionConverter.convertFunction(&I);
   }
 }
 
 } // end of namespace Ice