[ELF] - split RelocationSection<ELFT>::writeTo function.

[grimar]

Summary

Splitted writeTo to separate tls relocs handling stuff which is too long for one method now. Actually its NFC.

[ruiu]

ELF/OutputSections.cpp

196 ↗

(On Diff #41233)

Can you add a function comment?

202–204 ↗

(On Diff #41233)

If a function is named isXXX, it is usually expected to be a 'pure' function that does not change anything. It updates the arguments, so you may want to change the name.

[grimar]

ELF/OutputSections.cpp

196 ↗

(On Diff #41233)

Done.

202–204 ↗

(On Diff #41233)

Ok. Thanks for hint. Renamed to applyTlsDynamicReloc().

[ruiu]

LGTM

ELF/OutputSections.cpp

197 ↗

(On Diff #41357)

Remove "false otherwise" as it's obvious.

[grimar]

ELF/OutputSections.cpp

197 ↗

(On Diff #41357)

Done.

lld/trunk/ELF/OutputSections.h

public:
   void addReloc(const DynamicReloc<ELFT> &Reloc) { Relocs.push_back(Reloc); }
   unsigned getRelocOffset();
   void finalize() override;
   void writeTo(uint8_t *Buf) override;
   bool hasRelocs() const { return !Relocs.empty(); }
   bool isRela() const { return IsRela; }
 
 private:
+  bool applyTlsDynamicReloc(SymbolBody *Body, uint32_t Type, Elf_Rel *P,
+                            Elf_Rel *N);
+
   std::vector<DynamicReloc<ELFT>> Relocs;
   const bool IsRela;
 };
 
 template <class ELFT>
 class OutputSection final : public OutputSectionBase<ELFT> {
 public:
   typedef typename llvm::object::ELFFile<ELFT>::Elf_Shdr Elf_Shdr;

lld/trunk/ELF/OutputSections.cpp

RelocationSection<ELFT>::RelocationSection(StringRef Name, bool IsRela)
     : OutputSectionBase<ELFT>(Name,
                               IsRela ? llvm::ELF::SHT_RELA : llvm::ELF::SHT_REL,
                               llvm::ELF::SHF_ALLOC),
       IsRela(IsRela) {
   this->Header.sh_entsize = IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
   this->Header.sh_addralign = ELFT::Is64Bits ? 8 : 4;
 }
 
+// Applies corresponding symbol and type for dynamic tls relocation.
+// Returns true if relocation was handled.
+template <class ELFT>
+bool RelocationSection<ELFT>::applyTlsDynamicReloc(SymbolBody *Body,
+                                                   uint32_t Type, Elf_Rel *P,
+                                                   Elf_Rel *N) {
+  if (Target->isTlsLocalDynamicReloc(Type)) {
+    P->setSymbolAndType(0, Target->getTlsModuleIndexReloc(), Config->Mips64EL);
+    P->r_offset =
+        Out<ELFT>::Got->getVA() + Out<ELFT>::LocalModuleTlsIndexOffset;
+    return true;
+  }
+
+  if (Body && Target->isTlsGlobalDynamicReloc(Type)) {
+    P->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
+                        Target->getTlsModuleIndexReloc(), Config->Mips64EL);
+    P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body);
+    N->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
+                        Target->getTlsOffsetReloc(), Config->Mips64EL);
+    N->r_offset = Out<ELFT>::Got->getEntryAddr(*Body) + sizeof(uintX_t);
+    return true;
+  }
+  return false;
+}
+
 template <class ELFT> void RelocationSection<ELFT>::writeTo(uint8_t *Buf) {
   const unsigned EntrySize = IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
   for (const DynamicReloc<ELFT> &Rel : Relocs) {
     auto *P = reinterpret_cast<Elf_Rel *>(Buf);
     Buf += EntrySize;
 
     // Skip placeholder for global dynamic TLS relocation pair. It was already
     // handled by the previous relocation.
     if (!Rel.C || !Rel.RI)
       continue;
 
     InputSectionBase<ELFT> &C = *Rel.C;
     const Elf_Rel &RI = *Rel.RI;
     uint32_t SymIndex = RI.getSymbol(Config->Mips64EL);
     const ObjectFile<ELFT> &File = *C.getFile();
     SymbolBody *Body = File.getSymbolBody(SymIndex);
     if (Body)
       Body = Body->repl();
 
     uint32_t Type = RI.getType(Config->Mips64EL);
-
-    if (Target->isTlsLocalDynamicReloc(Type)) {
-      P->setSymbolAndType(0, Target->getTlsModuleIndexReloc(),
-                          Config->Mips64EL);
-      P->r_offset =
-          Out<ELFT>::Got->getVA() + Out<ELFT>::LocalModuleTlsIndexOffset;
-      continue;
-    }
-
-    if (Body && Target->isTlsGlobalDynamicReloc(Type)) {
-      P->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
-                          Target->getTlsModuleIndexReloc(), Config->Mips64EL);
-      P->r_offset = Out<ELFT>::Got->getEntryAddr(*Body);
-      auto *PNext = reinterpret_cast<Elf_Rel *>(Buf);
-      PNext->setSymbolAndType(Body->getDynamicSymbolTableIndex(),
-                              Target->getTlsOffsetReloc(), Config->Mips64EL);
-      PNext->r_offset = Out<ELFT>::Got->getEntryAddr(*Body) + sizeof(uintX_t);
+    if (applyTlsDynamicReloc(Body, Type, P, reinterpret_cast<Elf_Rel *>(Buf)))
       continue;
-    }
-
     bool NeedsCopy = Body && Target->relocNeedsCopy(Type, *Body);
     bool NeedsGot = Body && Target->relocNeedsGot(Type, *Body);
     bool CanBePreempted = canBePreempted(Body, NeedsGot);
     bool LazyReloc = Body && Target->supportsLazyRelocations() &&
                      Target->relocNeedsPlt(Type, *Body);
 
     if (CanBePreempted) {
       unsigned GotReloc =