Subzero. Refactors Switch Lowering.

src/IceCfg.cpp

 //===- subzero/src/IceCfg.cpp - Control flow graph implementation ---------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 988 matching lines @@
     Str << "\t.type\t" << Name << ",%function\n";
   }
   Str << "\t" << Asm->getAlignDirective() << " "
       << Asm->getBundleAlignLog2Bytes() << ",0x";
   for (uint8_t I : Asm->getNonExecBundlePadding())
     Str.write_hex(I);
   Str << "\n";
   Str << Name << ":\n";
 }
 
-void Cfg::deleteJumpTableInsts() {
-  for (InstJumpTable *JumpTable : JumpTables)
-    JumpTable->setDeleted();
-}
-
 void Cfg::emitJumpTables() {
   switch (Ctx->getFlags().getOutFileType()) {
   case FT_Elf:
   case FT_Iasm: {
     // The emission needs to be delayed until the after the text section so
     // save the offsets in the global context.
     for (const InstJumpTable *JumpTable : JumpTables) {
-      SizeT NumTargets = JumpTable->getNumTargets();
-      JumpTableData::TargetList TargetList;
-      for (SizeT I = 0; I < NumTargets; ++I) {
-        SizeT Index = JumpTable->getTarget(I)->getIndex();
-        TargetList.emplace_back(
-            getAssembler()->getCfgNodeLabel(Index)->getPosition());
-      }
-      Ctx->addJumpTable(FunctionName, JumpTable->getId(), TargetList);
+      Ctx->addJumpTableData(JumpTable->toJumpTableData(getAssembler()));
     }
   } break;
   case FT_Asm: {
     // Emit the assembly directly so we don't need to hang on to all the names
     for (const InstJumpTable *JumpTable : JumpTables)
       getTarget()->emitJumpTable(this, JumpTable);
   } break;
   }
 }
 
 void Cfg::emit() {
   if (!BuildDefs::dump())
     return;
   TimerMarker T(TimerStack::TT_emitAsm, this);
   if (Ctx->getFlags().getDecorateAsm()) {
     renumberInstructions();
     getVMetadata()->init(VMK_Uses);
     liveness(Liveness_Basic);
     dump("After recomputing liveness for -decorate-asm");
   }
   OstreamLocker L(Ctx);
   Ostream &Str = Ctx->getStrEmit();
   const Assembler *Asm = getAssembler<>();
   const bool NeedSandboxing = Ctx->getFlags().getUseSandboxing();
 
   emitTextHeader(FunctionName, Ctx, Asm);
-  deleteJumpTableInsts();
   if (Ctx->getFlags().getDecorateAsm()) {
     for (Variable *Var : getVariables()) {
       if (Var->getStackOffset() && !Var->isRematerializable()) {
         Str << "\t" << Var->getSymbolicStackOffset(this) << " = "
             << Var->getStackOffset() << "\n";
       }
     }
   }
   for (CfgNode *Node : Nodes) {
     if (NeedSandboxing && Node->needsAlignment()) {
       Str << "\t" << Asm->getAlignDirective() << " "
           << Asm->getBundleAlignLog2Bytes() << "\n";
     }
     Node->emit(this);
   }
   emitJumpTables();
   Str << "\n";
 }
 
 void Cfg::emitIAS() {
   TimerMarker T(TimerStack::TT_emitAsm, this);
   // The emitIAS() routines emit into the internal assembler buffer, so there's
   // no need to lock the streams.
-  deleteJumpTableInsts();
   const bool NeedSandboxing = Ctx->getFlags().getUseSandboxing();
   for (CfgNode *Node : Nodes) {
     if (NeedSandboxing && Node->needsAlignment())
       getAssembler()->alignCfgNode();
     Node->emitIAS(this);
   }
   emitJumpTables();
 }
 
 size_t Cfg::getTotalMemoryMB() const {
@@ skipping 72 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice