diff options
| author | Tom Stellard <tstellar@redhat.com> | 2018-12-07 00:24:01 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2018-12-07 00:24:01 +0000 |
| commit | e725fba53cb9ccc3014a900c4998995ea800cd5e (patch) | |
| tree | 9cf104bae4e7e4d5bd7cfcbcbcaf720c10ecfdf6 | |
| parent | c4c411579171b8bd5ac77177c02e1f1f82c926ef (diff) | |
| download | bcm5719-llvm-e725fba53cb9ccc3014a900c4998995ea800cd5e.tar.gz bcm5719-llvm-e725fba53cb9ccc3014a900c4998995ea800cd5e.zip | |
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
------------------------------------------------------------------------
llvm-svn: 348555
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index 1189be599ed..76f5e5ead50 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -275,7 +275,7 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) { uint64_t Size = I->getCommonSize(); if (!CommonAlign) CommonAlign = Align; - CommonSize += alignTo(CommonSize, Align) + Size; + CommonSize = alignTo(CommonSize, Align) + Size; CommonSymbolsToAllocate.push_back(*I); } } else |
