[lld] r264816 - Fix comments.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 29 17:43:50 PDT 2016


Author: ruiu
Date: Tue Mar 29 19:43:49 2016
New Revision: 264816

URL: http://llvm.org/viewvc/llvm-project?rev=264816&view=rev
Log:
Fix comments.

The original comments were separated by new code that is irrelevant to
the comment. This patch moves the comment to the right place and update it.

Modified:
    lld/trunk/ELF/InputSection.cpp

Modified: lld/trunk/ELF/InputSection.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputSection.cpp?rev=264816&r1=264815&r2=264816&view=diff
==============================================================================
--- lld/trunk/ELF/InputSection.cpp (original)
+++ lld/trunk/ELF/InputSection.cpp Tue Mar 29 19:43:49 2016
@@ -307,25 +307,24 @@ void InputSectionBase<ELFT>::relocate(ui
 template <class ELFT> void InputSection<ELFT>::writeTo(uint8_t *Buf) {
   if (this->Header->sh_type == SHT_NOBITS)
     return;
-  // Copy section contents from source object file to output file.
-  ArrayRef<uint8_t> Data = this->getSectionData();
   ELFFile<ELFT> &EObj = this->File->getObj();
 
-  // That happens with -r. In that case we need fix the relocation position and
-  // target. No relocations are applied.
+  // If -r is given, then an InputSection may be a relocation section.
   if (this->Header->sh_type == SHT_RELA) {
-    this->copyRelocations(Buf + OutSecOff, EObj.relas(this->Header));
+    copyRelocations(Buf + OutSecOff, EObj.relas(this->Header));
     return;
   }
   if (this->Header->sh_type == SHT_REL) {
-    this->copyRelocations(Buf + OutSecOff, EObj.rels(this->Header));
+    copyRelocations(Buf + OutSecOff, EObj.rels(this->Header));
     return;
   }
 
+  // Copy section contents from source object file to output file.
+  ArrayRef<uint8_t> Data = this->getSectionData();
   memcpy(Buf + OutSecOff, Data.data(), Data.size());
 
-  uint8_t *BufEnd = Buf + OutSecOff + Data.size();
   // Iterate over all relocation sections that apply to this section.
+  uint8_t *BufEnd = Buf + OutSecOff + Data.size();
   for (const Elf_Shdr *RelSec : this->RelocSections) {
     if (RelSec->sh_type == SHT_RELA)
       this->relocate(Buf, BufEnd, EObj.relas(RelSec));




More information about the llvm-commits mailing list