commit 030772114216c1a57c749050bb58d07de8ceaa7c
author John Porto <jpp@chromium.org> Tue Apr 05 06:30:21 2016 -0700
committer John Porto <jpp@chromium.org> Tue Apr 05 06:30:21 2016 -0700
tree 0d01b15dce26082927b8da7430f54d970ddabc52
parent 681f90fe6f4930c11d87a63d1c47cbb95a57f61b

Subzero. Refactors Switch Lowering.

BUG=
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1860473002 .

src/IceELFObjectWriter.cpp

diff --git a/src/IceELFObjectWriter.cpp b/src/IceELFObjectWriter.cpp
index e960d9c..38919cc 100644
--- a/src/IceELFObjectWriter.cpp
+++ b/src/IceELFObjectWriter.cpp
@@ -581,12 +581,8 @@
   const Elf64_Xword PointerSize = typeWidthInBytes(getPointerType());
   const Elf64_Xword ShAddralign = PointerSize;
   const Elf64_Xword ShEntsize = PointerSize;
-  const GlobalString JTName = JT.getFunctionName();
   const std::string SectionName = MangleSectionName(
-      IsPIC ? ".data.rel.ro" : ".rodata",
-      (JTName.hasStdString() ? JTName.toString()
-                             : std::to_string(JTName.getID())) +
-          "$jumptable");
+      IsPIC ? ".data.rel.ro" : ".rodata", JT.getSectionName());
   Section = createSection<ELFDataSection>(SectionName, SHT_PROGBITS, SHF_ALLOC,
                                           ShAddralign, ShEntsize);
   Section->setFileOffset(alignFileOffset(ShAddralign));
@@ -598,8 +594,7 @@
   Section->padToAlignment(Str, PointerSize);
   const bool IsExternal = getFlags().getDisableInternal();
   const uint8_t SymbolBinding = IsExternal ? STB_GLOBAL : STB_LOCAL;
-  GlobalString JumpTableName = Ctx.getGlobalString(
-      InstJumpTable::makeName(JT.getFunctionName(), JT.getId()));
+  const auto JumpTableName = JT.getName();
   SymTab->createDefinedSym(JumpTableName, SymbolType, SymbolBinding, Section,
                            Section->getCurrentSize(), PointerSize);
   StrTab->add(JumpTableName);