Subzero. Refactors Switch Lowering.

src/IceELFObjectWriter.cpp

Index: src/IceELFObjectWriter.cpp
diff --git a/src/IceELFObjectWriter.cpp b/src/IceELFObjectWriter.cpp
index c3ba9b070ab24fd6397e7d3842afbe3bd3300b4c..536af298935eb352849b64ac7d03c8971e2ff0ce 100644
--- a/src/IceELFObjectWriter.cpp
+++ b/src/IceELFObjectWriter.cpp
@@ -582,12 +582,8 @@ void ELFObjectWriter::writeJumpTable(const JumpTableData &JT,
   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());

[Jim Stichnoth, 2016/04/04 13:42:30]

It bothers me a tiny bit that we are instantiating the getSectionName() string.

I wonder if maybe we should only call MangleSectionName if -fdata-sections is
specified?

The same would apply to the x86 target emit routines.

[John, 2016/04/05 12:22:43]

This would change sz's output, so I'll leave as is.

This seems to be part of a larger "problem": we don't have a centralized
"section name factory," which would be nice to have so that we would have
control over how/when these strings are created.

   Section = createSection<ELFDataSection>(SectionName, SHT_PROGBITS, SHF_ALLOC,
                                           ShAddralign, ShEntsize);
   Section->setFileOffset(alignFileOffset(ShAddralign));
@@ -599,8 +595,7 @@ void ELFObjectWriter::writeJumpTable(const JumpTableData &JT,
   Section->padToAlignment(Str, PointerSize);
   const bool IsExternal = Ctx.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);