Merging r340125:

tstellar · tstellar · commit e725fba53cb9 · 2018-12-07T00:24:01.000Z
------------------------------------------------------------------------ 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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ RuntimeDyldImpl::loadObjectImpl(const object::ObjectFile &Obj) {`
`275`	`275`	`uint64_t Size = I->getCommonSize();`
`276`	`276`	`if (!CommonAlign)`
`277`	`277`	`CommonAlign = Align;`
`278`		`- CommonSize += alignTo(CommonSize, Align) + Size;`
	`278`	`+ CommonSize = alignTo(CommonSize, Align) + Size;`
`279`	`279`	`CommonSymbolsToAllocate.push_back(*I);`
`280`	`280`	`}`
`281`	`281`	`} else`