[llvm-branch-commits] [llvm-branch] r348555 - Merging r340125:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Dec  6 16:24:01 2018
New Revision: 348555

URL: http://llvm.org/viewvc/llvm-project?rev=348555&view=rev
Log:
Merging r340125:

------------------------------------------------------------------------
r340125 | lhames | 2018-08-18 11:38:37 -0700 (Sat, 18 Aug 2018) | 6 lines

[RuntimeDyld] Fix a bug in RuntimeDyld::loadObjectImpl that was over-allocating
space for common symbols.

Patch by Dmitry Sidorov. Thanks Dmitry!

Differential revision: https://reviews.llvm.org/D50240
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp

Modified: llvm/branches/release_70/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp?rev=348555&r1=348554&r2=348555&view=diff
==============================================================================
--- llvm/branches/release_70/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp (original)
+++ llvm/branches/release_70/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp Thu Dec  6 16:24:01 2018
@@ -275,7 +275,7 @@ RuntimeDyldImpl::loadObjectImpl(const ob
           uint64_t Size = I->getCommonSize();
           if (!CommonAlign)
             CommonAlign = Align;
-          CommonSize += alignTo(CommonSize, Align) + Size;
+          CommonSize = alignTo(CommonSize, Align) + Size;
           CommonSymbolsToAllocate.push_back(*I);
         }
       } else