Prepare for next PR

Created using spr 1.3.6-beta.1

Author: pcc

lld/ELF/Arch/X86_64.cpp

@@ -50,6 +50,7 @@ class X86_64 : public TargetInfo {
   bool deleteFallThruJmpInsn(InputSection &is, InputFile *file,
                              InputSection *nextIS) const override;
   bool relaxOnce(int pass) const override;
+  void relaxCFIJumpTables() const override;
   void applyBranchToBranchOpt() const override;
 
 private:
@@ -317,7 +318,7 @@ bool X86_64::deleteFallThruJmpInsn(InputSection &is, InputFile *file,
   return true;
 }
 
-static void relaxJumpTables(Ctx &ctx) {
+void X86_64::relaxCFIJumpTables() const {
   // Relax CFI jump tables.
   // - Split jump table into pieces and place target functions inside the jump
   //   table if small enough.
@@ -482,9 +483,6 @@ static void relaxJumpTables(Ctx &ctx) {
 }
 
 bool X86_64::relaxOnce(int pass) const {
-  if (pass == 0)
-    relaxJumpTables(ctx);
-
   uint64_t minVA = UINT64_MAX, maxVA = 0;
   for (OutputSection *osec : ctx.outputSections) {
     if (!(osec->flags & SHF_ALLOC))

lld/ELF/Target.h

@@ -96,6 +96,8 @@ class TargetInfo {
 
   // Do a linker relaxation pass and return true if we changed something.
   virtual bool relaxOnce(int pass) const { return false; }
+  // Relax CFI jump tables if implemented by target.
+  virtual void relaxCFIJumpTables() const {}
   // Do finalize relaxation after collecting relaxation infos.
   virtual void finalizeRelax(int passes) const {}
 

lld/ELF/Writer.cpp

@@ -1528,6 +1528,8 @@ template <class ELFT> void Writer<ELFT>::finalizeAddressDependentContent() {
   if (ctx.arg.randomizeSectionPadding)
     randomizeSectionPadding(ctx);
 
+  ctx.target->relaxCFIJumpTables();
+
   uint32_t pass = 0, assignPasses = 0;
   for (;;) {
     bool changed = ctx.target->needsThunks

llvm/lib/MC/MCSectionELF.cpp

@@ -176,11 +176,13 @@ void MCSectionELF::printSwitchToSection(const MCAsmInfo &MAI, const Triple &T,
     OS << "llvm_lto";
   else if (Type == ELF::SHT_LLVM_JT_SIZES)
     OS << "llvm_jt_sizes";
+  else if (Type == ELF::SHT_LLVM_CFI_JUMP_TABLE)
+    OS << "llvm_cfi_jump_table";
   else
     OS << "0x" << Twine::utohexstr(Type);
 
   if (EntrySize) {
-    assert(Flags & ELF::SHF_MERGE);
+    assert((Flags & ELF::SHF_MERGE) || Type == ELF::SHT_LLVM_CFI_JUMP_TABLE);
     OS << "," << EntrySize;
   }
 

llvm/test/MC/AsmParser/llvm_section_types.s

@@ -1,22 +1,32 @@
-## Verify that LLVM-specific section types are correctly inferred from assembly input.
+## Verify that LLVM-specific section types are correctly inferred from assembly input and printed.
+# RUN: llvm-mc -triple i386-pc-linux %s | FileCheck --check-prefix=ASM %s
 # RUN: llvm-mc -triple i386-pc-linux -filetype=obj -o %t %s
 # RUN: llvm-readobj -S %t | FileCheck %s
+# ASM: .section    .section1,"",@llvm_bb_addr_map
 .section    .section1,"",@llvm_bb_addr_map
 .byte 1
+# ASM: .section    .section2,"",@llvm_call_graph_profile
 .section    .section2,"",@llvm_call_graph_profile
 .byte 1
+# ASM: .section    .section3,"",@llvm_odrtab
 .section    .section3,"",@llvm_odrtab
 .byte 1
+# ASM: .section    .section4,"",@llvm_linker_options
 .section    .section4,"",@llvm_linker_options
 .byte 1
+# ASM: .section    .section5,"",@llvm_sympart
 .section    .section5,"",@llvm_sympart
 .byte 1
+# ASM: .section    .section6,"",@llvm_dependent_libraries
 .section    .section6,"",@llvm_dependent_libraries
 .byte 1
+# ASM: .section    .section7,"",@llvm_offloading
 .section    .section7,"",@llvm_offloading
 .byte 1
+# ASM: .section    .section8,"",@llvm_lto
 .section    .section8,"",@llvm_lto
 .byte 1
+# ASM: .section    .section9,"",@llvm_cfi_jump_table,1
 .section    .section9,"",@llvm_cfi_jump_table,1
 .byte 1