Subzero: Remove IceString.

src/IceTargetLoweringX8632.cpp

 //===- subzero/src/IceTargetLoweringX8632.cpp - x86-32 lowering -----------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 23 matching lines @@
 }
 
 void staticInit(::Ice::GlobalContext *Ctx) {
   ::Ice::X8632::TargetX8632::staticInit(Ctx);
   if (Ctx->getFlags().getUseNonsfi()) {
     // In nonsfi, we need to reference the _GLOBAL_OFFSET_TABLE_ for accessing
     // globals. The GOT is an external symbol (i.e., it is not defined in the
     // pexe) so we need to register it as such so that ELF emission won't barf
     // on an "unknown" symbol. The GOT is added to the External symbols list
     // here because staticInit() is invoked in a single-thread context.
-    Ctx->getConstantExternSym(::Ice::GlobalOffsetTable);
+    Ctx->getConstantExternSym(Ctx->getGlobalString(::Ice::GlobalOffsetTable));
   }
 }
+
+bool shouldBePooled(const class ::Ice::Constant *C) {
+  return ::Ice::X8632::TargetX8632::shouldBePooled(C);
+}
 } // end of namespace X8632
 
 namespace Ice {
 namespace X8632 {
 
 //------------------------------------------------------------------------------
 //      ______   ______     ______     __     ______   ______
 //     /\__  _\ /\  == \   /\  __ \   /\ \   /\__  _\ /\  ___\
 //     \/_/\ \/ \ \  __<   \ \  __ \  \ \ \  \/_/\ \/ \ \___  \
 //        \ \_\  \ \_\ \_\  \ \_\ \_\  \ \_\    \ \_\  \/\_____\
@@ skipping 188 matching lines @@
     BeforeAddReloc->setSubtract(true);
     auto *BeforeAdd = InstX86Label::create(Func, this);
     BeforeAdd->setRelocOffset(BeforeAddReloc);
 
     auto *AfterAddReloc = RelocOffset::create(Ctx);
     auto *AfterAdd = InstX86Label::create(Func, this);
     AfterAdd->setRelocOffset(AfterAddReloc);
 
     const RelocOffsetT ImmSize = -typeWidthInBytes(IceType_i32);
 
-    auto *GotFromPc = llvm::cast<ConstantRelocatable>(
-        Ctx->getConstantSym(ImmSize, {AfterAddReloc, BeforeAddReloc},
-                            GlobalOffsetTable, GlobalOffsetTable));
+    auto *GotFromPc =
+        llvm::cast<ConstantRelocatable>(Ctx->getConstantSymWithEmitString(
+            ImmSize, {AfterAddReloc, BeforeAddReloc},
+            Ctx->getGlobalString(GlobalOffsetTable), GlobalOffsetTable));
 
     // Insert a new version of InstX86GetIP.
     Context.insert<Traits::Insts::GetIP>(CallDest);
 
     Context.insert(BeforeAdd);
     _add(CallDest, GotFromPc);
     Context.insert(AfterAdd);
 
     // Spill the register to its home stack location if necessary.
     if (Dest != CallDest) {
@@ skipping 209 matching lines @@
 #define X(tag, sizeLog2, align, elts, elty, str, rcstr)                        \
   static_assert(_table1_##tag == _table2_##tag,                                \
                 "Inconsistency between ICETYPEX8632_TABLE and ICETYPE_TABLE");
 ICETYPE_TABLE
 #undef X
 } // end of namespace dummy3
 } // end of anonymous namespace
 
 } // end of namespace X8632
 } // end of namespace Ice