commit f694d33f4cc91a922ca6f7cbaf34ab5507cab326
author George Rimar <grimar@accesssoftek.com> Tue Jul 25 08:29:29 2017 +0000
committer George Rimar <grimar@accesssoftek.com> Tue Jul 25 08:29:29 2017 +0000
tree 70e877a87e5c0774f835a95ae3693260f31ed7ed
parent 97c8e097904daa82c1ad28f3623d8a12a81ae73d

[ELF] - Fix calculation of memory region offset.

This is PR33714.

Previously for each input section offset of memory region
was incremented on a size of output section.

That resulted in a wrong error message saying about
overflow. Patch fixes that.

Differential revision: https://reviews.llvm.org/D35803

llvm-svn: 308955

lld/ELF/LinkerScript.cpp

diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 835706d..9077c8c 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -550,6 +550,7 @@
 }
 
 void LinkerScript::output(InputSection *S) {
+  uint64_t Before = advance(0, 1);
   uint64_t Pos = advance(S->getSize(), S->Alignment);
   S->OutSecOff = Pos - S->getSize() - CurAddressState->OutSec->Addr;
 
@@ -563,7 +564,7 @@
   if (CurAddressState->MemRegion) {
     uint64_t &CurOffset =
         CurAddressState->MemRegionOffset[CurAddressState->MemRegion];
-    CurOffset += CurAddressState->OutSec->Size;
+    CurOffset += Pos - Before;
     uint64_t CurSize = CurOffset - CurAddressState->MemRegion->Origin;
     if (CurSize > CurAddressState->MemRegion->Length) {
       uint64_t OverflowAmt = CurSize - CurAddressState->MemRegion->Length;